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 2BA7544144; Mon, 3 Jun 2024 10:11:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6493642E05; Mon, 3 Jun 2024 10:11:13 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2070.outbound.protection.outlook.com [40.107.223.70]) by mails.dpdk.org (Postfix) with ESMTP id 8C4C842E04 for ; Mon, 3 Jun 2024 10:11:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XnL28/8y2wUApKbApIMXz4dA8dViiBRcdqRpCPfzqnmJbLNp73r1lJa1hAQBG7j95Uq4aNT/xkDoC22p4Fo7kq4gXws6P6hofUMMM99BbpjpF2cP+u8jNsxhdsXwiNJFsj9V19dbIrLCtRMjRz/n9CT14tIffhFoxy3eYUTvv4VxdXUYjF8vhZhOYYijuwNg9kCjjk7KT/99aM7XoboClbGWO9wcSHNkwQoz1DAWP6USOlLPzUuSZNNcI/EUgtGc9of2sF/WeIE6SIEzpWVnuckY668H/LOBfKH8yNZWh/y0JKJPaSUhC1U6afb9vY+xMydImeUebZr571mnhoYtyg== 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=Ke+oIH2HTuPyceZOhTuzfWBXgcqCzPcQ864h2ltOPw0=; b=ePJyJGhORRyfnJChjjej5FYLDfsXRvUDuojTuiY/Ai+q5BLVPrqk4Gu8+jhT4ONpsv3YD71tkXDJWmCTzmfJ4KxFQyYOhfyszeaRRyM4Q054mJ80ygdl0cr1lDvohTAZzC1DlUqdqGcDqtykvbBhfxo5LWicXxjvWUyZ4XaIGvNgGJLAMXZI8JeB7rwfIaUkRyNjciZIeRMG2/ivEbaXk7iczRA1734Z0pXoDVQDdbNqJeiT1gE4wbOLTOOZ8XC6g3d61EBOhuQpkjcow3v4qQAKyq5u4nN8NAf5o0any4VcPH0OYoQIot6K/hnvCqBMkrG/Mi6pr7zPoN31MYZTYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=Ke+oIH2HTuPyceZOhTuzfWBXgcqCzPcQ864h2ltOPw0=; b=rSN0IjDpVPH1MumbCJq5ZIhamn4AQnHGNTnYiswetZiCcXnjrXdUYJNWq4mQ8c2Ssn0dnE9ua7ee3Hm6zrwF8QYYndbr9jmQJ1ax6SgWMj5ulYI+jguRyz+SxNrHW4OX5VwovUGhUZkO+PCgEsWFNprtOOJDEFOaGNZrnJsF6Gzaddn+k+pYNioQrCEdUYnXSiBJHSbTj7ckAgI4/JLvxkgar4HW6aGxvv5MacQZbpxNE+HR95LaIYciJjUiKDJTc/RSdgB2HpJvADPUjCulp/NE1Qngx/N0JIWrSjsbt8YsWsCkDMU1JnYcsoOoX+WzCbCojnOiRVY1nFWedUFpJQ== Received: from DM6PR05CA0061.namprd05.prod.outlook.com (2603:10b6:5:335::30) by BL1PR12MB5946.namprd12.prod.outlook.com (2603:10b6:208:399::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Mon, 3 Jun 2024 08:11:08 +0000 Received: from CY4PEPF0000EE3C.namprd03.prod.outlook.com (2603:10b6:5:335:cafe::4c) by DM6PR05CA0061.outlook.office365.com (2603:10b6:5:335::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7656.13 via Frontend Transport; Mon, 3 Jun 2024 08:11:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CY4PEPF0000EE3C.mail.protection.outlook.com (10.167.242.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Mon, 3 Jun 2024 08:11:08 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 3 Jun 2024 01:10:58 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 3 Jun 2024 01:10:58 -0700 Received: from nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4 via Frontend Transport; Mon, 3 Jun 2024 01:10:55 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v2 18/34] net/mlx5: support indirect actions in non-template setup Date: Mon, 3 Jun 2024 11:10:39 +0300 Message-ID: <20240603081042.3109-3-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240603081042.3109-1-mkashani@nvidia.com> References: <20240602102841.196990-1-mkashani@nvidia.com> <20240603081042.3109-1-mkashani@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3C:EE_|BL1PR12MB5946:EE_ X-MS-Office365-Filtering-Correlation-Id: edeb3621-9b17-4f87-fb34-08dc83a4b902 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|36860700004|82310400017|376005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1+1IeYvcBX1hfQEuyiK7Fc8Jx3u0QeI0fnYfARFAvyixkru+70jOPywz3QeX?= =?us-ascii?Q?yQ+BcQtNEAmWbSebqGc8ZacOzGXFx+8C0xhfVldPDAEFDpfvyxlt+zea+cAw?= =?us-ascii?Q?LnLTsRItBmj6nEf1I6XyU3Pt4/HOgA8C855Wf6Ir8PsjfSGppXLkKtPJKgtk?= =?us-ascii?Q?DMgS53AQ2THDCZXqVU1k3WEir/qF7jPf3+fzrc2HAq2y0n3LhOTP5WCc4yYA?= =?us-ascii?Q?VehCPS1FQbdjOZydlgbqPzs+XBEk2fVc97ESZDupUejP01QEQdHWooaP3G7V?= =?us-ascii?Q?fvTQqGC3zLmEW8GUKQyUZoGc0gDqPMZdTD2Yvy1pkMEDXjetK6YA27PXOe0d?= =?us-ascii?Q?I6BDBbp268i2UDL0xvnwzOtSHPpH0dsRDD2CoWGtmaOTNjt2NOzV7ilFb/QI?= =?us-ascii?Q?2vwQCYoaZ+yBxufhgaq188ai1lXhoQUln0hUG11r+iHZz7RV4PnRsYHVfpQ9?= =?us-ascii?Q?1DTL4G1tD9nF4yzvaYMIv2imCRQCADRcbTigHHpB7n6Iq2A4RmL8Bdqlib31?= =?us-ascii?Q?jh6uxKOhlqHmC4CYzlc9Ze1ln1Npjm9+z8k4l4VaGiIn3L4BD2Qu4Ldqx6R/?= =?us-ascii?Q?7NfwI8KTdZ6LjYeMEvENCA5pdqEQ4qGFJH/1n8K4/1ZQHgPCgAMPCQs+4g01?= =?us-ascii?Q?GXeg3ZI0hg7Kii+gB7Ft4eRfSn/OAG+3yK5ZSX7iN2t+iPlIpP/eDDIDwq8S?= =?us-ascii?Q?X3LDWYMWfPPdFECQXqIb+ohE1Au9yObLorNqxwTXoauNIp7cPeX+Gy/JoPvU?= =?us-ascii?Q?YZ+P86hvu3TCXggPcMc5qX/ZOE4QLRxAZcin1grhZTkgEj4BrTwLaabtBxLr?= =?us-ascii?Q?hEfpS9ktv82fAk5ua2I2b1a2HlF29BfuyBKpIujJhHBMYx7d6K57S5WEaC6k?= =?us-ascii?Q?oF8L9GNLlLl2L20zj5xsV5Vze/wiBahNCu5Uh+G94a9goAmVpnKEGVp5Y9Km?= =?us-ascii?Q?/bPL4Z8XqlyL201qJCgj9b6kuWJ1WPoxG7Hy6vKAYlmORkid3uG/pF+Mt80Z?= =?us-ascii?Q?mijNQBtWVL8wCZnv05Rgo/2GSiabwzB8ne0lVrxFFesMEBEvSGlG3As7g/ZE?= =?us-ascii?Q?krzoEC4n6AqyJHNLrJLS+VdufBa+MdXQvUZuFicjKVWHqKtrwoGd9ySISv4F?= =?us-ascii?Q?laEmvi/zZa/Y9mjEYM4Dew9mO3fzc6wOgOk+QXOvYdxZW3uW46S5CBjt2uJV?= =?us-ascii?Q?6Y007EB/tBdZgjJja5xTZTlwKHN8qIZUjIT9xtOooXjU7ZzIbTqxt6nS0caY?= =?us-ascii?Q?6X8C/1e3rerIGOoVopgfiboueoW5JnKJIF+ao7G4OWNYqacv4WAf3RvJX2/4?= =?us-ascii?Q?QBfl8UE/85KxpT1fet5X4JhuKovtfjBMMRQiLZLy5wz76EZaE91E3znpZ7Kn?= =?us-ascii?Q?fEUNxfaBVn0Zb3P5THRFz3JyXGvm?= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(36860700004)(82310400017)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 08:11:08.0529 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: edeb3621-9b17-4f87-fb34-08dc83a4b902 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5946 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 From: Gregory Etelson Add support for the RSS, AGE, COUNT and CONNTRACK indirect flow actions for the non-template flow rules. Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_hw.c | 111 +++++++++++++++++++++++++------- 1 file changed, 89 insertions(+), 22 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 7984bf2f73..9f43fbfb35 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -12431,6 +12431,91 @@ flow_hw_encap_decap_resource_register return 0; } +static enum rte_flow_action_type +flow_nta_get_indirect_action_type(const struct rte_flow_action *action) +{ + switch (MLX5_INDIRECT_ACTION_TYPE_GET(action->conf)) { + case MLX5_INDIRECT_ACTION_TYPE_RSS: + return RTE_FLOW_ACTION_TYPE_RSS; + case MLX5_INDIRECT_ACTION_TYPE_AGE: + return RTE_FLOW_ACTION_TYPE_AGE; + case MLX5_INDIRECT_ACTION_TYPE_COUNT: + return RTE_FLOW_ACTION_TYPE_COUNT; + case MLX5_INDIRECT_ACTION_TYPE_CT: + return RTE_FLOW_ACTION_TYPE_CONNTRACK; + default: + break; + } + return RTE_FLOW_ACTION_TYPE_END; +} + +static void +flow_nta_set_mh_mask_conf(const struct rte_flow_action_modify_field *action_conf, + struct rte_flow_action_modify_field *mask_conf) +{ + memset(mask_conf, 0xff, sizeof(*mask_conf)); + mask_conf->operation = action_conf->operation; + mask_conf->dst.field = action_conf->dst.field; + mask_conf->src.field = action_conf->src.field; +} + +union actions_conf { + struct rte_flow_action_modify_field modify_field; + struct rte_flow_action_raw_encap raw_encap; + struct rte_flow_action_vxlan_encap vxlan_encap; + struct rte_flow_action_nvgre_encap nvgre_encap; +}; + +static int +flow_nta_build_template_mask(const struct rte_flow_action actions[], + struct rte_flow_action masks[MLX5_HW_MAX_ACTS], + union actions_conf mask_conf[MLX5_HW_MAX_ACTS]) +{ + int i; + + for (i = 0; i == 0 || actions[i - 1].type != RTE_FLOW_ACTION_TYPE_END; i++) { + const struct rte_flow_action *action = &actions[i]; + struct rte_flow_action *mask = &masks[i]; + union actions_conf *conf = &mask_conf[i]; + + mask->type = action->type; + switch (action->type) { + case RTE_FLOW_ACTION_TYPE_INDIRECT: + mask->type = flow_nta_get_indirect_action_type(action); + if (!mask->type) + return -EINVAL; + break; + case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD: + flow_nta_set_mh_mask_conf(action->conf, (void *)conf); + mask->conf = conf; + break; + case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: + /* This mask will set this action as shared. */ + memset(conf, 0xff, sizeof(struct rte_flow_action_raw_encap)); + mask->conf = conf; + break; + case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: + /* This mask will set this action as shared. */ + conf->vxlan_encap.definition = + ((const struct rte_flow_action_vxlan_encap *) + action->conf)->definition; + mask->conf = conf; + break; + case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: + /* This mask will set this action as shared. */ + conf->nvgre_encap.definition = + ((const struct rte_flow_action_nvgre_encap *) + action->conf)->definition; + mask->conf = conf; + break; + default: + break; + } + } + return 0; +#undef NTA_CHECK_CONF_BUF_SIZE +} + static int flow_hw_translate_flow_actions(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -12454,30 +12539,12 @@ flow_hw_translate_flow_actions(struct rte_eth_dev *dev, .transfer = attr->transfer, }; struct rte_flow_action masks[MLX5_HW_MAX_ACTS]; - struct rte_flow_action_raw_encap encap_conf; - struct rte_flow_action_modify_field mh_conf[MLX5_HW_MAX_ACTS]; + union actions_conf mask_conf[MLX5_HW_MAX_ACTS]; - memset(&masks, 0, sizeof(masks)); - int i = -1; - do { - i++; - masks[i].type = actions[i].type; - if (masks[i].type == RTE_FLOW_ACTION_TYPE_RAW_ENCAP) { - memset(&encap_conf, 0x00, sizeof(encap_conf)); - encap_conf.size = ((const struct rte_flow_action_raw_encap *) - (actions[i].conf))->size; - masks[i].conf = &encap_conf; - } - if (masks[i].type == RTE_FLOW_ACTION_TYPE_MODIFY_FIELD) { - const struct rte_flow_action_modify_field *conf = actions[i].conf; - memset(&mh_conf, 0xff, sizeof(mh_conf[i])); - mh_conf[i].operation = conf->operation; - mh_conf[i].dst.field = conf->dst.field; - mh_conf[i].src.field = conf->src.field; - masks[i].conf = &mh_conf[i]; - } - } while (masks[i].type != RTE_FLOW_ACTION_TYPE_END); RTE_SET_USED(action_flags); + memset(masks, 0, sizeof(masks)); + memset(mask_conf, 0, sizeof(mask_conf)); + flow_nta_build_template_mask(actions, masks, mask_conf); /* The group in the attribute translation was done in advance. */ ret = __translate_group(dev, attr, external, attr->group, &src_group, error); if (ret) -- 2.25.1