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 (cherry picked from commit 49717ef01ce1b6dbe4cd12bee0fc25e086c555df) [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 --- drivers/net/ethernet/intel/idpf/idpf_txrx.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.h b/drivers/net/ethernet/intel/idpf/idpf_txrx.h index f0537826f840..9c1fe84108ed 100644 --- 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 {
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 49717ef01ce1b6dbe4cd12bee0fc25e086c555df
WARNING: Author mismatch between patch and upstream commit: Backport author: Yifei Liuyifei.l.liu@oracle.com Commit author: Joe Damatojdamato@fastly.com
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.13.y | Present (exact SHA1)
Note: The patch differs from the upstream commit: --- 1: 49717ef01ce1b ! 1: de77aeac67190 idpf: Don't hard code napi_struct size @@ Metadata ## Commit message ## idpf: Don't hard code napi_struct size
+ 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)".
@@ Commit message 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 + (cherry picked from commit 49717ef01ce1b6dbe4cd12bee0fc25e086c555df) + [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
## drivers/net/ethernet/intel/idpf/idpf_txrx.h ## @@ drivers/net/ethernet/intel/idpf/idpf_txrx.h: struct idpf_q_vector { ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.12.y | Success | Success |
linux-stable-mirror@lists.linaro.org
-
Sasha Levin -
Yifei Liu