Changeset 98063 in vbox for trunk/src/VBox/Devices/VirtIO

Timestamp:

Jan 12, 2023 3:01:04 PM (2 years ago)

Author:

vboxsync

Message:

Devices/Virtio,Devices/DevVirtioNet_1_0: Additional fixes for the virtio-net device implementation, don't reset the shadow index counters in the virtq structure when it is being attached because the guest might have used the queues before setting the DRIVER_OK flag (FreeBSD's legacy virtio-net driver included up to version 12.3 and pfSense 2.6.0). Also add a device reset callback to properly reset the device state, avoiding the RX code to work on stale data overwriting random guest memory. Some style fixes, ticketref:21201

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• VirtioCore.cpp (modified) (4 diffs)
• VirtioCore.h (modified) (1 diff)

trunk/src/VBox/Devices/VirtIO/VirtioCore.cpp

@@ -590 +590 @@
     PVIRTQUEUE pVirtq = &pVirtio->aVirtqueues[uVirtq];
     pVirtq->uVirtq = uVirtq;
-    pVirtq->uAvailIdxShadow = 0;
-    pVirtq->uUsedIdxShadow  = 0;
     pVirtq->fUsedRingEvent = false;
     pVirtq->fAttached = true;
@@ -1014 +1012 @@
                     ("Guest driver not in ready state.\n"), VERR_INVALID_STATE);
 
-    Log6Func(("    Copying device data to %s, [desc:%u → used ring:%u]\n",
+    Log6Func(("    Copying device data to %s, [desc:%u -> used ring:%u]\n",
               VIRTQNAME(pVirtio, uVirtq), pVirtqBuf->uHeadIdx, pVirtq->uUsedIdxShadow));
 
@@ -1161 +1159 @@
             ("Guest driver not in ready state.\n"), VERR_INVALID_STATE);
 
-    Log6Func(("    Sync %s used ring (%u → idx)\n",
+    Log6Func(("    Sync %s used ring (%u -> idx)\n",
                         pVirtq->szName, pVirtq->uUsedIdxShadow));
 
@@ -1353 +1351 @@
     pVirtioCC->pfnStatusChanged(pVirtio, pVirtioCC, 0 /* fDriverOk */);
     virtioResetDevice(pDevIns, pVirtio);
+}
+
+DECLHIDDEN(void) virtioCoreR3ResetDevice(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, PVIRTIOCORECC pVirtioCC)
+{
+    virtioGuestR3WasReset(pDevIns, pVirtio, pVirtioCC);
 }
 #endif /* IN_RING3 */

trunk/src/VBox/Devices/VirtIO/VirtioCore.h

@@ -549 +549 @@
 
 /**
+ * Resets the device state upon a VM reset for instance.
+ *
+ * @returns nothing.
+ * @param   pVirtio     Pointer to the virtio state.
+ *
+ * @note Calls back into the upper device when the status changes.
+ */
+DECLHIDDEN(void) virtioCoreR3ResetDevice(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, PVIRTIOCORECC pVirtioCC);
+
+/**
  * 'Attaches' host device-specific implementation's queue state to host VirtIO core
  * virtqueue management infrastructure, informing the virtio core of the name of the