From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CCEF646211 for ; Thu, 13 Feb 2025 11:03:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C87C042F4D; Thu, 13 Feb 2025 11:03:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 3E8D042F37 for ; Thu, 13 Feb 2025 11:03:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ygj8uvcRa/7ns+XPpAQvfa3pII7tA7f6Z9kuLagwxZk=; b=ZXX7XdSYJEJDRUU59jc8jFoJWY3dyXZgopcq2ZVS4q+kQ8qY8MOelmw3fB8fq+R/8Z+pA3 ZJRa/27QMr+jxvj8NevgEkZx+Rb0eETGZUoqpvU8jdcsVPrWMjJ9d1whdeNGyrqZegT1lL p2z+P7eAZsKRiQH3jGmYJS7RcyvGRTA= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-5BOWUZ3aPRqNEVZQsfHf0Q-1; Thu, 13 Feb 2025 05:03:38 -0500 X-MC-Unique: 5BOWUZ3aPRqNEVZQsfHf0Q-1 X-Mimecast-MFC-AGG-ID: 5BOWUZ3aPRqNEVZQsfHf0Q Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A7782180087C; Thu, 13 Feb 2025 10:03:37 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 31F681800359; Thu, 13 Feb 2025 10:03:35 +0000 (UTC) From: Kevin Traynor To: Andre Muezerie Cc: Bruce Richardson , dpdk stable Subject: patch 'common/idpf: fix void function returning a value' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:07 +0000 Message-ID: <20250213095933.362078-100-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: B35ru9WxEdSAoBBRtSufR0xf3HVIBbuASRjsfKRd4Vg_1739441017 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Bruce Richardson --- 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@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)