From patchwork Sat Sep 30 10:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132252 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 64E8E42682; Sat, 30 Sep 2023 12:02:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0482E402E0; Sat, 30 Sep 2023 12:01:50 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2105.outbound.protection.outlook.com [40.107.95.105]) by mails.dpdk.org (Postfix) with ESMTP id 06B9B402A5 for ; Sat, 30 Sep 2023 12:01:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yeik+Eg6AQNpB1cdzDbo7CVNoF9Uxna+NCQmEJ0F4GZBVKZ1ZR3KGq2kMKHsGonQ3uRR0odqjQaTKMg1wb1UJvqpXuYBX43zu0Cfeaw4FPwyGrlw8u5YOgOjAOHCEh/0vB06STaNFQUStkgCTzWxsOmaSEASorZAeKRPVolEGM8ADRG2a9CKl/bOexg0+g/RvwrAtTnpOfc8kqDopdcApSaRqHmA+eUCTADGfVyB/eAsQldonksvOKPIK9oqgA8HTDG0oAW9cF04HHWopEgwwjIRC5nzRC45HCuuY3Rr3IyDOwzGiNnVxjw7DTnK68yLo0FYKXUzLYiqyjbh/lkAEg== 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=nu5vyg3p7qlR+z6XxZg0v5fC/+HDR7qNkWZGvwSYqdM=; b=XYpkE83ehrSa2VBezvv8KHZQ8e8syA0TUzSPhTNO4askRRsInVweCrnpfvf9vz3hCnVMx2wk4cRxj+YLUndIMFSRGx1CpxblYPRkmLi/u+WX4SDuJofM6qYCKc8BML7IK0OkG5PEJdFrcR0fKIcEykH5BIpowc2zrzj5I/ZY1GtcK7W9scVz7KaZfVCG8+9nHLBNn451KdwREcBQ5PPgULZWhfbY3WiqkqHUU2qXQAlJttIqrk6KEnjK08/q6rFOBRqU2+/pG5s+rPGljKGbgL7w6ytBMOdnSrCGmAr56wF+Y8AIi3Ip9CUbZpZXP6g/U52CBsLnn8JMcn9iRNa7RA== 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=nu5vyg3p7qlR+z6XxZg0v5fC/+HDR7qNkWZGvwSYqdM=; b=uwWypEQTyiVuaJlN3+eVsp1jMlH6roB42cZzhv54r3Vry56vzODIO2UkXFh6FPFesLyOmM4bSsOnDgFW44qdrhBaqTP5FZIcpkbbO3+P++INKtd/0kckr3FOmsU+Q+jWj172idcarppZL/a4lqikRnSHlFL7DaYDH565BaaVwaI= 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 PH7PR13MB5429.namprd13.prod.outlook.com (2603:10b6:510:138::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.21; Sat, 30 Sep 2023 10:01:44 +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; Sat, 30 Sep 2023 10:01:44 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 3/4] net/nfp: add call to add and delete the flows to firmware Date: Sat, 30 Sep 2023 18:00:52 +0800 Message-Id: <20230930100053.1227215-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230930100053.1227215-1-chaoyong.he@corigine.com> References: <20230930100053.1227215-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH8PR22CA0022.namprd22.prod.outlook.com (2603:10b6:510:2d1::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5429:EE_ X-MS-Office365-Filtering-Correlation-Id: b734fbdf-6087-4e7c-433d-08dbc19c402c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rJrZ5tF8qTChfiSr2NshN6V6nPx2Cbmtv2yqJiaUN70XVB6uJhciNvqcHUnqZLtDOHTHChE2Gu+HX+/2qmNJ7T8nCaTMbJV6d2q8t3ZtEODB4HkhYhDV1T/LaRuFMAf6yWhPny22mfzgFaikG3QbEjoTpGFW0szUzsZ/s4U+BSrwnhUUU4tA84cVimkjXccKsflFGUXDRs+plUSc1Kada9BRmwL6C5myZOXfxLPjUBhin0i53W9aTcwAMAXfUuZme8bToiNVwRz3iHf7TmVDaW0w0o12iI5A+hnnPc5mDbro/1OSUBtLXVYgbdFaWUcgThPJNcEK8A282gjZ8TKUVtd4GdvmXV36gR01+vF3+5mTa0pMwOa/a5AfQBtVdv3UhlEhtcNEX9P9qivuja/ti+XXbT/617cNpsrdXXbjobL+4+q2OzdIULd0i+uvaPH4EieAuOXhxI6O43PX1JmHw0RMzzfnhMKL4oosYS3TLw+x3ofzYAZqkn9cdUdq3rBcfJnHF5zmF/UONYxPHs/DSfnLcOq+pl8cCpoUsEfH+H/8NY3cuTuAVYXJXflJRitPfUFc80LI2N9/f0LspV5j9AY/yjofUI3oGk2mcmhdUrpUXv2i/fNii6BejdkqtVOIqnLggGVG1RwIGw5+vqrEnuo/3HprhJv5eMNdcCSOIYc= 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)(366004)(346002)(136003)(39830400003)(396003)(376002)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(66946007)(6916009)(8676002)(44832011)(316002)(4326008)(66476007)(66556008)(38100700002)(38350700002)(86362001)(6486002)(478600001)(41300700001)(2906002)(5660300002)(8936002)(6512007)(2616005)(52116002)(107886003)(1076003)(26005)(36756003)(6666004)(83380400001)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rb2RK1wFKCHM+Mrj1xQlwN78cPHfh+lRnkySXh1zAPByAJDsq+yDyzMpZjBqbdj2e1oV958VeKWeGw+v7H17H50VAx36uMRu0EiQzTkCJWWklfLhwPEmUCGRy//QNjJRjU+4nZbJg/NVQSDy5Rp5YH4aGXUwSIme71Yhnf9f5iE6pj2F+fmgu4td2912bsWImWEINPZVl+CSIu6xbfdIkKbaBYPUzzL8+lixTRFVZWgjS3yHzZHU8w/EfnYLiez/SckxiDARxFz4/09ZoGAu3IRWWSCnDOcN0ZCa7Lp5tSUHadhSxT2724M2Yo8B7YJqPCtJZ2mYOM2OBhCKH6vi2GzreJplEks/gL/u2NzEiOeRIQc3cnz6g2WUDcviZemYfuCcrbGZi2qmB4yYwnoXzSrMZQsEzzR1U82qauGPW0+sEGxwjQhOiIvjM8GrHm2AsS/Wb47qsfjaHa6dOXeH7V/qdx5F4e2dsC6U4LCPfNQ5nWvocfqEt16qIR6EvpBJGJeGrGYv+Jf8rGh3hrY/BKa7Flt+rb/NyHKuzbrc54+l5K6FouaVATh1RL1WeDIKrbN49vYS7OAYoLsZ6zQlVXbIjDyPqeQAgS0GmZwXrninN9RRlXNUIPOMRKZsXnZSEplUbwPl6b7DsFih2DAszJiKHmqtwQpNbYJTZ3s6oyQAqLJOUKCK4dzkCt7jYTpEU5+II7usVn6SixDbsi8p4X9zgkOKIorfrMbX9Rq4Bjz117yfIyA3S0O5ASJLxHpoJuTXXvUVTuq+aXT0dNv9qCPB05b4XAZ6jxPWZA+HEwDnwIrgmppnN64iiT3gAyVzYUY/cqtYXTGOfadDTPtJl3Hbi0pNM9utN5dg8OqsHP5FDzo1GI/N2ImiY6/q/bCImUYlDjHmF5vm718KmEtpqCPJ2SI9QCu5LxUD9fo5rZSDs8fc2iyriIGXavpdbBbipBdyG7zY4mAGjuzIwi0kon0megBMC0Qaors2iCt9R5ktGKwU8WrTxtjymu60vGwrU0+f1EBfVNERwzLATD8kpoVy67hL6BS6e84UUWWh5HE6pvvznNE1OyhCBNQNswGS9RClVTi+lZtNztaD/Za0TG0BVKif6kId3PVh5kOX6CVxTC8s79xQZcVF4UI/51T7bZFmKI6PdSUebIDzwEmCPIkQX4i5a3YdWQgTk9EvdwHpiV2PO4I8zITk1mHhjzMUwSCWN8OAgeB0tTKyktwLLAmETMQIm9L+PGgBr4F2S1t3NgYjEFMBcTgOe+/r7f90exajMyLKKz4LcFzUTXPA4fyDRJOvPAWfzc8eg3pOvBPUk6o6/yCZwY9c/x7m7z1zDcmeVoL8st7dKAiwFdpmSc8Kic7pZF64OaO/n1fFCq5bwb0OTQlunM8gdjpiIVtV1JBGItA+ddo5bzJvWArP2CKxx4GSAgRIPldh6JpPr7cseVrKgCz1fYhvJ8H1znNRCtR+9ubdMAwf0Rb32Ftz756gMiVY3PTqFpgug1sN7XJBkZ93GqizdRU94iOt6vph/tNKweop2x9N52o5X6SAWXCtgYYvbp4fRUPffBaCoBLfYOEbTLMoJo0XRIzQzgiUvLal4MpxI/UssPi3dm3o/Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b734fbdf-6087-4e7c-433d-08dbc19c402c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2023 10:01:44.1785 (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: L7Da4YBK+ixpqDQyvFEtzvXPsb42kLpQL+oj1JDjeSwQPi4PUkhngIrKBYQa7lKFxRqYUXJ4y9T5bKstVxYAGFhu2O1kx96H9o1X5S64+uM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5429 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 24762de133..d81e2970fb 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; @@ -984,6 +985,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, @@ -1411,8 +1508,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: @@ -1499,7 +1605,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); @@ -1568,7 +1674,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) {