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 9E1B8457A1 for ; Mon, 12 Aug 2024 14:59:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C7D5406BA; Mon, 12 Aug 2024 14:59:20 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2081.outbound.protection.outlook.com [40.107.92.81]) by mails.dpdk.org (Postfix) with ESMTP id BFBD640A7A for ; Mon, 12 Aug 2024 14:59:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EDAwFdRdT5F4UTewDWePQ6C75xd/qcewwEWsmtu3iaRu1y4FoknVgQxFYb+whQR//7xj0HiGp62/BuQceKfXeARocawqki0MfOH7LNdnuJMUaYWUuB0nc6+8aoUqAjuWE8lME45eS/5S7EZ28wlmISiv8D7c0ywq+lAvcfcsaPvkUK7Fk8SDhRsvJD6OqmdA9KI1aFlETrGuutEtBaS0m5VhxrcmxlELrfb03rR+lbsC7A6sSPOlIiXg7/Q/WgitfQWuWPx/Xu45LTGs9FpVH43hH+tGM6LUGlWi+S93BH0ohnsMOgoG1UZHPqOI8OWzOeKPn5/MTUnCd1IARV9ITg== 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=LCnQq0OCRS9j+XPzspizQXFq9WYg/KC+cWSW0+KvChk=; b=KS4H+vr1nBLmITLZy4AKV/onc9rEHuzM+izxQNrYwU23hkmKFmaUjhnSNLEDTRmk7xymZmwesZULpICbswKhMDx6HcGsleQ7EaR6YQcVor+7+IqMF5mbH4S7i2GRoQHiCfEM4UwHgkcZUgkfFvywPOsX+FRgfB0EjB6qNN+C3fPoKJkONs0V6wwwAMEUdQ8jWW2eyQWOuMNI39eWgtGjccPReHFWRJtjguMgjdAPCE9gPV1wTK9asxpfVSpkz4mhwp7NOztDQd3N6xMoWnCxszutEAF5SxdjGs2NqcA3NAEHfePB7UKEj0Dh17g/qv/s3N85MQJ4qWUDOYfEJ+SlGg== 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 (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=LCnQq0OCRS9j+XPzspizQXFq9WYg/KC+cWSW0+KvChk=; b=hevteWkXcSVmjyP6rnguYUquDl+xcuv/r9z5BAYlBAEUv1GK96ERltbnj8KP71T6Z5BjtYAkH7PvOXw8FxPXYUlDMoxKuazuL8icD0zQ8Kf9ySK/48MZNzGCz271jW0aTHL7PAWgeIRIQxA0jnVYm+Ig/rQR6lUnZqqNGmt1neQvJ/vcAaN62gnDrox63j+Blu5uBygCF48n/HI2I66tuKc23lw5tpsH95/D5AdaC3Pcs/4dT62wzsPnkNxLBb4s6kkTDka83KA8aZeVhvbMiYTYB91N1tOK4kNoIycO8hzB4adcWl6pFNQYQ8q3tCzyvFzhBzZnWUb8ovs0n1yfqA== Received: from BL0PR02CA0062.namprd02.prod.outlook.com (2603:10b6:207:3d::39) by DM6PR12MB4297.namprd12.prod.outlook.com (2603:10b6:5:211::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:59:14 +0000 Received: from BL02EPF0001A0FE.namprd03.prod.outlook.com (2603:10b6:207:3d:cafe::61) by BL0PR02CA0062.outlook.office365.com (2603:10b6:207:3d::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.19 via Frontend Transport; Mon, 12 Aug 2024 12:59:14 +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 BL02EPF0001A0FE.mail.protection.outlook.com (10.167.242.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:59:13 +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; Mon, 12 Aug 2024 05:59:00 -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.1544.4; Mon, 12 Aug 2024 05:58:58 -0700 From: Xueming Li To: Chaoyong He CC: , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix allocation of switch domain' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:25 +0800 Message-ID: <20240812125035.389667-89-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: BL02EPF0001A0FE:EE_|DM6PR12MB4297:EE_ X-MS-Office365-Filtering-Correlation-Id: ef251a11-fa46-46d1-7fcc-08dcbace9106 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YHbrBQKsAb0REZ1xYX5hGpAwiXo3spT6l715Uulttj0bka2mRddpi7EZuCOW?= =?us-ascii?Q?LdU7Froelq1KR9Q3ljz+TfNDSVxOMr7YbUOYlgaoEJwCtRqHf5hJWVxzZCBX?= =?us-ascii?Q?a0XxzjpHVCWOezODNd8lKvOTC4ssIQxp73ZLbIRam9tB0BGQxuKG+IaJLUO9?= =?us-ascii?Q?nuOBSYCCE5K1BAvswxj6rXIxxt4k7XApQ6ZOrBp3rfutzBA7P6zfiuwFyqWW?= =?us-ascii?Q?iVG5PKFT2Jo+eQF0/OUY4IbvE0QODcjUpX0DyW8fG2XElMsS90zZfI5HtBUa?= =?us-ascii?Q?XGGnmSrWbgzLnF4hBBGMxvNAR7Qw8xeg8hRStKCu3qq9veOUx9ev46k5VS3r?= =?us-ascii?Q?rBcVzDLjFFb3GM8C5MZTcioLVdkm0alXrFKYQGBjW9fuV12FbXwek+YbFook?= =?us-ascii?Q?8hCNtD3tAxdEaKLO04kLZzuzMITBjVedu7mkDGnOD5YF6c58hmZpYrRA+bsg?= =?us-ascii?Q?+Qp/B1xnQOPZRSwSZVLm/BognpA5IpFcvpFbHWHk/ePUk+ykWjJSX1/3tQ2D?= =?us-ascii?Q?Q7Hs+DaeupcTQs7wmxlLHmZlOziO7LVzr8cpwBmonS6NN8HIyh5EXGEssdg6?= =?us-ascii?Q?DkCCYugwLBg/1J2cmQkzZM8HbFGSS6gyIY1EjGGw3H6jLJUj7XI8+lRDluXU?= =?us-ascii?Q?Ccuon+uCk5Z6pGtMrWUVOtuYQGnse85AVsP5oGalhxGrVr2YDENH3ZRSBh7L?= =?us-ascii?Q?1fCV76BMtVPNyVPl/1TrwGlB7VYTUqg/ivR/bT18xMclyhTgWDZgal9HfASt?= =?us-ascii?Q?X8u8gbxv34VuFf3xtK0vbJL1t1LtQJXAcxDnM1O3XMl01rnB/2NhPQt2wzHs?= =?us-ascii?Q?DQDQpb+733+lp5b++4/rjuhyHORQlpR3hPSkGNx3oZVZJvu5G62qjlAXHbn6?= =?us-ascii?Q?OO6d5Z+pjB4wDRJBaMPwKL5LZ8Xj6J5k7oMNP0IKstHGkkz1hLLXFcR5u1Lf?= =?us-ascii?Q?049uJqI7wMnZzD3/MzVQU7ti5dcYvhaeKO3I4xEY/uYR7F0dWSmQocM2LR2v?= =?us-ascii?Q?w5I4wKMwHYK4DFZJXSVJA6OLKjb7IrFmr6Wt7hW0dXHlZZJN2jFlav80V2dG?= =?us-ascii?Q?hT4wgmRKd2k5rvrsVq9c3gwzNabu7jx0LwG2EtVMloNKcynMiVsHCHUOE4mf?= =?us-ascii?Q?puyre2wXskXDFkymzaRMDEl1RwkUmAMID76PDz5M4j6wodU+K806jTNC66Px?= =?us-ascii?Q?Kq3HS5nS/rnkqtc2sbFuXNUIOCaCLigiegTNK8lpxqNGWKGKNPJD53jeGEAl?= =?us-ascii?Q?IMBbmQxdHtUPqrSGNVmpH1IiJrMJOIt5mKv2yQgOXZ4ceU4l0ePBqcwLtK10?= =?us-ascii?Q?9QY9ePMyr71JEhCpnmq75tvoUVrIISnFaCidOZYejv9/Az03p/4UQKXV8Tro?= =?us-ascii?Q?/0VrMHmrDdzwgSCXbupfJkhDB730D7qTULUwvKgdfft49utPrg=3D=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)(36860700013)(376014)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:59:13.7044 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef251a11-fa46-46d1-7fcc-08dcbace9106 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: BL02EPF0001A0FE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4297 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.2 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/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=8df473a6531abedd05d4b7b13bf4bb6304af73ec Thanks. Xueming Li --- >From 8df473a6531abedd05d4b7b13bf4bb6304af73ec Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 19 Jun 2024 17:51:33 +0800 Subject: [PATCH] net/nfp: fix allocation of switch domain Cc: Xueming Li [ upstream commit e393598fc2967284398fcdfee6c7a75d0ceb95db ] The check of 'RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID' cause the following call of 'rte_eth_switch_domain_alloc()' never trigger. Fix this by just remove the check logic. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_representor.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index dba9ceee95..b51b467e7c 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -816,10 +816,9 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower) pci_dev = pf_dev->pci_dev; /* Allocate a switch domain for the flower app */ - if (app_fw_flower->switch_domain_id == RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID && - rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id) != 0) { + ret = rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id); + if (ret != 0) PMD_INIT_LOG(WARNING, "failed to allocate switch domain for device"); - } /* Now parse PCI device args passed for representor info */ if (pci_dev->device.devargs != NULL) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.403212869 +0800 +++ 0088-net-nfp-fix-allocation-of-switch-domain.patch 2024-08-12 20:44:02.345069344 +0800 @@ -1 +1 @@ -From e393598fc2967284398fcdfee6c7a75d0ceb95db Mon Sep 17 00:00:00 2001 +From 8df473a6531abedd05d4b7b13bf4bb6304af73ec Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e393598fc2967284398fcdfee6c7a75d0ceb95db ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 700957f945..e7550ce9ef 100644 +index dba9ceee95..b51b467e7c 100644 @@ -25 +27 @@ -@@ -907,10 +907,9 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower, +@@ -816,10 +816,9 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower)