Index: /trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp =================================================================== --- /trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp (revision 83663) +++ /trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp (revision 83664) @@ -201,10 +201,10 @@ /** @name VirtIO 1.0 NET Host Device device specific control types * @{ */ -#define VIRTIONET_HDR_F_NEEDS_CSUM 1 /**< Packet needs checksum */ -#define VIRTIONET_HDR_GSO_NONE 0 /**< No Global Segmentation Offset */ -#define VIRTIONET_HDR_GSO_TCPV4 1 /**< Global Segment Offset for TCPV4 */ -#define VIRTIONET_HDR_GSO_UDP 3 /**< Global Segment Offset for UDP */ -#define VIRTIONET_HDR_GSO_TCPV6 4 /**< Global Segment Offset for TCPV6 */ -#define VIRTIONET_HDR_GSO_ECN 0x80 /**< Explicit Congestion Notification */ +#define VIRTIONET_HDR_F_NEEDS_CSUM 1 /**< flags: Packet needs checksum */ +#define VIRTIONET_HDR_GSO_NONE 0 /**< gso_type: No Global Segmentation Offset */ +#define VIRTIONET_HDR_GSO_TCPV4 1 /**< gso_type: Global Segment Offset for TCPV4 */ +#define VIRTIONET_HDR_GSO_UDP 3 /**< gso_type: Global Segment Offset for UDP */ +#define VIRTIONET_HDR_GSO_TCPV6 4 /**< gso_type: Global Segment Offset for TCPV6 */ +#define VIRTIONET_HDR_GSO_ECN 0x80 /**< gso_type: Explicit Congestion Notification */ /** @} */ @@ -216,6 +216,6 @@ uint16_t uHdrLen; /**< hdr_len */ uint16_t uGsoSize; /**< gso_size */ - uint16_t uChksumStart; /**< Chksum_start */ - uint16_t uChksumOffset; /**< Chksum_offset */ + uint16_t uChksumStart; /**< Chksum_start */ + uint16_t uChksumOffset; /**< Chksum_offset */ uint16_t uNumBuffers; /**< num_buffers */ }; @@ -417,6 +417,4 @@ uint8_t aVlanFilter[VIRTIONET_MAX_VLAN_ID / sizeof(uint8_t)]; - bool fLog; - bool fBp; /* Receive-blocking-related fields ***************************************/ @@ -575,18 +573,21 @@ PVIRTIONET pThis = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET); pRxPktHdr->uNumBuffers = cDescs; - LogFunc(("-------------------------------------------------------------------\n")); - LogFunc(("rxPktHdr\n" - " uFlags ......... %2.2x\n" - " uGsoType ....... %2.2x\n" - " uHdrLen ........ %4.4x\n" - " uGsoSize ....... %4.4x\n" - " uChksumStart ... %4.4x\n" - " uChksumOffset .. %4.4x\n" - " uNumBuffers .... %4.4x\n", - pRxPktHdr->uFlags, - pRxPktHdr->uGsoType, pRxPktHdr->uHdrLen, pRxPktHdr->uGsoSize, - pRxPktHdr->uChksumStart, pRxPktHdr->uChksumOffset, pRxPktHdr->uNumBuffers)); - - virtioCoreHexDump((uint8_t *)pRxPktHdr, sizeof(VIRTIONET_PKT_HDR_T), 0, "Dump of virtual rPktHdr"); + if (pRxPktHdr) + { + LogFunc(("-------------------------------------------------------------------\n")); + LogFunc(("rxPktHdr\n" + " uFlags ......... %2.2x\n" + " uGsoType ....... %2.2x\n" + " uHdrLen ........ %4.4x\n" + " uGsoSize ....... %4.4x\n" + " uChksumStart ... %4.4x\n" + " uChksumOffset .. %4.4x\n" + " uNumBuffers .... %4.4x\n", + pRxPktHdr->uFlags, + pRxPktHdr->uGsoType, pRxPktHdr->uHdrLen, pRxPktHdr->uGsoSize, + pRxPktHdr->uChksumStart, pRxPktHdr->uChksumOffset, pRxPktHdr->uNumBuffers)); + + virtioCoreHexDump((uint8_t *)pRxPktHdr, sizeof(VIRTIONET_PKT_HDR_T), 0, "Dump of virtual rPktHdr"); + } virtioNetR3PacketDump(pThis, (const uint8_t *)pvBuf, cb, "<-- Incoming"); LogFunc((". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n")); @@ -1310,12 +1311,4 @@ return false; } -/** @todo remove this debug hack that detects ARP from specific ping on development setup - pk */ -uint8_t src[6] = { 0xA8, 0x20, 0x66, 0x57, 0x50, 0x3C }; -uint8_t dst[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; -if (memcmp(pvBuf, dst, 6) == 0 && memcmp(((uint8_t *)pvBuf) + 6, src, 6) == 0) -{ - pThis->fLog = true; - virtioNetR3PacketDump(pThis, (const uint8_t *)pvBuf, cb, "<-- Incoming"); -} if (virtioNetR3IsBroadcast(pvBuf)) @@ -1445,5 +1438,5 @@ int rc = virtioCoreR3QueueGet(pDevIns, &pThis->Virtio, RXQIDX_QPAIR(idxQueue), &pDescChain, true); - Assert(rc == VINF_SUCCESS || rc == VERR_NOT_AVAILABLE, ("%Rrc\n", rc)); + AssertMsgReturn(rc == VINF_SUCCESS || rc == VERR_NOT_AVAILABLE, ("%Rrc\n", rc), rc); /** @todo Find a better way to deal with this */ @@ -1517,20 +1510,6 @@ rc); - /* Dump Rx Pkt after it's been written to guest physical memory via the virtio core API */ -// if (pThis->fLog) -// { - virtioNetDumpGcPhysRxBuf(pDevIns, &rxPktHdr, cDescs, (uint8_t *)pvBuf, cb, - gcPhysPktHdrNumBuffers - RT_UOFFSETOF(VIRTIONET_PKT_HDR_T, uNumBuffers), - cb + sizeof(VIRTIONET_PKT_HDR_T)); -// } - virtioCoreQueueSync(pDevIns, &pThis->Virtio, RXQIDX_QPAIR(idxQueue)); - -if (pThis->fLog) { -// RTThreadSleep(500); -// RT_BREAKPOINT(); - pThis->fBp = false; -} RTMemFree(paVirtSegsToGuest); RTMemFree(pVirtSegBufToGuest); @@ -1542,5 +1521,4 @@ return VERR_TOO_MUCH_DATA; } -pThis->fLog = false; return VINF_SUCCESS; } @@ -1783,5 +1761,4 @@ LogFunc((" %RTmac\n", &pThis->aMacMulticastFilter[i])); #endif - } } @@ -1919,8 +1896,7 @@ LogFunc(("%s Finished processing CTRL command with status %s\n", INSTANCE(pThis), uAck == VIRTIONET_OK ? "VIRTIONET_OK" : "VIRTIONET_ERROR")); - -} - -static int virtioNetR3ReadHeader(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, PVIRTIONET_PKT_HDR_T pPktHdr, uint32_t cbMax) +} + +static int virtioNetR3ReadHeader(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, PVIRTIONET_PKT_HDR_T pPktHdr, uint32_t cbFrame) { int rc = PDMDevHlpPCIPhysRead(pDevIns, GCPhys, pPktHdr, sizeof(*pPktHdr)); @@ -1928,7 +1904,7 @@ return rc; - Log(("virtio-net: header flags=%x gso-type=%x len=%x gso-size=%x Chksum-start=%x Chksum-offset=%x cb=%x\n", + Log(("virtio-net: header (flags=%x gso-type=%x len=%x gso-size=%x Chksum-start=%x Chksum-offset=%x) cbFrame=%d\n", pPktHdr->uFlags, pPktHdr->uGsoType, pPktHdr->uHdrLen, - pPktHdr->uGsoSize, pPktHdr->uChksumStart, pPktHdr->uChksumOffset, cbMax)); + pPktHdr->uGsoSize, pPktHdr->uChksumStart, pPktHdr->uChksumOffset, cbFrame)); if (pPktHdr->uGsoType) @@ -1937,7 +1913,7 @@ /* Segmentation offloading cannot be done without checksumming, and we do not support ECN */ - AssertMsgReturn( RT_LIKELY(pPktHdr->uFlags & VIRTIONET_HDR_F_NEEDS_CSUM) - && RT_UNLIKELY(pPktHdr->uGsoType & VIRTIONET_HDR_GSO_ECN), - ("Unsupported ECN request in pkt header\n"), VERR_NOT_SUPPORTED); + AssertMsgReturn( RT_LIKELY(pPktHdr->uFlags & VIRTIONET_HDR_F_NEEDS_CSUM) + && RT_UNLIKELY(pPktHdr->uGsoType & VIRTIONET_HDR_GSO_ECN), + ("Unsupported ECN request in pkt header\n"), VERR_NOT_SUPPORTED); switch (pPktHdr->uGsoType) @@ -1955,11 +1931,13 @@ } /* Header + MSS must not exceed the packet size. */ - AssertMsgReturn(RT_LIKELY(uMinHdrSize + pPktHdr->uChksumStart + pPktHdr->uGsoSize <= cbMax), + AssertMsgReturn(RT_LIKELY(uMinHdrSize + pPktHdr->uChksumStart + pPktHdr->uGsoSize <= cbFrame), ("Header plus message exceeds packet size"), VERR_BUFFER_OVERFLOW); } - AssertMsgReturn( !pPktHdr->uFlags & VIRTIONET_HDR_F_NEEDS_CSUM - || sizeof(uint16_t) + pPktHdr->uChksumStart + pPktHdr->uChksumOffset <= cbMax, - ("Checksum doesn't fit into pkt header\n"), VERR_BUFFER_OVERFLOW); + AssertMsgReturn( !pPktHdr->uFlags & VIRTIONET_HDR_F_NEEDS_CSUM + || sizeof(uint16_t) + pPktHdr->uChksumStart + pPktHdr->uChksumOffset <= cbFrame, + ("Checksum (%d bytes) doesn't fit into pkt header (%d bytes)\n", + sizeof(uint16_t) + pPktHdr->uChksumStart + pPktHdr->uChksumOffset, cbFrame), + VERR_BUFFER_OVERFLOW); return VINF_SUCCESS; @@ -2114,5 +2092,7 @@ { uSize -= sizeof(PktHdr); - rc = virtioNetR3ReadHeader(pDevIns, paSegsFromGuest[0].gcPhys, &PktHdr, sizeof(PktHdr)); + rc = virtioNetR3ReadHeader(pDevIns, paSegsFromGuest[0].gcPhys, &PktHdr, uSize); + if (RT_FAILURE(rc)) + return; virtioCoreSgBufAdvance(pSgPhysSend, sizeof(PktHdr)); @@ -2499,5 +2479,4 @@ if (fVirtioReady) { -pThis->fBp = true; LogFunc(("%s VirtIO ready\n-----------------------------------------------------------------------------------------\n", INSTANCE(pThis))); Index: /trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp =================================================================== --- /trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp (revision 83663) +++ /trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp (revision 83664) @@ -1115,4 +1115,6 @@ return; } +/** TEMPORARY DEBUGGING HACK, EVALUATE AND REMOVE */ +virtioKick(pDevIns, pVirtio, VIRTIO_ISR_VIRTQ_INTERRUPT, pVirtio->uQueueMsixVector[idxQueue], fForce); Log6Func(("...skipping interrupt. Guest flagged VIRTQ_AVAIL_F_NO_INTERRUPT for queue\n"));