From: Xueming Li <xuemingl@nvidia.com>
Sent: Saturday, December 7, 2024 1:30 PM
To: Sunil Kumar Kori <skori@marvell.com>
Cc: Xueming Li <xuemingl@nvidia.com>; dpdk stable <stable@dpdk.org>
Subject: [EXTERNAL] patch 'net/cnxk: fix build on Ubuntu 24.04' has been queued to stable release 23.11.3
Hi, FYI, your patch has been queued to stable release 23. 11. 3 Note it hasn't been pushed to https: //urldefense. proofpoint. com/v2/url?u=http-3A__dpdk. org_browse_dpdk-2Dstable&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=dXeXaAMkP5COgn1zxHMyaF1_d9IIuq6vHQO6NrIPjaE&m=epjUCFVoFQjLZ3vMP9pCD5p-36hdkRRf0lU2WbZqd3SsSrMTOG-SsVTcZVwF1lFp&s=OCDHLcgcUmN7VEduKzegMzUsAaEig04Be9Y1usX-Fq8&e=
Hi,
FYI, your patch has been queued to stable release 23.11.3
Note it hasn't been pushed to https://urldefense.proofpoint.com/v2/url?u=http-3A__dpdk.org_browse_dpdk-2Dstable&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=dXeXaAMkP5COgn1zxHMyaF1_d9IIuq6vHQO6NrIPjaE&m=epjUCFVoFQjLZ3vMP9pCD5p-36hdkRRf0lU2WbZqd3SsSrMTOG-SsVTcZVwF1lFp&s=OCDHLcgcUmN7VEduKzegMzUsAaEig04Be9Y1usX-Fq8&e= yet.
It will be pushed if I get no objections before 12/10/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://urldefense.proofpoint.com/v2/url?u=https-3A__git.dpdk.org_dpdk-2Dstable_log_-3Fh-3D23.11-2Dstaging&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=dXeXaAMkP5COgn1zxHMyaF1_d9IIuq6vHQO6NrIPjaE&m=epjUCFVoFQjLZ3vMP9pCD5p-36hdkRRf0lU2WbZqd3SsSrMTOG-SsVTcZVwF1lFp&s=L5QXg_lPQSUvFkAmREdMj9EWsY7ZdwN56iEbwS4fW1k&e=
This queued commit can be viewed at:
https://urldefense.proofpoint.com/v2/url?u=https-3A__git.dpdk.org_dpdk-2Dstable_commit_-3Fh-3D23.11-2Dstaging-26id-3Dd39e6e67897cafd530b554985801a9f8f7092012&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=dXeXaAMkP5COgn1zxHMyaF1_d9IIuq6vHQO6NrIPjaE&m=epjUCFVoFQjLZ3vMP9pCD5p-36hdkRRf0lU2WbZqd3SsSrMTOG-SsVTcZVwF1lFp&s=2lph2omTzKv9yp2MuPsSAgKzj_eaN6Q0SUgxbKaj6H8&e=
Thanks.
Xueming Li <xuemingl@nvidia.com>
Acked-by: Sunil Kumar Kori skori@marvell.com
---
From d39e6e67897cafd530b554985801a9f8f7092012 Mon Sep 17 00:00:00 2001
From: Sunil Kumar Kori <skori@marvell.com>
Date: Thu, 14 Nov 2024 13:08:16 +0530
Subject: [PATCH] net/cnxk: fix build on Ubuntu 24.04
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit b9799fb5e7a38c824c91b88d3c89250d23c783e6 ]
Due to implicit unsigned to signed integer conversion, actual value gets
wrapped and becomes higher than its size.
Bugzilla ID: 1513
Fixes: 03b152389fb1 ("net/cnxk: add option to enable custom inbound SA")
Fixes: 7df4ead35436 ("net/cnxk: support parsing custom SA action")
Fixes: 47cca253d605 ("net/cnxk: support Rx inject")
Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
---
drivers/net/cnxk/cnxk_ethdev_devargs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/cnxk/cnxk_ethdev_devargs.c b/drivers/net/cnxk/cnxk_ethdev_devargs.c
index a0e9300cff..8c022e5f08 100644
--- a/drivers/net/cnxk/cnxk_ethdev_devargs.c
+++ b/drivers/net/cnxk/cnxk_ethdev_devargs.c
@@ -303,8 +303,8 @@ cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev)
uint16_t custom_sa_act = 0;
struct rte_kvargs *kvlist;
uint32_t meta_buf_sz = 0;
+ uint16_t lock_rx_ctx = 0;
uint16_t no_inl_dev = 0;
- uint8_t lock_rx_ctx = 0;
memset(&sdp_chan, 0, sizeof(sdp_chan));
memset(&pre_l2_info, 0, sizeof(struct flow_pre_l2_size_info));
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-12-06 23:26:46.164810003 +0800
+++ 0063-net-cnxk-fix-build-on-Ubuntu-24.04.patch 2024-12-06 23:26:43.983044827 +0800
@@ -1 +1 @@
-From b9799fb5e7a38c824c91b88d3c89250d23c783e6 Mon Sep 17 00:00:00 2001
+From d39e6e67897cafd530b554985801a9f8f7092012 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit b9799fb5e7a38c824c91b88d3c89250d23c783e6 ]
@@ -13 +15,0 @@
-Cc: stable@dpdk.org
@@ -17,2 +19,2 @@
- drivers/net/cnxk/cnxk_ethdev_devargs.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ drivers/net/cnxk/cnxk_ethdev_devargs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -21 +23 @@
-index 5bd50bb9a1..ecc2ea8b77 100644
+index a0e9300cff..8c022e5f08 100644
@@ -24,3 +26 @@
-@@ -305,12 +305,12 @@ cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev)
- uint16_t scalar_enable = 0;
- uint16_t tx_compl_ena = 0;
+@@ -303,8 +303,8 @@ cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev)
@@ -28,2 +27,0 @@
-- uint8_t custom_inb_sa = 0;
-+ uint16_t custom_inb_sa = 0;
@@ -33 +30,0 @@
-+ uint16_t rx_inj_ena = 0;
@@ -36 +32,0 @@
-- uint8_t rx_inj_ena = 0;