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 29DBF428F8 for ; Sun, 9 Apr 2023 17:36:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 25CF042BC9; Sun, 9 Apr 2023 17:36:48 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2051.outbound.protection.outlook.com [40.107.223.51]) by mails.dpdk.org (Postfix) with ESMTP id 555764067E for ; Sun, 9 Apr 2023 17:36:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f2S/L++YxRyzsuI6mddPp5RbMHDwLeceDTjx2fg92q1fNzG6APfBXY1eRyVQBSBFriStkXwftbDZXRNGCoALiOEG+sC4GjM/BmJuMAJ/MBz8Auy7cbmLCMyrd2QCzY8BSu/jmU64D85HtLJY/bSy6NuxkNcuCst1rw2jI531fp8YkCMK6j0LAgCFFNS6YGAF2sVsNhnXM88WhRtwJcB9qT2iU0as1UuddW4OECVFCKocQUFGaU1MY/ThpTM/AGY3RFCq5he22Ps4xxn4aW40E+ixItEBRFBs9YHqpOszcTWvzBeLazYSHUvWK1+dJ4O+B+/nllTrKYQhhAx/6GyQmQ== 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=iuFN1RMnCavN7OlzdGCRNwTI8jQrIBJd/v8MNzBAXdA=; b=KavENADiYZ5qjUcnqdbm94HuZqLdh5a/PIzCqOuK7/LbXHB1m0Jfb3bYvvylTjeB/TvtWkLUWMdW6JOtrzvkDdERLfeFje3cZMXgEs+dEkrQeE4aEZ/e0piIitwmJqQp5i39c2w1+pAnvFXE6CDzHaIi28VRMN1M3GdObNU318YzRwm7fUkarX7uN5+JLlPj+ElnCUJSh12CK41UPQxCD8N8723AgpRuW2AgjpAWhEtwt+rqWHNuiNlXa8GCzdaNqLj9zBF0f+083p2MP8LlTGrqrCAx32znU0KfMbmz1yDiaIsE1Oj3Y79/WFFwGWoWVz7ZqE3DOfTSONaiGlJiuA== 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 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=iuFN1RMnCavN7OlzdGCRNwTI8jQrIBJd/v8MNzBAXdA=; b=gqI34WhmrH3qt4oXbs1ASnYGh8+oC2bEb725RRqHuyV0K2rBrydLjBatl4zCYqVqgLrYpzkM/nca5jIx5ncOMaLiI5mCDA5I5yE+g36uH/Z7JqNPMilkuS18TODGaxQwlt7yVgH8hWeR98vQb0mJvDUYRMooQrYNvAOvX5mtLDIktV+ZtT9RKVFJyf+819tehFvbmTSA0JjWRzFW4fUibasmGLVcRvkel6emGClFfhQhm+YiyyHb4ZtS9rjX1O424mdaftFRokm53HA0YL4qEr8qbCNtkkQY5mjKhua14ELfT+/4mouuVWWoxqxovmia2TkxXZFppksyRuzQzOE1ew== Received: from BN0PR04CA0026.namprd04.prod.outlook.com (2603:10b6:408:ee::31) by MN0PR12MB6104.namprd12.prod.outlook.com (2603:10b6:208:3c8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:36:42 +0000 Received: from BN8NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ee:cafe::c3) by BN0PR04CA0026.outlook.office365.com (2603:10b6:408:ee::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35 via Frontend Transport; Sun, 9 Apr 2023 15:36:42 +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 BN8NAM11FT042.mail.protection.outlook.com (10.13.177.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:36:42 +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; Sun, 9 Apr 2023 08:36:35 -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; Sun, 9 Apr 2023 08:36:33 -0700 From: Xueming Li To: Erez Shitrit CC: Alex Vesker , Matan Azrad , "dpdk stable" Subject: patch 'net/mlx5/hws: fix pattern creation' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:17 +0800 Message-ID: <20230409152529.5308-130-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-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: 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: BN8NAM11FT042:EE_|MN0PR12MB6104:EE_ X-MS-Office365-Filtering-Correlation-Id: 077b0f4c-3c62-4718-2657-08db39103843 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a0BGeR8BfTXociphDfsOtEw0DoSJJPOicDbpDKiyheRwvjIbbq2UcZ0la44lLtwN9F1JKGYw65nc8Ml9Yv0GqQhXYEH2R3LRdMs7x7YisatizQgMFhU7Q82mDfRHOzF34ZiAg5gDhMJKqHqNZctzmeOJnSk5YkwCwXFA0O24SX9T57FyY28G9VN2VYwsXUV9HfKFKe9mw+qFlN//vjP42XsuiJLmAXwIcbedWl3gWwE+Z6C1iVWF73dUws7KQkcu50Qc3rEbOhljCSO/ll+sVwDAjqLY7otYo9nol3zZX0ccclHolEpIowqQ8FlWqF9GqkrcFUL41CKIGixkKrfFBpr4DIFOlVfTrCJopBSMNLSLh3vwk42H71AEJt+Ina5nHkuEGiz1T6wEuN2ZdprybEQl4jylNEimRsFB4pXNlTymYbq9QqU1GG25birlhDTnA6+C7zTuEg5ZQa98XXt1lU+gvllvfT2NOOE98pUj3D79uVHCqvAAdYOQVEM8JxyE5Gn6HrlGrgFHs/f5OK8m+JvJZNBUIV40QcsEHkiGN/H+uLI1MHrW5hOAe+0HVS//o3US3Llg/1ZD1yK6gC0baYNEn0EXm84IEixkEQzrn3Ojiv8qK5J0Pwce//zmQWhJYvvV5HSQxlYLnsU2QqI0YL00AMImuFZkLfaLucz7xtk6HqF6yCZmSrpEAQ1IT7N+cys9qtiv6hCKzA5tf/yk+xDSz8idJG6XTkPpPBq/Cg/SVjNRbCtW3w6LGZDaBaDAgOS4T4zCDG8+7f+8oh0iuh8O9WTtoIEDzyWH0O4dtt8UyElwbrY1FuI774b8ft4jCpifH+VHLZpmWoIVnSCSrA== 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)(39860400002)(136003)(346002)(396003)(376002)(451199021)(36840700001)(40470700004)(46966006)(7696005)(478600001)(86362001)(55016003)(40480700001)(83380400001)(47076005)(36756003)(40460700003)(82740400003)(7636003)(356005)(2616005)(36860700001)(426003)(336012)(6666004)(966005)(2906002)(54906003)(6636002)(316002)(37006003)(16526019)(6286002)(186003)(1076003)(53546011)(26005)(8676002)(41300700001)(6862004)(8936002)(5660300002)(82310400005)(4326008)(70586007)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:36:42.7210 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 077b0f4c-3c62-4718-2657-08db39103843 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: BN8NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6104 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 04/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/log/?h=22.11-staging/commit/d4335766d408b7586fa0af976a612bda42611d27 Thanks. Xueming Li --- >From d4335766d408b7586fa0af976a612bda42611d27 Mon Sep 17 00:00:00 2001 From: Erez Shitrit Date: Wed, 22 Mar 2023 16:41:17 +0200 Subject: [PATCH] net/mlx5/hws: fix pattern creation Cc: Xueming Li [ upstream commit 97e1a2ffc6615e1ace06049ee443af6551496194 ] When creating a new pattern the data area should be clean, otherwise when the data will come from the arg object it will do OR operation on the data part in the pattern and use the dirty area as is. Now we clean the data area on each pattern creation. Fixes: f8c8a6d8440d ("net/mlx5/hws: add action object") Signed-off-by: Erez Shitrit Reviewed-by: Alex Vesker Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_cmd.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c b/drivers/net/mlx5/hws/mlx5dr_cmd.c index 721376b8da..acad42e12e 100644 --- a/drivers/net/mlx5/hws/mlx5dr_cmd.c +++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c @@ -507,9 +507,11 @@ mlx5dr_cmd_header_modify_pattern_create(struct ibv_context *ctx, uint32_t in[MLX5_ST_SZ_DW(create_header_modify_pattern_in)] = {0}; uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0}; struct mlx5dr_devx_obj *devx_obj; - void *pattern_data; + uint64_t *pattern_data; + int num_of_actions; void *pattern; void *attr; + int i; if (pattern_length > MAX_ACTIONS_DATA_IN_HEADER_MODIFY) { DR_LOG(ERR, "Pattern length %d exceeds limit %d", @@ -535,9 +537,19 @@ mlx5dr_cmd_header_modify_pattern_create(struct ibv_context *ctx, /* Pattern_length is in ddwords */ MLX5_SET(header_modify_pattern_in, pattern, pattern_length, pattern_length / (2 * DW_SIZE)); - pattern_data = MLX5_ADDR_OF(header_modify_pattern_in, pattern, pattern_data); + pattern_data = (uint64_t *)MLX5_ADDR_OF(header_modify_pattern_in, pattern, pattern_data); memcpy(pattern_data, actions, pattern_length); + num_of_actions = pattern_length / MLX5DR_MODIFY_ACTION_SIZE; + for (i = 0; i < num_of_actions; i++) { + int type; + + type = MLX5_GET(set_action_in, &pattern_data[i], action_type); + if (type != MLX5_MODIFICATION_TYPE_COPY) + /* Action typ-copy use all bytes for control */ + MLX5_SET(set_action_in, &pattern_data[i], data, 0); + } + devx_obj->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in), out, sizeof(out)); if (!devx_obj->obj) { DR_LOG(ERR, "Failed to create header_modify_pattern"); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:42.068737600 +0800 +++ 0129-net-mlx5-hws-fix-pattern-creation.patch 2023-04-09 21:45:38.799042200 +0800 @@ -1 +1 @@ -From 97e1a2ffc6615e1ace06049ee443af6551496194 Mon Sep 17 00:00:00 2001 +From d4335766d408b7586fa0af976a612bda42611d27 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 97e1a2ffc6615e1ace06049ee443af6551496194 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index a444fb4438..0adcedd9c9 100644 +index 721376b8da..acad42e12e 100644 @@ -26 +28 @@ -@@ -523,9 +523,11 @@ mlx5dr_cmd_header_modify_pattern_create(struct ibv_context *ctx, +@@ -507,9 +507,11 @@ mlx5dr_cmd_header_modify_pattern_create(struct ibv_context *ctx, @@ -39 +41 @@ -@@ -551,9 +553,19 @@ mlx5dr_cmd_header_modify_pattern_create(struct ibv_context *ctx, +@@ -535,9 +537,19 @@ mlx5dr_cmd_header_modify_pattern_create(struct ibv_context *ctx,