VirtualBox

Changeset 23498 in vbox


Ignore:
Timestamp:
Oct 2, 2009 6:14:07 AM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
53130
Message:

#3987: Virtio: Reception/transmission works.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

    r23358 r23498  
    4646#define VIRTIO_RELOCATE(p, o) *(RTHCUINTPTR *)&p += o
    4747
    48 /*****************************************************************************/
    49 RT_C_DECLS_BEGIN
    50 PDMBOTHCBDECL(uint32_t) vnetGetHostFeatures(void *pState);
    51 PDMBOTHCBDECL(int)      vnetGetConfig(void *pState, uint32_t port, uint32_t cb, void *data);
    52 PDMBOTHCBDECL(int)      vnetSetConfig(void *pState, uint32_t port, uint32_t cb, void *data);
    53 PDMBOTHCBDECL(void)     vnetReset(void *pState);
    54 RT_C_DECLS_END
    55 
    56 /*****************************************************************************/
     48#ifdef DEBUG
     49#define QUEUENAME(s, q) g_VPCIDevices[s->enmDevType].pfnGetQueueName(s, q)
     50#endif /* DEBUG */
    5751
    5852//- TODO: Move to Virtio.h ----------------------------------------------------
     53
     54#define VPCI_F_NOTIFY_ON_EMPTY 0x1000000
    5955
    6056#define VRINGDESC_MAX_SIZE (2 * 1024 * 1024)
    … …  
    191187
    192188//- TODO: Move to VirtioPCI.cpp -----------------------------------------------
     189
     190/*****************************************************************************/
     191RT_C_DECLS_BEGIN
     192PDMBOTHCBDECL(uint32_t) vnetGetHostFeatures(void *pState);
     193PDMBOTHCBDECL(int)      vnetGetConfig(void *pState, uint32_t port, uint32_t cb, void *data);
     194PDMBOTHCBDECL(int)      vnetSetConfig(void *pState, uint32_t port, uint32_t cb, void *data);
     195PDMBOTHCBDECL(void)     vnetReset(void *pState);
     196#ifdef DEBUG
     197static const char *vnetGetQueueName(void *pvState, PVQUEUE pQueue);
     198#endif /* DEBUG */
     199RT_C_DECLS_END
     200
     201/*****************************************************************************/
    193202
    194203struct VirtioPCIDevices
    … …  
    206215    int       (*pfnSetConfig)(void *pvState, uint32_t port, uint32_t cb, void *data);
    207216    void      (*pfnReset)(void *pvState);
     217#ifdef DEBUG
     218    const char *(*pfnGetQueueName)(void *pvState, PVQUEUE pQueue);
     219#endif /* DEBUG */
    208220} g_VPCIDevices[] =
    209221{
    210     /* Vendor Device SSVendor SubSys             Class   Name */
    211     { 0x1AF4, 0x1000, 0x1AF4, 1 + VIRTIO_NET_ID, 0x0200, 3, "virtio-net", "vnet%d",
    212       vnetGetHostFeatures, vnetGetConfig, vnetSetConfig, vnetReset }, /* Virtio Network Device */
    213     { 0x1AF4, 0x1001, 0x1AF4, 1 + VIRTIO_BLK_ID, 0x0180, 2, "virtio-blk", "vblk%d",
    214       NULL, NULL, NULL, NULL }, /* Virtio Block Device */
     222    /*  Vendor  Device SSVendor SubSys             Class   NQ Name          Instance */
     223    { /* Virtio Network Device */
     224        0x1AF4, 0x1000, 0x1AF4, 1 + VIRTIO_NET_ID, 0x0200, 3, "virtio-net", "vnet%d",
     225        vnetGetHostFeatures, vnetGetConfig, vnetSetConfig, vnetReset
     226#ifdef DEBUG
     227        , vnetGetQueueName
     228#endif /* DEBUG */
     229    },
     230    { /* Virtio Block Device */
     231        0x1AF4, 0x1001, 0x1AF4, 1 + VIRTIO_BLK_ID, 0x0180, 2, "virtio-blk", "vblk%d",
     232        NULL, NULL, NULL, NULL
     233#ifdef DEBUG
     234        , NULL
     235#endif /* DEBUG */
     236    },
    215237};
    216238
    … …  
    249271
    250272
     273static void vqueueReset(PVQUEUE pQueue)
     274{
     275    pQueue->VRing.addrDescriptors = 0;
     276    pQueue->VRing.addrAvail       = 0;
     277    pQueue->VRing.addrUsed        = 0;
     278    pQueue->uNextAvailIndex       = 0;
     279    pQueue->uNextUsedIndex        = 0;
     280}
     281
    251282static void vqueueInit(PVQUEUE pQueue, uint32_t uPageNumber)
    252283{
    … …  
    287318void vringReadDesc(PVPCISTATE pState, PVRING pVRing, uint32_t uIndex, PVRINGDESC pDesc)
    288319{
    289     Log(("%s vringReadDesc: ring=%p idx=%u\n", INSTANCE(pState), pVRing, uIndex));
     320    //Log(("%s vringReadDesc: ring=%p idx=%u\n", INSTANCE(pState), pVRing, uIndex));
    290321    PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns),
    291322                      pVRing->addrDescriptors + sizeof(VRINGDESC) * (uIndex % pVRing->uSize),
    … …  
    298329   
    299330    PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns),
    300                       pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, auRing[uIndex]),
     331                      pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, auRing[uIndex % pVRing->uSize]),
    301332                      &tmp, sizeof(tmp));
    302333    return tmp;
    … …  
    310341    pElem->nIn = pElem->nOut = 0;
    311342
    312     Log2(("%s vqueueGet: avail_idx=%u\n", INSTANCE(pState), pQueue->uNextAvailIndex));
     343    Log2(("%s vqueueGet: %s avail_idx=%u\n", INSTANCE(pState),
     344          QUEUENAME(pState, pQueue), pQueue->uNextAvailIndex));
    313345
    314346    VRINGDESC desc;
    … …  
    322354        if (desc.u16Flags & VRINGDESC_F_WRITE)
    323355        {
    324             Log2(("%s vqueueGet: IN  idx=%u seg=%u addr=%p cb=%u\n", INSTANCE(pState), idx,
    325                   idx, desc.u64Addr, desc.uLen));
     356            Log2(("%s vqueueGet: %s IN  seg=%u desc_idx=%u addr=%p cb=%u\n", INSTANCE(pState),
     357                  QUEUENAME(pState, pQueue), pElem->nIn, idx, desc.u64Addr, desc.uLen));
    326358            pSeg = &pElem->aSegsIn[pElem->nIn++];
    327359        }
    328360        else
    329361        {
    330             Log2(("%s vqueueGet: OUT idx=%u seg=%u addr=%p cb=%u\n", INSTANCE(pState), idx,
    331                   idx, desc.u64Addr, desc.uLen));
     362            Log2(("%s vqueueGet: %s OUT seg=%u desc_idx=%u addr=%p cb=%u\n", INSTANCE(pState),
     363                  QUEUENAME(pState, pQueue), pElem->nOut, idx, desc.u64Addr, desc.uLen));
    332364            pSeg = &pElem->aSegsOut[pElem->nOut++];
    333365        }
    … …  
    340372    } while (desc.u16Flags & VRINGDESC_F_NEXT);
    341373
    342     Log2(("%s vqueueGet: idx=%u nIn=%u nOut=%u\n", INSTANCE(pState),
    343           pElem->uIndex, pElem->nIn, pElem->nOut));
     374    Log2(("%s vqueueGet: %s head_desc_idx=%u nIn=%u nOut=%u\n", INSTANCE(pState),
     375          QUEUENAME(pState, pQueue), pElem->uIndex, pElem->nIn, pElem->nOut));
    344376    return true;
    345377}
    … …  
    368400    elem.uLen = uLen;
    369401    PDMDevHlpPhysWrite(pState->CTX_SUFF(pDevIns),
    370                        pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, aRing[uIndex]),
     402                       pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, aRing[uIndex % pVRing->uSize]),
    371403                       &elem, sizeof(elem));
    372404}
    … …  
    376408    unsigned int i, uOffset;
    377409
    378     Log2(("%s vqueuePut: idx=%u acb=%u\n", INSTANCE(pState), pElem->uIndex, uLen));
     410    Log2(("%s vqueuePut: %s desc_idx=%u acb=%u\n", INSTANCE(pState),
     411          QUEUENAME(pState, pQueue), pElem->uIndex, uLen));
    379412    for (i = uOffset = 0; i < pElem->nIn && uOffset < uLen; i++)
    380413    {
    … …  
    382415        if (pElem->aSegsIn[i].pv)
    383416        {
    384             Log2(("%s vqueuePut: used_idx=%u idx=%u seg=%u addr=%p pv=%p cb=%u acb=%u\n", INSTANCE(pState),
    385                   pQueue->uNextUsedIndex, pElem->uIndex, i, pElem->aSegsIn[i].addr, pElem->aSegsIn[i].pv, pElem->aSegsIn[i].cb, cbSegLen));
     417            Log2(("%s vqueuePut: %s used_idx=%u seg=%u addr=%p pv=%p cb=%u acb=%u\n", INSTANCE(pState),
     418                  QUEUENAME(pState, pQueue), pQueue->uNextUsedIndex, i, pElem->aSegsIn[i].addr, pElem->aSegsIn[i].pv, pElem->aSegsIn[i].cb, cbSegLen));
    386419            PDMDevHlpPhysWrite(pState->CTX_SUFF(pDevIns), pElem->aSegsIn[i].addr,
    387420                               pElem->aSegsIn[i].pv, cbSegLen);
    … …  
    390423    }
    391424
    392     vringWriteUsedElem(pState, &pQueue->VRing, pQueue->uNextUsedIndex, pElem->uIndex, uLen);
    393     pQueue->uNextUsedIndex = (pQueue->uNextUsedIndex + 1) % pQueue->VRing.uSize;
     425    Log2(("%s vqueuePut: %s used_idx=%u guest_used_idx=%u id=%u len=%u\n", INSTANCE(pState),
     426          QUEUENAME(pState, pQueue), pQueue->uNextUsedIndex, vringReadUsedIndex(pState, &pQueue->VRing), pElem->uIndex, uLen));
     427    vringWriteUsedElem(pState, &pQueue->VRing, pQueue->uNextUsedIndex++, pElem->uIndex, uLen);
    394428}
    395429
    … …  
    403437void vqueueSync(PVPCISTATE pState, PVQUEUE pQueue)
    404438{
    405     Log2(("%s vqueueSync: used_idx=%u\n", INSTANCE(pState), pQueue->uNextUsedIndex));
     439    Log2(("%s vqueueSync: %s old_used_idx=%u new_used_idx=%u\n", INSTANCE(pState),
     440          QUEUENAME(pState, pQueue), vringReadUsedIndex(pState, &pQueue->VRing), pQueue->uNextUsedIndex));
    406441    vringWriteUsedIndex(pState, &pQueue->VRing, pQueue->uNextUsedIndex);
    407442    vqueueNotify(pState, pQueue);
     443}
     444
     445void vpciReset(PVPCISTATE pState)
     446{
     447    pState->uGuestFeatures = 0;
     448    pState->uQueueSelector = 0;
     449    pState->uStatus        = 0;
     450    pState->uISR           = 0;
     451
     452    for (unsigned i = 0; i < g_VPCIDevices[pState->enmDevType].nQueues; i++)
     453        vqueueReset(&pState->pQueues[i]);
    408454}
    409455
    … …  
    565611            // TODO: Feature negotiation code goes here.
    566612            // The guest may potentially desire features we don't support!
     613            pState->uGuestFeatures = u32;
    567614            break;
    568615
    … …  
    9881035    RTSEMEVENT  hEventMoreRxDescAvail;
    9891036
    990     R3PTRTYPE(PPDMQUEUE)    pCanRxQueueR3;           /**< Rx wakeup signaller - R3. */
    991     R0PTRTYPE(PPDMQUEUE)    pCanRxQueueR0;           /**< Rx wakeup signaller - R0. */
    992     RCPTRTYPE(PPDMQUEUE)    pCanRxQueueRC;           /**< Rx wakeup signaller - RC. */
    993 
    9941037    /* Statistic fields ******************************************************/
    9951038
    … …  
    10321075#define STATUS pState->config.uStatus
    10331076
     1077#ifdef DEBUG
     1078static const char *vnetGetQueueName(void *pvState, PVQUEUE pQueue)
     1079{
     1080    VNETSTATE *pState = (VNETSTATE *)pvState;
     1081    if (pQueue == pState->pRxQueue)
     1082        return "RX ";
     1083    else if (pQueue == pState->pTxQueue)
     1084        return "TX ";
     1085    else if (pQueue == pState->pCtlQueue)
     1086        return "CTL";
     1087    return "Invalid";
     1088}
     1089#endif /* DEBUG */
     1090
    10341091PDMBOTHCBDECL(uint32_t) vnetGetHostFeatures(void *pvState)
    10351092{
    … …  
    10711128    VNETSTATE *pState = (VNETSTATE*)pvState;
    10721129    Log(("%s Reset triggered\n", INSTANCE(pState)));
     1130    vpciReset(&pState->VPCI);
    10731131    // TODO: Implement reset
    10741132}
    … …  
    11331191static int vnetCanReceive(VNETSTATE *pState)
    11341192{
    1135     return (vqueueIsReady(&pState->VPCI, pState->pRxQueue)
     1193    LogFlow(("%s vnetCanReceive\n", INSTANCE(pState)));
     1194    int rc = (vqueueIsReady(&pState->VPCI, pState->pRxQueue)
    11361195            && !vqueueIsEmpty(&pState->VPCI, pState->pRxQueue))
    11371196        ? VINF_SUCCESS : VERR_NET_NO_BUFFER_SPACE;
     1197    LogFlow(("%s vnetCanReceive -> %d\n", INSTANCE(pState), rc));
     1198    return rc;
    11381199}
    11391200
    … …  
    11411202{
    11421203    VNETSTATE *pState = IFACE_TO_STATE(pInterface, INetworkPort);
     1204    LogFlow(("%s vnetWaitReceiveAvail(cMillies=%u)\n", INSTANCE(pState), cMillies));
    11431205    int rc = vnetCanReceive(pState);
    11441206
    … …  
    11661228    ASMAtomicXchgBool(&pState->fMaybeOutOfSpace, false);
    11671229
     1230    LogFlow(("%s vnetWaitReceiveAvail -> %d\n", INSTANCE(pState), rc));
    11681231    return rc;
    11691232}
    … …  
    12251288{
    12261289    VNETHDR hdr;
    1227     memset(&hdr, 0, sizeof(hdr));
    1228     /*hdr.u8Flags   = 0;
    1229       hdr.u8GSOType = VNETHDR_GSO_NONE;*/
     1290
     1291    hdr.u8Flags   = 0;
     1292    hdr.u8GSOType = VNETHDR_GSO_NONE;
    12301293
    12311294    unsigned int uOffset = 0;
    … …  
    12671330            uElemSize += uSize;
    12681331        }
    1269         elem.uIndex = nElem;
    12701332        vqueuePut(&pState->VPCI, pState->pRxQueue, &elem, uElemSize);
    12711333    }
    … …  
    13671429{
    13681430    VNETSTATE *pState = (VNETSTATE*)pvState;
    1369     Log(("%s Receive buffers has been added.\n", INSTANCE(pState)));
     1431    Log(("%s Receive buffers has been added, waking up receive thread.\n", INSTANCE(pState)));
     1432    vnetWakeupReceive(pState->VPCI.CTX_SUFF(pDevIns));
    13701433}
    13711434
    … …  
    14201483            RTMemFree(pFrame);
    14211484        }
    1422         vqueuePut(&pState->VPCI, pQueue, &elem, uOffset);
     1485        vqueuePut(&pState->VPCI, pQueue, &elem, sizeof(VNETHDR) + uOffset);
    14231486        vqueueSync(&pState->VPCI, pQueue);
    14241487    }
    … …  
    15011564    return rc;*/
    15021565
    1503 
    1504     /* Create the RX notifier signaller. */
    1505     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
    1506                                  vnetCanRxQueueConsumer, true, "VNet-rcv", &pState->pCanRxQueueR3);
    1507     if (RT_FAILURE(rc))
    1508         return rc;
    1509     pState->pCanRxQueueR0 = PDMQueueR0Ptr(pState->pCanRxQueueR3);
    1510     pState->pCanRxQueueRC = PDMQueueRCPtr(pState->pCanRxQueueR3);
    15111566
    15121567    /* Create Link Up Timer */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette