From: Kevin Traynor <ktraynor@redhat.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: Huisong Li <lihuisong@huawei.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'app/testpmd: fix out-of-bound reference in offload config' has been queued to stable release 24.11.2
Date: Fri, 7 Mar 2025 12:46:44 +0000 [thread overview]
Message-ID: <20250307124726.475001-11-ktraynor@redhat.com> (raw)
In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to stable release 24.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/12/25. 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/220244287b6705414f2bc0d7d4fd50d334f191e2
Thanks.
Kevin
---
From 220244287b6705414f2bc0d7d4fd50d334f191e2 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 20 Feb 2025 12:44:26 -0800
Subject: [PATCH] app/testpmd: fix out-of-bound reference in offload config
[ upstream commit 8f847023dd16cb6e5858756d7ec16c940ac6eee9 ]
When configuring offloads, need to check the port id before
indexing into the ports[] array. This can easily be done
by moving the call to oh_dev_conf_get_print_err() to before
the checks for port stopped.
Fixes: c73a9071877a ("app/testpmd: add commands to test new offload API")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Huisong Li <lihuisong@huawei.com>
---
app/test-pmd/cmdline.c | 67 +++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 31 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 93c9fc402d..0f9b8e36f6 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -11512,5 +11512,5 @@ cmd_rx_offload_get_configuration_parsed(
struct rte_eth_dev_info dev_info;
portid_t port_id = res->port_id;
- struct rte_port *port = &ports[port_id];
+ struct rte_port *port;
struct rte_eth_conf dev_conf;
uint64_t port_offloads;
@@ -11520,10 +11520,11 @@ cmd_rx_offload_get_configuration_parsed(
int ret;
+ ret = eth_dev_conf_get_print_err(port_id, &dev_conf);
+ if (ret != 0)
+ return;
+
+ port = &ports[port_id];
printf("Rx Offloading Configuration of port %d :\n", port_id);
- ret = eth_dev_conf_get_print_err(port_id, &dev_conf);
- if (ret != 0)
- return;
-
port_offloads = dev_conf.rxmode.offloads;
printf(" Port :");
@@ -11626,5 +11627,5 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
{
struct rte_eth_dev_info dev_info;
- struct rte_port *port = &ports[port_id];
+ struct rte_port *port;
uint16_t nb_rx_queues;
uint64_t offload;
@@ -11632,4 +11633,9 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
int ret;
+ ret = eth_dev_info_get_print_err(port_id, &dev_info);
+ if (ret != 0)
+ return;
+
+ port = &ports[port_id];
if (port->port_status != RTE_PORT_STOPPED) {
fprintf(stderr,
@@ -11639,8 +11645,4 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
}
- ret = eth_dev_info_get_print_err(port_id, &dev_info);
- if (ret != 0)
- return;
-
if (!strcmp(name, "all")) {
offload = dev_info.rx_offload_capa;
@@ -11828,8 +11830,13 @@ cmd_config_per_queue_rx_offload_parsed(void *parsed_result,
portid_t port_id = res->port_id;
uint16_t queue_id = res->queue_id;
- struct rte_port *port = &ports[port_id];
+ struct rte_port *port;
uint64_t offload;
int ret;
+ ret = eth_dev_info_get_print_err(port_id, &dev_info);
+ if (ret != 0)
+ return;
+
+ port = &ports[port_id];
if (port->port_status != RTE_PORT_STOPPED) {
fprintf(stderr,
@@ -11839,8 +11846,4 @@ cmd_config_per_queue_rx_offload_parsed(void *parsed_result,
}
- ret = eth_dev_info_get_print_err(port_id, &dev_info);
- if (ret != 0)
- return;
-
if (queue_id >= dev_info.nb_rx_queues) {
fprintf(stderr,
@@ -12030,5 +12033,5 @@ cmd_tx_offload_get_configuration_parsed(
struct rte_eth_dev_info dev_info;
portid_t port_id = res->port_id;
- struct rte_port *port = &ports[port_id];
+ struct rte_port *port;
struct rte_eth_conf dev_conf;
uint64_t port_offloads;
@@ -12038,10 +12041,10 @@ cmd_tx_offload_get_configuration_parsed(
int ret;
+ ret = eth_dev_conf_get_print_err(port_id, &dev_conf);
+ if (ret != 0)
+ return;
+
printf("Tx Offloading Configuration of port %d :\n", port_id);
-
- ret = eth_dev_conf_get_print_err(port_id, &dev_conf);
- if (ret != 0)
- return;
-
+ port = &ports[port_id];
port_offloads = dev_conf.txmode.offloads;
printf(" Port :");
@@ -12148,5 +12151,5 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
{
struct rte_eth_dev_info dev_info;
- struct rte_port *port = &ports[port_id];
+ struct rte_port *port;
uint16_t nb_tx_queues;
uint64_t offload;
@@ -12154,4 +12157,9 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
int ret;
+ ret = eth_dev_info_get_print_err(port_id, &dev_info);
+ if (ret != 0)
+ return;
+
+ port = &ports[port_id];
if (port->port_status != RTE_PORT_STOPPED) {
fprintf(stderr,
@@ -12161,8 +12169,4 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
}
- ret = eth_dev_info_get_print_err(port_id, &dev_info);
- if (ret != 0)
- return;
-
if (!strcmp(name, "all")) {
offload = dev_info.tx_offload_capa;
@@ -12354,8 +12358,13 @@ cmd_config_per_queue_tx_offload_parsed(void *parsed_result,
portid_t port_id = res->port_id;
uint16_t queue_id = res->queue_id;
- struct rte_port *port = &ports[port_id];
+ struct rte_port *port;
uint64_t offload;
int ret;
+ ret = eth_dev_info_get_print_err(port_id, &dev_info);
+ if (ret != 0)
+ return;
+
+ port = &ports[port_id];
if (port->port_status != RTE_PORT_STOPPED) {
fprintf(stderr,
@@ -12365,8 +12374,4 @@ cmd_config_per_queue_tx_offload_parsed(void *parsed_result,
}
- ret = eth_dev_info_get_print_err(port_id, &dev_info);
- if (ret != 0)
- return;
-
if (queue_id >= dev_info.nb_tx_queues) {
fprintf(stderr,
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-03-07 11:02:57.311680947 +0000
+++ 0011-app-testpmd-fix-out-of-bound-reference-in-offload-co.patch 2025-03-07 11:02:56.848335604 +0000
@@ -1 +1 @@
-From 8f847023dd16cb6e5858756d7ec16c940ac6eee9 Mon Sep 17 00:00:00 2001
+From 220244287b6705414f2bc0d7d4fd50d334f191e2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f847023dd16cb6e5858756d7ec16c940ac6eee9 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 6ca3eedb92..d4bb3ec998 100644
+index 93c9fc402d..0f9b8e36f6 100644
@@ -24 +25 @@
-@@ -11634,5 +11634,5 @@ cmd_rx_offload_get_configuration_parsed(
+@@ -11512,5 +11512,5 @@ cmd_rx_offload_get_configuration_parsed(
@@ -31 +32 @@
-@@ -11642,10 +11642,11 @@ cmd_rx_offload_get_configuration_parsed(
+@@ -11520,10 +11520,11 @@ cmd_rx_offload_get_configuration_parsed(
@@ -47 +48 @@
-@@ -11748,5 +11749,5 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
+@@ -11626,5 +11627,5 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
@@ -54 +55 @@
-@@ -11754,4 +11755,9 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
+@@ -11632,4 +11633,9 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
@@ -64 +65 @@
-@@ -11761,8 +11767,4 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
+@@ -11639,8 +11645,4 @@ config_port_rx_offload(portid_t port_id, char *name, bool on)
@@ -73 +74 @@
-@@ -11950,8 +11952,13 @@ cmd_config_per_queue_rx_offload_parsed(void *parsed_result,
+@@ -11828,8 +11830,13 @@ cmd_config_per_queue_rx_offload_parsed(void *parsed_result,
@@ -88 +89 @@
-@@ -11961,8 +11968,4 @@ cmd_config_per_queue_rx_offload_parsed(void *parsed_result,
+@@ -11839,8 +11846,4 @@ cmd_config_per_queue_rx_offload_parsed(void *parsed_result,
@@ -97 +98 @@
-@@ -12152,5 +12155,5 @@ cmd_tx_offload_get_configuration_parsed(
+@@ -12030,5 +12033,5 @@ cmd_tx_offload_get_configuration_parsed(
@@ -104 +105 @@
-@@ -12160,10 +12163,10 @@ cmd_tx_offload_get_configuration_parsed(
+@@ -12038,10 +12041,10 @@ cmd_tx_offload_get_configuration_parsed(
@@ -120 +121 @@
-@@ -12270,5 +12273,5 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
+@@ -12148,5 +12151,5 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
@@ -127 +128 @@
-@@ -12276,4 +12279,9 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
+@@ -12154,4 +12157,9 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
@@ -137 +138 @@
-@@ -12283,8 +12291,4 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
+@@ -12161,8 +12169,4 @@ config_port_tx_offload(portid_t port_id, char *name, bool on)
@@ -146 +147 @@
-@@ -12476,8 +12480,13 @@ cmd_config_per_queue_tx_offload_parsed(void *parsed_result,
+@@ -12354,8 +12358,13 @@ cmd_config_per_queue_tx_offload_parsed(void *parsed_result,
@@ -161 +162 @@
-@@ -12487,8 +12496,4 @@ cmd_config_per_queue_tx_offload_parsed(void *parsed_result,
+@@ -12365,8 +12374,4 @@ cmd_config_per_queue_tx_offload_parsed(void *parsed_result,
next prev parent reply other threads:[~2025-03-07 12:48 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 12:46 patch 'ci: build with MSVC in GHA' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/netvsc: scan all net devices under the PCI device' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/netvsc: remove device if its net devices removed' " Kevin Traynor
2025-03-07 12:46 ` patch 'doc: fix feature flags for queue start/stop' " Kevin Traynor
2025-03-07 12:46 ` patch 'doc: add VXLAN matching requirement in mlx5 guide' " Kevin Traynor
2025-03-07 12:46 ` patch 'app/testpmd: use VXLAN flow flags from user if set' " Kevin Traynor
2025-03-07 12:46 ` patch 'ethdev: fix registers info request' " Kevin Traynor
2025-03-07 12:46 ` patch 'app/testpmd: show all DCB priority TC map' " Kevin Traynor
2025-03-07 12:46 ` patch 'app/testpmd: avoid crash in DCB config' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/mana: fix multi-process tracking' " Kevin Traynor
2025-03-07 12:46 ` Kevin Traynor [this message]
2025-03-07 12:46 ` patch 'net/ngbe: fix WOL and NCSI capabilities' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/txgbe: remove useless condition for SW-FW sync' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/nfp: fix representor port statistics' " Kevin Traynor
2025-03-07 12:46 ` patch 'bus/pci: fix registered device name' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/nfp: fix init failure handling' " Kevin Traynor
2025-03-07 12:46 ` patch 'vhost/crypto: skip fetch before vring init' " Kevin Traynor
2025-03-07 12:46 ` patch 'examples/vhost_crypto: fix user callbacks' " Kevin Traynor
2025-03-07 12:46 ` patch 'vhost: check descriptor chains length' " Kevin Traynor
2025-03-07 12:46 ` patch 'test/bbdev: update FFT test vectors' " Kevin Traynor
2025-03-07 12:46 ` patch 'event/dlb2: fix event weight handling in SSE code path' " Kevin Traynor
2025-03-07 12:46 ` patch 'test/event: fix number of queues in eventdev conf' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/e1000: fix crashes in secondary processes' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/ixgbe: " Kevin Traynor
2025-03-07 12:46 ` patch 'net/ixgbe: fix minimum Rx/Tx descriptors' " Kevin Traynor
2025-03-07 12:46 ` patch 'net/mlx5/hws: fix fragmented packet type matching' " Kevin Traynor
2025-03-07 12:47 ` patch 'net/mlx5: fix leak in HWS flow counter action' " Kevin Traynor
2025-03-07 12:47 ` patch 'net/mlx5: fix crash with null flow list creation' " Kevin Traynor
2025-03-07 12:47 ` patch 'net/mlx5: fix actions translation error overwrite' " Kevin Traynor
2025-03-07 12:47 ` patch 'net/mlx5: fix hardware packet type translation' " Kevin Traynor
2025-03-07 12:47 ` patch 'common/cnxk: fix inbound IPsec SA setup' " Kevin Traynor
2025-03-07 12:47 ` patch 'stack: fix pop in C11 implementation' " Kevin Traynor
2025-03-07 12:47 ` patch 'test/crypto: fix AES-ECB test lengths' " Kevin Traynor
2025-03-07 12:47 ` patch 'examples/ipsec-secgw: fix IV length in CTR 192/256' " Kevin Traynor
2025-03-07 12:47 ` patch 'crypto/cnxk: fix asymmetric operation status code' " Kevin Traynor
2025-03-07 12:47 ` patch 'test/crypto: remove unused variable' " Kevin Traynor
2025-03-07 12:47 ` patch 'crypto/openssl: validate incorrect RSA signature' " Kevin Traynor
2025-03-07 12:47 ` patch 'test/crypto: fix check for OOP header data' " Kevin Traynor
2025-03-07 12:47 ` patch 'crypto/qat: fix SM3 state size' " Kevin Traynor
2025-03-07 12:47 ` patch 'test/dma: fix pointers in IOVA as PA mode' " Kevin Traynor
2025-03-07 12:47 ` patch 'doc: update ionic driver guide' " Kevin Traynor
2025-03-07 12:47 ` patch 'ci: point at GitHub mirror' " Kevin Traynor
2025-03-07 12:47 ` patch 'ci: fix ccache for Ubuntu 22.04' " 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=20250307124726.475001-11-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=lihuisong@huawei.com \
--cc=stable@dpdk.org \
--cc=stephen@networkplumber.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).