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 309844240B; Wed, 18 Jan 2023 11:31:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C1FB400D6; Wed, 18 Jan 2023 11:31:44 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2055.outbound.protection.outlook.com [40.107.92.55]) by mails.dpdk.org (Postfix) with ESMTP id 9DC2A4003F for ; Wed, 18 Jan 2023 11:31:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LS4SB4aupGdFL4IjKYDo9EgUs562gsU5LOBe3WHK+NAmwtsF7oB+oXhucc63yV23qf8525gPyfea0sNfyifkl4pkQC+8LahH71xmpYPieIF1Yy4zS1TjIsUAOkPU2a5w1LLNupkoydcIGNyMjM96XnlMWnd+s2UXQbnTrvqEzrbTbMe6E626fQd8PciRCDp5Xhws5/c7ulxMMQC5WsreTEBP6epaI3oxYXwot7pZ8dFm4Z0G+WUuPBf5ZFANTeX6V+THsDDk/lX4de0gQP4gtMtOuHKZ32xUcFqOW7g6MqPthKYRcXK4C5sLeIoWKNpey4YfUuU2l7C2lrNGozrugw== 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=93cBhL3lY10REmB1jYbKQTTI26pYuSVsn+wJtRLTlUw=; b=lbzXrONIhlJ3r+edSqEZJGQiQDnBiu6a/lP2skvf6Tq4EOCYzp9K4sG+5/ivLe5BpWADvQCUrWs2KnJncXkaI7Jsi0JYENkh+W/hHO8TOcbqCzdjW7senntMYKxb3aRuTEYtzvwMlQnCLOJVxuIF+ao4V/8PLO+d9os7CRwv/9Hl3ak7pBbPlfeYMYHN7vNIZSXXWTTRPDi/dJ7R8XK0CB0MY0PYuY8rKgPB0jdevV4Y8ut/jrjtiktlIhOMaBIFpbAoTaFyOBu5RdEE4wjBwH7QyURF4sCltmkQXgive5xiaCBVQ8kyktL1gUk2ov94fc2CfBvnfRUTvmRmAEvXgw== 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=93cBhL3lY10REmB1jYbKQTTI26pYuSVsn+wJtRLTlUw=; b=orgrat5awULnpC85fqFDPLg5qqjwqVeC+jdYubwbNpaazNuz7IpK3E1KapKXWkk3hIGKvmKq9BcfB6HwblOPLK9uKM7ReBl8lCwFBPYCm0SmoQfgpPEqy0bwvWKjsce11mEvJOS3T1dIu5dYKh9XpZcQjAR49SU/pFZivQfaBpEQW6dQIDMEUZIVYQSE4idIi4EdoAnw1KvUmMuOeyQFPtVapmERbAvaRKh8YLzIDcP2YdxyqGTD2VK7B8trBhHnrO/II1YQYoN2MB5jqD15/FmMtMwIMBRf+9lK0HjrPoEBVv03fFcvyzzF9CAwNoQ0WQEc9Yu41pEQjn+TxGEWGA== Received: from BN9PR03CA0677.namprd03.prod.outlook.com (2603:10b6:408:10e::22) by CH3PR12MB8209.namprd12.prod.outlook.com (2603:10b6:610:123::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.13; Wed, 18 Jan 2023 10:31:40 +0000 Received: from BL02EPF0000C407.namprd05.prod.outlook.com (2603:10b6:408:10e:cafe::a1) by BN9PR03CA0677.outlook.office365.com (2603:10b6:408:10e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.19 via Frontend Transport; Wed, 18 Jan 2023 10:31:40 +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 BL02EPF0000C407.mail.protection.outlook.com (10.167.241.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.11 via Frontend Transport; Wed, 18 Jan 2023 10:31:40 +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; Wed, 18 Jan 2023 02:31:26 -0800 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.36; Wed, 18 Jan 2023 02:31:23 -0800 From: Gregory Etelson To: CC: , , , Ori Kam , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Subject: [PATCH v4 1/2] ethdev: add query_update sync and async function calls Date: Wed, 18 Jan 2023 12:31:08 +0200 Message-ID: <20230118103109.4052-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000C407:EE_|CH3PR12MB8209:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c5a79ec-6eea-476d-06c1-08daf93f2fd7 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: SXsHO0ND3siRjQeD9enbRPBNpbU2fU9rKAc6LjvIUG/eDVH98VRp5dasmMvqIpxn0UR3aRZ7M0dQritGskUEzhlD/lzbV3Fma3oSUx9A8orSBeQcExWXnx9cnIYJTib0fIrUZAEKNwnz3qW/52hzrTUpX4CPjGk05XJEEx9iCRYcQCo3AJFJI0qizb13vAaoqQriHlgpfJwg7HPz+ominaraOw56/d1bAqk50Zu4WuBx3+akMuHofi0r2k4WAqo5fSlafHFWlv93HFNMUDJagSAPyhyM160c+MkUAkhDGU9yFbr2muSmqA+pylEoWqWxvW7ovYdZKmkV+esyDs24PjMLwFlQoOCYa3A9/3c3uOquYth1v145O3knsQ8pSkJcBTlUItQs58UvT7HJLpGV5bwZE5rA+tlljrq+aGEiujG+FfQR/fd3LV1NjXbC/jWmGjEW8OBqhfi+vfasNWz1xQDJOk1/ZJDzIQmvLupdY6k06/FPrwPQaELigrzoUl256YoYmmX7uQ0EevT1Qhy+UUTefZ3sR8xes8JZF3DjHGXOV/kYPKcbXQZrxH492G75ldOkVTLB5OG7kLPGPm1Pk4yRCYkjZ6EAubh7B5Afv+PxhZm9ceNfAAEP+E45W34X4g4FLjRHGl34kC1d6cOVv4Dbw4YZHjtNVljzJuBfLEl8Bvs+2IhnwzkPDisBj359HgF0N0xMs9U8GyjDi/Lu2A== 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)(376002)(136003)(39860400002)(396003)(346002)(451199015)(46966006)(40470700004)(36840700001)(1076003)(54906003)(2616005)(7696005)(70206006)(4326008)(336012)(6286002)(70586007)(186003)(26005)(6916009)(478600001)(47076005)(8676002)(426003)(8936002)(83380400001)(6666004)(5660300002)(41300700001)(2906002)(36860700001)(316002)(7636003)(356005)(16526019)(86362001)(82740400003)(40460700003)(40480700001)(82310400005)(55016003)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 10:31:40.5035 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c5a79ec-6eea-476d-06c1-08daf93f2fd7 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: BL02EPF0000C407.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8209 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 port hardware allows both update and query in a single operation, application still has to issue 2 separate hardware requests. The patch adds `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. 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 rte_flow_async_action_handle_query_update (uint16_t port_id, 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 mode, void *user_data, struct rte_flow_error *error); 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. RTE_FLOW_QU_QUERY and RTE_FLOW_QU_UPDATE parameter values provide query only and update only functionality for backward compatibility with existing API. 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. --- doc/guides/rel_notes/release_23_03.rst | 7 ++ lib/ethdev/rte_flow.c | 39 +++++++++ lib/ethdev/rte_flow.h | 107 +++++++++++++++++++++++++ lib/ethdev/rte_flow_driver.h | 15 ++++ lib/ethdev/version.map | 5 ++ 5 files changed, 173 insertions(+) diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index b8c5b68d6c..0f13c68578 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -55,6 +55,13 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **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..8b8aa940be 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -1883,3 +1883,42 @@ 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) +{ + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error); + int ret; + + 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) +{ + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error); + int ret; + + 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..817a2fabef 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -5622,6 +5622,113 @@ 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_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 update. + * + * @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 update parameter is NULL the function queries indirect action. + * If query parameter is NULL the function updates indirect action. + * If both query and update not NULL, the function atomically + * queries and updates indirect action. Query and update 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 + * Update profile specification used to modify the action pointed by handle. + * *update* could be with the same type of the immediate action corresponding + * to the *handle* argument when creating, or a wrapper structure includes + * action configuration to be updated and bit fields to indicate the member + * of fields inside the action to update. + * @param query + * Pointer to storage for the associated query data type. + * @param mode + * Operational mode. + * @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. + * - (ENOTSUP) if underlying device does not support this functionality. + * - (EINVAL) - if *handle* invalid + */ +__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 + * Update profile specification used to modify the action pointed by handle. + * *update* could be with the same type of the immediate action corresponding + * to the *handle* argument when creating, or a wrapper structure includes + * action configuration to be updated and bit fields to indicate the member + * of fields inside the action to update. + * @param query + * Pointer to storage for the associated query data type. + * Query result returned on async completion event. + * @param mode + * Operational mode. + * @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. + * - (ENOTSUP) if underlying device does not support this functionality. + * - (EINVAL) - if *handle* invalid + */ +__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..42f0d7b30c 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; + + # future + rte_flow_action_handle_query_update; + rte_flow_async_action_handle_query_update; + }; INTERNAL { -- 2.34.1