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

Timestamp:

Aug 29, 2019 2:47:17 PM (5 years ago)

Author:

vboxsync

Message:

Storage/DrvVirtioSCSI.cpp: Added code to handle event subscriptions and eventq handling. Various improvements to round-trip I/O with Linux at startup after feature negotiation and setup. Ready to try some preliminary device access from guest. See bugref:9440 Comment #58 for more info

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio_1_0.cpp (modified) (6 diffs)
• Virtio_1_0.h (modified) (1 diff)
• Virtio_1_0_impl.h (modified) (3 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Virtio_1_0 - Virtio Common Functions (VirtQ, virtqueue, Virtio PCI)
+ * Virtio_1_0 - Virtio Common (PCI, feature & config mgt, queue mgt & proxy, notification mgt)
  */
 
@@ -259 +259 @@
     RTSgBufInit(&pVirtqProxy->outSgBuf,(PCRTSGSEG)&pDescChain->aSegsOut, pDescChain->cSegsOut);
 
-    *ppInSegs  = &pVirtqProxy->inSgBuf;
-    *ppOutSegs = &pVirtqProxy->outSgBuf;
+    if (ppInSegs)
+        *ppInSegs  = &pVirtqProxy->inSgBuf;
+    if (ppOutSegs)
+        *ppOutSegs = &pVirtqProxy->outSgBuf;
 
     Log2Func(("%s -- segs out: %u,  segs in: %u --\n",
@@ -362 +364 @@
     Log2Func(("%s\n", pVirtqProxy->szVirtqName));
 
+
     /** Inform client */
     pVirtio->virtioCallbacks.pfnVirtioQueueNotified((VIRTIOHANDLE)pVirtio, pVirtio->pClientContext, qIdx);
@@ -472 +475 @@
     pVirtQ->uAvailIdx = 0;
     pVirtQ->uUsedIdx  = 0;
+    pVirtio->uQueueEnable[qIdx] = false;
     pVirtio->uQueueSize[qIdx] = VIRTQ_MAX_SIZE;
     pVirtio->uQueueNotifyOff[qIdx] = qIdx;
 }
+
 
 static void virtioResetDevice(PVIRTIOSTATE pVirtio)
@@ -519 +524 @@
 static void virtioGuestResetted(PVIRTIOSTATE pVirtio)
 {
-    LogFunc(("Guest reset the device"));
+    LogFunc(("Guest reset the device\n"));
 
     /** Let the client know */
@@ -770 +775 @@
     {
         *(uint8_t *)pv = pVirtio->uISR;
-        Log2Func(("Read and clear 0x%02x from uISR (interrupt type: virtq: %d, dev config: %d)\n",
-              pVirtio->uISR, pVirtio->uISR & VIRTIO_ISR_VIRTQ_INTERRUPT,
-              !!(pVirtio->uISR & VIRTIO_ISR_DEVICE_CONFIG)));
+        Log2Func(("Read and clear ISR\n"));
         pVirtio->uISR = 0; /** VirtIO specification requires reads of ISR to clear it */
         virtioLowerInterrupt(pVirtio);

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

@@ -215 +215 @@
  * @param pSgBuf    - Caller's sgbuf of one or more virtual memory segments
  *                    to write to the queue. This is useful because some kinds
- *                    of transactions involve variable length sub-components
+ *                    of transactions involve variable length subcomponents
  *                    whose size can only be known near the time of writing.
  * @parame fFence   - If set put up copy fence (memory barrier) after

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

@@ -40 +40 @@
 #define VIRTIO_F_RING_EVENT_IDX             RT_BIT_64(29)        /**< Doc bug: Goes under two names in spec     */
 
-#define VIRTIO_DEV_INDEPENDENT_FEATURES_OFFERED ( VIRTIO_F_EVENT_IDX ) /**< TBD: Add VIRTIO_F_INDIRECT_DESC     */
+#define VIRTIO_DEV_INDEPENDENT_FEATURES_OFFERED ( 0 )            /**< TBD: Add VIRTIO_F_INDIRECT_DESC     */
 
 #define VIRTIO_ISR_VIRTQ_INTERRUPT           RT_BIT_32(0)        /**< Virtq interrupt bit of ISR register       */
@@ -364 +364 @@
 static void        virtioWriteUsedAvailEvent  (PVIRTIOSTATE pVirtio, uint16_t qIdx, uint32_t uAvailEventIdx);
 
+
 DECLINLINE(int) virtqIsEventNeeded(uint16_t uEventIdx, uint16_t uDescIdxNew, uint16_t uDescIdxOld)
 {
@@ -504 +505 @@
                           &uAvailEventIdx, sizeof(uAvailEventIdx));
 }
+
 
 /**