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 9CA1F44145; Mon, 3 Jun 2024 12:53:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA01D42E6E; Mon, 3 Jun 2024 12:53:18 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2081.outbound.protection.outlook.com [40.107.212.81]) by mails.dpdk.org (Postfix) with ESMTP id 2C72142E6D for ; Mon, 3 Jun 2024 12:53:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gouz2iy+qR6TfN7MHg0IMYWV9JauUjGpQRfSUG+hEwaqlGoznbna0UjYXivZUs0oARcQ5ws72RGc3nogRElT7eCQfO4JeSiSo88AAlvGpUGk9qHYVGAcC17wE6jW/92OH1Qok+WcOqtJF2rKUdAh/ncEe9syRESBBbDRjtpWkl/j2ym8U9PDKuhGrm3PWk/xSLt7ak9YqrOBGgksUvnDulIK5Aa9+NR4G2i8hlUFVi7NUr3y9Qstvwj8J0l8hKuYDoohXzfsdzBChcczhQamw3wFZOuArd4mWJnSbNDkKxaHTFzC/+pMMvSe957sfJhD6tkabt5qcp4xemYRa4mQGQ== 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=eTmRG8XiaMIYmOuNA/bxCU2dNHwu8M5q7JiM0hmbsPM=; b=dGg1Msf5BIV3UqIsKQsdDVHUgfHHS9zpoI0VQRVaJgxaz+4Y8K8Vdk/WnzwrKYqT55AgN3hRHo9I6lxm+U5XxT3P6JUX1yW0nUAqVpwVEkKPS1woiIsDmyWLVxaA5MBVnJy0THw8q5As77aG5XyWs0wIgZ0nV/w2qvXDP2HimwBhHhJ+6SAcnHaWzC6nInJwzl4mZWpKMUnK8zfu30SdPwVabi11Jzo/4tKqkjgCYNO+mgABZD7zbVqc1C4xHH7kIi9Wy2gCP6AqCq/3nZKfgkqVaJ+7ftJkPSrF1Bq0Ffyf/IFn2DJVAWOyu4rks9CNkjRkvlZlyfUY7SjlLmbCSw== 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=eTmRG8XiaMIYmOuNA/bxCU2dNHwu8M5q7JiM0hmbsPM=; b=sJCD/RQk6Rv71F4HXfIEpn2Zm968ot3Vnr7MEbFp1wsxJIe1zTh4nRB55yJLLfo+OVfu6KYpyonLeT3adJ2Im91Zhq6UOBqvEpuoEl4NfoPD/Ez557zprc8mChDttwEwf5Fqi2DqiFpzF4CPsIdwGdSM5dWeUVvWgTVOSZa3eLByxuyLk6ii11OnobmixTBvjvAOFoiPy1VIVxidNBMJ9EHhsx1FgGCbLZnz8XxqomfEVgZns31gYwUH4WlamocrXxdmcCD5hDzc3CwHC8eQscfqRZPhnWezEO74mUVTsR8YfP8++eXraqhSchFGl2MvqGgF+48g/6tzps6jItZheQ== Received: from PH8PR20CA0011.namprd20.prod.outlook.com (2603:10b6:510:23c::14) by PH7PR12MB9067.namprd12.prod.outlook.com (2603:10b6:510:1f5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.24; Mon, 3 Jun 2024 10:53:12 +0000 Received: from SN1PEPF0002529E.namprd05.prod.outlook.com (2603:10b6:510:23c:cafe::ac) by PH8PR20CA0011.outlook.office365.com (2603:10b6:510:23c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.30 via Frontend Transport; Mon, 3 Jun 2024 10:53:12 +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 SN1PEPF0002529E.mail.protection.outlook.com (10.167.242.5) 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 10:53:12 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) 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 03:53:05 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) 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 03:53:05 -0700 Received: from nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.180) 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 03:53:02 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v3 5/6] net/mlx5: update HWS ASO actions validation Date: Mon, 3 Jun 2024 13:52:40 +0300 Message-ID: <20240603105241.10482-5-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240603105241.10482-1-mkashani@nvidia.com> References: <20240602102841.196990-1-mkashani@nvidia.com> <20240603105241.10482-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: SN1PEPF0002529E:EE_|PH7PR12MB9067:EE_ X-MS-Office365-Filtering-Correlation-Id: e0ef6550-8294-4e46-9645-08dc83bb5d34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|82310400017|376005|36860700004; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jbVV2bMBExRW1K7RaJgw/yYqyX2iwm+b7KA/o8jhVvRvvPJ3oJ/BrB/3T25z?= =?us-ascii?Q?+pBDvqONX8CUIw+HP1BxlWIEJhGx1Ng42RXzdAqBEEipo3rmwVOzttGankAN?= =?us-ascii?Q?cxw4RadTR37vz0y9arfnKKLkk+sWCAzAzGIF/+7OOM1JGdKvGPWItFy4osCM?= =?us-ascii?Q?EXwBrpfGbPpGCnxZG2SvS7oDEnEvRqa/jnGLhwc0ZzBBy1M5cXlML1TL/dJZ?= =?us-ascii?Q?4uxkk8OsUuc3bW0A1eGMu5cUnUjkRYGSJlX+N8uH2mHijI7ZiN8p20uHR4mu?= =?us-ascii?Q?siifuvFQ5sfJqEXMV8EJMrwBPCh/Czqa7WPN0ekJMUBTI//t5QeWPUkN4Jpw?= =?us-ascii?Q?wLUuJE1WKlJN9e94gLoeZaMetP4goHPN/fmkyA0PNPsQM7ozs2mw4ieZrIKO?= =?us-ascii?Q?BKyiGw5TLtRqhrZj+D5zgk6ZWGpm6updIZ2ociTpRoG3+K4IxHsNmiV51SEg?= =?us-ascii?Q?gGk16LsAdTskU/FhTLtA79bEPwSMPJpez7utVa6gceeQ3NBsAcWI3GSKLzwW?= =?us-ascii?Q?KqnaVAkLwT/GVh3SadU/PGowT7nDyRWcW0qRYipM1zHm2GF3oWxp+/A6fjof?= =?us-ascii?Q?OL2+YAy/csLintxzcqRh8sXukDwgq4CweJFJReUVridW4TGLjuaCCw7NZkGT?= =?us-ascii?Q?9PF3VIjcB/rJD9OHilfHpLnMlN6WUykjJ91ohrddJebmzRw1yfyIIItRV4f0?= =?us-ascii?Q?VMUXXk/JYEy88j2Hwm9T8SgWjm+R7XilcYIse30eBP61PTmzmy7XJsNgfzcp?= =?us-ascii?Q?Er4JKbU9RMQuaPpYS4sH3Xsy4+LA1scRpt8tx2AyZWDnbAUdN3cYYK+cB8S8?= =?us-ascii?Q?ecom60rH2QM8JM8wf5Jt1j4r6Rzf4Cwtg/8MQtHjf/NMuIGr3WoBYjPOFgV5?= =?us-ascii?Q?wM0EHUGJzgzaHrgzSYknemlyaFnPByhBYojdu1CUqP1az8NQkWRF19ylMRy2?= =?us-ascii?Q?w53MyrX7YwTnL2u6phCsFFqyRceaIOmJhmliytaLnWRQQay5FvtYTauRUT/C?= =?us-ascii?Q?ECQkCNkb8BJ3o4v0Pw6mj70a5TmPuQIikP8a/Y7WRpIZzjsbbvnJT0AmDDGN?= =?us-ascii?Q?ZSBIVQ38nK+Hgd5T9dvesRckMK0pPzmNYiSR5E6QE9kX0Fh6QA7bPmVnOL5R?= =?us-ascii?Q?njcjPpiiW1FUK5eIddcukOja/zRgLPdZfcEarpmJAhrLIn5PrR4BnGrx+poQ?= =?us-ascii?Q?TbhGMT6vp0GunujvmKPiWszZ2vo6+kLVlPH6aGELh21mxIxMAPHv0nOaV1YI?= =?us-ascii?Q?+vXQYncQbM3FQR4ymjnm/ZHPYfPOl+uwZXc3ueZisarclqQXlcfdw6IO5q1C?= =?us-ascii?Q?PzFDM3cVZm/vjoQTpLIMmfngZd+jMo1Tp3qHQFIlqaj0W+xEuGFiQKvum0NW?= =?us-ascii?Q?nPYEylFLhd/706RZEOynZOBo6Scc?= 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)(82310400017)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 10:53:12.4212 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0ef6550-8294-4e46-9645-08dc83bb5d34 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: SN1PEPF0002529E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9067 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 HWS ASO actions validation required PMD to allocate resources during the port configuration, before the action validation was called. That approach does not work in the HWS non-template setup, because non-template setup does not have explicit port configuration procedure and port allocates ASO resources "on demand". The patch assumes that if port did not have ASO resources during action validation PMD was configured for the non-template and allocates missing resources. Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_hw.c | 41 +++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index f2ed2d8e46..66e0b46f9b 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -207,6 +207,11 @@ mlx5_destroy_multi_pattern_segment(struct mlx5_multi_pattern_segment *segment); static __rte_always_inline enum mlx5_indirect_list_type flow_hw_inlist_type_get(const struct rte_flow_action *actions); +static int +flow_hw_allocate_actions(struct rte_eth_dev *dev, + uint64_t action_flags, + struct rte_flow_error *error); + static __rte_always_inline int mlx5_multi_pattern_reformat_to_index(enum mlx5dr_action_type type) { @@ -11361,25 +11366,31 @@ flow_hw_action_handle_validate(struct rte_eth_dev *dev, uint32_t queue, RTE_SET_USED(user_data); switch (action->type) { case RTE_FLOW_ACTION_TYPE_AGE: - if (!priv->hws_age_req) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - NULL, - "aging pool not initialized"); + if (!priv->hws_age_req) { + if (flow_hw_allocate_actions(dev, MLX5_FLOW_ACTION_AGE, + error)) + return rte_flow_error_set + (error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "aging pool not initialized"); + } break; case RTE_FLOW_ACTION_TYPE_COUNT: - if (!priv->hws_cpool) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - NULL, - "counters pool not initialized"); + if (!priv->hws_cpool) { + if (flow_hw_allocate_actions(dev, MLX5_FLOW_ACTION_COUNT, + error)) + return rte_flow_error_set + (error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "counters pool not initialized"); + } break; case RTE_FLOW_ACTION_TYPE_CONNTRACK: - if (priv->hws_ctpool == NULL) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - NULL, - "CT pool not initialized"); + if (priv->hws_ctpool == NULL) { + if (flow_hw_allocate_actions(dev, MLX5_FLOW_ACTION_CT, + error)) + return rte_flow_error_set + (error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "CT pool not initialized"); + } return mlx5_validate_action_ct(dev, action->conf, error); case RTE_FLOW_ACTION_TYPE_METER_MARK: return flow_hw_validate_action_meter_mark(dev, action, true, error); -- 2.25.1