patches for DPDK stable branches
 help / color / mirror / Atom feed
From: luca.boccassi@gmail.com
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: dpdk stable <stable@dpdk.org>
Subject: patch 'examples/l3fwd: fix socket ID check' has been queued to stable release 22.11.8
Date: Mon, 17 Feb 2025 17:04:48 +0000	[thread overview]
Message-ID: <20250217170456.1068278-75-luca.boccassi@gmail.com> (raw)
In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com>

Hi,

FYI, your patch has been queued to stable release 22.11.8

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/883c3357a84ec219cedc9a6ca0e00847b13f20aa

Thanks.

Luca Boccassi

---
From 883c3357a84ec219cedc9a6ca0e00847b13f20aa Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 5 Feb 2025 08:23:19 -0800
Subject: [PATCH] examples/l3fwd: fix socket ID check

[ upstream commit a7216f081767c7259dd3fba5eda0ca7b0bcb4595 ]

The expression:

  if ((socketid = rte_lcore_to_socket_id(lcore) != 0) &&

gets evaluated as socketid = (rte_lcore_to_socket_id(lcore) != 0)
which is not what was intended. This is goes all the way back
to first release.

Link: https://pvs-studio.com/en/blog/posts/cpp/1183/
Fixes: af75078fece3 ("first public release")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 examples/l3fwd-power/main.c | 4 ++--
 examples/l3fwd/main.c       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 1bcc61e777..501e4c47d6 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1537,8 +1537,8 @@ check_lcore_params(void)
 							"mask\n", lcore);
 			return -1;
 		}
-		if ((socketid = rte_lcore_to_socket_id(lcore) != 0) &&
-							(numa_on == 0)) {
+		socketid = rte_lcore_to_socket_id(lcore);
+		if (socketid != 0 && numa_on == 0) {
 			printf("warning: lcore %u is on socket %d with numa "
 						"off\n", lcore, socketid);
 		}
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 9201019711..d0067657e9 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -303,8 +303,9 @@ check_lcore_params(void)
 			printf("error: lcore %u is not enabled in lcore mask\n", lcore);
 			return -1;
 		}
-		if ((socketid = rte_lcore_to_socket_id(lcore) != 0) &&
-			(numa_on == 0)) {
+
+		socketid = rte_lcore_to_socket_id(lcore);
+		if (socketid != 0 && numa_on == 0) {
 			printf("warning: lcore %u is on socket %d with numa off\n",
 				lcore, socketid);
 		}
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-17 16:13:19.464653932 +0000
+++ 0075-examples-l3fwd-fix-socket-ID-check.patch	2025-02-17 16:13:16.870441592 +0000
@@ -1 +1 @@
-From a7216f081767c7259dd3fba5eda0ca7b0bcb4595 Mon Sep 17 00:00:00 2001
+From 883c3357a84ec219cedc9a6ca0e00847b13f20aa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a7216f081767c7259dd3fba5eda0ca7b0bcb4595 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index d279e664b3..e27b8531b5 100644
+index 1bcc61e777..501e4c47d6 100644
@@ -28 +29 @@
-@@ -1412,8 +1412,8 @@ check_lcore_params(void)
+@@ -1537,8 +1537,8 @@ check_lcore_params(void)
@@ -40 +41 @@
-index 994b7dd8e5..ae3b4f6439 100644
+index 9201019711..d0067657e9 100644
@@ -43 +44 @@
-@@ -311,8 +311,9 @@ check_lcore_params(void)
+@@ -303,8 +303,9 @@ check_lcore_params(void)

  parent reply	other threads:[~2025-02-17 17:08 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-17 17:03 patch 'test/ring: fix init with custom number of lcores' " luca.boccassi
2025-02-17 17:03 ` patch 'vhost: clear ring addresses when getting vring base' " luca.boccassi
2025-02-17 17:03 ` patch 'vhost: check GSO size validity' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/cnxk: fix build with GCC 15' " luca.boccassi
2025-02-17 17:03 ` patch 'net/thunderx/base: " luca.boccassi
2025-02-17 17:03 ` patch 'eal/x86: fix some intrinsics header include for Windows' " luca.boccassi
2025-02-17 17:03 ` patch 'net/bonding: fix dedicated queue setup' " luca.boccassi
2025-02-17 17:03 ` patch 'net/hns3: fix mbuf freeing in simple Tx path' " luca.boccassi
2025-02-17 17:03 ` patch 'net/hns3: remove PVID info dump for VF' " luca.boccassi
2025-02-17 17:03 ` patch 'net/hns3: rename RAS module' " luca.boccassi
2025-02-17 17:03 ` patch 'net/sfc: remove unnecessary assignment' " luca.boccassi
2025-02-17 17:03 ` patch 'net/mlx5: fix polling CQEs' " luca.boccassi
2025-02-17 17:03 ` patch 'net/iavf: remove reset of Tx prepare function pointer' " luca.boccassi
2025-02-17 17:03 ` patch 'net/ice: fix memory leak in scalar Rx' " luca.boccassi
2025-02-17 17:03 ` patch 'common/cnxk: fix atomic load in batch ops' " luca.boccassi
2025-02-17 17:03 ` patch 'common/cnxk: fix DPI mailbox structure' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/virtio: fix redundant queue free' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/openssl: fix CMAC auth context update' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/virtio: fix data queues iteration' " luca.boccassi
2025-02-17 17:03 ` patch 'net/enetfec: remove useless assignment' " luca.boccassi
2025-02-17 17:03 ` patch 'net/cnxk: fix NIX send header L3 type' " luca.boccassi
2025-02-17 17:03 ` patch 'eal/linux: fix memseg length in legacy mem init' " luca.boccassi
2025-02-17 17:03 ` patch 'use Python raw string notation' " luca.boccassi
2025-02-17 17:03 ` patch 'net/af_packet: fix socket close on device stop' " luca.boccassi
2025-02-17 17:03 ` patch 'ethdev: fix functions available in new device event' " luca.boccassi
2025-02-17 17:03 ` patch 'vhost: add null callback checks' " luca.boccassi
2025-02-17 17:04 ` patch 'build: force GCC 15 to initialize padding bits' " luca.boccassi
2025-02-17 17:04 ` patch 'net/bnxt: fix indication of allocation' " luca.boccassi
2025-02-17 17:04 ` patch 'net/bnxt: fix crash when representor is re-attached' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: fix Netlink socket leak' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: adjust actions per rule limitation' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: fix flush of non-template flow rules' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: fix GRE flow match with SWS' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix deadlock when writing i225 register' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix infinite loop' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix bitwise operation type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: increase PHY power up delay' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: reset loop variable' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix LTR for i225' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix typo in LTR calculation' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix unused value' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix semaphore timeout " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix iterator type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix MAC address hash bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix data type in MAC hash' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix NVM data type in bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix semaphore timeout value' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: correct mPHY access logic' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix iterator type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix MAC address hash bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix data type in MAC hash' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix uninitialized variable' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix bitwise operation type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix NVM data type in bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix reset for 82580' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix unchecked return' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: skip management check for 82575' " luca.boccassi
2025-02-17 17:04 ` patch 'common/idpf: fix void function returning a value' " luca.boccassi
2025-02-17 17:04 ` patch 'net/intel: fix void functions " luca.boccassi
2025-02-17 17:04 ` patch 'net/intel: fix build with icx' " luca.boccassi
2025-02-17 17:04 ` patch 'net/hns3: fix copper port initialization' " luca.boccassi
2025-02-17 17:04 ` patch 'net/hns3: fix reset timeout' " luca.boccassi
2025-02-17 17:04 ` patch 'raw/cnxk_gpio: fix file descriptor leak' " luca.boccassi
2025-02-17 17:04 ` patch 'net/i40e: remove duplicate code' " luca.boccassi
2025-02-17 17:04 ` patch 'eal: fix devargs layers parsing out of bounds' " luca.boccassi
2025-02-17 17:04 ` patch 'net/qede: fix debug messages array' " luca.boccassi
2025-02-17 17:04 ` patch 'examples/ptpclient: fix message parsing' " luca.boccassi
2025-02-17 17:04 ` patch 'net/hinic: fix flow type bitmask overflow' " luca.boccassi
2025-02-17 17:04 ` patch 'crypto/dpaa2_sec: fix bitmask truncation' " luca.boccassi
2025-02-17 17:04 ` patch 'crypto/dpaa_sec: " luca.boccassi
2025-02-17 17:04 ` patch 'event/dpaa: " luca.boccassi
2025-02-17 17:04 ` patch 'net/dpaa: " luca.boccassi
2025-02-17 17:04 ` patch 'net/dpaa2: " luca.boccassi
2025-02-17 17:04 ` patch 'net/qede: fix nested loops' " luca.boccassi
2025-02-17 17:04 ` luca.boccassi [this message]
2025-02-17 17:04 ` patch 'common/cnxk: fix null check' " luca.boccassi
2025-02-17 17:04 ` patch 'eal/linux: remove useless assignments' " luca.boccassi
2025-02-17 17:04 ` patch 'mempool: fix errno in empty create' " luca.boccassi
2025-02-17 17:04 ` patch 'ethdev: convert string initialization' " luca.boccassi

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=20250217170456.1068278-75-luca.boccassi@gmail.com \
    --to=luca.boccassi@gmail.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).