Compatibility with Linux 5.19-rc1

1 files changed, 189 insertions, 1 deletions

diff --git a/vmnet.patch b/vmnet.patch
index 25dddb093d10..83e99fc4ce72 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -91,6 +91,102 @@ index 0ec30b3..b920e2d 100644
  #else
     /*
      * Vmkernel's bogus __FreeBSD__ value causes gcc <stddef.h> to break.
+From 4af1a71978962f9805fe2e7e6ceb05c24f42c7f0 Mon Sep 17 00:00:00 2001
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Tue, 11 Jan 2022 17:25:45 +0100
+Subject: [PATCH] vmnet: use accessors for net_device::dev_addr
+
+Mainline commit adeef3e32146 ("net: constify netdev->dev_addr") in 5.17-rc1
+makes dev_addr member of struct net_device const but accessors should be
+used to modify it since 5.15 to make sure rbtree with hardware address list
+is updated properly.
+
+Use dev_addr_set() and __dev_addr_set() in VNetNetifSetMAC() and
+VNetNetIf_Create(). For kernels before 5.15 provide our own version of the
+accessors. As SMAC_SetMac() only reads dev_addr, constify the corresponding
+argument.
+---
+ vmnet-only/netif.c | 18 +++++++++++++++---
+ vmnet-only/smac.c  |  2 +-
+ vmnet-only/smac.h  |  2 +-
+ 3 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
+index c70f7f4..8c3bbf8 100644
+--- a/vmnet-only/netif.c
++++ b/vmnet-only/netif.c
+@@ -44,7 +44,6 @@
+ #include "compat_netdevice.h"
+ #include "vmnetInt.h"
+ 
+-
+ /*
+  * Default min MTU value as defined by kernel versions >= 4.10.0.
+  * Use the same value for earlier versions of the kernel which do not
+@@ -86,6 +85,19 @@ static int  VNetNetIfProcRead(char *page, char **start, off_t off,
+ static int VNetNetifChangeMtu(struct net_device *dev, int new_mtu);
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
++static void
++__dev_addr_set(struct net_device *dev, const void *addr, size_t len)
++{
++	memcpy(dev->dev_addr, addr, len);
++}
++
++static void dev_addr_set(struct net_device *dev, const u8 *addr)
++{
++	__dev_addr_set(dev, addr, dev->addr_len);
++}
++#endif
++
+ 
+ /*
+  *----------------------------------------------------------------------
+@@ -253,7 +265,7 @@ VNetNetIf_Create(char *devName,  // IN:
+ 
+    memset(&netIf->stats, 0, sizeof netIf->stats);
+ 
+-   memcpy(dev->dev_addr, netIf->port.paddr, sizeof netIf->port.paddr);
++   __dev_addr_set(dev, netIf->port.paddr, sizeof(netIf->port.paddr));
+ 
+    if (register_netdev(dev) != 0) {
+       LOG(0, (KERN_NOTICE "%s: could not register network device\n",
+@@ -532,7 +544,7 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
+       return -EINVAL;
+    }
+    memcpy(netIf->port.paddr, addr->sa_data, dev->addr_len);
+-   memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
++   dev_addr_set(dev, addr->sa_data);
+    return 0;
+ }
+ 
+diff --git a/vmnet-only/smac.c b/vmnet-only/smac.c
+index f18be8a..7f38e7a 100644
+--- a/vmnet-only/smac.c
++++ b/vmnet-only/smac.c
+@@ -4116,7 +4116,7 @@ SMAC_InitState(SMACState **ptr) // OUT: pointer to alloced/inited state
+ 
+ void SMACINT
+ SMAC_SetMac(SMACState *state,  // IN: state to update
+-	    uint8 *mac)        // IN: pointer to host adapter's MAC
++	    const uint8 *mac)  // IN: pointer to host adapter's MAC
+ {
+    VNETKdPrintCall(("SMAC_SetMac"));
+    ASSERT(state);
+diff --git a/vmnet-only/smac.h b/vmnet-only/smac.h
+index c8df9d2..f03fd3f 100644
+--- a/vmnet-only/smac.h
++++ b/vmnet-only/smac.h
+@@ -72,7 +72,7 @@ Bool BridgeIPv4MatchAddrMAC(const ULONG ipAddr, const uint8 *mac);
+ void SMACINT
+ SMAC_InitState(struct SMACState **ptr);           // IN: state to alloc/init
+ void SMACINT
+-SMAC_SetMac(struct SMACState *state, uint8 *mac); // IN: state, and host MAC
++SMAC_SetMac(struct SMACState *state, const uint8 *mac); // IN: state, and host MAC
+ void SMACINT
+ SMAC_CleanupState(struct SMACState **ptr);        // IN: state to cleanup/dealloc
+ 
 From 409623bd4693afada659af82e823a6291f70797a Mon Sep 17 00:00:00 2001
 From: Michal Kubecek <mkubecek@suse.cz>
 Date: Mon, 4 Apr 2022 02:05:17 +0200
@@ -145,7 +241,7 @@ diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
 index 8c3bbf8..35256a0 100644
 --- a/vmnet-only/netif.c
 +++ b/vmnet-only/netif.c
-@@ -345,7 +345,7 @@ VNetNetIfReceive(VNetJack        *this, // IN: jack
+@@ -357,7 +357,7 @@ VNetNetIfReceive(VNetJack        *this, // IN: jack
     /* send to the host interface */
     skb->dev = netIf->dev;
     skb->protocol = eth_type_trans(skb, netIf->dev);
@@ -154,3 +250,95 @@ index 8c3bbf8..35256a0 100644
     netIf->stats.rx_packets++;
  
     return;
+From e02b540ab528917c1afd7848ef64ca146a634994 Mon Sep 17 00:00:00 2001
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Tue, 31 May 2022 23:29:42 +0200
+Subject: [PATCH] vmnet: open code csum_and_copy_to_user on kernel >= 5.19
+
+Mainline commit 6308499b5e99 ("net: unexport csum_and_copy_{from,to}_user")
+in 5.19-rc1 unexports csum_and_copy_to_user as no in-tree module is using
+it. A clean solution would probably be rewriting the code to use iovec
+iterator as csum_and_copy_to_iter() is still exported (or perhaps
+skb_copy_and_csum_datagram() might be used instead). Anything like this
+would be way too intrusive so it would have to wait for VMware developers.
+
+For now, use the simplest solution and replace the calls to
+csum_and_copy_to_user() on 5.19 and newer with open coded implementation.
+As the optimized x86 version uses csum_partial_copy_generic() which is not
+exported on x86_64 either, copy the generic one from include/net/checksum.h
+instead. This will be less efficient but hopefully the performace hit will
+not be noticeable.
+---
+ vmnet-only/userif.c | 45 +++++++++++++++++++++++++++++++--------------
+ 1 file changed, 31 insertions(+), 14 deletions(-)
+
+diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
+index e99c436..2c5a24a 100644
+--- a/vmnet-only/userif.c
++++ b/vmnet-only/userif.c
+@@ -87,6 +87,33 @@ extern unsigned int  vnet_max_qlen;
+ #   define skb_frag_off(frag) (frag)->page_offset
+ #endif
+ 
++#if COMPAT_LINUX_VERSION_CHECK_LT(5, 10, 0)
++static inline unsigned int
++compat_csum_and_copy_to_user(const void *src, void __user *dst, int len,
++			     int *err)
++{
++	return csum_and_copy_to_user(src, dst, len, 0, err);
++}
++#else
++static inline unsigned int
++compat_csum_and_copy_to_user(const void *src, void __user *dst, int len,
++			     int *err)
++{
++	unsigned int csum;
++
++#if COMPAT_LINUX_VERSION_CHECK_LT(5, 19, 0)
++	csum = csum_and_copy_to_user(src, dst, len);
++#else
++	csum = csum_partial(src, len, ~0U);
++	if (copy_to_user(dst, src, len))
++		csum = 0;
++#endif /* 5.19 */
++
++	*err = (csum == 0 ? -EFAULT : 0);
++	return csum;
++}
++#endif /* 5.10 */
++
+ /*
+  *-----------------------------------------------------------------------------
+  *
+@@ -561,12 +588,7 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
+       return -EINVAL;
+    }
+ 
+-#if COMPAT_LINUX_VERSION_CHECK_LT(5, 10, 0)
+-   csum = csum_and_copy_to_user(skb->data + offset, curr, len, 0, &err);
+-#else
+-   csum = csum_and_copy_to_user(skb->data + offset, curr, len);
+-   err = (csum == 0) ? -EFAULT : 0;
+-#endif
++   csum = compat_csum_and_copy_to_user(skb->data + offset, curr, len, &err);
+    if (err) {
+       return err;
+    }
+@@ -580,14 +602,9 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
+ 	 const void *vaddr;
+ 
+ 	 vaddr = kmap(skb_frag_page(frag));
+-#if COMPAT_LINUX_VERSION_CHECK_LT(5, 10, 0)
+-	 tmpCsum = csum_and_copy_to_user(vaddr + skb_frag_off(frag),
+-					 curr, skb_frag_size(frag), 0, &err);
+-#else
+-	 tmpCsum = csum_and_copy_to_user(vaddr + skb_frag_off(frag),
+-					 curr, skb_frag_size(frag));
+-         err = (tmpCsum == 0) ? -EFAULT : 0;
+-#endif
++	 tmpCsum = compat_csum_and_copy_to_user(vaddr + skb_frag_off(frag),
++						curr, skb_frag_size(frag),
++						&err);
+ 	 kunmap(skb_frag_page(frag));
+ 
+ 	 if (err) {