6.6-stable patches

added patches:
	virtio_net-fix-napi_skb_cache_put-warning.patch

diff --git a/queue-6.6/series b/queue-6.6/series
index 597d4e7f7cfbc3b15feab751c0932c5a159b8082..de600bd0d8140080013bbac48ef83729dcf831e8 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -127,3 +127,4 @@ drm-amd-display-use-preferred-link-settings-for-dp-s.patch
 drm-amd-display-check-bios-images-before-it-is-used.patch
 drm-amd-display-skip-wbscl_set_scaler_filter-if-filt.patch
 media-uvcvideo-enforce-alignment-of-frame-and-interv.patch
+virtio_net-fix-napi_skb_cache_put-warning.patch

diff --git a/queue-6.6/virtio_net-fix-napi_skb_cache_put-warning.patch b/queue-6.6/virtio_net-fix-napi_skb_cache_put-warning.patch
new file mode 100644 (file)
index 0000000..88c62b7
--- /dev/null
+++ b/queue-6.6/virtio_net-fix-napi_skb_cache_put-warning.patch
@@ -0,0 +1,88 @@
+From f8321fa75102246d7415a6af441872f6637c93ab Mon Sep 17 00:00:00 2001
+From: Breno Leitao <leitao@debian.org>
+Date: Fri, 12 Jul 2024 04:53:25 -0700
+Subject: virtio_net: Fix napi_skb_cache_put warning
+
+From: Breno Leitao <leitao@debian.org>
+
+commit f8321fa75102246d7415a6af441872f6637c93ab upstream.
+
+After the commit bdacf3e34945 ("net: Use nested-BH locking for
+napi_alloc_cache.") was merged, the following warning began to appear:
+
+        WARNING: CPU: 5 PID: 1 at net/core/skbuff.c:1451 napi_skb_cache_put+0x82/0x4b0
+
+         __warn+0x12f/0x340
+         napi_skb_cache_put+0x82/0x4b0
+         napi_skb_cache_put+0x82/0x4b0
+         report_bug+0x165/0x370
+         handle_bug+0x3d/0x80
+         exc_invalid_op+0x1a/0x50
+         asm_exc_invalid_op+0x1a/0x20
+         __free_old_xmit+0x1c8/0x510
+         napi_skb_cache_put+0x82/0x4b0
+         __free_old_xmit+0x1c8/0x510
+         __free_old_xmit+0x1c8/0x510
+         __pfx___free_old_xmit+0x10/0x10
+
+The issue arises because virtio is assuming it's running in NAPI context
+even when it's not, such as in the netpoll case.
+
+To resolve this, modify virtnet_poll_tx() to only set NAPI when budget
+is available. Same for virtnet_poll_cleantx(), which always assumed that
+it was in a NAPI context.
+
+Fixes: df133f3f9625 ("virtio_net: bulk free tx skbs")
+Suggested-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Breno Leitao <leitao@debian.org>
+Reviewed-by: Jakub Kicinski <kuba@kernel.org>
+Acked-by: Michael S. Tsirkin <mst@redhat.com>
+Acked-by: Jason Wang <jasowang@redhat.com>
+Reviewed-by: Heng Qi <hengqi@linux.alibaba.com>
+Link: https://patch.msgid.link/20240712115325.54175-1-leitao@debian.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+[Shivani: Modified to apply on v6.6.y]
+Signed-off-by: Shivani Agarwal <shivani.agarwal@broadcom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/virtio_net.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/virtio_net.c
++++ b/drivers/net/virtio_net.c
+@@ -2140,7 +2140,7 @@ static int virtnet_receive(struct receiv
+       return packets;
+ }
+ 
+-static void virtnet_poll_cleantx(struct receive_queue *rq)
++static void virtnet_poll_cleantx(struct receive_queue *rq, int budget)
+ {
+       struct virtnet_info *vi = rq->vq->vdev->priv;
+       unsigned int index = vq2rxq(rq->vq);
+@@ -2158,7 +2158,7 @@ static void virtnet_poll_cleantx(struct
+ 
+               do {
+                       virtqueue_disable_cb(sq->vq);
+-                      free_old_xmit_skbs(sq, true);
++                      free_old_xmit_skbs(sq, !!budget);
+               } while (unlikely(!virtqueue_enable_cb_delayed(sq->vq)));
+ 
+               if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)
+@@ -2177,7 +2177,7 @@ static int virtnet_poll(struct napi_stru
+       unsigned int received;
+       unsigned int xdp_xmit = 0;
+ 
+-      virtnet_poll_cleantx(rq);
++      virtnet_poll_cleantx(rq, budget);
+ 
+       received = virtnet_receive(rq, budget, &xdp_xmit);
+ 
+@@ -2280,7 +2280,7 @@ static int virtnet_poll_tx(struct napi_s
+       txq = netdev_get_tx_queue(vi->dev, index);
+       __netif_tx_lock(txq, raw_smp_processor_id());
+       virtqueue_disable_cb(sq->vq);
+-      free_old_xmit_skbs(sq, true);
++      free_old_xmit_skbs(sq, !!budget);
+ 
+       if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)
+               netif_tx_wake_queue(txq);