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 4E27D4625C for ; Tue, 18 Feb 2025 13:43:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 491F1402A0; Tue, 18 Feb 2025 13:43:06 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) by mails.dpdk.org (Postfix) with ESMTP id 8B874402E9 for ; Tue, 18 Feb 2025 13:43:04 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g7jA1sJrYk8K+5DLv3rdjE920Rmpb3Hy3SIxnnxYgGrQMBi69EVNQCYbnaRv/74UFvV9xo5jM/nQso+sq+ZbHOYT8xJEqUKWC/Rw1EfwF0N82Y0WIU521OOspjGgIMSrsE80L8B7sDZc4I6I7Bl2s/EHOi6PosYOq/ONPxZeGV2b5Fidzj0bKQzpKDnZWZad3M0Dnyze5OZPFrtxB0s35snSohsc/Nlxo9jXpAvB4+7Q6pxHbFQFcOl2IWSGU8xhH0PfG/Kx+wUEUw77KsoUqLEdUYyXxXZL9uSyX7+pa9jzO66Q9zfABkw3Nh8dO8ttSkKC+brE4N3gLfEswp+DRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U7gQgNutXyPO1adewq30UBSocP/CE6JX3P44MNxAK20=; b=ikPk2jYXGZ4+P5li2ZcBcYuM4PVcpBuI6eOwMVZ/F5jTTesqISkgTVvMMSPkATjAnXBIfGYCeeK+38iR1q9TdD7npnGoywdHpWlG2smDcSBdi6x3crgrjXcFNae+CSRY99sZf9XEyGR0hrgxZ7CPfHvjtMKottgg/mF6KKF9KoD4I+I8gZsBlfr0kVZvwk0HG8tAztg6G3kC+7uKWp+8Y/r/wMw8yB3KLbhjzcDPQmajL1WjfvRf9evDfbrd9acevsa1xwQ0CDS7RphO1xlRCH6Rl05qNdebPuEhHPD/Mo7BQeoK+MHAd5I4OWHnjM88x7JdEii2Lfg77i9L62OU6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=linux.microsoft.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U7gQgNutXyPO1adewq30UBSocP/CE6JX3P44MNxAK20=; b=dJ5ykmgThnDbJu2wIBzFxQfY8Hcw6NQMZIpfCPeEwsksArkg9TIZnuw2jFhuwIvhQl5jrG2MtJimq1MaBZtmhAJ6LTqmcwYycADmU0NVtr7Pdhw8+2fqEd4BFKHVs2nYYjT9+C/p7TBz+dpwZvXfHopN1sfiFLI6XTDww/DZMOITwQm9inhwp6j9T5KcxoMcK6Jvr9Qq3DCUnV7fzWVlQtVqQQiFOa+aj9hIWLjYix9VFfs5ZpoaC0m3a27RhkMduIomTq5o6+6UnS48ttrLTE0VbKSHOoC213YEkWSz++1R1uKVG2lJ/4VtmqzkETBRaBy7z9v1CkGfWtP5bbD9cA== Received: from PH8PR05CA0015.namprd05.prod.outlook.com (2603:10b6:510:2cc::16) by SN7PR12MB8789.namprd12.prod.outlook.com (2603:10b6:806:34b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.14; Tue, 18 Feb 2025 12:43:00 +0000 Received: from SA2PEPF000015C7.namprd03.prod.outlook.com (2603:10b6:510:2cc:cafe::1c) by PH8PR05CA0015.outlook.office365.com (2603:10b6:510:2cc::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.12 via Frontend Transport; Tue, 18 Feb 2025 12:43:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015C7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:42:59 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:42:50 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:42:48 -0800 From: Xueming Li To: Andre Muezerie CC: , Bruce Richardson , "dpdk stable" Subject: patch 'net/intel: fix void functions returning a value' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:05 +0800 Message-ID: <20250218123523.36836-71-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C7:EE_|SN7PR12MB8789:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e558cbf-0b43-44f0-fb40-08dd5019c719 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qBWZxB+kbqskCYvfySbTRjSxq4/Xp52hUm/iOq9NeTqpwsiGc4quOBZ0E9au?= =?us-ascii?Q?RGQeHS2+hvQ5RNFvWN/brLknHLSyUFqRfWhG7F4FcLF8oE8h22LEBTgAA8JU?= =?us-ascii?Q?TdO8LjZ0tKSO6ls3O662nBQMPqJqPFCkTLkwJ0qrLkWGSyfuIZUUSrPLuS6J?= =?us-ascii?Q?Gcv1FC5N81K0IM7Kbw94Wvdu2aM2CbMuVllOF+yNPdZCrQVU9nD2osO8VPeW?= =?us-ascii?Q?queHY7jxFLC4fmTapGdoW/z9yj1ARRzO/PYMR6KYUOf0OIQ8wzhwQmRhIrfH?= =?us-ascii?Q?wuK8MikgRErzWYCHV4u2oEXtRPa7xWJaazBeUvF2Davah1tnDkye4D5fUY5X?= =?us-ascii?Q?MpxzBPyMcv6ld8aFjzGzGRZy0l6IncXGXYoRkPclrQ4rP2/SgKPQ+TANJgyB?= =?us-ascii?Q?93F4M/0fs5u2Apt50jzNYBxCLq+1Oha8b9kVq+ZGYD43QENm1+OvXetlC8iK?= =?us-ascii?Q?ccNoo0zErA33CUyEJzh9vL7t6cKgrmTikdDPB1lkwPOr+QHgqSBdmbNJFWeV?= =?us-ascii?Q?bxLHPEBnl2+3t3/0NXiRkXKW1lYrdWzGdSCI955H1uaApPB+YdLeKECOCBZV?= =?us-ascii?Q?KFho67tYMvXyKPVxREn+XdB8O0IsPSZY1YsMEalMheQwUprqCAP/zOIERcqC?= =?us-ascii?Q?eEwEjL2vm8bo1HHwoydXh1cYTP/9z9p7Mjk++tyjmeESWUcAxhwvrow8s8tG?= =?us-ascii?Q?Vo1BMBD3Kzfb+D7QHFt6ukUQCZqKkgGBC0HWcIdgelB3tj4a/3Pcm+0LCTxV?= =?us-ascii?Q?Oey5Liw4DvbNeYdtWbdRQfgrU/Kbh4L0TGrJPxMFZFbHGzWvii7uoea7X4IT?= =?us-ascii?Q?6xSHeF3vR+SgIuh+ZDv2EgGmcpJ55qJ3PwEeXxFVAEmiOSi5/s1XgE77n1HL?= =?us-ascii?Q?TyGFwMdYzHdR+L37s6257zRy9a0Kf/xOGisQ1mckPNJ0Y5T9R76PDjXpCayZ?= =?us-ascii?Q?zse3N3mlWkrvEVkFPniXALB+MFLBs56iqkYt7synOeuIgfHWYGy3ZNLExjdv?= =?us-ascii?Q?v0tc9YHyGcorWNr5EDzr54+qw5tBIuUzdwXQF3f9RNVcWrmGAtI6eHE1t2Gw?= =?us-ascii?Q?Y16tyJ34LpOXjXXUO9YWrMmqn3dewsb/pWIKhYFC71FeUgZLq6CsNQR78pGG?= =?us-ascii?Q?UpPg8HoKOOAKACN/DCXi97Pk3jhNfDHtfu6BW6bJ3ARMjYcy7WOKFHAprfpc?= =?us-ascii?Q?qT/jxiyx2Xg29CiNEnGGZ24kkqGgPBKgXBteve3WDhwnDB5Ur6q8SiscPS9R?= =?us-ascii?Q?hBzcNTw7pRVJbPCFqIpJ2+AVIg0zYTMGfJhV29uNc6nJhaBZjZA33EB1dKxz?= =?us-ascii?Q?DykRZXQGvGMoKP18rd/84lB8B14S1iONBr51uxTwAYPdMbeyDE5ZEP+MVCnE?= =?us-ascii?Q?wGrg+1QJVjK2Ck28gYjcxmhrT5Qk0j5qqAkiaV09WHsRojCqA+fCoWwDxIqS?= =?us-ascii?Q?wr5t5fn9hv/bAi0XZA8RKzwBK1IztitYbL3leL36YvXryNdz+2NPbHN8Ee0b?= =?us-ascii?Q?Fc6Z9eL27M1AqyY=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:42:59.9689 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e558cbf-0b43-44f0-fb40-08dd5019c719 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8789 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=774b751b986957a586dbf4f3305021f8c62be09e Thanks. Xueming Li --- >From 774b751b986957a586dbf4f3305021f8c62be09e 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 Cc: Xueming Li [ 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 | 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 @@ -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 62fce19dc4..3bf0faf066 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c +++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c @@ -24,7 +24,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); } #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC 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 @@ -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 d6e88dbb29..02bfb9b15d 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.153662913 +0800 +++ 0070-net-intel-fix-void-functions-returning-a-value.patch 2025-02-18 19:39:00.688244037 +0800 @@ -1 +1 @@ -From bc64580a631ee4ad67d7a2a9ae96a63e8d4a02b1 Mon Sep 17 00:00:00 2001 +From 774b751b986957a586dbf4f3305021f8c62be09e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bc64580a631ee4ad67d7a2a9ae96a63e8d4a02b1 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -20,4 +22,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 +28,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 -@@ -18,7 +18,7 @@ +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 +@@ -22,7 +22,7 @@ @@ -39,5 +41,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 @@ +diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c +index 62fce19dc4..3bf0faf066 100644 +--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c ++++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c +@@ -24,7 +24,7 @@ @@ -52,5 +54,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 -@@ -9,7 +9,7 @@ +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 +@@ -13,7 +13,7 @@ @@ -65,5 +67,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 d6e88dbb29..02bfb9b15d 100644 +--- a/drivers/net/ice/ice_rxtx_vec_avx2.c ++++ b/drivers/net/ice/ice_rxtx_vec_avx2.c +@@ -14,7 +14,7 @@