Changeset 28868 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Apr 28, 2010 2:01:56 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: fix priority tagged VLAN packets.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFltInternal.h (modified) (1 diff)
• solaris/VBoxNetFlt-solaris.c (modified) (10 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -203 +203 @@
             /** Whether we are attaching to IPv6 stream dynamically now. */
             bool volatile fAttaching;
+            /** Whether this is a VLAN interface or not. */
+            bool volatile fVLAN;
             /** Layered device handle to the interface. */
             ldi_handle_t hIface;

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -110 +110 @@
 #define VBOXNETFLT_LOOPBACK_SIZE        32
 
+/** VLAN tag masking, should probably be in IPRT? */
+#define VLAN_ID(vlan)          (((vlan) >>  0) & 0x0fffu)
+#define VLAN_CFI(vlan)         (((vlan) >> 12) & 0x0001u)
+#define VLAN_PRI(vlan)         (((vlan) >> 13) & 0x0007u)
+
+typedef struct VLANHEADER
+{
+    uint16_t Type;
+    uint16_t Data;
+} VLANHEADER;
+typedef struct VLANHEADER *PVLANHEADER;
+
 /*******************************************************************************
 *   Global Functions                                                           *
@@ -1814 +1826 @@
 
     char *pszEnd = strchr(pszDev, '\0');
-    int PPALen = 0;
     while (--pszEnd > pszDev)
-    {
         if (!RT_C_IS_DIGIT(*pszEnd))
             break;
-        PPALen++;
-    }
     pszEnd++;
 
@@ -1875 +1883 @@
     DevId = ldi_ident_from_anon();
     int ret;
+
+    /*
+     * Figure out if this is a VLAN interface or not based on the interface name.
+     * Only works for the VLAN PPA-hack based names. See #4854 for details.
+     */
+    char *pszEnd = strchr(pThis->szName, '\0');
+    while (--pszEnd > pThis->szName)
+        if (!RT_C_IS_DIGIT(*pszEnd))
+            break;
+    pszEnd++;
+    uint32_t PPA = RTStrToUInt32(pszEnd);
+    if (PPA > 1000)
+    {
+        pThis->u.s.fVLAN = true;
+        LogRel((DEVICE_NAME ": %s detected as VLAN interface with VID=%u.\n", pThis->szName, PPA / 1000U));
+    }
 
     /*
@@ -2571 +2595 @@
     LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface pThis=%p\n", pThis));
 
+    /*
+     * Since this is asynchronous streams injection, let the attach succeed before we can start
+     * processing the stream.
+     */
+    ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
     int rc = vboxNetFltSolarisOpenStream(pThis);
     if (RT_SUCCESS(rc))
@@ -3233 +3262 @@
 
     /*
+     * Solaris raw mode streams for priority-tagged VLAN does not strip the VLAN tag.
+     * It zero's the VLAN-Id but keeps the tag intact as part of the Ethernet header.
+     * We need to manually strip these tags out or the guests might get confused.
+     */
+    bool fCopied = false;
+    if (   pThis->u.s.fVLAN
+        && pPromiscStream->fRawMode)
+    {
+        if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_VLAN))
+        {
+            if (msgdsize(pMsg) > sizeof(RTNETETHERHDR) + sizeof(VLANHEADER))
+            {
+                if (pMsg->b_cont)
+                {
+                    mblk_t *pFullMsg = msgpullup(pMsg, -1 /* all data blocks */);
+                    if (pFullMsg)
+                    {
+                        /* Original pMsg will be freed by the caller */
+                        pMsg = pFullMsg;
+                        fCopied = true;
+                    }
+                    else
+                    {
+                        LogRel((DEVICE_NAME ":vboxNetFltSolarisRecv msgpullup failed.\n"));
+                        return VERR_NO_MEMORY;
+                    }
+                }
+
+                PVLANHEADER pVlanHdr = (PVLANHEADER)(pMsg->b_rptr + sizeof(RTNETETHERHDR) - sizeof(pEthHdr->EtherType));
+                LogFlow((DEVICE_NAME ":Recv VLAN Pcp=%u Cfi=%u Id=%u\n", VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)),
+                            VLAN_CFI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_ID(RT_BE2H_U16(pVlanHdr->Data))));
+                if (   VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)) > 0
+                    && VLAN_ID(RT_BE2H_U16(pVlanHdr->Data) == 0)
+                {
+                    /*
+                     * Create new Ethernet header with stripped VLAN tag.
+                     */
+                    size_t cbEthPrefix = sizeof(RTNETETHERHDR) - sizeof(pEthHdr->EtherType);
+                    mblk_t *pStrippedMsg = allocb(cbEthPrefix, BPRI_MED);
+                    if (RT_LIKELY(pStrippedMsg))
+                    {
+                        /*
+                         * Copy ethernet header excluding the ethertype.
+                         */
+                        bcopy(pMsg->b_rptr, pStrippedMsg->b_wptr, cbEthPrefix);
+                        pStrippedMsg->b_wptr += cbEthPrefix;
+
+                        /*
+                         * Link the rest of the message (ethertype + data, skipping VLAN header).
+                         */
+                        pMsg->b_rptr += cbEthPrefix + sizeof(VLANHEADER);
+                        pStrippedMsg->b_cont = pMsg;
+                        pMsg = pStrippedMsg;
+                        LogFlow((DEVICE_NAME ":Stripped VLAN tag.\n"));
+                    }
+                    else
+                    {
+                        LogRel((DEVICE_NAME ":vboxNetFltSolarisRecv insufficient memory for creating VLAN stripped packet cbMsg=%u.\n",
+                                    cbEthPrefix));
+                        if (fCopied)
+                            freemsg(pMsg);
+                        return VERR_NO_MEMORY;
+                    }
+                }
+            }
+        }
+    }
+
+    /*
      * Route all received packets into the internal network.
      */
@@ -3242 +3340 @@
     else
         LogRel((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG failed. rc=%d\n", rc));
+
+    /*
+     * If we made an extra copy for VLAN stripping, we need to free that ourselves.
+     */
+    if (fCopied)
+        freemsg(pMsg);
 
     return VINF_SUCCESS;
@@ -3399 +3503 @@
         {
             if (pIpHdr->ip_p == RTNETIPV4_PROT_ICMP)
-                LogFlow((DEVICE_NAME ":ICMP D=%.6Rhxs  S=%.6Rhxs  T=%04x\n", pb, pb + 6, RT_BE2H_U16(*(uint16_t *)(pb + 12))));
+                LogRel((DEVICE_NAME ":ICMP D=%.6Rhxs  S=%.6Rhxs  T=%04x\n", pb, pb + 6, RT_BE2H_U16(*(uint16_t *)(pb + 12))));
             else if (pIpHdr->ip_p == RTNETIPV4_PROT_TCP)
-                LogFlow((DEVICE_NAME ":TCP D=%.6Rhxs  S=%.6Rhxs\n", pb, pb + 6));
+                LogRel((DEVICE_NAME ":TCP D=%.6Rhxs  S=%.6Rhxs\n", pb, pb + 6));
             else if (pIpHdr->ip_p == RTNETIPV4_PROT_UDP)
             {
@@ -3420 +3524 @@
     else if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_VLAN))
     {
-        typedef struct VLANHEADER
-        {
-            int Pcp:3;
-            int Cfi:1;
-            int Vid:12;
-        } VLANHEADER;
-
-        VLANHEADER *pVlanHdr = (VLANHEADER *)(pMsg->b_rptr + sizeof(RTNETETHERHDR));
-        LogFlow((DEVICE_NAME ":VLAN Pcp=%d Cfi=%d Id=%d\n", pVlanHdr->Pcp, pVlanHdr->Cfi, pVlanHdr->Vid >> 4));
-        LogFlow((DEVICE_NAME "%.*Rhxd\n", MBLKL(pMsg), pMsg->b_rptr));
+        PVLANHEADER pVlanHdr = (PVLANHEADER)(pMsg->b_rptr + sizeof(RTNETETHERHDR) - sizeof(pEthHdr->EtherType));
+        LogRel((DEVICE_NAME ":VLAN Pcp=%u Cfi=%u Id=%u\n", VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_CFI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_ID(RT_BE2H_U16(pVlanHdr->Data))));
+        LogRel((DEVICE_NAME "%.*Rhxd\n", sizeof(VLANHEADER), pVlanHdr));
     }
     else if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_ARP))
     {
         PRTNETARPHDR pArpHdr = (PRTNETARPHDR)(pEthHdr + 1);
-        LogFlow((DEVICE_NAME ":ARP Op=%d\n", pArpHdr->ar_oper));
+        LogRel((DEVICE_NAME ":ARP Op=%d\n", pArpHdr->ar_oper));
     }
     else if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_IPV6))
     {
-        LogFlow((DEVICE_NAME ":IPv6 D=%.6Rhxs S=%.6Rhxs\n", pb, pb + 6));
+        LogRel((DEVICE_NAME ":IPv6 D=%.6Rhxs S=%.6Rhxs\n", pb, pb + 6));
     }
     else if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_IPX_1)
@@ -3444 +3541 @@
              || pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_IPX_3))
     {
-        LogFlow((DEVICE_NAME ":IPX packet.\n"));
+        LogRel((DEVICE_NAME ":IPX packet.\n"));
     }
     else
     {
-        LogFlow((DEVICE_NAME ":Unknown EtherType=%x D=%.6Rhxs S=%.6Rhxs\n", RT_H2BE_U16(pEthHdr->EtherType), &pEthHdr->DstMac,
+        LogRel((DEVICE_NAME ":Unknown EtherType=%x D=%.6Rhxs S=%.6Rhxs\n", RT_H2BE_U16(pEthHdr->EtherType), &pEthHdr->DstMac,
                     &pEthHdr->SrcMac));
         /* LogFlow((DEVICE_NAME ":%.*Rhxd\n", MBLKL(pMsg), pMsg->b_rptr)); */
@@ -3572 +3669 @@
     pThis->u.s.pvArpStream = NULL;
     pThis->u.s.pvPromiscStream = NULL;
+    pThis->u.s.fAttaching = false;
+    pThis->u.s.fVLAN = false;
     pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING