6.12-stable patches

added patches:
	idpf-don-t-hard-code-napi_struct-size.patch

diff --git a/queue-6.12/idpf-don-t-hard-code-napi_struct-size.patch b/queue-6.12/idpf-don-t-hard-code-napi_struct-size.patch
new file mode 100644 (file)
index 0000000..491c458
--- /dev/null
+++ b/queue-6.12/idpf-don-t-hard-code-napi_struct-size.patch
@@ -0,0 +1,37 @@
+From 49717ef01ce1b6dbe4cd12bee0fc25e086c555df Mon Sep 17 00:00:00 2001
+From: Joe Damato <jdamato@fastly.com>
+Date: Fri, 4 Oct 2024 10:54:07 +0000
+Subject: idpf: Don't hard code napi_struct size
+
+From: Joe Damato <jdamato@fastly.com>
+
+commit 49717ef01ce1b6dbe4cd12bee0fc25e086c555df upstream.
+
+The sizeof(struct napi_struct) can change. Don't hardcode the size to
+400 bytes and instead use "sizeof(struct napi_struct)".
+
+Suggested-by: Alexander Lobakin <aleksander.lobakin@intel.com>
+Signed-off-by: Joe Damato <jdamato@fastly.com>
+Acked-by: Alexander Lobakin <aleksander.lobakin@intel.com>
+Link: https://patch.msgid.link/20241004105407.73585-1-jdamato@fastly.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+[Yifei: In Linux-6.12.y, it still hard code the size of napi_struct,
+adding a member will lead the entire build failed]
+Signed-off-by: Yifei Liu <yifei.l.liu@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/intel/idpf/idpf_txrx.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.h
++++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.h
+@@ -438,7 +438,8 @@ struct idpf_q_vector {
+       __cacheline_group_end_aligned(cold);
+ };
+ libeth_cacheline_set_assert(struct idpf_q_vector, 112,
+-                          424 + 2 * sizeof(struct dim),
++                          24 + sizeof(struct napi_struct) +
++                          2 * sizeof(struct dim),
+                           8 + sizeof(cpumask_var_t));
+ 
+ struct idpf_rx_queue_stats {

diff --git a/queue-6.12/series b/queue-6.12/series
index 5c30d88b194469ac6ff6242dd6a098751686ccf2..335d5a77bdaf1cedd1b3d9ae565478fc123d57cb 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -377,3 +377,4 @@ ntb_perf-delete-duplicate-dmaengine_unmap_put-call-in-perf_copy_chunk.patch
 perf-x86-intel-apply-static-call-for-drain_pebs.patch
 perf-x86-intel-avoid-disable-pmu-if-cpuc-enabled-in-sample-read.patch
 uprobes-x86-harden-uretprobe-syscall-trampoline-check.patch
+idpf-don-t-hard-code-napi_struct-size.patch