From patchwork Wed Oct 4 09:36:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132296 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 BA5D44266A; Wed, 4 Oct 2023 11:36:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CAF2406B6; Wed, 4 Oct 2023 11:36:32 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2110.outbound.protection.outlook.com [40.107.243.110]) by mails.dpdk.org (Postfix) with ESMTP id 2159D4067A for ; Wed, 4 Oct 2023 11:36:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fYpJk0F/OkOLiRuajf3tpLdwBkirquNiP9O9Y18mcZBKBNivJDycEN8iy+pKoqnuhs19N7IIxnMJ/9lNXnk0tqMehTIsc/s26qx8I8zJgQssSLrJDPHXQ7Xivkf6XWx1Nz0d0aa1LYTT0aKD978FOHvK0YCWezOYREDjfypM8JXzKEawrUSJsHPmxpds0U96wUz2txA5Ch1E1fUe83aAvzEBhwYhFd8CmlZeq9/55+TU5KmrZaHfJ/1E+UGLctCXDoZzUdrVut6tYWq5MD4oqkZY1RSDwmth4bpe33wKXrB6pHBswoOVuBVQXNH38L2AqNKVsGGOOMFXamuoWhMFaQ== 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=kktQzHSkKJnpIS7fknVTMn8YTtZcsBlVonTrJNqMvOA=; b=L8GqZGIiEjFXSc06TMmBBQPVnlkX/HoBr8KcULpg4nnyIMGtjpjEKTUSRONCHscpkPIPrseh4T4uPPvomWqOIBuPfa+QV1ljgO4nuXqpWbd8ZbAt2r0DBne19T/Xs60DqFcUEENH7CUniFYdGP0CzZlIoYfGtteCx/WsEzkNT2/9Ak1J0GRNE1Dz2ctEP7dbKwW1+eF9oAHOMlMYYU8lSoUeQ1sDgV9OGKzINtS+1NSHq3ek5tL9xfSu98WG+Q4HN6U4L1ftOCVnWQNpnoYYeMmtJgwdLN16M1fpCshxg9vyRxG6EU1LKvSgDYEabcoZg5VMgvtS/q4DZzXqir0E2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kktQzHSkKJnpIS7fknVTMn8YTtZcsBlVonTrJNqMvOA=; b=b/tCou/OE1LcQxdGPGbfOL1DCGOBeAFTSPE7fDoH141g09NE7WamO4tRuQ+rLwKS3O69fekymVyqBRPBTQiYHFrYo19IAVTXoaZI283NBfvwHj2+RgCOHwfP359CUzGTA5w/sHhUL2v9Nv/v5t1djdIuUma76Z/lZlpcyeC6LH0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by CH0PR13MB4764.namprd13.prod.outlook.com (2603:10b6:610:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Wed, 4 Oct 2023 09:36:28 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::28c0:63e2:ecd1:9314]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::28c0:63e2:ecd1:9314%4]) with mapi id 15.20.6813.027; Wed, 4 Oct 2023 09:36:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH v2 3/4] net/nfp: add call to add and delete the flows to firmware Date: Wed, 4 Oct 2023 17:36:01 +0800 Message-Id: <20231004093602.1278126-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231004093602.1278126-1-chaoyong.he@corigine.com> References: <20230930100053.1227215-1-chaoyong.he@corigine.com> <20231004093602.1278126-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0080.namprd03.prod.outlook.com (2603:10b6:a03:331::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CH0PR13MB4764:EE_ X-MS-Office365-Filtering-Correlation-Id: 8456cf96-7d31-4061-855f-08dbc4bd6257 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: av8sXW31Fd4X2alj+j18f+yb1T3lH3v1+2OTG8+IY33jujhnymGhTRus8N9v2apsp0hJ5fS32fbaMQMOGZ0kV4nr8AmEotzMCQQyK/HZXbROA3OLdCJhccQcARU/V3rivoLMldFLyuiQDI1uzjFaFsZO/+0I7zZBnt2u4qf+YBzQ5ObZ5rfCiKvPWBlpa7mAEd789cWwb0bt0CD96vuDEyXWPufkEqYb1QMwBhiUL6pqJGN4+8IU3AGviz3G3yStlLdnCqWtsDx3J+f/E0qO1rygj88yK4558pUWvKRABOfCDDqwyDccGbJbPlE4PfPJpV3/gNK1MzbXGNyQz7RX6pHoIyITz1E/kxGZP/TjqOJNbGnPj0o3LJIH2glYJMYPoQl9K3ueWzPemGzJH7qsrK4Li94NbhYT3kGFA8894EHGOvxwVohWzln50p1VguPL02WT5wdVMmox5yE/GAvYNqOYoNRyv6utoNKoeBSQ8m33qZCWlTQpz+eGcBB0yzmznoJMV6tiCPX5EQHJEJh6ipIqpvZt/EXtatEKUpwqEnAI1ToDQ3O8RajAZ6Ulz7dpiUlql7rUIU35iHEhF4yDcar0nrq+fuCyaKfpKJ7RzGku3BCDI+u7n6dXMEJ/6EnIqpvzo+3jwC/h7/2IWYropzE9SG7FeqavXff5GCnsHk0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39830400003)(136003)(396003)(346002)(366004)(376002)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(107886003)(41300700001)(1076003)(6486002)(52116002)(2616005)(6506007)(316002)(6512007)(6916009)(66556008)(66946007)(66476007)(44832011)(8676002)(8936002)(4326008)(5660300002)(26005)(6666004)(478600001)(2906002)(83380400001)(36756003)(38100700002)(38350700002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6DvujC3HTDzqi0Cs2t+inW2QTOZLln7pI0Ja/W+xd5E9t/UgMAmrqL2Dj4LHs0ThgQPCg8sEePuYGc1FNm7aVk6FhZDYYYLgo+rllNxHcvEmNE7S+1nzPqEsIcS/PdxeUvtIy9BURAHp0qidNWAiAaZIImEM2wvtnmD8peGifmN5JrkfcmkQOgc+k3Cmg0ACp6AibbUsorE97xPGgSbgf7D29rJulumUAtn+yVmEGd7e2NF4agYH4KN1suCP+ppmbXUnq41Nt1205Z8AdZ5UG3wXr1BkcWYjBR+8A+37rzI29xVRY/ZaWDzXd7QEv+YEfVJ47UKZvmmQofXtOxo6GpekRyHpJq8QQxewApDcGD/P3HIFJHKFBTt1hTBNFKNQTxEtKy8SjumtJtVBw021kQ8Q2EW3NCeS96/trvzmLNPx1/zmd1lqeh75f7OYxltJFprhF0lOP9oF5J4MB+OuAAV+ZtcPE6p277fxgl8Lbt3EVWH07Xw7pOCtcATI3Qefhayu6KohBuIM2W5Q+vWFvwKw5k7wMDcZodR1InEwCAlKVk5K3OPvtXeyr5vfdH3+t7YeQ0eCV8WVK6lXsh0LqJJNIY8KRy+0ilEC1zSg5Ez8IJZVoqHzRTwFbtz4q4sv8dr8fSo/gy3cXkiFd4as1kbWuIB0XRj/LCJPsgwQC3IlLm6IF+C9jsHfMI+q7t85+yTljHecASoFvCbFYj+wyG8P8cie8505v3Ay890DUXdOjzmV2gqltnKpnxbC8yYOiqET8jcNYzk/yzhDlaqadx9rM4Jl637JbUq10ipHMl3T/ZIYH2rwDfkFi4Pim8zcg6y642KTOXysUlZ35OTSe7uaIjkNoAdDc8MY97DWIPQIdCKeNcQuBJNfTaQ6SwF9NLh+ykBSRxE56cBzWNIx9yDzSTKZxYacEKeIvarljFfHKXFbgMmiS0shS0x8H4pQtGCdLgP2Qb2hSE+hHWIKEY6pcYy5HLW545wpZcpkwI/8l5XzLW/ZLbmDNQ7LJcCMYfLBqQ4YzIMkNLUdYVQVs86voItkOsJBEq41TETedJpfduTHQfwGmEhs2z1oH/+M6eBT+uhm9maupb/WQ2pisp0uS/FOFVU0DyGH7x5QYp9sDoBwB6hYRnRajXSUXMnVNSA/T8Fufl61bpdgsgvxVDnaghFH0VeuvyDsUkjgDrvxSsJXB67UbIuRlBvC2a6ZE9RAf5ZA8tefJYOh6Wn0BUjH+E+RzmNSdclpIa02QA2wu07KOwYpalqdJRUDX6YtrInUXbJV3SSaagdnhMPlzGDoorbtG0ql08hz50RIvJ1c34cI6nMYlRBjqrdQv++8ZpR5ncmNjdJ8CtcbnLaY+lMdgmJ+BlYfuRRETbCfMOE8XvtgUc64FOz/0X3T4i5rvFvPJ1sY69f8QwfS9Ea73Pr/XbVpVcZA9GqwAoYzhsfNGhvkeldBSsA2zBeu/VJk/XzxYTsyC/xc7/pApMhFUeCuEbjsv45fqDor9yMUClkhuMNAD0wxSjcjdp+grhg/JLk38yfnhxa3JsPPDZTbwSYK2neRN0hUsm45JDlNbLsqqR2lm7g74Q01g9KLqn7VaRQk5kIoFAxkxewBwOhJjw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8456cf96-7d31-4061-855f-08dbc4bd6257 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2023 09:36:28.3669 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Jl8QmpDAH03za8e0Rklp7xRXUiKXCI6UV8STvc1CvAhXB7Qamvg0jr2FutU+H/tGj4o5AX9vPe60V392U1dV5yzWHIPSB8ZQVDqwH8GkQEo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR13MB4764 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 Add the offload call to add and delete the flows to the firmware. Signed-off-by: Chaoyong He --- drivers/net/nfp/flower/nfp_conntrack.c | 112 ++++++++++++++++++++++++- drivers/net/nfp/flower/nfp_conntrack.h | 5 ++ drivers/net/nfp/nfp_flow.c | 8 ++ 3 files changed, 122 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_conntrack.c b/drivers/net/nfp/flower/nfp_conntrack.c index 4fa6fdff99..2ea856ebab 100644 --- a/drivers/net/nfp/flower/nfp_conntrack.c +++ b/drivers/net/nfp/flower/nfp_conntrack.c @@ -9,8 +9,8 @@ #include #include -#include "../nfp_flow.h" #include "../nfp_logs.h" +#include "nfp_flower_cmsg.h" #include "nfp_flower_representor.h" struct ct_data { @@ -59,6 +59,7 @@ struct nfp_ct_merge_entry { LIST_ENTRY(nfp_ct_merge_entry) pre_ct_list; LIST_ENTRY(nfp_ct_merge_entry) post_ct_list; struct nfp_initial_flow rule; + struct rte_flow *compiled_rule; struct nfp_ct_zone_entry *ze; struct nfp_ct_flow_entry *pre_ct_parent; struct nfp_ct_flow_entry *post_ct_parent; @@ -974,6 +975,102 @@ nfp_ct_zone_entry_free(struct nfp_ct_zone_entry *ze, } } +static int +nfp_ct_offload_add(struct nfp_flower_representor *repr, + struct nfp_ct_merge_entry *merge_entry) +{ + int ret; + uint64_t cookie; + struct rte_flow *nfp_flow; + struct nfp_flow_priv *priv; + const struct rte_flow_item *items; + const struct rte_flow_action *actions; + + cookie = rte_rand(); + items = merge_entry->rule.items; + actions = merge_entry->rule.actions; + nfp_flow = nfp_flow_process(repr, items, actions, false, cookie, true); + if (nfp_flow == NULL) { + PMD_DRV_LOG(ERR, "Process the merged flow rule failed."); + return -EINVAL; + } + + /* Add the flow to hardware */ + priv = repr->app_fw_flower->flow_priv; + ret = nfp_flower_cmsg_flow_add(repr->app_fw_flower, nfp_flow); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Add the merged flow to firmware failed."); + goto flow_teardown; + } + + /* Add the flow to flow hash table */ + ret = nfp_flow_table_add(priv, nfp_flow); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Add the merged flow to flow table failed."); + goto flow_teardown; + } + + merge_entry->compiled_rule = nfp_flow; + + return 0; + +flow_teardown: + nfp_flow_teardown(priv, nfp_flow, false); + nfp_flow_free(nfp_flow); + + return ret; +} + +int +nfp_ct_offload_del(struct rte_eth_dev *dev, + struct nfp_ct_map_entry *me, + struct rte_flow_error *error) +{ + int ret; + struct nfp_ct_flow_entry *fe; + struct nfp_ct_merge_entry *m_ent; + + fe = me->fe; + + if (fe->type == CT_TYPE_PRE_CT) { + LIST_FOREACH(m_ent, &fe->children, pre_ct_list) { + if (m_ent->compiled_rule != NULL) { + ret = nfp_flow_destroy(dev, m_ent->compiled_rule, error); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Could not alloc ct_flow_item"); + return -EINVAL; + } + m_ent->compiled_rule = NULL; + } + + m_ent->pre_ct_parent = NULL; + LIST_REMOVE(m_ent, pre_ct_list); + if (m_ent->post_ct_parent == NULL) + nfp_ct_merge_entry_destroy(m_ent); + } + } else { + LIST_FOREACH(m_ent, &fe->children, post_ct_list) { + if (m_ent->compiled_rule != NULL) { + ret = nfp_flow_destroy(dev, m_ent->compiled_rule, error); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Could not alloc ct_flow_item"); + return -EINVAL; + } + m_ent->compiled_rule = NULL; + } + + m_ent->post_ct_parent = NULL; + LIST_REMOVE(m_ent, post_ct_list); + if (m_ent->pre_ct_parent == NULL) + nfp_ct_merge_entry_destroy(m_ent); + } + } + + nfp_ct_flow_entry_destroy_partly(fe); + + return 0; +} + static inline bool is_item_check_pass(const struct rte_flow_item *item1, const struct rte_flow_item *item2, @@ -1401,8 +1498,17 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, goto free_actions; } + /* Send to firmware */ + ret = nfp_ct_offload_add(pre_ct_entry->repr, merge_entry); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed"); + goto merge_table_del; + } + return true; +merge_table_del: + nfp_ct_merge_table_delete(ze, merge_entry); free_actions: rte_free(merge_entry->rule.actions); free_items: @@ -1489,7 +1595,7 @@ nfp_flow_handle_pre_ct(const struct rte_flow_item *ct_item, } } - /* The real offload logic comes in next commit, so here just return false for now */ + return true; ct_flow_entry_free: nfp_ct_flow_entry_destroy(fe); @@ -1558,7 +1664,7 @@ nfp_flow_handle_post_ct(const struct rte_flow_item *ct_item, if (!ret) goto ct_flow_entry_free; - /* The real offload logic comes in next commit, so here just return false for now */ + return true; ct_flow_entry_free: nfp_ct_flow_entry_destroy(fe); diff --git a/drivers/net/nfp/flower/nfp_conntrack.h b/drivers/net/nfp/flower/nfp_conntrack.h index 149a3eb040..2f47280716 100644 --- a/drivers/net/nfp/flower/nfp_conntrack.h +++ b/drivers/net/nfp/flower/nfp_conntrack.h @@ -8,6 +8,7 @@ #include +#include #include #include "../nfp_flow.h" @@ -22,6 +23,10 @@ struct nfp_ct_map_entry *nfp_ct_map_table_search(struct nfp_flow_priv *priv, char *hash_data, uint32_t hash_len); +int nfp_ct_offload_del(struct rte_eth_dev *dev, + struct nfp_ct_map_entry *me, + struct rte_flow_error *error); + struct rte_flow *nfp_ct_flow_setup(struct nfp_flower_representor *representor, const struct rte_flow_item items[], const struct rte_flow_action actions[], diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 16a5c7e055..a6439679d3 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3911,8 +3911,10 @@ nfp_flow_destroy(struct rte_eth_dev *dev, struct rte_flow_error *error) { int ret; + uint64_t cookie; struct rte_flow *flow_find; struct nfp_flow_priv *priv; + struct nfp_ct_map_entry *me; struct nfp_app_fw_flower *app_fw_flower; struct nfp_flower_representor *representor; @@ -3920,6 +3922,12 @@ nfp_flow_destroy(struct rte_eth_dev *dev, app_fw_flower = representor->app_fw_flower; priv = app_fw_flower->flow_priv; + /* Find the flow in ct_map_table */ + cookie = rte_be_to_cpu_64(nfp_flow->payload.meta->host_cookie); + me = nfp_ct_map_table_search(priv, (char *)&cookie, sizeof(uint64_t)); + if (me != NULL) + return nfp_ct_offload_del(dev, me, error); + /* Find the flow in flow hash table */ flow_find = nfp_flow_table_search(priv, nfp_flow); if (flow_find == NULL) {