[patch] Cleaned Virtualbox-modules patch for 5.18 kernel

virtualbox-modules-6.1.34-linux-5.18.patch (text/plain), 5.32 KB, created by Benjamin Réveillé on 2022-05-25 17:53:56 UTC

--- a/vboxnetflt/linux/VBoxNetFlt-linux.c	2022-05-25 10:22:28.186525589 -0400
+++ b/vboxnetflt/linux/VBoxNetFlt-linux.c	2022-05-25 10:26:44.640963985 -0400
@@ -1,10 +1,10 @@
-/* $Id: VBoxNetFlt-linux.c 150609 2022-03-21 21:07:44Z vgalitsy $ */
+/* $Id$ */
 /** @file
  * VBoxNetFlt - Network Filter Driver (Host), Linux Specific Code.
  */

 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2022 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -402,11 +402,11 @@ static int vboxNetFltLinuxStartXmitFilte
      *       to be production quality code, we would have to be much more
      *       careful here and avoid the race.
      */
-    if (   !VALID_PTR(pOverride)
+    if (   !RT_VALID_PTR(pOverride)
         || pOverride->u32Magic != VBOXNETDEVICEOPSOVERRIDE_MAGIC
 # if RTLNX_VER_MIN(2,6,29)
-        || !VALID_PTR(pOverride->pOrgOps)
-# endif /* RTLNX_VER_MIN(2,6,29) */
+        || !RT_VALID_PTR(pOverride->pOrgOps)
+# endif
         )
     {
         printk("vboxNetFltLinuxStartXmitFilter: bad override %p\n", pOverride);
@@ -426,9 +426,9 @@ static int vboxNetFltLinuxStartXmitFilte
     cbHdrs = RT_MIN(cbHdrs, sizeof(abHdrBuf));
     pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, cbHdrs, &abHdrBuf[0]);
     if (   pEtherHdr
-        && VALID_PTR(pOverride->pVBoxNetFlt)
+        && RT_VALID_PTR(pOverride->pVBoxNetFlt)
         && (pSwitchPort = pOverride->pVBoxNetFlt->pSwitchPort) != NULL
-        && VALID_PTR(pSwitchPort)
+        && RT_VALID_PTR(pSwitchPort)
         && cbHdrs >= 6)
     {
         INTNETSWDECISION enmDecision;
@@ -457,7 +457,7 @@ static int vboxNetFltLinuxStartXmitFilte
     PVBOXNETDEVICEOPSOVERRIDE   pOverride;
 
     /* Cancel override if ethtool_ops is missing (host-only case, @bugref{5712}) */
-    if (!VALID_PTR(pDev->OVR_OPS))
+    if (!RT_VALID_PTR(pDev->OVR_OPS))
         return;
     pOverride = RTMemAlloc(sizeof(*pOverride));
     if (!pOverride)
@@ -497,11 +497,11 @@ static void vboxNetFltLinuxHookDev(PVBOX
     if (!pDev)
         pDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
-    if (VALID_PTR(pDev))
+    if (RT_VALID_PTR(pDev))
     {
         pOverride = (PVBOXNETDEVICEOPSOVERRIDE)pDev->OVR_OPS;
-        if (    VALID_PTR(pOverride)
-            &&  pOverride->u32Magic == VBOXNETDEVICEOPSOVERRIDE_MAGIC
-            &&  VALID_PTR(pOverride->pOrgOps)
+        if (    RT_VALID_PTR(pOverride)
+            &&  pOverride->u32Magic == VBOXNETDEVICEOPSOVERRIDE_MAGIC
+            &&  RT_VALID_PTR(pOverride->pOrgOps)
            )
         {
 # if RTLNX_VER_MAX(2,6,29)
@@ -1531,7 +1531,6 @@ static void vboxNetFltLinuxForwardToIntN
               skb_shinfo(pBuf)->nr_frags, skb_shinfo(pBuf)->gso_size,
               skb_shinfo(pBuf)->gso_segs, skb_shinfo(pBuf)->gso_type,
               skb_shinfo(pBuf)->frag_list, pBuf->pkt_type, pBuf->ip_summed));
-#ifndef VBOXNETFLT_SG_SUPPORT
         if (RT_LIKELY(fSrc & INTNETTRUNKDIR_HOST))
         {
             /*
@@ -1545,7 +1544,6 @@ static void vboxNetFltLinuxForwardToIntN
             pBuf->mac_len = pBuf->nh.raw - pBuf->data;
 # endif
         }
-#endif /* !VBOXNETFLT_SG_SUPPORT */
 # ifdef VBOXNETFLT_WITH_GSO_RECV
         if (   (skb_shinfo(pBuf)->gso_type & (SKB_GSO_TCPV6 | SKB_GSO_TCPV4))
             && vboxNetFltLinuxCanForwardAsGso(pThis, pBuf, fSrc, &GsoCtx) )
@@ -1698,7 +1696,7 @@ static void vboxNetFltLinuxXmitTask(void
  */
 static void vboxNetFltLinuxReportNicGsoCapabilities(PVBOXNETFLTINS pThis)
 {
-#ifdef VBOXNETFLT_WITH_GSO_XMIT_WIRE
+#if defined(VBOXNETFLT_WITH_GSO_XMIT_WIRE) || defined(VBOXNETFLT_WITH_GSO_XMIT_HOST)
     if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
     {
         struct net_device  *pDev;
@@ -1724,7 +1722,7 @@ static void vboxNetFltLinuxReportNicGsoC
                 fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP);
             if (fFeatures & NETIF_F_TSO6)
                 fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP);
-            Log3(("vboxNetFltLinuxReportNicGsoCapabilities: reporting wire %s%s%s%s\n",
+            Log3(("vboxNetFltLinuxReportNicGsoCapabilities: reporting wire %s%s\n",
                   (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP)) ? "tso " : "",
                   (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP)) ? "tso6 " : ""));
             pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, fGsoCapabilites, INTNETTRUNKDIR_WIRE);
@@ -1732,7 +1730,7 @@ static void vboxNetFltLinuxReportNicGsoC
 
         vboxNetFltRelease(pThis, true /*fBusy*/);
     }
-#endif /* VBOXNETFLT_WITH_GSO_XMIT_WIRE */
+#endif /* VBOXNETFLT_WITH_GSO_XMIT_WIRE || VBOXNETFLT_WITH_GSO_XMIT_HOST */
 }

 /**
@@ -2311,7 +2309,13 @@ int  vboxNetFltPortOsXmit(PVBOXNETFLTINS
                 vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
                 Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
                 Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
+#if RTLNX_VER_MIN(5,18,0)
+                local_bh_disable();
+                err = netif_rx(pBuf);
+                local_bh_enable();
+#else
                 err = netif_rx_ni(pBuf);
+#endif
                 if (err)
                     rc = RTErrConvertFromErrno(err);
             }