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 E63C3431D5 for ; Sun, 22 Oct 2023 16:31:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 761BF410F2; Sun, 22 Oct 2023 16:31:42 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2060.outbound.protection.outlook.com [40.107.212.60]) by mails.dpdk.org (Postfix) with ESMTP id 75E4B406FF for ; Sun, 22 Oct 2023 16:31:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NPrHAUZCb03mgn8EvDbjBS3NStXTeg1CRoP6YoBZU+DVx4Mr8lhphhODbCW42LWqSfkLQbCXgkCC7qYNOfPfKdb/Nc2asFz3SUVxTKBvLmOM78eerNluBtyJ1k6397l9qNe9SJkZNgir4fWKeQfyHgOJMK4RAus95jRiXXoE48OtvkhxWOgHNWhkyusn+P0LS7gbLOTSa9KBxBp+XEet/bkjtc7hqLNYMpUaQYa3s7hFApc8qVEK52/h3mHfzs6DIvVHgV8tpNdPHVnT4jQtPsHk/I/8G+c368WidgwqprOWnipP3AEdkJfXVurKwSaFemVUlcC+WnAtVhrRnf7yBg== 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=JPrqwzBvFFrLqYKnurECojDjeoSJHwfWeQ9kH3sdzsA=; b=TZZMw6f39GEYY3i9d3Sz+2nYkOsL6fNffrLWDd1mcOPklzxWGt6mTMnDyxAO/OmCDeKADaY8EIq808qBAblzD7mU+q7w1Fz9aEN0nlPNqePXAmJa5j4cIyCtdJvt3zosuWkX1Vb3o9yOpJ+B3WRbX19HL1cdbO0Bo7Paqm695ONgLCV23wK2MIlotdxfxNUbm6E1AX3LiSNZVN5r3EAKsKpefnHX6chAdgSP50dIUFIQQ51v/K3jC5e6sOzUr+7tLfWOcZjipRFxDuWOiqIPvHYSxZCQb1oZZ82Y3z8TKWyJLDJtAhwxU0pZ1KmOuTf/AE67INsO2Bn0ElFqdA4mFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.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 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=JPrqwzBvFFrLqYKnurECojDjeoSJHwfWeQ9kH3sdzsA=; b=AQTcH5WMSEcqyVhrO1DWLRvh6KK/7XevX84aIUIngnxLea+d9QHriDFPxzapz5sfRf/r3kIIXLGOibTPxa63eICxWuQf6Yvb9YTPsP0kJjLdD4ENHq3VyrLEnbMYiZJpew8J6jgIxMmIngB2IzNnmoGl7Ysdc930LTz+4v/I9kk0xV5InPqL5/sl4YrUPnJWCkCcXZextYjfGfawW4quSjAspTi/NTnnr66+/FZdxPWSChmPUHm6KDvn/viFQTgrJgD6Dlnyuz4sgo13grHBrhvAOMcHurXn3RndnsxOqAKf94oAvXzlZ5n/YfHqXbAiTm0uPlT60XhUuvrEHZNOjg== Received: from BLAPR03CA0107.namprd03.prod.outlook.com (2603:10b6:208:32a::22) by IA1PR12MB6386.namprd12.prod.outlook.com (2603:10b6:208:38a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:31:37 +0000 Received: from BL02EPF0001A0FA.namprd03.prod.outlook.com (2603:10b6:208:32a:cafe::30) by BLAPR03CA0107.outlook.office365.com (2603:10b6:208:32a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Sun, 22 Oct 2023 14:31: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 BL02EPF0001A0FA.mail.protection.outlook.com (10.167.242.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:31: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.986.41; Sun, 22 Oct 2023 07:31:26 -0700 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.986.41; Sun, 22 Oct 2023 07:31:24 -0700 From: Xueming Li To: Zerun Fu CC: Long Wu , Peng Zhang , Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix initialization of physical representors' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:07 +0800 Message-ID: <20231022142250.10324-99-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: BL02EPF0001A0FA:EE_|IA1PR12MB6386:EE_ X-MS-Office365-Filtering-Correlation-Id: 26635b2b-2cdd-4f73-6258-08dbd30b998b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xHgHXYl+xX0nYd/mZYX4Eu1qtzEpnGQwtU4j7Am9cxoQN3WqmQdPjFlvu8wA2BxR7eY/cfkuxJjs/0D+mHeJL4zdBl3b02Es8DcFUUSTa0Z2w0J06x5gVQuaEMTP26CikzdWD+ZZ0nLuYa92Q/UYSNDXmZ4fqdsJpPxw56fKvzgnEqAIQZGFLoQ88qNmHDr1h2EbbqFKfd3dtUVRKhNrfPzIAZ/aouxizMY9HlUJvIXphfLCPyuCGtHGWJEdz8riBYuqgjLR8O83kp/vuC1ddd2gJ1XBYD6dywwfrOHvn5Rv9CwuQerNpFp0XUDM03lm5k9WeEl/u6cN95l2aR587dB+u3UrQzqoJ56y7Gdksho2MJir6bMOakpS6c3e9ntWxocmzqrsEFMNmmY3DakQ91taFCSDJjj+Kq30k3jgaQWEh1xsHHsPFk4H+mTIAlqFxuqkGACBBHEkcgELn76QgsK//zK4WFzHwGIBP+t/dfkcmESP9c+ntm28zZd0Xdgh6PIv+bCnrHcxPtjSiapKrvmjo6WOIurka8iRBKoNaqxONgCQ4Hj0JEAFWgz2yShrZsGUNGrqd00fuoNiMuDQvw3ub535trnboZjcTw3vfJSnBpiH2+KRkWiVl9Sjtbo1kTGuIsLMDcsvt35UyjhAdZ152fqqJf5hfFfkZmK7Z3Lbey3cI6z3seI31cKawb+C52jciaHkEFe3gFgwvTvk/39fp7tJXx7jYymq1pywoCEWCdMSQB6I2ApxbjZRyWQ9gcjOFL5oHT+8zq1XB9udpQ5vUv9Xgvv2QqoLpdnCExY= 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:(13230031)(4636009)(136003)(39850400004)(346002)(376002)(396003)(230922051799003)(451199024)(64100799003)(82310400011)(1800799009)(186009)(40470700004)(36840700001)(46966006)(40460700003)(55016003)(2616005)(336012)(1076003)(6286002)(16526019)(7696005)(6666004)(53546011)(8936002)(36860700001)(26005)(83380400001)(47076005)(41300700001)(5660300002)(8676002)(4326008)(2906002)(4001150100001)(478600001)(966005)(70206006)(54906003)(6916009)(70586007)(7636003)(82740400003)(356005)(86362001)(316002)(426003)(36756003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:31:37.5175 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26635b2b-2cdd-4f73-6258-08dbd30b998b 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: BL02EPF0001A0FA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6386 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/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=06cd13b57e238c55ad359ea171040b2564351722 Thanks. Xueming Li --- >From 06cd13b57e238c55ad359ea171040b2564351722 Mon Sep 17 00:00:00 2001 From: Zerun Fu Date: Tue, 10 Oct 2023 14:03:12 +0800 Subject: [PATCH] net/nfp: fix initialization of physical representors Cc: Xueming Li [ upstream commit ae23bfd0291a40222ec2acb802d519ac4d61cb7c ] The former logic of initializing the array of physical port representors is according to 'nfp_idx', but referencing based on 'port_id'. This is a potential bug and will cause segment fault when these two values are not equal. Fix it by using the 'port_id' as index at all time. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Signed-off-by: Zerun Fu Reviewed-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower_representor.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index d319aefb08..b9f2f631ff 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -637,6 +637,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, void *init_params) { int ret; + uint16_t index; unsigned int numa_node; char ring_name[RTE_ETH_NAME_MAX_LEN]; struct nfp_app_fw_flower *app_fw_flower; @@ -710,10 +711,13 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, } /* Add repr to correct array */ - if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT) - app_fw_flower->phy_reprs[repr->nfp_idx] = repr; - else - app_fw_flower->vf_reprs[repr->vf_id] = repr; + if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT) { + index = NFP_FLOWER_CMSG_PORT_PHYS_PORT_NUM(repr->port_id); + app_fw_flower->phy_reprs[index] = repr; + } else { + index = repr->vf_id; + app_fw_flower->vf_reprs[index] = repr; + } return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.972977700 +0800 +++ 0098-net-nfp-fix-initialization-of-physical-representors.patch 2023-10-22 22:17:34.366723700 +0800 @@ -1 +1 @@ -From ae23bfd0291a40222ec2acb802d519ac4d61cb7c Mon Sep 17 00:00:00 2001 +From 06cd13b57e238c55ad359ea171040b2564351722 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ae23bfd0291a40222ec2acb802d519ac4d61cb7c ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 55ca3e6db0..e4c5d765e7 100644 +index d319aefb08..b9f2f631ff 100644 @@ -27 +29 @@ -@@ -646,6 +646,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, +@@ -637,6 +637,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, @@ -35 +37 @@ -@@ -719,10 +720,13 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, +@@ -710,10 +711,13 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,