From: Kevin Traynor <ktraynor@redhat.com>
To: Andre Muezerie <andremue@linux.microsoft.com>
Cc: Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'net/intel: fix void functions returning a value' has been queued to stable release 24.11.2
Date: Thu, 13 Feb 2025 09:59:08 +0000 [thread overview]
Message-ID: <20250213095933.362078-101-ktraynor@redhat.com> (raw)
In-Reply-To: <20250213095933.362078-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 02/17/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/a805904f88d742371cc2bd66b17132c8f8e96c83
Thanks.
Kevin
---
From a805904f88d742371cc2bd66b17132c8f8e96c83 Mon Sep 17 00:00:00 2001
From: Andre Muezerie <andremue@linux.microsoft.com>
Date: Wed, 22 Jan 2025 07:20:44 -0800
Subject: [PATCH] net/intel: fix void functions returning a value
[ upstream commit bc64580a631ee4ad67d7a2a9ae96a63e8d4a02b1 ]
This patch avoids warnings like the one below emitted by MSVC:
../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
warning C4098: 'idpf_singleq_rearm':
'void' function returning a value
Fixes: 0604b1f2208f ("net/i40e: fix crash in AVX512")
Fixes: 4eb3dcce7c5d ("net/iavf: fix crash in AVX512")
Fixes: 20daa1c978b7 ("net/ice: fix crash in AVX512")
Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +-
drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
drivers/net/iavf/iavf_rxtx_vec_avx2.c | 2 +-
drivers/net/ice/ice_rxtx_vec_avx2.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index 19cf0ac718..3e95a6a1df 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -23,5 +23,5 @@ static __rte_always_inline void
i40e_rxq_rearm(struct i40e_rx_queue *rxq)
{
- return i40e_rxq_rearm_common(rxq, false);
+ i40e_rxq_rearm_common(rxq, false);
}
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index 3b2750221b..ae7bcb582b 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -25,5 +25,5 @@ static __rte_always_inline void
i40e_rxq_rearm(struct i40e_rx_queue *rxq)
{
- return i40e_rxq_rearm_common(rxq, true);
+ i40e_rxq_rearm_common(rxq, true);
}
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
index 49d41af953..cdb48438da 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
@@ -14,5 +14,5 @@ static __rte_always_inline void
iavf_rxq_rearm(struct iavf_rx_queue *rxq)
{
- return iavf_rxq_rearm_common(rxq, false);
+ iavf_rxq_rearm_common(rxq, false);
}
diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c
index d6e88dbb29..02bfb9b15d 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
@@ -15,5 +15,5 @@ static __rte_always_inline void
ice_rxq_rearm(struct ice_rx_queue *rxq)
{
- return ice_rxq_rearm_common(rxq, false);
+ ice_rxq_rearm_common(rxq, false);
}
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-12 17:29:45.230548110 +0000
+++ 0101-net-intel-fix-void-functions-returning-a-value.patch 2025-02-12 17:29:34.600947421 +0000
@@ -1 +1 @@
-From bc64580a631ee4ad67d7a2a9ae96a63e8d4a02b1 Mon Sep 17 00:00:00 2001
+From a805904f88d742371cc2bd66b17132c8f8e96c83 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc64580a631ee4ad67d7a2a9ae96a63e8d4a02b1 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -20,4 +21,4 @@
- drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c | 2 +-
- drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c | 2 +-
- drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c | 2 +-
- drivers/net/intel/ice/ice_rxtx_vec_avx2.c | 2 +-
+ drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +-
+ drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
+ drivers/net/iavf/iavf_rxtx_vec_avx2.c | 2 +-
+ drivers/net/ice/ice_rxtx_vec_avx2.c | 2 +-
@@ -26,5 +27,5 @@
-diff --git a/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
-index 504015de6e..9c406e7a6f 100644
---- a/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
-+++ b/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
-@@ -19,5 +19,5 @@ static __rte_always_inline void
+diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+index 19cf0ac718..3e95a6a1df 100644
+--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
++++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+@@ -23,5 +23,5 @@ static __rte_always_inline void
@@ -37,5 +38,5 @@
-diff --git a/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
-index c10ae050d3..d8244556c0 100644
---- a/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
-+++ b/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
-@@ -21,5 +21,5 @@ static __rte_always_inline void
+diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+index 3b2750221b..ae7bcb582b 100644
+--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
++++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+@@ -25,5 +25,5 @@ static __rte_always_inline void
@@ -48,5 +49,5 @@
-diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
-index 3571835c5b..88e35dc3e9 100644
---- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
-+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
-@@ -10,5 +10,5 @@ static __rte_always_inline void
+diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+index 49d41af953..cdb48438da 100644
+--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
++++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+@@ -14,5 +14,5 @@ static __rte_always_inline void
@@ -59,5 +60,5 @@
-diff --git a/drivers/net/intel/ice/ice_rxtx_vec_avx2.c b/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
-index 8dc9b51c5c..0c54b325c6 100644
---- a/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
-+++ b/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
-@@ -11,5 +11,5 @@ static __rte_always_inline void
+diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c
+index d6e88dbb29..02bfb9b15d 100644
+--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
++++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
+@@ -15,5 +15,5 @@ static __rte_always_inline void
next prev parent reply other threads:[~2025-02-13 10:03 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 9:57 patch 'log: fix double free on cleanup' " Kevin Traynor
2025-02-13 9:57 ` patch 'test/ring: fix init with custom number of lcores' " Kevin Traynor
2025-02-13 9:57 ` patch 'vhost: clear ring addresses when getting vring base' " Kevin Traynor
2025-02-13 9:57 ` patch 'vhost: check GSO size validity' " Kevin Traynor
2025-02-13 9:57 ` patch 'vhost: fix log when setting max queue num' " Kevin Traynor
2025-02-13 9:57 ` patch 'vhost: reset packets count when not ready' " Kevin Traynor
2025-02-13 9:57 ` patch 'crypto/cnxk: fix build with GCC 15' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/thunderx/base: " Kevin Traynor
2025-02-13 9:57 ` patch 'examples/flow_filtering: " Kevin Traynor
2025-02-13 9:57 ` patch 'eal/x86: fix some intrinsics header include for Windows' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/ena: fix missing default LLQ policy' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/nfp: fix VF link speed' " Kevin Traynor
2025-02-13 9:57 ` patch 'test/bonding: fix active backup receive test' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/bonding: fix dedicated queue setup' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/hns3: fix mbuf freeing in simple Tx path' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/hns3: remove PVID info dump for VF' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/hns3: rename RAS module' " Kevin Traynor
2025-02-13 9:57 ` patch 'examples/flow_filtering: remove duplicate assignment' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/sfc: remove unnecessary " Kevin Traynor
2025-02-13 9:57 ` patch 'net/mlx5: fix polling CQEs' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/mlx5: fix leak of flow action data list' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/mlx5: fix unneeded stub flow table allocation' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/ixgbe: fix E610 support in flow engine' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/ixgbe/base: fix TSAM checking return value' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/ixgbe/base: remove 2.5/5G from auto-negotiation for E610' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/ixgbe/base: fix driver hang in VM' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/ixgbe/base: add missing buffer copy for ACI' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/iavf: remove reset of Tx prepare function pointer' " Kevin Traynor
2025-02-13 9:57 ` patch 'net/ice: fix memory leak in scalar Rx' " Kevin Traynor
2025-02-13 9:57 ` patch 'common/cnxk: fix atomic load in batch ops' " Kevin Traynor
2025-02-13 9:57 ` patch 'common/cnxk: fix DPI mailbox structure' " Kevin Traynor
2025-02-13 9:57 ` patch 'eventdev: fix format string data type in log messages' " Kevin Traynor
2025-02-13 9:58 ` patch 'crypto/virtio: fix redundant queue free' " Kevin Traynor
2025-02-13 9:58 ` patch 'crypto/openssl: fix CMAC auth context update' " Kevin Traynor
2025-02-13 15:18 ` Wathsala Wathawana Vithanage
2025-02-13 9:58 ` patch 'cryptodev: fix C++ include' " Kevin Traynor
2025-02-13 9:58 ` patch 'crypto/virtio: fix data queues iteration' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/octeon_ep: remove useless assignment' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/enetfec: " Kevin Traynor
2025-02-13 9:58 ` patch 'net/gve: allocate Rx QPL pages using malloc' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/nfp: fix multiple PFs check from NSP' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/nfp: fix misuse of function return values' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/nfp: fix multi-PF control flag' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/nfp: fix firmware load from flash' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/ice: fix flows handling' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/cnxk: fix NIX send header L3 type' " Kevin Traynor
2025-02-13 9:58 ` patch 'gro: fix unprocessed IPv4 packets' " Kevin Traynor
2025-02-13 9:58 ` patch 'log: fix systemd journal socket open' " Kevin Traynor
2025-02-13 9:58 ` patch 'eal/linux: fix memseg length in legacy mem init' " Kevin Traynor
2025-02-13 9:58 ` patch 'service: fix getting service lcore attributes' " Kevin Traynor
2025-02-13 9:58 ` patch 'ptr_compress: fix build with Arm SVE' " Kevin Traynor
2025-02-13 9:58 ` patch 'buildtools: fix some Python regex syntax warnings' " Kevin Traynor
2025-02-13 9:58 ` patch 'dts: fix MTU set command' " Kevin Traynor
2025-02-13 9:58 ` patch 'dts: fix pass rate edge case in results' " Kevin Traynor
2025-02-13 9:58 ` patch 'use Python raw string notation' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/af_packet: fix socket close on device stop' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/mana: do not ring short doorbell for every mbuf alloc' " Kevin Traynor
2025-02-13 9:58 ` patch 'ethdev: fix functions available in new device event' " Kevin Traynor
2025-02-13 9:58 ` patch 'vhost: add null callback checks' " Kevin Traynor
2025-02-13 9:58 ` patch 'vhost: fix FD entries cleanup' " Kevin Traynor
2025-02-13 9:58 ` patch 'build: force GCC 15 to initialize padding bits' " Kevin Traynor
2025-02-13 9:58 ` patch 'random: defer seeding to EAL init' " Kevin Traynor
2025-02-13 9:58 ` patch 'power: defer lcore variable allocation' " Kevin Traynor
2025-02-13 9:58 ` patch 'eal/x86: defer power intrinsics " Kevin Traynor
2025-02-13 9:58 ` patch 'net/bnxt: fix indication of " Kevin Traynor
2025-02-13 9:58 ` patch 'net/bnxt: fix Rx handler' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/bnxt: fix crash when representor is re-attached' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/bnxt: fix dead code' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/bnxt: fix overflow' " Kevin Traynor
2025-02-13 9:58 ` Kevin Traynor
2025-02-13 9:58 ` patch 'net/bnxt: address uninitialized variables' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/mlx5: fix Netlink socket leak' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/mlx5: adjust actions per rule limitation' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/mlx5: fix crash in non-template metadata split' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/mlx5: fix flush of non-template flow rules' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/mlx5: fix GRE flow match with SWS' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix deadlock when writing i225 register' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix infinite loop' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix bitwise operation type' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: increase PHY power up delay' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: reset loop variable' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix LTR for i225' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix typo in LTR calculation' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix unused value' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix semaphore timeout " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix iterator type' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix MAC address hash bit shift' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix data type in MAC hash' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/igc/base: fix NVM data type in bit shift' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/e1000/base: fix semaphore timeout value' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/e1000/base: correct mPHY access logic' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/e1000/base: fix iterator type' " Kevin Traynor
2025-02-13 9:58 ` patch 'net/e1000/base: fix MAC address hash bit shift' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/e1000/base: fix data type in MAC hash' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/e1000/base: fix uninitialized variable' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/e1000/base: fix bitwise operation type' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/e1000/base: fix NVM data type in bit shift' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/e1000/base: fix reset for 82580' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/e1000/base: fix unchecked return' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/e1000/base: skip management check for 82575' " Kevin Traynor
2025-02-13 9:59 ` patch 'common/idpf: fix void function returning a value' " Kevin Traynor
2025-02-13 9:59 ` Kevin Traynor [this message]
2025-02-13 9:59 ` patch 'net/intel: fix build with icx' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/hns3: fix copper port initialization' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/hns3: fix reset timeout' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/cpfl: fix representor parsing log' " Kevin Traynor
2025-02-13 9:59 ` patch 'raw/cnxk_gpio: fix file descriptor leak' " Kevin Traynor
2025-02-13 9:59 ` patch 'eal: fix devargs layers parsing out of bounds' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/qede: fix debug messages array' " Kevin Traynor
2025-02-13 9:59 ` patch 'examples/ptpclient: fix message parsing' " Kevin Traynor
2025-02-13 9:59 ` patch 'net/hinic: fix flow type bitmask overflow' " Kevin Traynor
2025-02-13 9:59 ` patch 'crypto/dpaa2_sec: fix bitmask truncation' " Kevin Traynor
2025-02-13 9:59 ` patch 'crypto/dpaa_sec: " Kevin Traynor
2025-02-13 9:59 ` patch 'event/dpaa: " Kevin Traynor
2025-02-13 9:59 ` patch 'net/dpaa: " Kevin Traynor
2025-02-13 9:59 ` patch 'net/dpaa2: " Kevin Traynor
2025-02-13 9:59 ` patch 'net/qede: fix nested loops' " Kevin Traynor
2025-02-13 9:59 ` patch 'examples/l3fwd: fix socket ID check' " Kevin Traynor
2025-02-13 9:59 ` patch 'common/cnxk: fix null " Kevin Traynor
2025-02-13 9:59 ` patch 'eal/linux: remove useless assignments' " Kevin Traynor
2025-02-13 9:59 ` patch 'mempool: fix errno in empty create' " Kevin Traynor
2025-02-13 9:59 ` patch 'doc: add tested platforms with NVIDIA NICs in 24.11' " Kevin Traynor
2025-02-13 9:59 ` patch 'doc: add two more tested Intel " 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=20250213095933.362078-101-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=andremue@linux.microsoft.com \
--cc=bruce.richardson@intel.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).