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 A92C841D8D for ; Mon, 27 Feb 2023 08:14:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1013410D3; Mon, 27 Feb 2023 08:14:40 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2040.outbound.protection.outlook.com [40.107.93.40]) by mails.dpdk.org (Postfix) with ESMTP id 01AB940A84 for ; Mon, 27 Feb 2023 08:14:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FIqwZoMTjjglJVuUR3VyyJVEgNohZw8/ravxhQ8x90B9vgyRcN1CRdI92lvvQqMpXdNwvm9ulvmte1aTOuXWFJqXRuxHbsxf96jfDe1iAGkcKapSPVC4giPqcmkHxRrcKuLdynzY5D303QHRl+Z1pI4U7IBIB4XfDsLZuDjWRUy6seyHeUQijNLcWgz3g8MatJTLWzrjspAZMh2uOUyx+Y6TYNsZ4lE2d4b7wlyBkHDq04LgiZTSwuuEza/C1w8Io/sSEY2Gfy/ungzG/YU2Bo2eFL1AtfZQcZiybT5cBnmv3wqb0xZFZKncaaHZx2wym2xxnbZuMkHMTBinbJHxgg== 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=97ERMjxDdIg5o+CGgTHrFTgOPkuwQJuEl0B6rtN6h1E=; b=iqiRQc6wT9kM5fM1/5UbSu2d8n5eGLSDZdjvRSjCu5OWCzwGSqTo8XuJwMLYTdK1RygP4o/leCt9HwrIFUUUoIg6RZ37l9TNyrmKYxqCrWoP52CbvPpwVnjxZpreC3XF9KLQVd+ounGmNz4W1tS0ZkWFFzIPBBzBHqiH+B9F3o4RlFtJEFSvOfYfbIbM4bqu/eouykMVr5poMU+eDbJ/jbgO4Fu7wFDSxGpxD8oK2sIpc+yQD4MG+ZHFUWIQ81A39Q6mdNAc36R9S6olEsD4BU6Ozgc3pLBlpxTgc20PH9Bkt25ilYF3bmIl/FwzswYLFZxpWcxvUpvHNVvJGs+/ZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 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=97ERMjxDdIg5o+CGgTHrFTgOPkuwQJuEl0B6rtN6h1E=; b=gnAE4HtqFgoaFNDTEt6JVgeV8HGe0qPffKACbiEi7dNrwfrWT5nl2xPa8CXcGOKGpNmmVe5nm1sCuCW9mZYtqPs3Z2CN6SyneKW2pMIzA0GhIK/y4Ip0FJsM08mepo6iypnGM0NUlOldI/dIqez6mZ0n9yL1zXaEz31hTUt8xtxS+4hORfocM2pm9jpzMhg5At4GWLJYTMNrhQ4VL2EvBoV7RZNfjyM9H45ftRL5aZtQsGO2Hp3dr6tJUOvZ2qiuYzcox73TD6zTBhiJkzl1qLyJTaBbeMbVy0CrEXN/cRotO38acGdJ9LOsW6Wxdc/F8LjhGi40NZ7mGAJvr4cIUQ== Received: from MN2PR19CA0029.namprd19.prod.outlook.com (2603:10b6:208:178::42) by SJ0PR12MB6965.namprd12.prod.outlook.com (2603:10b6:a03:448::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 07:14:37 +0000 Received: from BL02EPF00010206.namprd05.prod.outlook.com (2603:10b6:208:178:cafe::c8) by MN2PR19CA0029.outlook.office365.com (2603:10b6:208:178::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Mon, 27 Feb 2023 07:14:36 +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 BL02EPF00010206.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:14:36 +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.36; Sun, 26 Feb 2023 23:14:22 -0800 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; Sun, 26 Feb 2023 23:14:20 -0800 From: Xueming Li To: Jiawei Wang CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix flow sample with ConnectX-5' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:30 +0800 Message-ID: <20230227070107.15664-122-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-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: BL02EPF00010206:EE_|SJ0PR12MB6965:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ec2184a-1d89-413c-5d63-08db18924893 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7T626ZHIzG4sGNhCoIxIA8jRjqXSoUqPhZAfyTiPbEHf4/8nvtzBO0aV8/JbM19+YAtC1uN1uHCcEdw3WS128z1/WuFEvxKlADECIOCBfSWo14rF91VtWODu4JD96MIhiUOXMEzVXpcAlwPU/C8JYauyefk/cJ48lgY7CnozuEnghhHgTSl5f7WZmONyZUcz721LLiEGXcXZavSM6dZ0Wi/Rhbd6CMiAtfqKl4L6p/GHEIA8kBO3RznHu0E9frwsgSQmbZXNgR3CKTm41BWDEGHSNx+xLwVYvSlFIed2tiQZ/MJ2DSWzhZdigI1QM6SPKomRpFxEQWoOUOhjEC5ah6SbOMruOQPh9K+7bg0Fuf250YDsQLNXnQRpZgCgt6Sd58T6WYe5xc4ylQGHm4Mckeb2Aai0FUDO1yWzrNEqkSYd+qIiL+DZ3U6Nb1Q+AphTu5UqYP3JLTMV9Ri308VkbL0gQ5fkfG/xBnsJdjnoU4JxgTLuQr+RkiHyX4SoySS6DTGRWBy6xyPdgJrPnrriD2LfLUN0+YAYFNG7MbUDEp0q357oO/vxuuSjlUOOCYylKChW5ssoCt6V2VvM7hLBEVCfVjSMR7LXNaaGVF9ctMbnVvxJnZFe4Ffg95SIctwOHGltRgp0fHR3kIrWe57jryOOvZ37tVII8bc9LfiMe0PQdKCUef9xyq+VVIQ0jgMoaLV+K0tiulcez8kCD+zLr52bEjG7K44YxWbet6tdMiTIabYXDCWauzPNw1mW2e+rTYvoMxUkp8tp5/ulXOR5ad+up9lAzEBy7q/55EimIfI= 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:(13230025)(4636009)(376002)(39860400002)(346002)(396003)(136003)(451199018)(40470700004)(36840700001)(46966006)(7696005)(478600001)(82310400005)(70586007)(4326008)(8676002)(41300700001)(356005)(70206006)(8936002)(6862004)(40460700003)(86362001)(40480700001)(55016003)(36756003)(186003)(6666004)(16526019)(47076005)(966005)(53546011)(82740400003)(7636003)(26005)(336012)(2616005)(1076003)(426003)(2906002)(316002)(5660300002)(6636002)(54906003)(37006003)(6286002)(83380400001)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:14:36.3090 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ec2184a-1d89-413c-5d63-08db18924893 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: BL02EPF00010206.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6965 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.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 03/01/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=d5be08262127a74d41e2db1f740dbdc099b1399d Thanks. Xueming Li --- >From d5be08262127a74d41e2db1f740dbdc099b1399d Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Fri, 9 Dec 2022 16:34:06 +0200 Subject: [PATCH] net/mlx5: fix flow sample with ConnectX-5 Cc: Xueming Li [ upstream commit 7aa6d7998a9e59dc510e4e5706f675493855ff27 ] The sample flow tried to get the reserved metadata register for the match implicitly, and if the reserved metadata register was invalid then back to use the application tag. The assertion failure was caused while getting registered due to the reserved metadata regC is invalid on CX-5 trusted device(VF/SF). This patch adds the checking for reserved metadata register before getting the register, to avoid assertion failure. Fixes: 9a726360dd30 ("net/mlx5: fix sample flow action on trusted device") Signed-off-by: Jiawei Wang Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index a0cf677fb0..1768ec3cdb 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -6125,13 +6125,14 @@ flow_sample_split_prep(struct rte_eth_dev *dev, /* Prepare the prefix tag action. */ append_index++; set_tag = (void *)(actions_pre + actions_n + append_index); - ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); /* Trust VF/SF on CX5 not supported meter so that the reserved * metadata regC is REG_NON, back to use application tag * index 0. */ - if (unlikely(ret == REG_NON)) + if (unlikely(priv->mtr_color_reg == REG_NON)) ret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, 0, error); + else + ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); if (ret < 0) return ret; mlx5_ipool_malloc(priv->sh->ipool -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:44.826674300 +0800 +++ 0123-net-mlx5-fix-flow-sample-with-ConnectX-5.patch 2023-02-27 14:08:40.899237000 +0800 @@ -1 +1 @@ -From 7aa6d7998a9e59dc510e4e5706f675493855ff27 Mon Sep 17 00:00:00 2001 +From d5be08262127a74d41e2db1f740dbdc099b1399d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7aa6d7998a9e59dc510e4e5706f675493855ff27 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 51547aa78f..ea2016598e 100644 +index a0cf677fb0..1768ec3cdb 100644 @@ -29 +31 @@ -@@ -6186,13 +6186,14 @@ flow_sample_split_prep(struct rte_eth_dev *dev, +@@ -6125,13 +6125,14 @@ flow_sample_split_prep(struct rte_eth_dev *dev,