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 D68A54301E for ; Thu, 10 Aug 2023 01:51:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF51540DD8; Thu, 10 Aug 2023 01:51:25 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2066.outbound.protection.outlook.com [40.107.212.66]) by mails.dpdk.org (Postfix) with ESMTP id 072BE406B6 for ; Thu, 10 Aug 2023 01:51:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QaIMZOxVrNDNHqUIC5mKeGNVBJW7yJGWQ+0DkngZwPN5FwkRhU7WiJOVQI0QcNZbw/I6bir+ox175H9E4FKMgRmwMOttzdTlfVN55ge1/41dGF2ey5H44IAeps8SQTY8ai2CFIjsYFBF4BxrnhdiwCX3oedDYRnSUh3NbNXL10W40hclt8dygnzLBqZCqOUOKiNxyKmFkhF6+fyWFSIN3N1gEWrOgi/7VOTdGUVlbHBYdUI+gNvohoDhi2c6yDp8UWw+NJ239GCaEE809Q4Q3sCA3CHt+ojMGkWiq8lepOcFaFmtXeM+evxnkRMbjl8wF+L5qH2gidkRT44J1qfsmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=DZVYl+JUTSnRDk9woAsNZ/cczEyjzYtMnfOo+Y0ntLc=; b=GkXqMdRDGoleXel4mGd+bXGRcZhKiqi4H2PVgnchQry30H58mwpPaGH4iTy+dW5jZwafll6/6UeeVtyQoSz/KENF+TI6fri8yT+wMPkNzrQrVENMlpod+BrWTMmiU0XH6bt6HtfhyFbIPSi5JHgecMzXpUm2tSg71c6YO4BbI7S7UwpCq2q9hp6Ko+YM+YE1MgLDDEUwjPX8TqBC0bQuAWM5H6e20+paY/hHkhBjFzU9t6buEWopsPWiz9Epi9x5nwL9EO2NDBfWicNns3S9H8Pvw2lisSjv9UZtfLdbypCiHrNei1TK/EtXAGeNK16Whtge3YP+8TmbmUu7OLHsRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=arknetworks.am 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 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=DZVYl+JUTSnRDk9woAsNZ/cczEyjzYtMnfOo+Y0ntLc=; b=lBPtDrmRwruyl1UoZ/Nilk94B/JVW5j3cJ2V8edVUoBSJ61Bq9tB2yGyOXLpwdDcHBFh20FqVsH9mbdkBCz/dzOGDkdTAqLw7nzYuZe7QbaXB25IGfSnFTjr5fAqm6Zx8AiMz/fmuIOPFsb39T/TJwSX9LB6HQ2K9ZBvp50E7v2Z4fDoGNnPCzfvIDiVrhj3o3qlULVf8Gf53uHYL7FWuU6RECjH7qIznAuc1OE3KrZFqt5yg2WPFbq6QYelIj6gCnxB6gXJlSxrfVz1z0KBaemG8qTwxhXSXCoVTMtJN0SOtdhHf+EkuiDm67bGsdYumi82CEZ2ug/dZxIRxr2yZg== Received: from SA1P222CA0115.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::24) by PH8PR12MB6818.namprd12.prod.outlook.com (2603:10b6:510:1c9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:51:20 +0000 Received: from SA2PEPF000015CB.namprd03.prod.outlook.com (2603:10b6:806:3c5:cafe::6e) by SA1P222CA0115.outlook.office365.com (2603:10b6:806:3c5::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:51:20 +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 SA2PEPF000015CB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:51:20 +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.986.5; Wed, 9 Aug 2023 16:51:09 -0700 Received: from nvidia.com (10.126.230.37) 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.986.37; Wed, 9 Aug 2023 16:51:07 -0700 From: Xueming Li To: Denis Pryazhennikov CC: Ivan Malov , Viacheslav Galaktionov , Ferruh Yigit , dpdk stable Subject: patch 'ethdev: check that at least one FEC mode is specified' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:37 +0800 Message-ID: <20230809234930.32424-16-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CB:EE_|PH8PR12MB6818:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ceb832b-13b9-4644-a8ed-08db993387c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lIEio00602zesgniFmXHCMjFoCRlOOnetfDDr09HYxRBOqL1N/Snp2Z1Ipa53e19Nyn+k9B1sJhqyS6qfM8O+CuUcZG9Cwrpy4mx3fp25QRWt3qEIkSthkq7K6/BLN95xk0WAcBdptoaIGr8obK5rhO03IvShPjvlweFR3x/O64+XBEr/5MKQrygAz/iFizD4cV/Mk4xIbV3hsdwgvJ2GgbzNUkIbppd6xygXCmIUJkw/haGAKdKiUBsNmzU+7zoooEqQazNu+DdzxokMVljKWXEaOx0n74JIqJbSmscuHqgHVFUDswvbt2s6V0mxMFdIQOtlyDT6RYMo7AkjkoYctfYSNYR+CS+YSpXNzkRHUgCZvSCYKyAK+EiHLVGu2f9EckUSfXOTacrHMonqlYV2bTvOdy20Gu1LsPZo1WY2isHr7F2IVRkXG5w7UL7UZiVYgsDsc3EWUZPLX2saZsSwAT1slJtt3PhpFj4zleel4ZSeWX6MheZXiGDBRC+XUDA3rK1bILU7hNhA/T1I7n6TNXQc/d+wpNVB0u7g0hWJF2qFlT5NtkJrQ7Gplq0n/6TrVaFT2zDTfppGVE69YUJVX8IXfKJMOGTaKv1crFWxldqviw0cxNmK7zj7tJus7IFdIlbOWwZvuiU4p7VfmS6J17tfa0cWsk9tErQh+YfK/eH34xIQR8vGNDhOXjfixku4XLdI0OHr6/f5nCUlmY5n4j8xmAutW0BcPHF6xZasslFRguADmyRCelw7uRODEPuKPuKPF4LTanBj/gmYFx8cw== 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:(13230028)(4636009)(136003)(376002)(39860400002)(346002)(396003)(451199021)(82310400008)(1800799006)(186006)(40470700004)(46966006)(36840700001)(40460700003)(478600001)(54906003)(7636003)(426003)(2616005)(47076005)(1076003)(26005)(86362001)(53546011)(16526019)(6286002)(336012)(36860700001)(356005)(82740400003)(40480700001)(55016003)(2906002)(966005)(6666004)(36756003)(7696005)(41300700001)(316002)(8936002)(8676002)(70206006)(5660300002)(4326008)(6916009)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:51:20.1648 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ceb832b-13b9-4644-a8ed-08db993387c1 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: SA2PEPF000015CB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6818 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=7594b6e44d13945cffa0f7fce3ba14bc156a2cbb Thanks. Xueming Li --- >From 7594b6e44d13945cffa0f7fce3ba14bc156a2cbb Mon Sep 17 00:00:00 2001 From: Denis Pryazhennikov Date: Mon, 8 May 2023 15:47:06 +0400 Subject: [PATCH] ethdev: check that at least one FEC mode is specified Cc: Xueming Li [ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ] The behaviour is undefined in the rte_eth_fec_set() function when the fec_capa parameter is equal to zero. Add a check to handle this case. Fixes: b7ccfb09da95 ("ethdev: introduce FEC API") Signed-off-by: Denis Pryazhennikov Acked-by: Ivan Malov Acked-by: Viacheslav Galaktionov Acked-by: Ferruh Yigit --- lib/ethdev/rte_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 08a08cf431..437d04b34e 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -4362,6 +4362,11 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; + if (fec_capa == 0) { + RTE_ETHDEV_LOG(ERR, "At least one FEC mode should be specified\n"); + return -EINVAL; + } + if (*dev->dev_ops->fec_set == NULL) return -ENOTSUP; return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.674558300 +0800 +++ 0015-ethdev-check-that-at-least-one-FEC-mode-is-specified.patch 2023-08-09 21:51:18.134352000 +0800 @@ -1 +1 @@ -From 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a Mon Sep 17 00:00:00 2001 +From 7594b6e44d13945cffa0f7fce3ba14bc156a2cbb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 731423ef03..1e024802ae 100644 +index 08a08cf431..437d04b34e 100644 @@ -25 +27 @@ -@@ -4828,6 +4828,11 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) +@@ -4362,6 +4362,11 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) @@ -36 +38 @@ - ret = eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); + return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa));