5.13-stable patches

added patches:
	skbuff-fix-build-with-skb-extensions-disabled.patch

diff --git a/queue-5.13/series b/queue-5.13/series
index 721274c68e5cb6a75de63e427d40296e15c9ad84..238de3af0d9274094da024ff9d0b03324f77040d 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -221,3 +221,4 @@ perf-inject-close-inject.output-on-exit.patch
 drm-i915-gvt-clear-d3_entered-on-elsp-cmd-submission.patch
 spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch
 sfc-ensure-correct-number-of-xdp-queues.patch
+skbuff-fix-build-with-skb-extensions-disabled.patch

diff --git a/queue-5.13/skbuff-fix-build-with-skb-extensions-disabled.patch b/queue-5.13/skbuff-fix-build-with-skb-extensions-disabled.patch
new file mode 100644 (file)
index 0000000..f0caf70
--- /dev/null
+++ b/queue-5.13/skbuff-fix-build-with-skb-extensions-disabled.patch
@@ -0,0 +1,45 @@
+From 9615fe36b31d926f1c5107013b772dc226a6a7ca Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <f.fainelli@gmail.com>
+Date: Wed, 7 Jul 2021 21:10:51 -0700
+Subject: skbuff: Fix build with SKB extensions disabled
+
+From: Florian Fainelli <f.fainelli@gmail.com>
+
+commit 9615fe36b31d926f1c5107013b772dc226a6a7ca upstream.
+
+We will fail to build with CONFIG_SKB_EXTENSIONS disabled after
+8550ff8d8c75 ("skbuff: Release nfct refcount on napi stolen or re-used
+skbs") since there is an unconditionally use of skb_ext_find() without
+an appropriate stub. Simply build the code conditionally and properly
+guard against both COFNIG_SKB_EXTENSIONS as well as
+CONFIG_NET_TC_SKB_EXT being disabled.
+
+Fixes: Fixes: 8550ff8d8c75 ("skbuff: Release nfct refcount on napi stolen or re-used skbs")
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Reviewed-by: Roi Dayan <roid@nvidia.com>
+Reviewed-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/core/dev.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -5983,7 +5983,7 @@ static void gro_list_prepare(const struc
+                                      maclen);
+ 
+               diffs |= skb_get_nfct(p) ^ skb_get_nfct(skb);
+-
++#if IS_ENABLED(CONFIG_SKB_EXTENSIONS) && IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
+               if (!diffs) {
+                       struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
+                       struct tc_skb_ext *p_ext = skb_ext_find(p, TC_SKB_EXT);
+@@ -5992,6 +5992,7 @@ static void gro_list_prepare(const struc
+                       if (!diffs && unlikely(skb_ext))
+                               diffs |= p_ext->chain ^ skb_ext->chain;
+               }
++#endif
+ 
+               NAPI_GRO_CB(p)->same_flow = !diffs;
+       }

diff --git a/queue-5.13/spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch b/queue-5.13/spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch
index 774e99330a6d7dbe9f6d7d26d281533b11405b5d..479aeba602f967a2efa3ebb16efe64e665a1f2db 100644 (file)
--- a/queue-5.13/spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch
+++ b/queue-5.13/spi-spi-cadence-quadspi-fix-division-by-zero-warning-try2.patch
@@ -1,7 +1,7 @@
 From 0e85ee897858b1c7a5de53f496d016899d9639c5 Mon Sep 17 00:00:00 2001
 From: Yoshitaka Ikeda <ikeda@nskint.co.jp>
 Date: Fri, 16 Jul 2021 14:35:13 +0000
-Subject: spi: spi-cadence-quadspi: Fix division by zero warning
+Subject: spi: spi-cadence-quadspi: Fix division by zero warning - try2
 
 From: Yoshitaka Ikeda <ikeda@nskint.co.jp>