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 E4FAD4625C for ; Tue, 18 Feb 2025 13:42:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9A70402D8; Tue, 18 Feb 2025 13:42:42 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2086.outbound.protection.outlook.com [40.107.220.86]) by mails.dpdk.org (Postfix) with ESMTP id B8FAA402A0 for ; Tue, 18 Feb 2025 13:42:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dL/e/JBKmp6r89MfmTBRT/vtWZUNvE9fYffHkMLGn58X/By+b9LUHnBWqgqZzSPkVKsuSLquvUIuy4zZejNReiFARbe7ZHRxDXxOji2g+WpSnyIFh3uJftgIqDpoOB3HDhVgbL0uguzkdZMGohRVuTuavGtH4JgIu9WJJZdyJvBSd/CRoPVFlLBhLUlfp706WCbtIZnpamU8nDlXgOqzm44StjgAUDjIHjQZC4tjwoC7+sxVy+vMbWNS9IEnG2WdfxhRMtO7rB14oxDprmpbdIavF+jOcc+NsK00MCB2Pu7h6jODZ1w9qF/7qUAjf1IyRjsxM8Ny/DyQNE7RlJtOHA== 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=f4gW4kIzAv0SyDF1cPvX2bzqVqZ6Cpsym8bIJbBU6b4=; b=m50OMFK0+kyXdirA+SU+QYaQOnXy5WHXXSxFhQL6rUvrzWrtXHFmDU5RK5P5JkTLJ5CLxsqTx955ggg1zNZ8t6gTo/lMh987dLGYWv8bXdbGGHVttkiSphS0z03DNt3CKYxfeH4oivhf/PYyIVFDrCiyxEiQMUc9bzJvHHxkO+wyOmIC9Gzp+7t3aNjPFdUghII7J8KEx6wFJDVHQLwc4sWIhK7fjw9VGNOsgCrHd0XFYtM90pYGLdxVdm82czcoKgYST0zX7Iif71sjqzMsdnkVpLY3lnFWYpATAHr8FWJh7DlF1OdPJBm8m0pt+5vhrIGZ5oGhuRVJV+tKTROENg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=f4gW4kIzAv0SyDF1cPvX2bzqVqZ6Cpsym8bIJbBU6b4=; b=WinwUxHrcZvH/nU1ZRIxOeqdm4oCdr4xDjveIFv1y+Nk5GFlDYSG5eYbrfQyQ9InKsQ1tNgBd1bV2zrKeoCotlnT3rjSJ0U1hdeonY0/a2JYuyx4nyri3V3SVKQTmT1K7Ez0RpMT8Eg8A07+pMGWP2kl4L++Ku+Mr4lGCxDoGjS8ZoNb825ti6daFoqnroSmvXHBrcq7SMx6BgkvsJLMjEk/ozo1TrkSKBZStgtLrkj+hkeJ7FIyXuUU3kwAGWPQZgBQdMWr8JWPtwtQBZpevU8ND+Gi4fWZXHvhyj8jFuE07ouMi7Yc4RzG5V5n1balZP/7LJb0JFIQAUXn3UyNDQ== Received: from MW4PR04CA0378.namprd04.prod.outlook.com (2603:10b6:303:81::23) by IA1PR12MB6603.namprd12.prod.outlook.com (2603:10b6:208:3a1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.14; Tue, 18 Feb 2025 12:42:38 +0000 Received: from SJ1PEPF00002325.namprd03.prod.outlook.com (2603:10b6:303:81:cafe::dc) by MW4PR04CA0378.outlook.office365.com (2603:10b6:303:81::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.14 via Frontend Transport; Tue, 18 Feb 2025 12:42:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00002325.mail.protection.outlook.com (10.167.242.88) 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:37 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:30 -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:28 -0800 From: Xueming Li To: Andre Muezerie CC: , Bruce Richardson , "dpdk stable" Subject: patch 'common/idpf: fix void function returning a value' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:04 +0800 Message-ID: <20250218123523.36836-70-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: SJ1PEPF00002325:EE_|IA1PR12MB6603:EE_ X-MS-Office365-Filtering-Correlation-Id: 22df54b6-890d-4f3c-5597-08dd5019b9d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?w6c03rPG6OZCrhWWwkvPFhEXkrAqW4LC/OLKWdNyvr8HrLxmGd0AYwM/SwOv?= =?us-ascii?Q?Msbt1i1vouFapWOf7HHqO4nSNIJoLUyjyusOoMVw5kcYmbvnVdRwi7pMSMgh?= =?us-ascii?Q?LW0rys6uxZUOt1hT2FwSBNDMkF+D5lt/x+sdmvFhbj9MDox1eJoWZ1s16Vt7?= =?us-ascii?Q?n23sMIlrv7wL2h4K8vIYGTacjZHsNbMgDCDmsJBFmKvyQej3iVQOi7FTnguc?= =?us-ascii?Q?//2jN6gj1MJ/4sctCcMpXPCTqIs4xy4mZ23AkWUU+JxFhxuHzCOM2Kmzx7/f?= =?us-ascii?Q?eR9AOyvXVbNFfU9XdBdjuj8XBeOMIR2vDHPL0LuCOdneTMiWmTYvgerGo235?= =?us-ascii?Q?GYcszOSWeGjULTDh5U50E0OgMwDOBzrcQd9zBn07DrKAGdg/w4U+PzPvr6fy?= =?us-ascii?Q?HOlLYXKxqhU0fO1YoxhxfcgnJsnpcubFDtjp6DwTit+npYgDfLKywC4M+PAE?= =?us-ascii?Q?R+quqbF4+aJLABHsOj73H/VoBHePPmWX1HN88Pwh8wGp1V4uX8IOIieiS3Dk?= =?us-ascii?Q?JI0T3dK5phe5nCyHWzgLx0Wip80fGZMpPe0yzeDz4QvqAj7kdouwlKpiFtRF?= =?us-ascii?Q?vBif6ZJVN89x66+Rm+xHz2ikUJ6kdUAicJBi4onp8T+4NlGDdoNyl1CoVX9+?= =?us-ascii?Q?lmMzvFIxJwAnpM1aWsUyvJcNCMJft5r4XUp/uYRicX4mYJHnSrwTvRyEIAOA?= =?us-ascii?Q?cRyzuYNf+zpk37FON4frKQhs4T/0VOSzS2Sx8lgAmhZ6Pbg+QY5Hv424yiSH?= =?us-ascii?Q?nX5GbPV9EZkufXNdVEFaykjVo+X5jMyRZ9Qp0YHOWmaK/052SbQ3sDWYyBns?= =?us-ascii?Q?v3AMPpSvchGdf3fE+zsSgnhp+O4ikr5aQ+9WYQs1Q4fZSfRUO0ToU8eoFPRp?= =?us-ascii?Q?wu9LV0W+NZQIrKQ336TGuWEUIXDBopDdo10H7CoE3+Bg62rvQobi35e+DQ1Z?= =?us-ascii?Q?BVSJ1EqlE8eGMamzUPLFqIIRoiiLtNSYQopXdlMmbIVzPeCTYtpx97yS4ndc?= =?us-ascii?Q?H+LgyiaG0nnpRdiJzMOClxTONmdXBgFGH2Bm4dZDX1V15Nrgg0Vy30F5j8l6?= =?us-ascii?Q?SLzsArbAzfzq2v0v+16sd0jorl782VvCgsvWgu7/7b1A+rHt7Qn0g72EW4BS?= =?us-ascii?Q?YjLNvT8x4DCtYzckhTagKmZ+n/dW1nLiy74/OYUUV1+YFuc+Re/gH13AC/J1?= =?us-ascii?Q?xD8pNORzi1noiyQhTkOwbXKdrc1Y3y38ZsThBMi3mA2zXsy5LCOTKE0YKyTE?= =?us-ascii?Q?FjH9AZEpbr93Wk47F4m2QfBV7Oi19A2vASPD2bP5mJS6ohgTIGHIUIX424lq?= =?us-ascii?Q?GsvYZioGrJ96kAztfjqUcVLYRtosjoIaG88u31W3h+3TrCndi3AcEZSPpYBY?= =?us-ascii?Q?vhgxs+FhO69wsKL9AGuy3b+RrKHHY/07iGv2WJB4BCPzXnWkBkTDEHE2z+TS?= =?us-ascii?Q?ycUhz9JXHM3J0/R3LDIRjIuLVR2qaBczbmOFeGfbP965g9bySjDMVjwXlYTq?= =?us-ascii?Q?pd44C7PvZUFIvMU=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:42:37.8008 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22df54b6-890d-4f3c-5597-08dd5019b9d0 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00002325.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6603 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=b60a546487237f2b2c011d921db850c71ba6c5e0 Thanks. Xueming Li --- >From b60a546487237f2b2c011d921db850c71ba6c5e0 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 Cc: Xueming Li [ 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 5abafc729b..617ef092d1 100644 --- a/drivers/common/idpf/idpf_common_rxtx_avx512.c +++ b/drivers/common/idpf/idpf_common_rxtx_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 @@ -607,8 +609,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); + 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.120612718 +0800 +++ 0069-common-idpf-fix-void-function-returning-a-value.patch 2025-02-18 19:39:00.688244037 +0800 @@ -1 +1 @@ -From c39e89b467c510923295a73e5b76a6a44c72dd1b Mon Sep 17 00:00:00 2001 +From b60a546487237f2b2c011d921db850c71ba6c5e0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c39e89b467c510923295a73e5b76a6a44c72dd1b ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 6fbfee1b2d..b630d1fcd9 100644 +index 5abafc729b..617ef092d1 100644 @@ -26 +28 @@ -@@ -133,8 +133,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq) +@@ -137,8 +137,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq) @@ -39 +41 @@ -@@ -603,8 +605,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq) +@@ -607,8 +609,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)