From: Kevin Traynor <ktraynor@redhat.com>
To: Shani Peretz <shperetz@nvidia.com>
Cc: Bing Zhao <bingz@nvidia.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'common/mlx5: fix misalignment' has been queued to stable release 21.11.9
Date: Wed, 27 Nov 2024 17:18:56 +0000 [thread overview]
Message-ID: <20241127171916.690404-109-ktraynor@redhat.com> (raw)
In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to stable release 21.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/02/24. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/a8403f04b0d04ac2e44e4d41c3f5d114014a353f
Thanks.
Kevin
---
From a8403f04b0d04ac2e44e4d41c3f5d114014a353f Mon Sep 17 00:00:00 2001
From: Shani Peretz <shperetz@nvidia.com>
Date: Tue, 12 Nov 2024 10:21:26 +0200
Subject: [PATCH] common/mlx5: fix misalignment
[ upstream commit 90967539d0d1afcfd5237ed85efdc430359a0e6b ]
ASan reported a runtime error due to misalignment
involving three structures.
The first issue arises when accessing
l_inconst->cache[MLX5_LIST_GLOBAL]->h.
If struct mlx5_list_cache is not properly aligned, the pointer gc,
assigned to l_inconst->cache[MLX5_LIST_GLOBAL], could be misaligned.
To address this, the __rte_aligned(16) attribute was added to
struct mlx5_list_inconst in struct mlx5_list, which includes struct
mlx5_list_cache, ensuring that the entire mlx5_list structure,
including mlx5_list_cache, is aligned to 64 bytes.
To resolve misalignment issues with struct mlx5_flow_handle,
The initialization of resources for the ipool ensures that
the ipool size is rounded up to the 8-byte boundary
The error in assigning values to actions[i] was due to potential
padding or misalignment in struct mlx5_modification_cmd.
To prevent such issues, the __rte_packed attribute was added to
struct mlx5_modification_cmd, ensuring that the structure is packed
without extra padding which helps avoid misaligned memory accesses.
Two performance degradation tests were conducted.
Following are the results comparing this commit to the most recent
commit in mlnx_dpdk_22.11 at that time (b69408ae453).
Before asan misalignment fix (average kflows/sec) -
Insertion - 4461.269, Deletion - 7799.9992
After:
Insertion - 4579.0642 , Deletion - 7913.0034
Fixes: 9a4c36880704 ("common/mlx5: optimize cache list object memory")
Signed-off-by: Shani Peretz <shperetz@nvidia.com>
Acked-by: Bing Zhao <bingz@nvidia.com>
---
drivers/common/mlx5/mlx5_common_utils.h | 2 +-
drivers/common/mlx5/mlx5_prm.h | 4 ++--
drivers/net/mlx5/mlx5.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common_utils.h b/drivers/common/mlx5/mlx5_common_utils.h
index 98e487e7ef..2b013254ad 100644
--- a/drivers/common/mlx5/mlx5_common_utils.h
+++ b/drivers/common/mlx5/mlx5_common_utils.h
@@ -131,5 +131,5 @@ struct mlx5_list_inconst {
*
*/
-struct mlx5_list {
+struct __rte_aligned(16) mlx5_list {
struct mlx5_list_const l_const;
struct mlx5_list_inconst l_inconst;
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 58aa72df64..fd5c8b5c72 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -754,5 +754,5 @@ struct mlx5_modification_cmd {
unsigned int action_type:4;
};
- };
+ } __rte_packed;
union {
uint32_t data1;
@@ -765,5 +765,5 @@ struct mlx5_modification_cmd {
unsigned int rsvd4:4;
};
- };
+ } __rte_packed;
};
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index b339ccce84..20960b8b03 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -832,5 +832,5 @@ mlx5_flow_ipool_create(struct mlx5_dev_ctx_shared *sh,
case MLX5_IPOOL_MLX5_FLOW:
cfg.size = config->dv_flow_en ?
- sizeof(struct mlx5_flow_handle) :
+ RTE_ALIGN_MUL_CEIL(sizeof(struct mlx5_flow_handle), 8) :
MLX5_FLOW_HANDLE_VERBS_SIZE;
break;
--
2.47.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-11-27 17:17:41.691940689 +0000
+++ 0109-common-mlx5-fix-misalignment.patch 2024-11-27 17:17:38.338269959 +0000
@@ -1 +1 @@
-From 90967539d0d1afcfd5237ed85efdc430359a0e6b Mon Sep 17 00:00:00 2001
+From a8403f04b0d04ac2e44e4d41c3f5d114014a353f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 90967539d0d1afcfd5237ed85efdc430359a0e6b ]
+
@@ -38 +39,0 @@
-Cc: stable@dpdk.org
@@ -49 +50 @@
-index c5eff7a0bf..9139bc6829 100644
+index 98e487e7ef..2b013254ad 100644
@@ -52 +53 @@
-@@ -132,5 +132,5 @@ struct mlx5_list_inconst {
+@@ -131,5 +131,5 @@ struct mlx5_list_inconst {
@@ -60 +61 @@
-index 210158350d..2d82807bc2 100644
+index 58aa72df64..fd5c8b5c72 100644
@@ -63 +64 @@
-@@ -942,5 +942,5 @@ struct mlx5_modification_cmd {
+@@ -754,5 +754,5 @@ struct mlx5_modification_cmd {
@@ -70 +71 @@
-@@ -953,5 +953,5 @@ struct mlx5_modification_cmd {
+@@ -765,5 +765,5 @@ struct mlx5_modification_cmd {
@@ -78 +79 @@
-index 52b90e6ff3..6e4473e2f4 100644
+index b339ccce84..20960b8b03 100644
@@ -81 +82 @@
-@@ -908,5 +908,5 @@ mlx5_flow_ipool_create(struct mlx5_dev_ctx_shared *sh)
+@@ -832,5 +832,5 @@ mlx5_flow_ipool_create(struct mlx5_dev_ctx_shared *sh,
@@ -83 +84 @@
- cfg.size = sh->config.dv_flow_en ?
+ cfg.size = config->dv_flow_en ?
next prev parent reply other threads:[~2024-11-27 17:23 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-27 17:17 patch 'net/ionic: fix build with Fedora Rawhide' " Kevin Traynor
2024-11-27 17:17 ` patch 'eal/x86: fix 32-bit write combining store' " Kevin Traynor
2024-11-27 17:17 ` patch 'examples/eventdev: fix queue crash with generic pipeline' " Kevin Traynor
2024-11-27 17:17 ` patch 'crypto/dpaa2_sec: fix memory leak' " Kevin Traynor
2024-11-27 17:17 ` patch 'common/dpaax/caamflib: fix PDCP SNOW-ZUC watchdog' " Kevin Traynor
2024-11-27 17:17 ` patch 'dev: fix callback lookup when unregistering device' " Kevin Traynor
2024-11-27 17:17 ` patch 'bpf: fix free function mismatch if convert fails' " Kevin Traynor
2024-11-27 17:17 ` patch 'baseband/la12xx: fix use after free in modem config' " Kevin Traynor
2024-11-27 17:17 ` patch 'crypto/bcmfs: fix free function mismatch' " Kevin Traynor
2024-11-27 17:17 ` patch 'dma/idxd: fix free function mismatch in device probe' " Kevin Traynor
2024-11-27 17:17 ` patch 'event/cnxk: fix free function mismatch in port config' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/e1000: fix use after free in filter flush' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/sfc: fix use after free in debug logs' " Kevin Traynor
2024-11-27 17:17 ` patch 'raw/ifpga/base: fix use after free' " Kevin Traynor
2024-11-27 17:17 ` patch 'raw/ifpga: fix free function mismatch in interrupt config' " Kevin Traynor
2024-11-27 17:17 ` patch 'examples/vhost: fix free function mismatch' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/nfb: fix use after free' " Kevin Traynor
2024-11-27 17:17 ` patch 'power: enable CPPC' " Kevin Traynor
2024-11-27 17:17 ` patch 'fib6: add runtime checks in AVX512 lookup' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/cnxk: fix Rx timestamp handling for VF' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/cnxk: fix Rx offloads to handle timestamp' " Kevin Traynor
2024-11-27 17:17 ` patch 'common/cnxk: fix base log level' " Kevin Traynor
2024-11-27 17:17 ` patch 'vhost: fix offset while mapping log base address' " Kevin Traynor
2024-11-27 17:17 ` patch 'vdpa: update used flags in used ring relay' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/virtio-user: reset used index counter' " Kevin Traynor
2024-11-27 17:17 ` patch 'fib: fix AVX512 lookup' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/e1000: fix link status crash in secondary process' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/iavf: fix crash when link is unstable' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/ice/base: fix link speed for 200G' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/ice/base: fix iteration of TLVs in Preserved Fields Area' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/ixgbe/base: fix unchecked return value' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e/base: fix setting flags in init function' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e/base: fix misleading debug logs and comments' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e/base: fix blinking X722 with X557 PHY' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e/base: fix DDP loading with reserved track ID' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e/base: fix repeated register dumps' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e/base: fix unchecked return value' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e/base: fix loop bounds' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/i40e: fix AVX-512 pointer copy on 32-bit' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/ice: " Kevin Traynor
2024-11-27 17:17 ` patch 'net/iavf: " Kevin Traynor
2024-11-27 17:17 ` patch 'net/tap: avoid memcpy with null argument' " Kevin Traynor
2024-11-27 17:17 ` patch 'app/testpmd: remove unnecessary cast' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/pcap: set live interface as non-blocking' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/ena: revert redefining memcpy' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/hns3: remove some basic address dump' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/hns3: fix dump counter of registers' " Kevin Traynor
2024-11-27 17:17 ` patch 'ethdev: fix overflow in descriptor count' " Kevin Traynor
2024-11-27 17:17 ` patch 'bus/dpaa: fix PFDRs leaks due to FQRNIs' " Kevin Traynor
2024-11-27 17:17 ` patch 'net/dpaa: fix typecasting channel ID' " Kevin Traynor
2024-11-27 17:17 ` patch 'bus/dpaa: fix VSP for 1G fm1-mac9 and 10' " Kevin Traynor
2024-11-27 17:17 ` patch 'bus/dpaa: fix the fman details status' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/dpaa: fix reallocate mbuf handling' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/memif: fix buffer overflow in zero copy Rx' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/tap: restrict maximum number of MP FDs' " Kevin Traynor
2024-11-27 17:18 ` patch 'ethdev: verify queue ID in Tx done cleanup' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/hns3: verify reset type from firmware' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/pcap: fix blocking Rx' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ice/base: add bounds check' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ice/base: fix VLAN replay after reset' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/iavf: preserve MAC address with i40e PF Linux driver' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mlx5: workaround list management of Rx queue control' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mlx5: fix number of supported flex parsers' " Kevin Traynor
2024-11-27 17:18 ` patch 'app/testpmd: remove flex item init command leftover' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mlx5: fix next protocol validation after flex item' " Kevin Traynor
2024-11-27 17:18 ` patch 'build: remove version check on compiler links function' " Kevin Traynor
2024-11-27 17:18 ` patch 'hash: fix thash LFSR initialization' " Kevin Traynor
2024-11-27 17:18 ` patch 'dmadev: fix potential null pointer access' " Kevin Traynor
2024-11-27 17:18 ` patch 'power: fix mapped lcore ID' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/netvsc: fix using Tx queue higher than Rx queues' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/hns3: restrict tunnel flow rule to one header' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ice: detect stopping a flow director queue twice' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ixgbe: fix link status delay on FreeBSD' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mvneta: fix possible out-of-bounds write' " Kevin Traynor
2024-11-27 17:18 ` patch 'crypto/openssl: fix 3DES-CTR with big endian CPUs' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mlx5: fix memory leak in metering' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mlx5: fix reported Rx/Tx descriptor limits' " Kevin Traynor
2024-11-27 17:18 ` patch 'app/dumpcap: remove unused struct array' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/nfp: fix link change return value' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mlx5: fix non full word sample fields in flex item' " Kevin Traynor
2024-11-27 17:18 ` patch 'bus/fslmc: fix Coverity warnings in QBMAN' " Kevin Traynor
2024-11-27 17:18 ` patch 'test/bonding: remove redundant info query' " Kevin Traynor
2024-11-27 17:18 ` patch 'examples/ntb: check info query return' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/netvsc: force Tx VLAN offload on 801.2Q packet' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/vmxnet3: fix crash after configuration failure' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/txgbe: fix SWFW mbox' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/txgbe: fix VF-PF mbox interrupt' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/txgbe: remove outer UDP checksum capability' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/txgbe: fix driver load bit to inform firmware' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ngbe: " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ngbe: reconfigure more MAC Rx registers' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ngbe: fix interrupt lost in legacy or MSI mode' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/ngbe: restrict configuration of VLAN strip offload' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/hns3: fix error code for repeatedly create counter' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/hns3: fix fully use hardware flow director table' " Kevin Traynor
2024-11-27 17:18 ` patch 'event/octeontx: fix possible integer overflow' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnxt/tf_core: fix Thor TF EM key size check' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnxt: fix reading SFF-8436 SFP EEPROMs' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnxt: fix TCP and UDP checksum flags' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnxt: fix bad action offset in Tx BD' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnx2x: remove dead conditional' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnx2x: fix always true expression' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnx2x: fix possible infinite loop at startup' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/bnx2x: fix duplicate branch' " Kevin Traynor
2024-11-27 17:18 ` patch 'common/cnxk: fix build on Ubuntu 24.04' " Kevin Traynor
2024-11-27 17:18 ` patch 'examples/l2fwd-event: fix spinlock handling' " Kevin Traynor
2024-11-27 17:18 ` patch 'eventdev: fix possible array underflow/overflow' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/mlx5: fix shared queue port number in vector Rx' " Kevin Traynor
2024-11-27 17:18 ` Kevin Traynor [this message]
2024-11-27 17:18 ` patch 'bus/dpaa: fix lock condition during error handling' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/iavf: add segment-length check to Tx prep' " Kevin Traynor
2024-11-27 17:18 ` patch 'net/i40e: check register read for outer VLAN' " Kevin Traynor
2024-11-27 17:19 ` patch 'app/procinfo: fix leak on exit' " Kevin Traynor
2024-11-27 17:19 ` patch 'member: fix choice of bucket for displacement' " Kevin Traynor
2024-11-27 17:19 ` patch 'app/testpmd: fix aged flow destroy' " Kevin Traynor
2024-11-27 17:19 ` patch 'test/bonding: fix loop on members' " Kevin Traynor
2024-11-27 17:19 ` patch 'test/bonding: fix MAC address comparison' " Kevin Traynor
2024-11-27 17:19 ` patch 'test/event: avoid duplicate initialization' " Kevin Traynor
2024-11-27 17:19 ` patch 'test/eal: fix loop coverage for alignment macros' " Kevin Traynor
2024-11-27 17:19 ` patch 'test/eal: fix lcore check' " Kevin Traynor
2024-11-27 17:19 ` patch 'app/testpmd: remove redundant policy action condition' " Kevin Traynor
2024-11-27 17:19 ` patch 'doc: correct definition of stats per queue feature' " Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241127171916.690404-109-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=bingz@nvidia.com \
--cc=shperetz@nvidia.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).