From patchwork Mon Mar 20 14:53:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erez Shitrit X-Patchwork-Id: 125320 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36691427E2; Mon, 20 Mar 2023 15:54:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15FA940A7F; Mon, 20 Mar 2023 15:54:31 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2065.outbound.protection.outlook.com [40.107.92.65]) by mails.dpdk.org (Postfix) with ESMTP id 139F7406BC for ; Mon, 20 Mar 2023 15:54:30 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FiF47gumHT61ZKPHLQACO7YKo/kZ/hd5sUMP+CS7ifIrW3aXldH5JvdUZpiL52FqjT6MWPph6dwbe6rBIQDwO7rp++VknOW5x1ujsgnhTtb2MblkdViVU+0u/hjFw/6YQNTRDs8NWr8L61xY7CiAwdjdCss67fKoqapmGC0nD7MxUaE4GO66nb4neECMHQzHYHXZMxlymYUPMjRyj7aBBM4pDPve+B79exRX41bTVbjkdtDXzQs1nIYfIoUHKTejqsCf39SpjaZeJweagyXPuhE7EPNSLj9FWaCKGrjASD2Cr/YXOiChUC20oxi80mRfwaNrSG9DDREMPOKppXxR9Q== 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=XmAHIGG5ABb7aF3h9kGc48C9NGzjK6tzwVcUltIHigE=; b=Y5MIr91/iq4p3s1y4Nzodeh+M/YDbpVWdXGYeOQjFxOK60rrXvHtRmqjIz4Q/2MqAN/tR7qbfwt0yYBM2dCt2Zbd2ELvRNBI9ST+ZnnCCA0JpFGjUOh3mn7N5foNgmfXh9RiuMa3pe2NS7WRWbk6ljtGqYewovESarwN/mIeJE8Sdu1tTHS5u18LgEpvqoqIYSgb99duQ7PxrX1iY1xoVsnl9mPZ9NiboBKwEfjBEwBYzq09IdntPae44Cs7Q4zAGXP0olVMQw2q3/EEqACWDkpHxt2ygzFFyv17PesL/e2R7jQkzb5AqH8I258HSNSdzMoGYk9OeNWZjcTYgdtRIg== 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=XmAHIGG5ABb7aF3h9kGc48C9NGzjK6tzwVcUltIHigE=; b=LbqXpGOHuZHahTa5QFeGiaoQxjDnFm1tyi1lW2lPxfsuL6JVqCHuX72yi7s5J+sSkXSgAgHT+rjfZV+wiLBugAPzSLYGzYppF0Yn9yJxGACSa3Nbos7sDLzF7NzvYSypr86rpcy470yVvQr+RW7Aoci1kyzR6X7mIjRg3ksDYR0m8HRAE1/JIjl4sOY7bBH6IcggSfdaG5O7qZaasn5F5hBa4r1VBOThAj8ewaXjA3OUizeJdapC8s+cuT4LDwI1XxFD09/R8S2ADLombC52G5drNZ/YfWrDaMKBOL7sPgcj4M5iIV2XWO1HlKlN08YxtbWWc1kBXCVYGiUZcGxJMg== Received: from MW4PR03CA0066.namprd03.prod.outlook.com (2603:10b6:303:b6::11) by CY8PR12MB7756.namprd12.prod.outlook.com (2603:10b6:930:85::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 14:54:28 +0000 Received: from CO1NAM11FT100.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b6:cafe::d9) by MW4PR03CA0066.outlook.office365.com (2603:10b6:303:b6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Mon, 20 Mar 2023 14:54:28 +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 CO1NAM11FT100.mail.protection.outlook.com (10.13.175.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 14:54:28 +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; Mon, 20 Mar 2023 07:54:14 -0700 Received: from nvidia.com (10.126.231.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; Mon, 20 Mar 2023 07:54:13 -0700 From: Erez Shitrit To: CC: , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 1/4] net/mlx5/hws: fix bug in pattern creation Date: Mon, 20 Mar 2023 16:53:40 +0200 Message-ID: <20230320145343.449023-1-erezsh@nvidia.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 X-Originating-IP: [10.126.231.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: CO1NAM11FT100:EE_|CY8PR12MB7756:EE_ X-MS-Office365-Filtering-Correlation-Id: 89480434-88a1-40ea-ea7b-08db29530159 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: THWxeJcdT3cE40dqlzm1zGsZxNGHbpzGJMrbCIoMcODc+i2KqS4Piy5atSEsGrZAGh7cvbZNwlogmqX5fhTKXdmW3dzOrGtvFIxlF/o/dIn4MH3IA2dD9DfMs3n+v8O9dnJdZNttBuse6PgXPF5KeZ4DgbYPuH+FG7edq8HOq/JCXBwEU28zSmhAQwcN6ihxnNGZmkXsXvBuwDaW7YfWPKahdH5rw4OVAJX9hJoo7T1v2ALT3fpBGZs+CR3ntWRQwLDShV5LCLfYiGtfyViNgXwNRBfMnbBYQaJ09Bc3zgJASwgiui+x9N+iP+GuHZ/Im1yNglQkjBGoaWCQSe3FV2Fl7QlHf20b0O99cL6HvtYilEJN1zxpv2GMjl/3Zh5fUJeHjHa3sZuODdm/HpwN/zSsjKFKVytWTe17y8lTfMM4odw7EO+ZNbr8vqoloc7pcr3XY5yzYmxLQsfbRnX418UAxWihyZ0jHOjL2yuUhQGJ0zLdminpu5krLAgOG56tvyjEjGZLPFiUnXZS705jtpfU/8r+almn1iFTSSKLyPENavPKy0zxTLXxhh7/rUp0Q4R43HG7qKUgFfxr/3XuqCFk9Arhgx/b8zUI+XnK1TEAjGCtDXoSwNvG2YRhNlePCtk4wYuThrKHbPpBYJ7y8o4927+AkNi1DAQO18pnARsIXOeE/ab0U2ZsYUQkDHdg+B+8SijwIBX5GfLennC7ktquKSKAnb79OAQ2ZSGIy8IPU4lS1V6sAzTlDuHavYvD 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:(13230025)(4636009)(396003)(346002)(39860400002)(376002)(136003)(451199018)(46966006)(36840700001)(40470700004)(2616005)(7696005)(107886003)(16526019)(186003)(6286002)(426003)(4326008)(47076005)(83380400001)(478600001)(6666004)(336012)(316002)(54906003)(6916009)(70586007)(70206006)(26005)(1076003)(8676002)(36860700001)(41300700001)(8936002)(5660300002)(7636003)(40460700003)(82740400003)(2906002)(356005)(55016003)(86362001)(82310400005)(36756003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 14:54:28.3032 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89480434-88a1-40ea-ea7b-08db29530159 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: CO1NAM11FT100.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7756 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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. Fixes: f8c8a6d8440d ("net/mlx5/hws: add action object") Reviewed-by: Alex Vesker Signed-off-by: Erez Shitrit --- 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 a444fb4438..0adcedd9c9 100644 --- a/drivers/net/mlx5/hws/mlx5dr_cmd.c +++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c @@ -523,9 +523,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", @@ -551,9 +553,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"); From patchwork Mon Mar 20 14:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erez Shitrit X-Patchwork-Id: 125321 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4D45D427E2; Mon, 20 Mar 2023 15:54:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D1BE41141; Mon, 20 Mar 2023 15:54:33 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2041.outbound.protection.outlook.com [40.107.243.41]) by mails.dpdk.org (Postfix) with ESMTP id 49BC7410F3 for ; Mon, 20 Mar 2023 15:54:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BPajCmy3TRrWKaT0G/oidWalEDFIIzRDQmctHq73VOXaeVAVt/lu7WJH5XpYznPuGWi8RnA1Kyg537e0DB1KT0EMPLDnXiklhFdUNwmmKuo83jZlEZfrkuIYnGYDb/VUtpzJGvdxkG+FuhsFamoz4PuWcuuthJhsPow3PrS64phapKUt7b6XUxHrhoTmf6eyASHqVUuZitkA+uIsM0WNkTS8q9zRJyri0hNGRVzI5qEuXbNffDwGNEI/hf3Z7D8apF9fvQAnOLOGk5uD5tFtR/TkrmVGM4Z3wigLxBo0wlPQEc9mD4IjwhxDkzO3+DhjPmVy1TGFeLVxPZvsW4POcg== 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=l2jCM1B6ibpccGCSJdjcTE6xhukWCOoSFVpgujADW10=; b=bjK4kXkBIh82neqByWQIrBD4LXves4vXK5ZsMNQnV2c27Q+poSg71mli5jqt3GtLu62sMEkO1A5i3A5hsxIbosPBpjIzz7Lip6MBosDKsShjkCA+ny4dh18/wNSIz2S/XDWDauIKUO4zNQWS8F7UA5b3muOC1r8dF973AgkD9sfeLNGmpzMt8Ft5jgDh7Tr9PMG4RBePZHmU2ef2/ENJVqw297fvly5xRkiStAM0ZnuvM5PJhWXC/zL4JgLZk+JXrE87aRZaeAQFC7UwscfnQCsnZZCz/BhE6ZymmkLrPK83RCY15Qa7WwS0h0IlmmPHxvfUEll3UjC+2cLftMgmrQ== 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=l2jCM1B6ibpccGCSJdjcTE6xhukWCOoSFVpgujADW10=; b=tXlDa12wCDTGYApHjtKJOM16GBHNVRG9TL6XTiTew06VWNeQuyU6uEpy9fcDrpK2qUFGkWw83cTYBCdDS0wM9GPblo5IBTenylagnKJLZWLlbw3xLGsa+dk+sM4eTxj/7PzD8EqlXqziMK7UUW9hGeV8xJ6g3yL2rbT2U3NxHuApBBY91brsLrTvNgnbJr2pMpBCayMUs5mGB44QCPQ/xic54VkN6w4UTHWfhZfdJs4BkOK4fEIYegy2QLHMt1H7cW6t34/MASQN2FEwJNqikeBbKKHIeVAkj8CO4qq+kR4GUWhxLxPyUwzBhuxvez2pF153QN0izQsxx6Brt2pLGw== Received: from MW4PR03CA0248.namprd03.prod.outlook.com (2603:10b6:303:b4::13) by SJ0PR12MB8613.namprd12.prod.outlook.com (2603:10b6:a03:44d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 14:54:30 +0000 Received: from CO1NAM11FT095.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::d7) by MW4PR03CA0248.outlook.office365.com (2603:10b6:303:b4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Mon, 20 Mar 2023 14:54:30 +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 CO1NAM11FT095.mail.protection.outlook.com (10.13.174.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 14:54:30 +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; Mon, 20 Mar 2023 07:54:16 -0700 Received: from nvidia.com (10.126.231.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; Mon, 20 Mar 2023 07:54:14 -0700 From: Erez Shitrit To: CC: , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 2/4] net/mlx5/hws: shared context uses defaults from local context Date: Mon, 20 Mar 2023 16:53:41 +0200 Message-ID: <20230320145343.449023-2-erezsh@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230320145343.449023-1-erezsh@nvidia.com> References: <20230320145343.449023-1-erezsh@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.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: CO1NAM11FT095:EE_|SJ0PR12MB8613:EE_ X-MS-Office365-Filtering-Correlation-Id: 232f5ca0-efb2-4e21-e737-08db2953026f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rJgR41s26q3xf3kMoqTUQ1PS9A3jazbvbJywRqfLE2VRARVw7IXeUJGyL8m9pBOLEA895VuTAbRvWrgzp0HlLCchKu2QFVHoXD2usoa2Xt0KRlCwz0PUnPZUaf9awnEtsBplafpRBPktwq0zTEZY9Q9jXmt3hkl9yVcoM7DyT0iIDVclEALJ9IyfRcNMf4aDnhGiAMH4Q3Y5PA7K3VfyrAh77Vcnv2LIaKtLrfTIEdikqhCcNzjNg9CaU3zi+RWWvDXld8ScIhTgmz/27cktvsGAczoVFUjn21GrC6EtV8CbY+y5Qm4gsZ9JKN1etrM17Id+HYjq3+QMWxZ33UwOdYkr497spG1O7NQ+SayDxmGl+5TUjGZ1uUQ2uDTTQNwORdKxcnneWRIMe8mN9l0PEFpL88Y4ZJVj2b+PNG6FdV1HRIoUp18JRc9v13Gqe6ykLXRwZU10fR2WfbcOFxek+S9AOn4YIvmvEKuTsNSAXYcPDfBx1pCVSY5ZYVF2FEVxdvwMq3ByA9NC5F8MF1i05CXPioR19SQhvfIJ8mMRhABgXi14JsaVuQg9J81G5knUdMxGOV2k4IvA+IuMMA7lQBcwBCe5Wy+JZ+JlNLH57YSU+/eepy7Eo0QD5rKwiEdWAco6cIg29M+a7tX5FGop+klZCz5fms0P/9QpbvLiNE2z9dDdsxc6AU8QFQp9M529nxdvoBK5Ztw0dSYfvTibjzsLkRUw0/w46gFLg4BZ9xRSOdMBp0UV+1Pg+Z2g17s2 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:(13230025)(4636009)(136003)(346002)(376002)(39860400002)(396003)(451199018)(46966006)(40470700004)(36840700001)(426003)(47076005)(2616005)(107886003)(6666004)(336012)(1076003)(26005)(40460700003)(5660300002)(86362001)(7696005)(70206006)(478600001)(316002)(186003)(6286002)(16526019)(82310400005)(83380400001)(54906003)(70586007)(36756003)(4326008)(8676002)(6916009)(41300700001)(356005)(36860700001)(8936002)(82740400003)(40480700001)(2906002)(7636003)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 14:54:30.1407 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 232f5ca0-efb2-4e21-e737-08db2953026f 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: CO1NAM11FT095.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8613 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fix default miss behavior for shared resources, the problem could happen in two cases: When the table created, the default miss should go to the alias ft that will direct it back to local context. When the rule is without specific hit address and we are in a shared RTC from here it should be redirected back to the local context. Fixes: ce946c7d3999 ("net/mlx5/hws: support ibv context shared with local one") Reviewed-by: Alex Vesker Signed-off-by: Erez Shitrit --- drivers/net/mlx5/hws/mlx5dr_action.c | 9 ++++++++- drivers/net/mlx5/hws/mlx5dr_table.c | 29 ++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 2db62635c1..77cf1f5132 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -1751,8 +1751,15 @@ int mlx5dr_action_get_default_stc(struct mlx5dr_context *ctx, goto free_nop_dw6; } - stc_attr.action_type = MLX5_IFC_STC_ACTION_TYPE_ALLOW; stc_attr.action_offset = MLX5DR_ACTION_OFFSET_HIT; + if (!mlx5dr_context_shared_gvmi_used(ctx)) { + stc_attr.action_type = MLX5_IFC_STC_ACTION_TYPE_ALLOW; + } else { + /* On shared gvmi the default hit behavior is jump to alias end ft */ + stc_attr.action_type = MLX5_IFC_STC_ACTION_TYPE_JUMP_TO_FT; + stc_attr.dest_table_id = ctx->gvmi_res[tbl_type].aliased_end_ft->id; + } + ret = mlx5dr_action_alloc_single_stc(ctx, &stc_attr, tbl_type, &default_stc->default_hit); if (ret) { diff --git a/drivers/net/mlx5/hws/mlx5dr_table.c b/drivers/net/mlx5/hws/mlx5dr_table.c index 327e2ec710..0e5e9b49ab 100644 --- a/drivers/net/mlx5/hws/mlx5dr_table.c +++ b/drivers/net/mlx5/hws/mlx5dr_table.c @@ -272,6 +272,9 @@ static void mlx5dr_table_uninit_shared_ctx_res(struct mlx5dr_table *tbl) /* called under spin_lock ctx->ctrl_lock */ static int mlx5dr_table_init_shared_ctx_res(struct mlx5dr_context *ctx, struct mlx5dr_table *tbl) { + struct mlx5dr_cmd_ft_modify_attr ft_attr = {0}; + int ret; + if (!mlx5dr_context_shared_gvmi_used(ctx)) return 0; @@ -288,8 +291,22 @@ static int mlx5dr_table_init_shared_ctx_res(struct mlx5dr_context *ctx, struct m goto clean_local_ft; } + /* On shared gvmi the default behavior is jump to alias end ft */ + mlx5dr_cmd_set_attr_connect_miss_tbl(tbl->ctx, + tbl->fw_ft_type, + tbl->type, + &ft_attr); + + ret = mlx5dr_cmd_flow_table_modify(tbl->ft, &ft_attr); + if (ret) { + DR_LOG(ERR, "Failed to point table to its default miss"); + goto clean_shared_res; + } + return 0; +clean_shared_res: + mlx5dr_table_put_shared_gvmi_res(tbl); clean_local_ft: mlx5dr_table_destroy_default_ft(tbl, tbl->local_ft); return rte_errno; @@ -337,20 +354,20 @@ static int mlx5dr_table_init(struct mlx5dr_table *tbl) return rte_errno; } - ret = mlx5dr_action_get_default_stc(ctx, tbl->type); + ret = mlx5dr_table_init_shared_ctx_res(ctx, tbl); if (ret) goto tbl_destroy; - ret = mlx5dr_table_init_shared_ctx_res(ctx, tbl); + ret = mlx5dr_action_get_default_stc(ctx, tbl->type); if (ret) - goto put_stc; + goto free_shared_ctx; pthread_spin_unlock(&ctx->ctrl_lock); return 0; -put_stc: - mlx5dr_action_put_default_stc(ctx, tbl->type); +free_shared_ctx: + mlx5dr_table_uninit_shared_ctx_res(tbl); tbl_destroy: mlx5dr_table_destroy_default_ft(tbl, tbl->ft); pthread_spin_unlock(&ctx->ctrl_lock); @@ -363,8 +380,8 @@ static void mlx5dr_table_uninit(struct mlx5dr_table *tbl) return; pthread_spin_lock(&tbl->ctx->ctrl_lock); mlx5dr_action_put_default_stc(tbl->ctx, tbl->type); - mlx5dr_table_destroy_default_ft(tbl, tbl->ft); mlx5dr_table_uninit_shared_ctx_res(tbl); + mlx5dr_table_destroy_default_ft(tbl, tbl->ft); pthread_spin_unlock(&tbl->ctx->ctrl_lock); } From patchwork Mon Mar 20 14:53:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erez Shitrit X-Patchwork-Id: 125322 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 260ED427E2; Mon, 20 Mar 2023 15:54:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3E4E42B71; Mon, 20 Mar 2023 15:54:36 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2077.outbound.protection.outlook.com [40.107.237.77]) by mails.dpdk.org (Postfix) with ESMTP id 14E504282D for ; Mon, 20 Mar 2023 15:54:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kxa5eK0IJQLcXodNeucusJrGtw8noxOs14vZ7sa24A7pl3ZO6ni4bREpRkmPid2AfwciC42YPR0+C4kIA8PfPI0ixi5ATNUqRnpSROiTIZprG3uBRxZ8NeMRvgHOcHxmiZ68rKz+TUyjN5d4vVJMvgv8Jmpi9QxIxvUKVbajls3rnYAMSpmPlo3PWw5m+ID5uujqAnmkR8Df8m3Dfg+Ci6VKpIy8I8DO4GkTHWRmGFxhmQk62x1D3oTMnZUPpQ6EufoKIb7Q4VK9oHQu2Y4rXMxawIJ4lHISfwM7+LzXF2Kh1lCY0gqvOywHI1OzrEuaRKn47MtS3+0+vrCtbq8X0g== 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=evy6+ZOECI7rOR22tglazJLuz6Vcn1O5P4rxe4Grd70=; b=Q+gw6T/XKUA8pGjLJQPBJIgASLavdojRDNCpB1b04PeV5vsz2S/G8zX+S3AB9Ux3zAt0gjTRaw25OC/pGnGLKgxsBRv4luS3VJfsAex7MCsaRU/OOhqDrp0xkmSg8KI9+RFT3jHyJILtfA0vW320J4fe354dqiCQEd5hkLdfGsvCytBDzZ71hMScFBRLrdtzoU/JFAwP+Cdxv5daJos0THso5JAMZlVv5ddi+nEkFzqPe6+KLOfGhgCd3GqvPhmVgfeNzjepye+dV4PVnoVoogMcA0Hzzqzaiev4pvML6LNzvcDGFM9esAxbr2iEYn31iPB19ubLPJJ1r4jmSzOroQ== 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=evy6+ZOECI7rOR22tglazJLuz6Vcn1O5P4rxe4Grd70=; b=q6ogGFqrDN8momZX+cJ4IDpbhidFfClihODLtuDtV1vxdlZ/Ol12nX4/PY5CcR5uHYxI0DXIL7E4Jdvlae/5YHErn0KX11Ikn0+1baH2Np0T9VSKptQDOhi6GmMihVBgKoYuFthEBsfyfQOabNRI6UmwlbLTYPuo4CdmO7FbDZznrum9lwA+3bHGjWeZnv4M+r0DAE6z/24DA2igMXO4f5gjZy0p77QzqvZ5c74WWxejAjr53gZWn+SRQ3XhYs366jB57YiwIMr91aybqm9cyTFh3Wq+pSyTwj0S5zYLAmNFofdfXTmyjD5vmUv1kwt0r/Vbu11GvgsAJ9lpgcbdZg== Received: from MW4PR04CA0061.namprd04.prod.outlook.com (2603:10b6:303:6b::6) by CH2PR12MB4053.namprd12.prod.outlook.com (2603:10b6:610:7c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 14:54:32 +0000 Received: from CO1NAM11FT081.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6b:cafe::2a) by MW4PR04CA0061.outlook.office365.com (2603:10b6:303:6b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Mon, 20 Mar 2023 14:54:32 +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 CO1NAM11FT081.mail.protection.outlook.com (10.13.174.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 14:54:31 +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; Mon, 20 Mar 2023 07:54:18 -0700 Received: from nvidia.com (10.126.231.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; Mon, 20 Mar 2023 07:54:16 -0700 From: Erez Shitrit To: CC: , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 3/4] net/mlx5/hws: keep all jumbo tag for deletion Date: Mon, 20 Mar 2023 16:53:42 +0200 Message-ID: <20230320145343.449023-3-erezsh@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230320145343.449023-1-erezsh@nvidia.com> References: <20230320145343.449023-1-erezsh@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.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: CO1NAM11FT081:EE_|CH2PR12MB4053:EE_ X-MS-Office365-Filtering-Correlation-Id: a0e7c818-775e-4e8d-ec25-08db29530381 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mc3QHbOWok5a+ICLwU0UAu5QK7Zgmek9tM1lVNBkk86N3GQaawzPjVwHFdDfxkM30aThx0ob9UA81lrJTAOswtmInOn3XMAe6AkDP7X7z0cNytGih9j8u9DyJZjl28dxumPO5Sp8L3EYLflfCsPDZUBITWDoX6+BpBs2ej5VYdvE8faHAr9I/3P9McThYDcykQtAri4KYrjYBsPKAfCEQr680qLAWu6pqrXNuWy9fmDv+rpbHLR9ayPr1V+LSa4zvRGckSx0/i0/ecOk5hdgcJLJZrHf1g0xenF81cl/jwNbLxbBs/CEDHg0zbSzDjhunH6YYKc4qjzleHoyua9+O0DA4g5fCLKQUrrpKinOBnBjbtALEsqlLpR831QL1LdUIK1SN8cOeJEHMZ+8Wo5rDy8886jf7Q/sML1Aon0V3Uvq6Q8Y7idgCvjpZ4s4CeOBOKEt6XGqIupof15/f5nxVwArbaJfybrHvsBVfY50UwtW7drlC8MKTLNfgMzkGIo83EqCjSnn3hzYobHZADxql6tnAsyqvXlFtE3tb9/JfbZnvXnfS3b9qkQsOu0+iMKmco7sJ5CABHIZfCxfYI4FRlewtyytrnLalCLHCOTBStl3g//ZtuyfNcxg2HylPL5bihALJ1zyVRXJFHR3CXOLz5dkX1evJixsakxUEkRg/HQ9QSbTF6BrWXJWPltsy5X9Wfkb02HZo7VBfkqgtN98Dwcz2wBdk7vFYXmMmSAZJTc8U5Az3bJUMDtlbD+Lrl9k 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:(13230025)(4636009)(396003)(39860400002)(346002)(136003)(376002)(451199018)(46966006)(36840700001)(40470700004)(2616005)(336012)(6286002)(16526019)(26005)(1076003)(6666004)(47076005)(107886003)(426003)(83380400001)(8676002)(4326008)(6916009)(316002)(54906003)(186003)(478600001)(70586007)(70206006)(8936002)(5660300002)(7636003)(82740400003)(2906002)(41300700001)(36860700001)(356005)(7696005)(40460700003)(82310400005)(86362001)(55016003)(40480700001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 14:54:31.9365 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0e7c818-775e-4e8d-ec25-08db29530381 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: CO1NAM11FT081.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4053 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org In cases with more than one STE we didn't update the whole tag of the match jumbo STE, the ste_attr that keeps that indication was not updated at the last iteration. Now we indicate it is a jumbo frame before saving the tag for coming deletion of it. Fixes: 405242c52dd5 ("net/mlx5/hws: add rule object") Reviewed-by: Alex Vesker Signed-off-by: Erez Shitrit --- drivers/net/mlx5/hws/mlx5dr_rule.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c b/drivers/net/mlx5/hws/mlx5dr_rule.c index 9d5e5b11a5..2418ca0b26 100644 --- a/drivers/net/mlx5/hws/mlx5dr_rule.c +++ b/drivers/net/mlx5/hws/mlx5dr_rule.c @@ -116,6 +116,9 @@ static void mlx5dr_rule_save_delete_info(struct mlx5dr_rule *rule, struct mlx5dr_send_ste_attr *ste_attr) { + struct mlx5dr_match_template *mt = rule->matcher->mt; + bool is_jumbo = mlx5dr_matcher_mt_is_jumbo(mt); + if (unlikely(mlx5dr_matcher_req_fw_wqe(rule->matcher))) { uint8_t *src_tag; @@ -136,7 +139,7 @@ mlx5dr_rule_save_delete_info(struct mlx5dr_rule *rule, return; } - if (ste_attr->wqe_tag_is_jumbo) + if (is_jumbo) memcpy(rule->tag.jumbo, ste_attr->wqe_data->jumbo, MLX5DR_JUMBO_TAG_SZ); else memcpy(rule->tag.match, ste_attr->wqe_data->tag, MLX5DR_MATCH_TAG_SZ); From patchwork Mon Mar 20 14:53:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erez Shitrit X-Patchwork-Id: 125323 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C09DE427E2; Mon, 20 Mar 2023 15:54:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D750242B7E; Mon, 20 Mar 2023 15:54:39 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) by mails.dpdk.org (Postfix) with ESMTP id 9DD0D42C24 for ; Mon, 20 Mar 2023 15:54:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIaSGVm3cZmVi0x7jNHsEHhUBSuDEiRCF/2r8NBqfXlC8a6Ofc+E+6srCqqGO5L/cNGlAQokgKliYf519VsMMPnssYsoFOhpPiHG6dWEU7J9Um2+KU5hAlsaZhxrs6h7u2jVhtWUfuKUuhxz41W+kr8K4BkRvdTIZC9aJ/rpx4+HogU8124CeCQME6I26Ztnk5PEnik6vGVtHDQgd+Ifg0zQUYOd+rvB7hLExYYl4w6Sy/B1rMf7v0GzjCds3RFlHnzil2OLIU3oK32ptT3ZZAQq2ST/sbESSWNzvZ75wzzOnXY14n+5l8wM6+UTvk4d/1lPjNZrrptAJ3Qh0aJScQ== 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=bOZXOhwyRqYG01U86gM5OcfX1ruYK5q6XMvHTNv+ewE=; b=WovUH5ueHrEcfwUZJgksk7mGZ1qFz6y/8y+gEa/ICr4FBe/7KpmJYFmR4GqjspSJg+70/J+EKxxFqFihDYThu6TMfYWz+3j0JZVV03/MZTvHE3dDccLCmjN4F8Dvq4cSA4U2cUiRf662jxKF3toxpCW5PtKJp8PyrjMu5Jy1x2hXZb27mm15G/2LQ9VKzeV/KWAZI/qTGn8pqf7dNDUAuamSgnxXJfoJJF27PMKZvrrSdzzQJZdhFT4DeUczZ1g5Blsq1jDjtKGzrMFZ4Sha3RFs+EujM19rKuoo/cDq9rtoc1SBnaeBCIYfJukI75abE8CUIN3jXqAPuV93AMbJWQ== 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=bOZXOhwyRqYG01U86gM5OcfX1ruYK5q6XMvHTNv+ewE=; b=oHBVP3KtkEs9agensHaL1XZbfHdVFWvwfWYRgzGMBe6mkx3pQOQWoqJP4OldOy0rJ3/MBDyTGPt/5k8y/5rKguxmF4S5z4npF9kvUJR7izogLZK22l/bU3Jbp/mlq5+w8GmrV8ivRClvZwr46Qw61Gw5/6NeCqlvn+f/Vj9029J57HV5wDY4OzLErAJGHWNdTS6B1rrBu3tky7R15lQi7viKnE0YqD54pvoCT0lC92jSlqx1a6DDkigfp5LjnVCX4u++zCLvdcal4R2OXeI94ByXJOMz6jE0zo1aW3tFpqKdXUIYlWsXMCdztkrD84ixdfaKPmLYV1EwJZAbLYv9nA== Received: from MW4PR03CA0268.namprd03.prod.outlook.com (2603:10b6:303:b4::33) by PH8PR12MB7133.namprd12.prod.outlook.com (2603:10b6:510:22e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 14:54:35 +0000 Received: from CO1NAM11FT095.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::69) by MW4PR03CA0268.outlook.office365.com (2603:10b6:303:b4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Mon, 20 Mar 2023 14:54:35 +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 CO1NAM11FT095.mail.protection.outlook.com (10.13.174.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.15 via Frontend Transport; Mon, 20 Mar 2023 14:54:34 +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; Mon, 20 Mar 2023 07:54:20 -0700 Received: from nvidia.com (10.126.231.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; Mon, 20 Mar 2023 07:54:18 -0700 From: Erez Shitrit To: CC: , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 4/4] net/mlx5/hws: add check for modify-header actions Date: Mon, 20 Mar 2023 16:53:43 +0200 Message-ID: <20230320145343.449023-4-erezsh@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230320145343.449023-1-erezsh@nvidia.com> References: <20230320145343.449023-1-erezsh@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.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: CO1NAM11FT095:EE_|PH8PR12MB7133:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ba844a1-48a3-4f42-9091-08db29530550 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q26QoKsr52XoZVeftZdqrj0mkY3iZcc6YLfbfyqkKxXkpqKDYyqOlCnU7ys1UxBDIpWh3PDCSwUVgXI3+EHOi0wDWZ1tyGRJbWeUzHADaLADlxW+wcXEdmhmJ0zlkJwFxc6XOCQ+oolnMXQZTmqlnzyhHiruJYFaJ/FmlhdAqvrA/3UQb46l1rN8ReUurcd0zDdm6Tr+2UgBAGPOvXabW1ZNlIcY/XRcyQ/j5aT/y8yqo2/rh4uvTDLKwhOrYW4f7NxVlV3Flkao/gyz2VHVLnmVnjHzj5jB1V0oL//2Nv/Q7mQ4DA987QKqGffpan18oumHP4oxNn63mxLY6REkWQ7UbKNGawHv7ee8Q8xTgxxtYAsy0eKzWM+j7wTUHDa8K//QzIHYIWq3Pygg49fzo2Xj6sOmVNk2Zfz/5ntLAOVlMA4sT8fYrHPVYogUoSVdRD4F8ouSWidL12OrWDEuAAozg4XFkdSXy9VY0Mvz1w4UkDP4rZymSQ55OXjraWo3s86Mvbb5mJ55oHhWMnOGFCg0SBt7yKg24SfZWqFaO7xeJ/1dKSVyGUa4yzqETn1DOF/iyJYo+7+lCwJSFhvm4nboVOrvufCSU3fN0J7YaQ9N2xnDo0A9XDeCBaMnZ+PdwgMj5EheWbHX7gHIReKdqU5I2Y0JKA+RLEELP8WUoI6IR3BEhuGmS/SV+Lr9hLEEO2U3UM8MIZ/s2QAJCsKCSML523s1XaG0lTKL/Nn8LemqnUKR3OqaZ/A4+nElud11 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:(13230025)(4636009)(39850400004)(376002)(396003)(136003)(346002)(451199018)(46966006)(40470700004)(36840700001)(47076005)(7696005)(336012)(82310400005)(5660300002)(1076003)(26005)(6666004)(107886003)(478600001)(316002)(54906003)(6286002)(426003)(2616005)(186003)(356005)(83380400001)(16526019)(86362001)(8676002)(4326008)(6916009)(70586007)(70206006)(40480700001)(41300700001)(82740400003)(36860700001)(55016003)(8936002)(40460700003)(36756003)(2906002)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 14:54:34.9685 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ba844a1-48a3-4f42-9091-08db29530550 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: CO1NAM11FT095.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7133 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Allow only actions that are currently supported. Fixes: f8c8a6d8440d ("net/mlx5/hws: add action object") Reviewed-by: Alex Vesker Signed-off-by: Erez Shitrit --- drivers/common/mlx5/mlx5_prm.h | 1 + drivers/net/mlx5/hws/mlx5dr_action.c | 6 ++++++ drivers/net/mlx5/hws/mlx5dr_pat_arg.c | 16 ++++++++++++++++ drivers/net/mlx5/hws/mlx5dr_pat_arg.h | 2 ++ 4 files changed, 25 insertions(+) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 4b0a56f4e5..0b6dc43752 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -715,6 +715,7 @@ enum { MLX5_MODIFICATION_TYPE_REMOVE = 0x5, MLX5_MODIFICATION_TYPE_NOP = 0x6, MLX5_MODIFICATION_TYPE_REMOVE_WORDS = 0x7, + MLX5_MODIFICATION_TYPE_MAX, }; /* The field of packet to be modified. */ diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 77cf1f5132..2d93be717f 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -1603,6 +1603,12 @@ mlx5dr_action_create_modify_header(struct mlx5dr_context *ctx, goto free_action; } + if (!mlx5dr_pat_arg_verify_actions(pattern, pattern_sz / MLX5DR_MODIFY_ACTION_SIZE)) { + DR_LOG(ERR, "One of the actions is not supported\n"); + rte_errno = EINVAL; + goto free_action; + } + if (pattern_sz / MLX5DR_MODIFY_ACTION_SIZE == 1) { /* Optimize single modiy action to be used inline */ action->modify_header.single_action = pattern[0]; diff --git a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c index 6ed04dac6d..830bc08678 100644 --- a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c +++ b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c @@ -441,6 +441,22 @@ mlx5dr_arg_create_modify_header_arg(struct mlx5dr_context *ctx, return 0; } +bool mlx5dr_pat_arg_verify_actions(__be64 pattern[], uint16_t num_of_actions) +{ + int i; + + for (i = 0; i < num_of_actions; i++) { + u8 action_id = + MLX5_GET(set_action_in, &pattern[i], action_type); + if (action_id >= MLX5_MODIFICATION_TYPE_MAX) { + DR_LOG(ERR, "Invalid action %u\n", action_id); + return false; + } + } + + return true; +} + int mlx5dr_pat_arg_create_modify_header(struct mlx5dr_context *ctx, struct mlx5dr_action *action, size_t pattern_sz, diff --git a/drivers/net/mlx5/hws/mlx5dr_pat_arg.h b/drivers/net/mlx5/hws/mlx5dr_pat_arg.h index 92db6d6aee..ec467dbb4b 100644 --- a/drivers/net/mlx5/hws/mlx5dr_pat_arg.h +++ b/drivers/net/mlx5/hws/mlx5dr_pat_arg.h @@ -53,6 +53,8 @@ int mlx5dr_pat_init_pattern_cache(struct mlx5dr_pattern_cache **cache); void mlx5dr_pat_uninit_pattern_cache(struct mlx5dr_pattern_cache *cache); +bool mlx5dr_pat_arg_verify_actions(__be64 pattern[], uint16_t num_of_actions); + int mlx5dr_pat_arg_create_modify_header(struct mlx5dr_context *ctx, struct mlx5dr_action *action, size_t pattern_sz,