]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2023 11:35:28 +0000 (12:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2023 11:35:28 +0000 (12:35 +0100)
added patches:
hv_netvsc-allocate-memory-in-netvsc_dma_map-with-gfp_atomic.patch
series

queue-6.1/hv_netvsc-allocate-memory-in-netvsc_dma_map-with-gfp_atomic.patch [new file with mode: 0644]
queue-6.1/series [new file with mode: 0644]

diff --git a/queue-6.1/hv_netvsc-allocate-memory-in-netvsc_dma_map-with-gfp_atomic.patch b/queue-6.1/hv_netvsc-allocate-memory-in-netvsc_dma_map-with-gfp_atomic.patch
new file mode 100644 (file)
index 0000000..8752e64
--- /dev/null
@@ -0,0 +1,40 @@
+From c6aa9d3b43cd11ac13a8220368a3b0483c6751d4 Mon Sep 17 00:00:00 2001
+From: Michael Kelley <mikelley@microsoft.com>
+Date: Mon, 6 Feb 2023 12:11:57 -0800
+Subject: hv_netvsc: Allocate memory in netvsc_dma_map() with GFP_ATOMIC
+
+From: Michael Kelley <mikelley@microsoft.com>
+
+commit c6aa9d3b43cd11ac13a8220368a3b0483c6751d4 upstream.
+
+Memory allocations in the network transmit path must use GFP_ATOMIC
+so they won't sleep.
+
+Reported-by: Paolo Abeni <pabeni@redhat.com>
+Link: https://lore.kernel.org/lkml/8a4d08f94d3e6fe8b6da68440eaa89a088ad84f9.camel@redhat.com/
+Fixes: 846da38de0e8 ("net: netvsc: Add Isolation VM support for netvsc driver")
+Cc: stable@vger.kernel.org
+Signed-off-by: Michael Kelley <mikelley@microsoft.com>
+Link: https://lore.kernel.org/r/1675714317-48577-1-git-send-email-mikelley@microsoft.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/hyperv/netvsc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index e02d1e3ef672..79f4e13620a4 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -1034,7 +1034,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev,
+       packet->dma_range = kcalloc(page_count,
+                                   sizeof(*packet->dma_range),
+-                                  GFP_KERNEL);
++                                  GFP_ATOMIC);
+       if (!packet->dma_range)
+               return -ENOMEM;
+-- 
+2.39.1
+
diff --git a/queue-6.1/series b/queue-6.1/series
new file mode 100644 (file)
index 0000000..2291932
--- /dev/null
@@ -0,0 +1 @@
+hv_netvsc-allocate-memory-in-netvsc_dma_map-with-gfp_atomic.patch