Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132296/?format=api
{ "id": 132296, "url": "http://patches.dpdk.org/api/patches/132296/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231004093602.1278126-4-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231004093602.1278126-4-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231004093602.1278126-4-chaoyong.he@corigine.com", "date": "2023-10-04T09:36:01", "name": "[v2,3/4] net/nfp: add call to add and delete the flows to firmware", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "a8bfccb30a070075ce8c256521f6756e2c7ee83a", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231004093602.1278126-4-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29730, "url": "http://patches.dpdk.org/api/series/29730/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29730", "date": "2023-10-04T09:35:58", "name": "support offload of simple conntrack flow rules", "version": 2, "mbox": "http://patches.dpdk.org/series/29730/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/132296/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/132296/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BA5D44266A;\n\tWed, 4 Oct 2023 11:36:49 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0CAF2406B6;\n\tWed, 4 Oct 2023 11:36:32 +0200 (CEST)", "from NAM12-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam12on2110.outbound.protection.outlook.com [40.107.243.110])\n by mails.dpdk.org (Postfix) with ESMTP id 2159D4067A\n for <dev@dpdk.org>; Wed, 4 Oct 2023 11:36:30 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by CH0PR13MB4764.namprd13.prod.outlook.com (2603:10b6:610:df::16)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Wed, 4 Oct\n 2023 09:36:28 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::28c0:63e2:ecd1:9314]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::28c0:63e2:ecd1:9314%4]) with mapi id 15.20.6813.027; Wed, 4 Oct 2023\n 09:36:28 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=fYpJk0F/OkOLiRuajf3tpLdwBkirquNiP9O9Y18mcZBKBNivJDycEN8iy+pKoqnuhs19N7IIxnMJ/9lNXnk0tqMehTIsc/s26qx8I8zJgQssSLrJDPHXQ7Xivkf6XWx1Nz0d0aa1LYTT0aKD978FOHvK0YCWezOYREDjfypM8JXzKEawrUSJsHPmxpds0U96wUz2txA5Ch1E1fUe83aAvzEBhwYhFd8CmlZeq9/55+TU5KmrZaHfJ/1E+UGLctCXDoZzUdrVut6tYWq5MD4oqkZY1RSDwmth4bpe33wKXrB6pHBswoOVuBVQXNH38L2AqNKVsGGOOMFXamuoWhMFaQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=kktQzHSkKJnpIS7fknVTMn8YTtZcsBlVonTrJNqMvOA=;\n b=L8GqZGIiEjFXSc06TMmBBQPVnlkX/HoBr8KcULpg4nnyIMGtjpjEKTUSRONCHscpkPIPrseh4T4uPPvomWqOIBuPfa+QV1ljgO4nuXqpWbd8ZbAt2r0DBne19T/Xs60DqFcUEENH7CUniFYdGP0CzZlIoYfGtteCx/WsEzkNT2/9Ak1J0GRNE1Dz2ctEP7dbKwW1+eF9oAHOMlMYYU8lSoUeQ1sDgV9OGKzINtS+1NSHq3ek5tL9xfSu98WG+Q4HN6U4L1ftOCVnWQNpnoYYeMmtJgwdLN16M1fpCshxg9vyRxG6EU1LKvSgDYEabcoZg5VMgvtS/q4DZzXqir0E2w==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=kktQzHSkKJnpIS7fknVTMn8YTtZcsBlVonTrJNqMvOA=;\n b=b/tCou/OE1LcQxdGPGbfOL1DCGOBeAFTSPE7fDoH141g09NE7WamO4tRuQ+rLwKS3O69fekymVyqBRPBTQiYHFrYo19IAVTXoaZI283NBfvwHj2+RgCOHwfP359CUzGTA5w/sHhUL2v9Nv/v5t1djdIuUma76Z/lZlpcyeC6LH0=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com,\n\tChaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v2 3/4] net/nfp: add call to add and delete the flows to\n 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>\n <20231004093602.1278126-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SJ0PR03CA0080.namprd03.prod.outlook.com\n (2603:10b6:a03:331::25) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (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": "\n 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:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n 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);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n 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": "\n 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": "\n 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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Add the offload call to add and delete the flows to the firmware.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\n---\n drivers/net/nfp/flower/nfp_conntrack.c | 112 ++++++++++++++++++++++++-\n drivers/net/nfp/flower/nfp_conntrack.h | 5 ++\n drivers/net/nfp/nfp_flow.c | 8 ++\n 3 files changed, 122 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_conntrack.c b/drivers/net/nfp/flower/nfp_conntrack.c\nindex 4fa6fdff99..2ea856ebab 100644\n--- a/drivers/net/nfp/flower/nfp_conntrack.c\n+++ b/drivers/net/nfp/flower/nfp_conntrack.c\n@@ -9,8 +9,8 @@\n #include <rte_hash.h>\n #include <rte_jhash.h>\n \n-#include \"../nfp_flow.h\"\n #include \"../nfp_logs.h\"\n+#include \"nfp_flower_cmsg.h\"\n #include \"nfp_flower_representor.h\"\n \n struct ct_data {\n@@ -59,6 +59,7 @@ struct nfp_ct_merge_entry {\n \tLIST_ENTRY(nfp_ct_merge_entry) pre_ct_list;\n \tLIST_ENTRY(nfp_ct_merge_entry) post_ct_list;\n \tstruct nfp_initial_flow rule;\n+\tstruct rte_flow *compiled_rule;\n \tstruct nfp_ct_zone_entry *ze;\n \tstruct nfp_ct_flow_entry *pre_ct_parent;\n \tstruct nfp_ct_flow_entry *post_ct_parent;\n@@ -974,6 +975,102 @@ nfp_ct_zone_entry_free(struct nfp_ct_zone_entry *ze,\n \t}\n }\n \n+static int\n+nfp_ct_offload_add(struct nfp_flower_representor *repr,\n+\t\tstruct nfp_ct_merge_entry *merge_entry)\n+{\n+\tint ret;\n+\tuint64_t cookie;\n+\tstruct rte_flow *nfp_flow;\n+\tstruct nfp_flow_priv *priv;\n+\tconst struct rte_flow_item *items;\n+\tconst struct rte_flow_action *actions;\n+\n+\tcookie = rte_rand();\n+\titems = merge_entry->rule.items;\n+\tactions = merge_entry->rule.actions;\n+\tnfp_flow = nfp_flow_process(repr, items, actions, false, cookie, true);\n+\tif (nfp_flow == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"Process the merged flow rule failed.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Add the flow to hardware */\n+\tpriv = repr->app_fw_flower->flow_priv;\n+\tret = nfp_flower_cmsg_flow_add(repr->app_fw_flower, nfp_flow);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Add the merged flow to firmware failed.\");\n+\t\tgoto flow_teardown;\n+\t}\n+\n+\t/* Add the flow to flow hash table */\n+\tret = nfp_flow_table_add(priv, nfp_flow);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Add the merged flow to flow table failed.\");\n+\t\tgoto flow_teardown;\n+\t}\n+\n+\tmerge_entry->compiled_rule = nfp_flow;\n+\n+\treturn 0;\n+\n+flow_teardown:\n+\tnfp_flow_teardown(priv, nfp_flow, false);\n+\tnfp_flow_free(nfp_flow);\n+\n+\treturn ret;\n+}\n+\n+int\n+nfp_ct_offload_del(struct rte_eth_dev *dev,\n+\t\tstruct nfp_ct_map_entry *me,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tint ret;\n+\tstruct nfp_ct_flow_entry *fe;\n+\tstruct nfp_ct_merge_entry *m_ent;\n+\n+\tfe = me->fe;\n+\n+\tif (fe->type == CT_TYPE_PRE_CT) {\n+\t\tLIST_FOREACH(m_ent, &fe->children, pre_ct_list) {\n+\t\t\tif (m_ent->compiled_rule != NULL) {\n+\t\t\t\tret = nfp_flow_destroy(dev, m_ent->compiled_rule, error);\n+\t\t\t\tif (ret != 0) {\n+\t\t\t\t\tPMD_DRV_LOG(ERR, \"Could not alloc ct_flow_item\");\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n+\t\t\t\tm_ent->compiled_rule = NULL;\n+\t\t\t}\n+\n+\t\t\tm_ent->pre_ct_parent = NULL;\n+\t\t\tLIST_REMOVE(m_ent, pre_ct_list);\n+\t\t\tif (m_ent->post_ct_parent == NULL)\n+\t\t\t\tnfp_ct_merge_entry_destroy(m_ent);\n+\t\t}\n+\t} else {\n+\t\tLIST_FOREACH(m_ent, &fe->children, post_ct_list) {\n+\t\t\tif (m_ent->compiled_rule != NULL) {\n+\t\t\t\tret = nfp_flow_destroy(dev, m_ent->compiled_rule, error);\n+\t\t\t\tif (ret != 0) {\n+\t\t\t\t\tPMD_DRV_LOG(ERR, \"Could not alloc ct_flow_item\");\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n+\t\t\t\tm_ent->compiled_rule = NULL;\n+\t\t\t}\n+\n+\t\t\tm_ent->post_ct_parent = NULL;\n+\t\t\tLIST_REMOVE(m_ent, post_ct_list);\n+\t\t\tif (m_ent->pre_ct_parent == NULL)\n+\t\t\t\tnfp_ct_merge_entry_destroy(m_ent);\n+\t\t}\n+\t}\n+\n+\tnfp_ct_flow_entry_destroy_partly(fe);\n+\n+\treturn 0;\n+}\n+\n static inline bool\n is_item_check_pass(const struct rte_flow_item *item1,\n \t\tconst struct rte_flow_item *item2,\n@@ -1401,8 +1498,17 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze,\n \t\tgoto free_actions;\n \t}\n \n+\t/* Send to firmware */\n+\tret = nfp_ct_offload_add(pre_ct_entry->repr, merge_entry);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Send the merged flow to firmware failed\");\n+\t\tgoto merge_table_del;\n+\t}\n+\n \treturn true;\n \n+merge_table_del:\n+\tnfp_ct_merge_table_delete(ze, merge_entry);\n free_actions:\n \trte_free(merge_entry->rule.actions);\n free_items:\n@@ -1489,7 +1595,7 @@ nfp_flow_handle_pre_ct(const struct rte_flow_item *ct_item,\n \t\t}\n \t}\n \n-\t/* The real offload logic comes in next commit, so here just return false for now */\n+\treturn true;\n \n ct_flow_entry_free:\n \tnfp_ct_flow_entry_destroy(fe);\n@@ -1558,7 +1664,7 @@ nfp_flow_handle_post_ct(const struct rte_flow_item *ct_item,\n \tif (!ret)\n \t\tgoto ct_flow_entry_free;\n \n-\t/* The real offload logic comes in next commit, so here just return false for now */\n+\treturn true;\n \n ct_flow_entry_free:\n \tnfp_ct_flow_entry_destroy(fe);\ndiff --git a/drivers/net/nfp/flower/nfp_conntrack.h b/drivers/net/nfp/flower/nfp_conntrack.h\nindex 149a3eb040..2f47280716 100644\n--- a/drivers/net/nfp/flower/nfp_conntrack.h\n+++ b/drivers/net/nfp/flower/nfp_conntrack.h\n@@ -8,6 +8,7 @@\n \n #include <stdbool.h>\n \n+#include <ethdev_driver.h>\n #include <rte_flow.h>\n \n #include \"../nfp_flow.h\"\n@@ -22,6 +23,10 @@ struct nfp_ct_map_entry *nfp_ct_map_table_search(struct nfp_flow_priv *priv,\n \t\tchar *hash_data,\n \t\tuint32_t hash_len);\n \n+int nfp_ct_offload_del(struct rte_eth_dev *dev,\n+\t\tstruct nfp_ct_map_entry *me,\n+\t\tstruct rte_flow_error *error);\n+\n struct rte_flow *nfp_ct_flow_setup(struct nfp_flower_representor *representor,\n \t\tconst struct rte_flow_item items[],\n \t\tconst struct rte_flow_action actions[],\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 16a5c7e055..a6439679d3 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -3911,8 +3911,10 @@ nfp_flow_destroy(struct rte_eth_dev *dev,\n \t\tstruct rte_flow_error *error)\n {\n \tint ret;\n+\tuint64_t cookie;\n \tstruct rte_flow *flow_find;\n \tstruct nfp_flow_priv *priv;\n+\tstruct nfp_ct_map_entry *me;\n \tstruct nfp_app_fw_flower *app_fw_flower;\n \tstruct nfp_flower_representor *representor;\n \n@@ -3920,6 +3922,12 @@ nfp_flow_destroy(struct rte_eth_dev *dev,\n \tapp_fw_flower = representor->app_fw_flower;\n \tpriv = app_fw_flower->flow_priv;\n \n+\t/* Find the flow in ct_map_table */\n+\tcookie = rte_be_to_cpu_64(nfp_flow->payload.meta->host_cookie);\n+\tme = nfp_ct_map_table_search(priv, (char *)&cookie, sizeof(uint64_t));\n+\tif (me != NULL)\n+\t\treturn nfp_ct_offload_del(dev, me, error);\n+\n \t/* Find the flow in flow hash table */\n \tflow_find = nfp_flow_table_search(priv, nfp_flow);\n \tif (flow_find == NULL) {\n", "prefixes": [ "v2", "3/4" ] }