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 8DBCD4624E for ; Mon, 17 Feb 2025 18:08:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8899D400EF; Mon, 17 Feb 2025 18:08:07 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id BB79D402D5 for ; Mon, 17 Feb 2025 18:08:05 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-439350f1a0bso27587805e9.0 for ; Mon, 17 Feb 2025 09:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812085; x=1740416885; 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=rcMVIGA70frVARRJvTgI1X0wY08eGwtmFr3N8QaGEdI=; b=PoRmnB1TRFy8tYicND4ueZj9Uh1iSPIfkhf6G/7AVwhczDYWkLSIpvTZgRM+dqDc8K SYWKGfQK6tf86S+dJlTBldGdr9/3xw1ACNZvhhtfEPJY9B67cnsNwetLANwyFLt2WJpM JptK6CXvVxGHV3HGzww+f9BHOJsoL+4CEDScYF2VFoVuO7/VdF5qFqgHU/JbosxBRsdi asv+aSdHLBqwNWywm0Izg6kKFB/VtBjUiNJAq4mI1FCGoBIrpqYBdq6RdsxRIr6ZND0Z +YKrP0h9Tsnkfsav78kAyXntXVfrFSiEJaY6vpE77UuLoRvUFGlrDp4G3vxPDt+wA4BU Otbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812085; x=1740416885; 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=rcMVIGA70frVARRJvTgI1X0wY08eGwtmFr3N8QaGEdI=; b=jDDX1qrcv4PtiU66ZyLEdpbKYdY4VQ0yYbfyu6LcW/p09oaDjWH7I402df+e/KFNKW 7s7DaXDVMSj3IpWqG+dNdZVFiZRteS1gfjlAgsCj+swuBQiESkJuM+4yiyqfPMAL1wfs +glKsq+bllHTtDDVVfQI98gcvXXy8JmXBS3b6Z+rKS7pOUIXsO9Rc0lp3U5H5FVAomp2 9rbU8sd0/y/5Xd2dotFvieKdDS9of1ZZfz/t1YSoWaxP89H/oodG4vgrWNynQsVgf4PW g/fx4AcKW7RuywkkEcCGJ6LBUQ7JQcOf431vI9MBdxJDf7SCS0X+Ori0fLFdQ6EftMhm XJuA== X-Forwarded-Encrypted: i=1; AJvYcCXbxUp7EkMtkzDIJHon1Pb/ARg+xP9RDscEFn9ZW9GiAcQUO5P4UudVParkhszrexJOLCoG8xg=@dpdk.org X-Gm-Message-State: AOJu0YwWYzacDi+/9dHf+KIPSt1pnmlwvUDIVbL3iCMbXmwhlIvltV4V FpKUCEk5k3SvzRjXUEggftNf55cVL27puESbCYAlw9Xb3KKSAmkn6AFeP1N0a1UYRg== X-Gm-Gg: ASbGncu4e8TIt4GVp7jC3ijRroJ0d3H4o3qyjRslq4v6Q+kgKL8eefUSxOA2jLA0o7y RcCCmQ3bd33gMSiToKNzbuCtPnoz9AcOy0K2n4Nyp18QftzLk7NzTL2NgPd6e7V/JGI5CpT+duW t1pHCvcxIxR8O8pAuTYeteTWKnpfTM+jUHtf+8lM8uF9eOEssS1eo4TW/mkObg6OnlCHR9hYokM 42GGhHXdbpifzz41Dlqjy7BX9RuoWq7mZH7sVaOAfp67+qFM93W2xLuRWk5djUrl2OufEKGI9CO syo4+dBUFlxSlUuL8MKxCQ== X-Google-Smtp-Source: AGHT+IFv2W9AvNoMlOEynFJJ1fkAVeL9uappAT2AxaRaUllhpxkyS3AAmPDhBvYGQMqEqMO0b8tSVg== X-Received: by 2002:a05:600c:46ce:b0:439:5fbd:19d2 with SMTP id 5b1f17b1804b1-4396ec7c92amr91226925e9.10.1739812085042; Mon, 17 Feb 2025 09:08:05 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4398148f4fcsm42147505e9.7.2025.02.17.09.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:04 -0800 (PST) From: luca.boccassi@gmail.com To: Andre Muezerie Cc: Bruce Richardson , dpdk stable Subject: patch 'net/intel: fix void functions returning a value' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:32 +0000 Message-ID: <20250217170456.1068278-59-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/1c4c4564bf843a57533a8104009562bc314ac2d0 Thanks. Luca Boccassi --- >From 1c4c4564bf843a57533a8104009562bc314ac2d0 Mon Sep 17 00:00:00 2001 From: Andre Muezerie 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 Acked-by: Bruce Richardson --- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +- drivers/net/i40e/i40e_rxtx_vec_avx512.c | 6 ++++-- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 2 +- drivers/net/ice/ice_rxtx_vec_avx2.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c index 60baff7970..c8d8028748 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c +++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c @@ -22,7 +22,7 @@ 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); } #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c index 3490299a6f..bd84a6bb3c 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c +++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c @@ -33,8 +33,10 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) rxdp = rxq->rx_ring + rxq->rxrearm_start; - if (unlikely(!cache)) - return i40e_rxq_rearm_common(rxq, true); + if (unlikely(!cache)) { + i40e_rxq_rearm_common(rxq, true); + 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 diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c index 7bf22d5c0d..d4a17c95f8 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c +++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c @@ -13,7 +13,7 @@ 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); } #define PKTLEN_SHIFT 10 diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c index 5d591f9834..b86fdda3b8 100644 --- a/drivers/net/ice/ice_rxtx_vec_avx2.c +++ b/drivers/net/ice/ice_rxtx_vec_avx2.c @@ -14,7 +14,7 @@ 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); } static __rte_always_inline __m256i -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.933157047 +0000 +++ 0059-net-intel-fix-void-functions-returning-a-value.patch 2025-02-17 16:13:16.858441592 +0000 @@ -1 +1 @@ -From bc64580a631ee4ad67d7a2a9ae96a63e8d4a02b1 Mon Sep 17 00:00:00 2001 +From 1c4c4564bf843a57533a8104009562bc314ac2d0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc64580a631ee4ad67d7a2a9ae96a63e8d4a02b1 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,11 +21,11 @@ - 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 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -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 -@@ -18,7 +18,7 @@ + drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +- + drivers/net/i40e/i40e_rxtx_vec_avx512.c | 6 ++++-- + drivers/net/iavf/iavf_rxtx_vec_avx2.c | 2 +- + drivers/net/ice/ice_rxtx_vec_avx2.c | 2 +- + 4 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c +index 60baff7970..c8d8028748 100644 +--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c ++++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c +@@ -22,7 +22,7 @@ @@ -39,11 +40,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 -@@ -20,7 +20,7 @@ - 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/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c +index 3490299a6f..bd84a6bb3c 100644 +--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c ++++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c +@@ -33,8 +33,10 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) @@ -51,6 +46,16 @@ - #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC -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 -@@ -9,7 +9,7 @@ + rxdp = rxq->rx_ring + rxq->rxrearm_start; + +- if (unlikely(!cache)) +- return i40e_rxq_rearm_common(rxq, true); ++ if (unlikely(!cache)) { ++ i40e_rxq_rearm_common(rxq, true); ++ 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 +diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c +index 7bf22d5c0d..d4a17c95f8 100644 +--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c ++++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c +@@ -13,7 +13,7 @@ @@ -65,5 +70,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 -@@ -10,7 +10,7 @@ +diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c +index 5d591f9834..b86fdda3b8 100644 +--- a/drivers/net/ice/ice_rxtx_vec_avx2.c ++++ b/drivers/net/ice/ice_rxtx_vec_avx2.c +@@ -14,7 +14,7 @@