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 9A5D345610 for ; Fri, 12 Jul 2024 13:03:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9403340684; Fri, 12 Jul 2024 13:03:03 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2061.outbound.protection.outlook.com [40.107.243.61]) by mails.dpdk.org (Postfix) with ESMTP id C0B6840261 for ; Fri, 12 Jul 2024 13:03:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Iki2x1VFVHngWbx/5BvvB7bdQyc/vjk8doMuzIhrEf2DHT6eLHuX+dUQrSJQL8J8+RNQrHeLkcOkX3T166KgM/N/80WADVYZmMza3WQF68MJLyUSAM5Edfsr1gJX22Q3h5Ro9e6J4H1GBUmdH7mcyoAtUSUBUPwx3j8XflC+Ja4T3mfD2iBsnboUL1w6BNHGf/O1pi//OkpvY+OaTkE7il9mFXkvfEXj2eTeFgvtpHtRud5RJJkaNv/UGVDFuPpMPx49rpEY4cLdiyJlY7TylTphZqsCLbsbd37oxOSjzY+QFICFNxILbETH45gs86xkPRY/n1Yxe0QBJkcVeZ7QoA== 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=E1b1z1DfXsJgXYyjRx9fGRTSJ7Jf6TP/rBF/gnt7DpI=; b=NRpOrZmwsPe5LwHqtmtBEE4rln8kMJDqBeiszn8xx6UpuNC5dIX4Qjd/Z9uvWFUd1hKGLXnEw0/V5H6nX75TWVd2dhf/ViHHVAlvV6uE+HWUcsBl/RHVKFOGipXau2z+7wQSVG+rFiS8LDyZnY23QxvJi3A42buSfL+DNwnj0nj6bltrH/6zhHVyBMpNpfX8ZMPWYHMkR4+6Cy1BKGVxNTD8UjFaAcSPq43GQXT/hg8N/CiwvIMr7MaDsX1vOFGqErIQ1RsZHhLuTsWt/gT4JKLDZblropCFscCOPfBdJdfbdLkLZeUAQlMMtSCboyjp01Y5zX5YLs1U+m6ZZczxPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org 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=E1b1z1DfXsJgXYyjRx9fGRTSJ7Jf6TP/rBF/gnt7DpI=; b=c71PQjSk4WBCd9GYro3KocgjkwI+DorEnvV6v6+yV6hYGLNcNbGtGmR9z4CtlhmcPodqRxAEAdlczFaN0OhZfr49ZBxNldXLpQj1EZpJIfhlr1PQ2D6E4JSv2ZKjA2Dgbw9rYyC3CH78gTqP7geKu6uIs/PFrXXOhzPCChP4qlzY/NQdTBqUn2eXkBbViaaAj6rDX817olP0bg0jW1/YliM3adSqhwdGgs1n01MIMMPof/MKLEh0W5efeo4G1i9vw3x8P8DF6jwKgqN0X3E8TzQkHFQ2Cixo2iT56iVu91N7FbzplfvvPFigzmE05JPlvZKNM8aQRlGUnb0eOfGNwQ== Received: from SJ0PR03CA0184.namprd03.prod.outlook.com (2603:10b6:a03:2ef::9) by DS0PR12MB8813.namprd12.prod.outlook.com (2603:10b6:8:14e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 11:02:57 +0000 Received: from SJ5PEPF000001EA.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::6b) by SJ0PR03CA0184.outlook.office365.com (2603:10b6:a03:2ef::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35 via Frontend Transport; Fri, 12 Jul 2024 11:02:57 +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 SJ5PEPF000001EA.mail.protection.outlook.com (10.167.242.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 11:02:57 +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; Fri, 12 Jul 2024 04:02:41 -0700 Received: from nvidia.com (10.126.231.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; Fri, 12 Jul 2024 04:02:39 -0700 From: Xueming Li To: Itamar Gozlan CC: Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: set default miss when replacing table' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:38 +0800 Message-ID: <20240712110153.309690-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712110153.309690-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> <20240712110153.309690-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001EA:EE_|DS0PR12MB8813:EE_ X-MS-Office365-Filtering-Correlation-Id: 7108e035-3105-48b6-4379-08dca2623004 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?iJb6E8rTy7I0fH6LBsRV8gx2pZa0dSiR5+hp9pKDjlp48jhtGfIVQNVT/00Q?= =?us-ascii?Q?zw5hxwu6CHouJfQ87kQcfpnUMtctHBSeB15u2f4gPqZFcBTQVHir+w7+AwGC?= =?us-ascii?Q?YoMMC3oOFa4Ovt+HIoTJDx00MfiR3rd1nIw6kV01IO/Ne+1G6hb8KWYvQef2?= =?us-ascii?Q?+4YdF0i4suDfIhDnqMjahqr9RcEYjX9uqganbFiamDgQHkDCS+3rPj/XC1lO?= =?us-ascii?Q?R2FcbXnNp0eXOrtpq8kqxsU6kRB70nEGttGlKXX3uwpvNj9RbIbuv8w4FlS0?= =?us-ascii?Q?FILmUYIeE6b05vCCm5HQhHvig90e9Cua2fGWpX/aaJ45YvYGL5cO44uQ/nxY?= =?us-ascii?Q?UsUVFrOFYjZ8h+Pf+S+KdALZ6NvPegmbSQgdosdHET1NxPgRgOPhbrVV1EzA?= =?us-ascii?Q?+ijZgWcaztRrflsd8Klrpk61/x30VD3B3tHd5NvEeOMwNlnyJO3+Rb0jr1Lb?= =?us-ascii?Q?GNu+pYrsYLrQfqiszPT37+0Gwz6xWfMBdpRWkNge98K+LnLM24h1E8OwoeJs?= =?us-ascii?Q?WArp1Oao1OIzOk/FBEBZbHQfZWnQKpUEQpPlfQRAxYR8jtxa/rIApq7RgQrh?= =?us-ascii?Q?umzEoOiEWgFpjrHSGgZ8SjzKf2yPwPFOCwyv4xKxDQGQNZdZO1o2iiwxuhta?= =?us-ascii?Q?KQ6+7Uu6y982PmJBIJCLqxnZ12ay7O+j2aZmcUtL454V41N3L41bE0sdRTG7?= =?us-ascii?Q?eLq/p0Fv5kR89QwXQytAEj85+6UAAHPqDXTu0k69tC5tcDaDVCSC/nwryb/i?= =?us-ascii?Q?U4iZzfKaNkdK6gzFr0iF2hYjeHoXXJLpFgF0dlDP++WrrTwmHdgV7x308ja4?= =?us-ascii?Q?P77X5toyG7levbixNSXk9eBiZtJ5slWxVkOaGrKzjOsqzOMGJNBulNUM2xtq?= =?us-ascii?Q?vEu+wm98ymfZHaKLdLUXwU1eXwELtkLYchdQcHf6HCA8ybHGRn1PXN8D9B/P?= =?us-ascii?Q?5RHDsnJ1mf3xcY5m/nuGOYf4w9dy3HTaXVqDEjwmPfEgWTlOsMRkMMFjQnIM?= =?us-ascii?Q?1ifSjCTpq7ekpy13mYwjm5znGOH5SO/m+RZ8ZLZ3i2C4mToA8rLs/R83IUGL?= =?us-ascii?Q?GS7T7cyOkB1X1G29YC0mjwCdTMXtUM5elWmZvHO5AB7HifNaKgimrMCQ+z4X?= =?us-ascii?Q?aRt9MocmTpZCjSQ0U5ORuCkzN5BkZ2gHFTPWBPNB9t6w4n9zuUR+VYDqfbez?= =?us-ascii?Q?RtJ2EMiUoMYebN0xtauFs9e3uaiMrDqs0+J3ufAryyFoJBon3hEUXqu8euhL?= =?us-ascii?Q?3o/ixzj9gObGK9oBj2Z5jq7tSZiGHh4xEGqke+QmHX+qPHAoTu7ZHnmHzNgF?= =?us-ascii?Q?CIiEmIFLMHrHdMRjUlqTvYWiQdOlplH8lQXFulvFLJ/82fiuFf9oTzlmpWqv?= =?us-ascii?Q?WiZT6UMWGLiWwIY4h/KADqiEjTOhH3qWQdbCyT7Bzvu0fhiNaB1ylVFIB9RF?= =?us-ascii?Q?TiUBQLiOWbGxlkeYQkwi1yjYTpaBe/l7?= 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)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:02:57.5535 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7108e035-3105-48b6-4379-08dca2623004 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: SJ5PEPF000001EA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8813 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 07/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=2b25e7e741fd0b3a5a928abb542faafab422d6a9 Thanks. Xueming Li --- >From 2b25e7e741fd0b3a5a928abb542faafab422d6a9 Mon Sep 17 00:00:00 2001 From: Itamar Gozlan Date: Mon, 6 May 2024 14:44:16 +0300 Subject: [PATCH] net/mlx5/hws: set default miss when replacing table Cc: Xueming Li [ upstream commit 4711950b04e2124e8d3796853cfd16bf22026ebc ] Allowing the replacement of a miss table without enforcing a previous disconnecting. This feature extension allows the user to change the destination miss table when the system runs without losing traffic. Fixes: b81f95ca770d ("net/mlx5/hws: support default miss table") Signed-off-by: Itamar Gozlan Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_table.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_table.c b/drivers/net/mlx5/hws/mlx5dr_table.c index 55b9b20150..ab73017ade 100644 --- a/drivers/net/mlx5/hws/mlx5dr_table.c +++ b/drivers/net/mlx5/hws/mlx5dr_table.c @@ -611,8 +611,7 @@ static int mlx5dr_table_set_default_miss_not_valid(struct mlx5dr_table *tbl, if (mlx5dr_table_is_root(tbl) || (miss_tbl && mlx5dr_table_is_root(miss_tbl)) || - (miss_tbl && miss_tbl->type != tbl->type) || - (miss_tbl && tbl->default_miss.miss_tbl)) { + (miss_tbl && miss_tbl->type != tbl->type)) { DR_LOG(ERR, "Invalid arguments"); rte_errno = EINVAL; return -rte_errno; @@ -625,6 +624,7 @@ int mlx5dr_table_set_default_miss(struct mlx5dr_table *tbl, struct mlx5dr_table *miss_tbl) { struct mlx5dr_context *ctx = tbl->ctx; + struct mlx5dr_table *old_miss_tbl; int ret; ret = mlx5dr_table_set_default_miss_not_valid(tbl, miss_tbl); @@ -632,15 +632,16 @@ int mlx5dr_table_set_default_miss(struct mlx5dr_table *tbl, return ret; pthread_spin_lock(&ctx->ctrl_lock); - + old_miss_tbl = tbl->default_miss.miss_tbl; ret = mlx5dr_table_connect_to_miss_table(tbl, miss_tbl); if (ret) goto out; + if (old_miss_tbl) + LIST_REMOVE(tbl, default_miss.next); + if (miss_tbl) LIST_INSERT_HEAD(&miss_tbl->default_miss.head, tbl, default_miss.next); - else - LIST_REMOVE(tbl, default_miss.next); pthread_spin_unlock(&ctx->ctrl_lock); return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:17.999092060 +0800 +++ 0087-net-mlx5-hws-set-default-miss-when-replacing-table.patch 2024-07-12 18:40:14.246594210 +0800 @@ -1 +1 @@ -From 4711950b04e2124e8d3796853cfd16bf22026ebc Mon Sep 17 00:00:00 2001 +From 2b25e7e741fd0b3a5a928abb542faafab422d6a9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4711950b04e2124e8d3796853cfd16bf22026ebc ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org