From patchwork Tue Jan 24 09:37:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 122465 X-Patchwork-Delegate: ferruh.yigit@amd.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 447D54247A; Tue, 24 Jan 2023 10:38:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D98CB40150; Tue, 24 Jan 2023 10:38:28 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2086.outbound.protection.outlook.com [40.107.93.86]) by mails.dpdk.org (Postfix) with ESMTP id B1C5D400EF for ; Tue, 24 Jan 2023 10:38:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mMvTngG2uKh51imMmke2l0UZJbxOwQMhHETrgx5KmKI3j3dKYHngE65Xi6e46C2j29tpWlz+EMXcQB7jXc0XDdMVi1XY+FqdMnEHfPsyGWwIzl6P5Bgi69CUL3xo4EY4OTUFSgPQX/Y/6oNFD/MmXaJzKCUh8iyyCCwW7YTQi1winb3qCidjlyXJbm/CARRawuB0xPRqGJT0a7zfmTJ3JCMQypLXP/eoIql4ckqwdYT7cpLsd2kZ9tk5txnXebfAOxdqyX1O/ReYqA/W3L0mxYjhNj7cqINi3wE4TBV0Avq7iQkjst/+iiqLWBsGG6oRw7krkuVme6OTDI9rYAI0Qw== 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=yoODDuBuHoFvWCcMFsqhcCUSKNGhIv/BK35hJfyK8pM=; b=lVD/un22uAD42mRmLrxQvzlYhJcEvPeQSpFNDUNTqx5KleIWUpA7jmxAgkgh6p5FQXAL1nkLAHrc75Z95aRy/4UT1aZJjyldbInVxcsdEZzp8hmy8JM4X6VS4BCw1u23AIu9lv6zMQOhYHf7Mb6M7A49CALb5cVEpncGhdpTwHf7g79ZuyzVGipenIkYdAKy1ZgHkip/R/61cbiH4IIZLr+lvccnnJrtMRFC85c65Wk75KzL9bhmSnspbVVeqO2gwAj634CK89HVbSYamYrDk7EjL3Y+GYkv32dBn4UuN2wPJx04gxyyGV/za9Czq1bn5/N2TUe/xRl3AXJjXpdRdA== 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=yoODDuBuHoFvWCcMFsqhcCUSKNGhIv/BK35hJfyK8pM=; b=sBpRUwEoVStAX06PbBDiwWNiyazXdl8/CSbwtpctjRP58F4cSPcrBA228eY0je71jomS0AnZ12CafJl7Fhl+ku2SQ2ZlojXNQjwMrPHgVC4pd/UITsXR8v4kf4GAao7RglMk5OlPEEXfZnLvC2TrgpNbp48ec3fu/9EyiPC02P0CxN3KLjA0J9CulI80zj1m8R/ZxjjNQNueO4cZJ1b8APjZnaIe6zVrpxpWzS8lo2XFj6mzIVRKCj/JIzcPBD1Td7lt1GejkJ97NZxDghF3+TGD66tHN9sCnqhTPHWE5wkK/6c199qvS8Azcg0fZAL8VVeOirseDYVUrFaT/MyoNA== Received: from BN9PR03CA0578.namprd03.prod.outlook.com (2603:10b6:408:10d::13) by IA1PR12MB6532.namprd12.prod.outlook.com (2603:10b6:208:3a3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 09:38:25 +0000 Received: from BN8NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10d:cafe::4a) by BN9PR03CA0578.outlook.office365.com (2603:10b6:408:10d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33 via Frontend Transport; Tue, 24 Jan 2023 09:38:25 +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 BN8NAM11FT036.mail.protection.outlook.com (10.13.177.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6023.16 via Frontend Transport; Tue, 24 Jan 2023 09:38:25 +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; Tue, 24 Jan 2023 01:38:07 -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.36; Tue, 24 Jan 2023 01:38:04 -0800 From: Gregory Etelson To: CC: , , , Ori Kam , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Subject: [PATCH v7 1/2] ethdev: add query_update sync and async function calls Date: Tue, 24 Jan 2023 11:37:49 +0200 Message-ID: <20230124093750.2472-1-getelson@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221073547.988-1-getelson@nvidia.com> References: <20221221073547.988-1-getelson@nvidia.com> MIME-Version: 1.0 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: BN8NAM11FT036:EE_|IA1PR12MB6532:EE_ X-MS-Office365-Filtering-Correlation-Id: f4ae12e0-49d4-428e-d08b-08dafdeebdbc X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cJ70jfCUbsLAp0LFrrhMWm8sP0oTJce/thJpZMwh8sfHDeNg68hwIgP8I4KIYOL0rWQyiM4BzDeaEQjDIWwB0rPJm3GeWBRyz5YeOP/2KUPtH1iWLjCZQ2iRGxTDmERE1QSrqppQ1KbVpH02cAHXBgDymnn34A1JvenBfymMnkW5xIPMGwnmGQndn3ry3KUEqlnoFH03GAJxYoDP+6n5DBjAiNBm9u7ibkTapXFnDRoSjtQjwZ7s44ALgsTzwYEpnYjVMQISqwXf0bj6EbvK/DteY0imoxeL6JUpwv4TfwLe4cl7TNoGNDNLWKVYBE+H/zR2ap/Mo3ECJCo3goSqlRuc6skwqHih2TQxf7xEMOcfGaVS6+QZ3hjxc+vTDvtDDa/cC6HXCFoiGLSkCpy+zBosZqyFWoIXHu7krpgK8MzqdikNNCVsMJB49LHyS/YO95q5K1iZdU/I1aaIakBpnR3Bqw3rv5uVfRM0Yy77WSng6m91w9pSFl7/8oPuc5uiAiF8Odd7OMvAU0aj9Ki2tbcFxLi8pdmYbLbiW3Mvirh6Jzl1HZTyr/aBdOvDXlr0Ph6eJ9qjI/5VtzFkvLZYBsyeWeHxhYSpRhUC62a8N+5qOZ7jN+53jeYcr3tOBV2IulvCQ7bJyJieFmK2I/46zk/ubaRug7Sq/r5GmlVEnbOcAzBzNALiN6D2O+dUvTrGx+Sk0dpzBr8xN85xjPM3iw== 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:(13230022)(4636009)(346002)(376002)(396003)(39860400002)(136003)(451199015)(36840700001)(46966006)(40470700004)(54906003)(7696005)(1076003)(2906002)(70586007)(6916009)(70206006)(4326008)(8676002)(6286002)(2616005)(47076005)(426003)(5660300002)(6666004)(16526019)(8936002)(26005)(41300700001)(186003)(83380400001)(36860700001)(82740400003)(7636003)(316002)(478600001)(336012)(82310400005)(86362001)(40460700003)(36756003)(356005)(40480700001)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 09:38:25.1783 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4ae12e0-49d4-428e-d08b-08dafdeebdbc 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: BN8NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6532 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 Current API allows either query or update indirect flow action. If indirect action must be conditionally updated according to it's present state application must first issue action query then analyze returned data and if needed issue update request. When the update will be processed, action state can change and the update can invalidate the action. Add `rte_flow_action_handle_query_update` function call, and it's async version `rte_flow_async_action_handle_query_update` to atomically query and update flow action. Application can control query and update order, if that is supported by port hardware, by setting `qu_mode` parameter to RTE_FLOW_QU_QUERY_FIRST or RTE_FLOW_QU_UPDATE_FIRST. Signed-off-by: Gregory Etelson --- v2: Remove RTE_FLOW_QU_DEFAULT query-update mode. v3: Update release release notes. Fix doxygen errors. v4: Add returned errno codes. v5: Update the patch description. Fix typos. v6: Resolve merge conflict with the main branch. v7: Update documentation. --- doc/guides/rel_notes/release_23_03.rst | 7 ++ lib/ethdev/rte_flow.c | 45 +++++++++++ lib/ethdev/rte_flow.h | 103 +++++++++++++++++++++++++ lib/ethdev/rte_flow_driver.h | 15 ++++ lib/ethdev/version.map | 5 ++ 5 files changed, 175 insertions(+) diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index c15f6fbb9f..5b98e18032 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -68,6 +68,13 @@ New Features * With this change, the application no longer needs to account for the ``rte_event_dev_config::nb_single_link_event_port_queues`` parameter required for eth_rx, eth_tx, crypto and timer eventdev adapters. +* **Added functions to atomically query and update indirect flow action.** + + Added synchronous and asynchronous functions to atomically query and update + indirect flow action: + + - ``rte_flow_action_handle_query_update`` + - ``rte_flow_async_action_handle_query_update`` Removed Items diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 7d0c24366c..ece40e7877 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -1883,3 +1883,48 @@ rte_flow_async_action_handle_query(uint16_t port_id, action_handle, data, user_data, error); return flow_err(port_id, ret, error); } + +int +rte_flow_action_handle_query_update(uint16_t port_id, + struct rte_flow_action_handle *handle, + const void *update, void *query, + enum rte_flow_query_update_mode mode, + struct rte_flow_error *error) +{ + int ret; + struct rte_eth_dev *dev; + const struct rte_flow_ops *ops; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + ops = rte_flow_ops_get(port_id, error); + if (!ops || !ops->action_handle_query_update) + return -ENOTSUP; + ret = ops->action_handle_query_update(dev, handle, update, query, + mode, error); + return flow_err(port_id, ret, error); +} + +int +rte_flow_async_action_handle_query_update(uint16_t port_id, uint32_t queue_id, + const struct rte_flow_op_attr *attr, + struct rte_flow_action_handle *handle, + const void *update, void *query, + enum rte_flow_query_update_mode mode, + void *user_data, + struct rte_flow_error *error) +{ + int ret; + struct rte_eth_dev *dev; + const struct rte_flow_ops *ops; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + ops = rte_flow_ops_get(port_id, error); + if (!ops || !ops->async_action_handle_query_update) + return -ENOTSUP; + ret = ops->async_action_handle_query_update(dev, queue_id, attr, + handle, update, query, mode, + user_data, error); + return flow_err(port_id, ret, error); +} diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index b60987db4b..6705cb32af 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -5622,6 +5622,109 @@ rte_flow_async_action_handle_query(uint16_t port_id, void *user_data, struct rte_flow_error *error); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Query and update operational mode. + * + * RTE_FLOW_QU_QUERY_FIRST + * Force port to query action before update. + * RTE_FLOW_QU_UPDATE_FIRST + * Force port to update action before query. + * + * @see rte_flow_action_handle_query_update() + * @see rte_flow_async_action_handle_query_update() + */ +enum rte_flow_query_update_mode { + RTE_FLOW_QU_QUERY_FIRST, /* query before update */ + RTE_FLOW_QU_UPDATE_FIRST, /* query after update */ +}; + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Query and/or update indirect flow action. + * If both query and update not NULL, the function atomically + * queries and updates indirect action. Query and update are carried in order + * specified in the mode parameter. + * + * @param port_id + * Port identifier of Ethernet device. + * @param handle + * Handle for the indirect action object to be updated. + * @param update + * If not NULL, update profile specification used to modify the action + * pointed by handle. + * @param query + * If not NULL pointer to storage for the associated query data type. + * @param mode + * Operational mode. + * Required if both *update* and *query* are not NULL. + * @param error + * Perform verbose error reporting if not NULL. + * PMDs initialize this structure in case of error only. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + * - (-ENODEV) if *port_id* invalid. + * - (-ENOTSUP) if underlying device does not support this functionality. + * - (-EINVAL) - if *handle* invalid or both *query* and *update* are NULL. + */ +__rte_experimental +int +rte_flow_action_handle_query_update(uint16_t port_id, + struct rte_flow_action_handle *handle, + const void *update, void *query, + enum rte_flow_query_update_mode mode, + struct rte_flow_error *error); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Enqueue async indirect flow action query and/or update + * + * @param port_id + * Port identifier of Ethernet device. + * @param queue_id + * Flow queue which is used to update the rule. + * @param attr + * Indirect action update operation attributes. + * @param handle + * Handle for the indirect action object to be updated. + * @param update + * If not NULL, update profile specification used to modify the action + * pointed by handle. + * @param query + * If not NULL, pointer to storage for the associated query data type. + * Query result returned on async completion event. + * @param mode + * Operational mode. + * Required if both *update* and *query* are not NULL. + * @param user_data + * The user data that will be returned on async completion event. + * @param error + * Perform verbose error reporting if not NULL. + * PMDs initialize this structure in case of error only. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + * - (-ENODEV) if *port_id* invalid. + * - (-ENOTSUP) if underlying device does not support this functionality. + * - (-EINVAL) - if *handle* invalid or both *update* and *query* are NULL. + */ +__rte_experimental +int +rte_flow_async_action_handle_query_update(uint16_t port_id, uint32_t queue_id, + const struct rte_flow_op_attr *attr, + struct rte_flow_action_handle *handle, + const void *update, void *query, + enum rte_flow_query_update_mode mode, + void *user_data, + struct rte_flow_error *error); + #ifdef __cplusplus } #endif diff --git a/lib/ethdev/rte_flow_driver.h b/lib/ethdev/rte_flow_driver.h index c7d0699c91..7358c10a7a 100644 --- a/lib/ethdev/rte_flow_driver.h +++ b/lib/ethdev/rte_flow_driver.h @@ -114,6 +114,13 @@ struct rte_flow_ops { const struct rte_flow_action_handle *handle, void *data, struct rte_flow_error *error); + /** See rte_flow_action_handle_query_update() */ + int (*action_handle_query_update) + (struct rte_eth_dev *dev, + struct rte_flow_action_handle *handle, + const void *update, void *query, + enum rte_flow_query_update_mode qu_mode, + struct rte_flow_error *error); /** See rte_flow_tunnel_decap_set() */ int (*tunnel_decap_set) (struct rte_eth_dev *dev, @@ -276,6 +283,14 @@ struct rte_flow_ops { void *data, void *user_data, struct rte_flow_error *error); + /** See rte_flow_async_action_handle_query_update */ + int (*async_action_handle_query_update) + (struct rte_eth_dev *dev, uint32_t queue_id, + const struct rte_flow_op_attr *op_attr, + struct rte_flow_action_handle *action_handle, + const void *update, void *query, + enum rte_flow_query_update_mode qu_mode, + void *user_data, struct rte_flow_error *error); }; /** diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 17201fbe0f..628c486081 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -298,6 +298,11 @@ EXPERIMENTAL { rte_flow_get_q_aged_flows; rte_mtr_meter_policy_get; rte_mtr_meter_profile_get; + + # added in 23.03 + rte_flow_action_handle_query_update; + rte_flow_async_action_handle_query_update; + }; INTERNAL {