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 6D8BC4624E for ; Mon, 17 Feb 2025 18:08:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 683DD402AB; Mon, 17 Feb 2025 18:08:06 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 8A273402BC for ; Mon, 17 Feb 2025 18:08:04 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-38f2c4382d1so1826242f8f.0 for ; Mon, 17 Feb 2025 09:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812084; x=1740416884; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=49vQbIFe9oHzxOkVEFnwHgy2hOkZSmbszcmfIfghLW0=; b=CcUzhynKAjfFH+vHAQLbuvJ/3APu54yao/S4Ctcr5rY3oj7ZQPvtCE+kDbD5lHkZfr vQ9yNyT0z9Nnm+vwNc2E+su1xzLwlzlk3l/yxw9ANvbHrXA3zRJUmhdlMIxGNcu5nnn+ T2bUDkFSu2sXIMXGPiISj7BqBZQKHJ5WPUZUhuhRecnWZWckZPkeow/QMJNFh+Tx+Re3 7A4zN+SDvfVrkAfNpSU9XbmPuJCZn8vjhgk3rvA0RV0u7yiFrS9iF6x6ZzqPB+pfYSBD SXlHLLhQLR7I81Z/TUU3iBrxMeGGmFi6/shRT2fP96PWYSp1N/V85Y4LDHMj2mxeumPW JHXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812084; x=1740416884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=49vQbIFe9oHzxOkVEFnwHgy2hOkZSmbszcmfIfghLW0=; b=NjyggujmKlL5UB+XhU7GqAtqACTy1JWegWQNJv7S/HgFLGrfsOmYGZOZ0wJ1eOQ6nZ /n/NGOVL0P6Mf+HakIxMx41/Q/e5iG3VCLms29qZNQrl1iuhpFYtVbPt/5+ezbxKhvn0 HhaFGKbwHHeP8jVoR7rUZk6JTNubpyt7n2bN6YYaMMLLPqqaVloVunI25fva/U+36GnD Tpu6JDp80GA3KqcVn67r51IjaDOZ/FNvfnKj17AwaXRAu/pxdPnLEatpxg634WAewmet B34NnsYmVIPm9bLEnvEqqACYHbQMetl4bJUPMGXlFLrP2bHR3GC3xIhk1tz54AqcXbyM rDdg== X-Forwarded-Encrypted: i=1; AJvYcCWO8y5GEDMoHqbp0XKiOOGRqv5KOV3QnnT3EFcA16AudeWNUWeS0bpcErAfPe5pMx6Pp72zCoE=@dpdk.org X-Gm-Message-State: AOJu0YyfjkYIhkSsekdS+CtYqIuFXnSHBK7Dc8Hhky+WNyTcDbVcFmyn dqRdWNUI5VqyPcscpdnRv+LWr+r4M9C8hCpADQDRRr2+RqK59b3ddxL4/zqaziS67g== X-Gm-Gg: ASbGncsGxgUWrv9po/5pu4FWbUjci1zRlERZLXOoFwsEIMQrmE+3bBb7D2bfMTETO5K W2FvtwC/bp0suVN4HSNNK6nZqWQ97bp5lXOQPNCbjLKum+2WwrfXq4iKBtGG9PlA/2dg6vFgiXC u4jRJXlBKMLgGkuFp2PbQyTE/sjoKJiywdTki9J/nCoLAiVDQ1I8xDk0qEnqrzQtIx3/+XITUZN 10+1k+VUHdhCCTTRe0PWx1A1k6YdfLG++vvxXjzKiYflAKT/cmFx2ulc8/IyjX72jFVj7GEkEVv rXOFulNU0dTKde23uTfvAQ== X-Google-Smtp-Source: AGHT+IEpHoFI83lGPKvuNnjLcmKXewKTaGckv6KHIxkMuxfz7AsaRXHZRt2Ji1J3ILcGmwrl9Cglbw== X-Received: by 2002:a5d:6d0a:0:b0:38d:e363:494b with SMTP id ffacd0b85a97d-38f24cfa3f1mr21092203f8f.8.1739812083958; Mon, 17 Feb 2025 09:08:03 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f258ccd51sm12781621f8f.29.2025.02.17.09.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:03 -0800 (PST) From: luca.boccassi@gmail.com To: Andre Muezerie Cc: Bruce Richardson , dpdk stable Subject: patch 'common/idpf: fix void function returning a value' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:31 +0000 Message-ID: <20250217170456.1068278-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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/c6c1c3874daa571f12291334b30a65792c96982a Thanks. Luca Boccassi --- >From c6c1c3874daa571f12291334b30a65792c96982a 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/net/idpf/idpf_rxtx_vec_avx512.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/idpf/idpf_rxtx_vec_avx512.c b/drivers/net/idpf/idpf_rxtx_vec_avx512.c index 29f9624a9d..82a9f34a06 100644 --- a/drivers/net/idpf/idpf_rxtx_vec_avx512.c +++ b/drivers/net/idpf/idpf_rxtx_vec_avx512.c @@ -137,8 +137,10 @@ 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 * We inline the mempool function here, so we can vectorize the copy -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.892426424 +0000 +++ 0058-common-idpf-fix-void-function-returning-a-value.patch 2025-02-17 16:13:16.854441592 +0000 @@ -1 +1 @@ -From c39e89b467c510923295a73e5b76a6a44c72dd1b Mon Sep 17 00:00:00 2001 +From c6c1c3874daa571f12291334b30a65792c96982a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c39e89b467c510923295a73e5b76a6a44c72dd1b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19,2 +20,2 @@ - drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) + drivers/net/idpf/idpf_rxtx_vec_avx512.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) @@ -22,5 +23,5 @@ -diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c -index 6fbfee1b2d..b630d1fcd9 100644 ---- a/drivers/common/idpf/idpf_common_rxtx_avx512.c -+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c -@@ -133,8 +133,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq) +diff --git a/drivers/net/idpf/idpf_rxtx_vec_avx512.c b/drivers/net/idpf/idpf_rxtx_vec_avx512.c +index 29f9624a9d..82a9f34a06 100644 +--- a/drivers/net/idpf/idpf_rxtx_vec_avx512.c ++++ b/drivers/net/idpf/idpf_rxtx_vec_avx512.c +@@ -137,8 +137,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq) @@ -34,13 +34,0 @@ -+ return; -+ } - - /* We need to pull 'n' more MBUFs into the software ring from mempool - * We inline the mempool function here, so we can vectorize the copy -@@ -603,8 +605,10 @@ 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);