Skip to content

Commit aef0a43

Browse files
maxpainlikebreath
authored andcommitted
vdpa: fix RX failure after device reset by always using base 0
After a vDPA device reset, activate_vdpa() read avail_idx from guest memory to pass as the vring base via VHOST_SET_VRING_BASE. However, the guest memory still contained the stale avail_idx from the previous session. For a 256-entry ring, this meant base=256, causing the hardware to believe the entire RX ring was consumed with no available buffers — RX silently stopped while TX continued to work. QEMU handles this correctly by tracking last_avail_idx internally (reset to 0 in virtio_reset()) and passing that value, rather than reading from guest memory. Fix by always passing base=0 to set_vring_base(). After a device reset, both the guest driver and the vhost backend restart their rings from index 0. For live migration, the correct base should come from VHOST_GET_VRING_BASE (saved before the migration), not guest memory. Tested with mlx5_vdpa (ConnectX-6 Dx) + Windows Server 2025 (netkvm). Before: RX=0 after 3rd driver activation. After: full connectivity. Signed-off-by: Max Makarov <maxpain@linux.com>
1 parent f56c839 commit aef0a43

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

virtio-devices/src/vdpa.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl Vdpa {
217217

218218
fn activate_vdpa(
219219
&mut self,
220-
mem: &GuestMemoryMmap,
220+
_mem: &GuestMemoryMmap,
221221
virtio_interrupt: &dyn VirtioInterrupt,
222222
queues: &[(usize, Queue, EventFd)],
223223
) -> Result<()> {
@@ -269,13 +269,7 @@ impl Vdpa {
269269
self.vhost
270270
.as_ref()
271271
.unwrap()
272-
.set_vring_base(
273-
*queue_index,
274-
queue
275-
.avail_idx(mem, Ordering::Acquire)
276-
.map_err(Error::GetAvailableIndex)?
277-
.0,
278-
)
272+
.set_vring_base(*queue_index, 0)
279273
.map_err(Error::SetVringBase)?;
280274

281275
if let Some(eventfd) =

0 commit comments

Comments
 (0)