patch 'common/idpf: fix void function returning a value' has been queued to stable release 24.11.2

Kevin Traynor ktraynor at redhat.com
Thu Feb 13 10:59:07 CET 2025


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/875cdf78a6c5c3057b41a6c5bde7cd23dcf88c79

Thanks.

Kevin

---
>From 875cdf78a6c5c3057b41a6c5bde7cd23dcf88c79 Mon Sep 17 00:00:00 2001
From: Andre Muezerie <andremue at linux.microsoft.com>
Date: Wed, 22 Jan 2025 07:20:43 -0800
Subject: [PATCH] common/idpf: fix void function returning a value

[ upstream commit c39e89b467c510923295a73e5b76a6a44c72dd1b ]

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: 5bf87b45b2c8 ("net/idpf: add AVX512 data path for single queue model")
Fixes: e528d7c74819 ("common/idpf: add AVX512 data path for split queue model")

Signed-off-by: Andre Muezerie <andremue at linux.microsoft.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index b8450b03ae..9ea71c3718 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -138,6 +138,8 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
 	rxdp += rxq->rxrearm_start;
 
-	if (unlikely(cache == NULL))
-		return idpf_singleq_rearm_common(rxq);
+	if (unlikely(cache == NULL)) {
+		idpf_singleq_rearm_common(rxq);
+		return;
+	}
 
 	/* We need to pull 'n' more MBUFs into the software ring from mempool
@@ -608,6 +610,8 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)
 	rxdp += rx_bufq->rxrearm_start;
 
-	if (unlikely(!cache))
-		return idpf_splitq_rearm_common(rx_bufq);
+	if (unlikely(!cache)) {
+		idpf_splitq_rearm_common(rx_bufq);
+		return;
+	}
 
 	/* We need to pull 'n' more MBUFs into the software ring from mempool
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-12 17:29:45.145428429 +0000
+++ 0100-common-idpf-fix-void-function-returning-a-value.patch	2025-02-12 17:29:34.592947374 +0000
@@ -1 +1 @@
-From c39e89b467c510923295a73e5b76a6a44c72dd1b Mon Sep 17 00:00:00 2001
+From 875cdf78a6c5c3057b41a6c5bde7cd23dcf88c79 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c39e89b467c510923295a73e5b76a6a44c72dd1b ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 6fbfee1b2d..b630d1fcd9 100644
+index b8450b03ae..9ea71c3718 100644
@@ -26 +27 @@
-@@ -134,6 +134,8 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
+@@ -138,6 +138,8 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
@@ -37 +38 @@
-@@ -604,6 +606,8 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)
+@@ -608,6 +610,8 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)



More information about the stable mailing list