Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/135583/?format=api
{ "id": 135583, "url": "http://patches.dpdk.org/api/patches/135583/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231226072824.3163121-15-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": "<20231226072824.3163121-15-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231226072824.3163121-15-chaoyong.he@corigine.com", "date": "2023-12-26T07:28:24", "name": "[v6,14/14] net/nfp: support offloading bond-flow", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7bbb00d8e86ede2e6f0cc4f9ee46776607f21254", "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/20231226072824.3163121-15-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 30668, "url": "http://patches.dpdk.org/api/series/30668/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30668", "date": "2023-12-26T07:28:10", "name": "Enhance the bond framework to support offload", "version": 6, "mbox": "http://patches.dpdk.org/series/30668/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/135583/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/135583/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 BBF5343795;\n\tTue, 26 Dec 2023 08:30:34 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D1CC040DDA;\n\tTue, 26 Dec 2023 08:29:14 +0100 (CET)", "from NAM02-BN1-obe.outbound.protection.outlook.com\n (mail-bn1nam02on2138.outbound.protection.outlook.com [40.107.212.138])\n by mails.dpdk.org (Postfix) with ESMTP id C91A440E2D\n for <dev@dpdk.org>; Tue, 26 Dec 2023 08:29:12 +0100 (CET)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by CH3PR13MB6506.namprd13.prod.outlook.com (2603:10b6:610:1a3::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.27; Tue, 26 Dec\n 2023 07:29:11 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7113.027; Tue, 26 Dec 2023\n 07:29:11 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=TcifrqfDiCrZZhHhYtGHk0lFgZJfDGokc2m5hKwOcV6ZpfHKaNaNHsJfa2xbH1nVPMp60mW0IBgih1zJb3T8BW/sKqYOXFVRqVblOmA+SDU+ImpEj22HA419NAHzmSMRMXSO/YgeKuNKjMJCLBEM5RvF26QV3pPQ9X2LyGk6e3VtIkySmFO3m087qcDxP9hs8ivOh+mH+5tECSHESwH5VJbi82iikqAqyoGO4AXUQvyeD93s3sYTQ6BvsNYgXnbFaF7u3teo+iq8+nLHbcMD9YSzNV56WKnRJnP8WZfQyGjUPrL11b4+nmLe035Bzg6FEugMbDNa7NQ0/Bn+ofj9GQ==", "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=Kz6AxSRyxYAWiz4Z80tcP47HAyDQt9mpNsuwFgYiPfs=;\n b=WfZ141eMqbmy4ohdFMtijC2b0Ho97XrhuY9b04DuBoy3SOSZFyPOBjbdv9XgJn1IbnTd4aKGR7TV0gTYstt+mXtUEpOROE9XYh5hkoXpbQO3gP+J2FHkL4cpGIuQK6npRbnkAB6i+N65WykDKTeZEWY9qdsEIfzd7GAFz4IzXb2rTfxdmUmuEoCgF14sCQr0HZRNjFSKLuknLB9+VZq27vpT828ZzsLnlorcJlc/V/XoWutllmeKq2EzmsrbRFM4Nu9fFy2qE0OGsbESNulZkAbnKNEjo/vIrP9CbQWGXHJx+JJ5y2lVyCdx49Jyjy7PRENTwYLxA4yHJhHb6FTY7A==", "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=Kz6AxSRyxYAWiz4Z80tcP47HAyDQt9mpNsuwFgYiPfs=;\n b=MfZRY/MEL4+A1dWQ/3EWufyJoaWJ+sWKdpprvEfqB8yE7oW7ScsqpeFhTmocuO/aO1bYxj/ruMXtofJpe/b4il99w/baEvcZ8M7ATaQ51cvRAehZHiC2EMPaovvQAnoW6Ded90k295hlUShCYDI43byf0r+X3qUIbucbRiojbg4=", "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, Long Wu <long.wu@corigine.com>,\n Peng Zhang <peng.zhang@corigine.com>,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v6 14/14] net/nfp: support offloading bond-flow", "Date": "Tue, 26 Dec 2023 15:28:24 +0800", "Message-Id": "<20231226072824.3163121-15-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231226072824.3163121-1-chaoyong.he@corigine.com>", "References": "<20231226023745.3144143-1-chaoyong.he@corigine.com>\n <20231226072824.3163121-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SJ0PR03CA0239.namprd03.prod.outlook.com\n (2603:10b6:a03:39f::34) 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_|CH3PR13MB6506:EE_", "X-MS-Office365-Filtering-Correlation-Id": "82ff253d-e347-4ddd-7592-08dc05e45a67", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n kB4u27JNh1RLVZPQhe+r9rJ7oazfEuTmZpikb/WYhRU+xwdS0In4KFsOS34rFqxi5gB50JkTcXxaElxU3RvsLx68khPr2K+qO4f2cbJhT18PSR/YsMrOFLihmY46vMaAsQDxIuyNWB7coRMKziDY1QPAZ2Qwnhu5t0iVqmkvN06OCwnIiYBLFcHhznkzfYPBr2p8XuAGHvBPsjKtaRkIXQcgZsRru+b238pys1qvf5rqIt7aCcGBYfvonAgBDQRIywfO0wOAs2WPgbWZS+zQx0YwoQNl0vurQ+vXwvqhQ7Eiw3pHp+EY/dPkiNB08T8h8YU3cc9CyOM4hUvn/Xxz+5DIsRW/VEpsUkuMzbFBQwlIJh+SvHKjl7H3jMrZFCBriC/zC+GSQt3xDKdniIagE3kBqKxzuNTbrpE9O/A8ZoIzYa2b1NGdAQAb+RnkotCdANerUbgpvXYxd1mIJzfpHhe+HNbG+IKV5mk8vDBb8g5oUJv5cwYfSTDG6N1NhfNTEwFbhFWB2yh36vkErpCLH1Ri9h2649aieZ6Qt/3YwqUbh8ep5kMEupLzPeZGWBrRholM43yrVbMjkhqJJX1lg1HznaE+Gl2a8Ojd8J2kiBceTOAu8P2Itnh8Xz2QYFxbAaDY1l1lEn6np6sMPdJnBFXUa/YXiEa7vNilIqfbA28=", "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)(376002)(346002)(136003)(396003)(366004)(39840400004)(230922051799003)(451199024)(186009)(64100799003)(1800799012)(107886003)(26005)(1076003)(52116002)(6666004)(2616005)(6512007)(83380400001)(5660300002)(44832011)(4326008)(8676002)(41300700001)(2906002)(30864003)(8936002)(6486002)(478600001)(316002)(6916009)(54906003)(66476007)(66556008)(66946007)(6506007)(86362001)(36756003)(38100700002)(38350700005);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n QkiZPRl4DzuCmacSXeSUZw8FYCSS2Kr3LsM3xEsKcr0sUz+ZTllbA0pxPOGxorbeEkvNM+LpQZY7Y4EHa1U1P35zJ3I0QOp+djT5yKMPhPChndX/r1WcFYWVJN1FJGZ1Wd20+Xz8fnxT3dROrByFOsGxHjuGT9Ls3dTbIu1EGml5rtxSaC0WBhVLmGmE8er19ybmnTceHDrUZLjMphXnTedTOTASGUdrWLTASA4E0DmwZV83/HbK7Hl1NnJChCWtoxwkZ4DqEijp+yZynGHoczj7ogu6HywquVX/A7eYnhbrFIpgtDd+mAp7lSvVbq6hwyMQN2Fzlrxd55B400HPvgCyvWEJsVeYtaBBY6cuKnXcDhqfyhkDxcZ514P+9QrqLi7LjYzgANc1ZV3QkwNPf/ciUJjuF5fNZeSv6dxKK9F/VtZW9vLIB6AweD2xQW3zWVdfpJWe2Q6W911pCkovS+xP5bl+SLBn+880WjKDGo0DBwcft0OzrWyaw1/h2ULDzdu+oa5l0rrdr3swXYGl9Zy/5akHIXtfBuAPw7CFcCrosUJH9qDaXkK+3L3IyG5MGs4dZN7+AzpmuC61pyTWfqIvE5kBl2t2eQ7eBdTgfiNY1kbCqi30MCdTs6pvA6VOKnuIMXu7xqaBb9Vmyfp6cMlC+r5gAFDFmJUZx4KqQ5ouBQfn9y3y2HagfWKAOE1AZV2H9K3gUol/rQ4hUV4EnBifJKGj6RrqrOrM5NZb107YYr72xJRDDdHDyzsD3M2nm/RbWOOaK6ABF0DEO1iPFwK1zbiT0PgnECIMdDfrW/ajHBqm6zThn0PlyFLc305TfxeKKnzsY2tXHabg6WAYtQZingsup81w/KN7TqQJy3Aqq4m5yYl+nioq+Js7m8gZMM1aNN8N3E/tbicxhUZ54I9YK14IX6V44eL31b6PPeJALplyVBshm4aOV+Wq7YabhYYTXobPWBA2m76/kzxc3Q3f3AS8qBvPFnXc5ouPsOJ/91R4x9TSiLzFDHZ4pXZvOIvKIIBR+OodWYf70moXDxcmf2pSXRNw+HwdjMaqIumOrt51UllI8iTH65/pTKcCnd4D96rk+87LjZQ9Zrt6fofssVvXfKFN1fRiP1apuvjZKBkjmRHncI4pliqI3jYP5dZuHhsSx+ys8QnunOYuRfpiYgG9qnU7W/VU7rP4yb+3XBGcVNc+Lu8KPjAwYmczHKbmunDDS7Q7Ah+Stv0jQDvOvA1ctLJu8jQEUOsPaxQr4qf9wnW8aoDnib8mphaRXYwKwuBuW83iFzKrPQR8PkimAIvzJF4BHM0ivF1Dd6hFBBIPuz9FXIW/WO+SoVS47oAAV/TxhPvJy1xv5XQxORHc4ibiDLUeViLaSqPmLT2Q79MRPuuFcpD2KA4Umrb8qlPnyii+ixys45s/foXsyd6dikAkeULL/Zuvt4AUXoNIu79BMbX1H65wKec6dwSFGGUCUD7nEO+hsW9GBcKHLoY1XJcri9q+CSV5Vs+Vdvu2BlrC1TByc/vEhvLmhupfDrL5EJUB23dGX3lxDx4CaDrTxfisF4XQH/MyG/M1TqN9ARc5jgN9Qf8s8pz5hOxBnhxz64m+R2flmyhQ5CZ+SQ==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 82ff253d-e347-4ddd-7592-08dc05e45a67", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "26 Dec 2023 07:29:10.9948 (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 j7RoUu0PskclCSqF3VjT+g6C9m1oEEh2Pf1y88dvUwnVKZSPe83bQ4/9lCaSNvpnRH90Brba/tj91V17dPmkxD4z+D3wwVmFBxzE7rrApRY=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CH3PR13MB6506", "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": "From: Long Wu <long.wu@corigine.com>\n\nAfter bonding port notification and firmware created\nthe bonding port, NFP rte_flow rule adds support for\ndestination port to bonding port.\n\nSigned-off-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\nReviewed-by: Chaoyong He <chaoyong.he@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower_bond.c | 22 +++\n drivers/net/nfp/flower/nfp_flower_bond.h | 6 +\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 9 +\n drivers/net/nfp/flower/nfp_flower_flow.c | 232 +++++++++++++++++++++--\n 4 files changed, 252 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_bond.c b/drivers/net/nfp/flower/nfp_flower_bond.c\nindex c809465ffc..6e4d60659a 100644\n--- a/drivers/net/nfp/flower/nfp_flower_bond.c\n+++ b/drivers/net/nfp/flower/nfp_flower_bond.c\n@@ -667,3 +667,25 @@ nfp_flower_bond_fw_create_get(struct rte_eth_dev *bond_dev,\n \n \treturn ret;\n }\n+\n+int\n+nfp_flower_bond_get_output_id(struct nfp_flower_bond *nfp_bond,\n+\t\tconst struct rte_eth_dev *bond_dev,\n+\t\tuint32_t *group_id)\n+{\n+\tstruct nfp_bond_group *group;\n+\n+\tpthread_mutex_lock(&nfp_bond->mutex);\n+\n+\tgroup = nfp_flower_bond_find_group(nfp_bond, bond_dev);\n+\tif (group == NULL) {\n+\t\tpthread_mutex_unlock(&nfp_bond->mutex);\n+\t\treturn -ENOENT;\n+\t}\n+\n+\t*group_id = group->group_id;\n+\n+\tpthread_mutex_unlock(&nfp_bond->mutex);\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/net/nfp/flower/nfp_flower_bond.h b/drivers/net/nfp/flower/nfp_flower_bond.h\nindex 41cd64d9eb..7e451c58f1 100644\n--- a/drivers/net/nfp/flower/nfp_flower_bond.h\n+++ b/drivers/net/nfp/flower/nfp_flower_bond.h\n@@ -44,6 +44,9 @@\n /** We store 100(101-1) mbufs but queue needs 101 */\n #define NFP_FL_BOND_RETRANS_LIMIT 101\n \n+/* Flow output action of bonding port */\n+#define NFP_FL_BOND_OUT 0xC0DE0000\n+\n enum nfp_flower_bond_batch {\n \tNFP_FLOWER_BOND_BATCH_FIRST,\n \tNFP_FLOWER_BOND_BATCH_MEMBER,\n@@ -155,5 +158,8 @@ int nfp_fl_bond_put_unprocessed(struct nfp_flower_bond *nfp_bond,\n \t\tstruct rte_mbuf *mbuf);\n int nfp_flower_bond_fw_create_get(struct rte_eth_dev *bond_dev,\n \t\tstruct rte_eth_dev *nfp_dev);\n+int nfp_flower_bond_get_output_id(struct nfp_flower_bond *nfp_bond,\n+\t\tconst struct rte_eth_dev *bond_dev,\n+\t\tuint32_t *group_id);\n \n #endif /* __NFP_FLOWER_BOND_H__ */\ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 60ab58a3b1..17ef943855 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -712,6 +712,15 @@ struct nfp_fl_act_head {\n \tuint8_t len_lw;\n };\n \n+#define NFP_FL_PRE_BOND_VER_OFF 8\n+\n+struct nfp_fl_pre_bond {\n+\tstruct nfp_fl_act_head head;\n+\trte_be16_t group_id;\n+\tuint8_t lag_version[3];\n+\tuint8_t instance;\n+};\n+\n struct nfp_fl_act_output {\n \tstruct nfp_fl_act_head head;\n \trte_be16_t flags;\ndiff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c\nindex e26be30d18..6e21ad8c26 100644\n--- a/drivers/net/nfp/flower/nfp_flower_flow.c\n+++ b/drivers/net/nfp/flower/nfp_flower_flow.c\n@@ -5,12 +5,14 @@\n \n #include \"nfp_flower_flow.h\"\n \n+#include <rte_eth_bond.h>\n #include <rte_flow_driver.h>\n #include <rte_hash.h>\n #include <rte_jhash.h>\n #include <rte_malloc.h>\n \n #include \"flower/nfp_conntrack.h\"\n+#include \"flower/nfp_flower_bond.h\"\n #include \"flower/nfp_flower_representor.h\"\n #include \"nfpcore/nfp_rtsym.h\"\n #include \"nfp_logs.h\"\n@@ -969,9 +971,23 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[],\n \treturn 0;\n }\n \n+static bool\n+nfp_flow_check_bond_action(struct nfp_flower_representor *representor,\n+\t\tuint32_t port_id)\n+{\n+\tstruct rte_eth_dev *bond_dev = &rte_eth_devices[port_id];\n+\n+\tif (nfp_flower_support_bond_offload(representor->app_fw_flower) ||\n+\t\t\t!nfp_flower_bond_all_member_are_phyrepr(bond_dev))\n+\t\treturn false;\n+\n+\treturn true;\n+}\n+\n static int\n nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[],\n-\t\tstruct nfp_fl_key_ls *key_ls)\n+\t\tstruct nfp_fl_key_ls *key_ls,\n+\t\tstruct nfp_flower_representor *representor)\n {\n \tint ret = 0;\n \tbool meter_flag = false;\n@@ -981,6 +997,8 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[],\n \tbool mac_set_flag = false;\n \tbool ttl_tos_flag = false;\n \tconst struct rte_flow_action *action;\n+\tconst struct rte_flow_action_port_id *port_id;\n+\tconst struct rte_flow_action_ethdev *action_ethdev;\n \n \tfor (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) {\n \t\t/* Make sure actions length no longer than NFP_FL_MAX_A_SIZ */\n@@ -1006,10 +1024,36 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[],\n \t\tcase RTE_FLOW_ACTION_TYPE_PORT_ID:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ACTION_TYPE_PORT_ID detected\");\n \t\t\tkey_ls->act_size += sizeof(struct nfp_fl_act_output);\n+\n+\t\t\tport_id = action->conf;\n+\t\t\tif (port_id == NULL)\n+\t\t\t\treturn -ERANGE;\n+\n+\t\t\tif (!rte_eth_bond_is_valid_port(port_id->id))\n+\t\t\t\tbreak;\n+\n+\t\t\tif (!nfp_flow_check_bond_action(representor, port_id->id))\n+\t\t\t\treturn -ENOTSUP;\n+\n+\t\t\t/* We only add when all checks have passed */\n+\t\t\tkey_ls->act_size += sizeof(struct nfp_fl_pre_bond);\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT detected\");\n \t\t\tkey_ls->act_size += sizeof(struct nfp_fl_act_output);\n+\n+\t\t\taction_ethdev = action->conf;\n+\t\t\tif (action_ethdev == NULL)\n+\t\t\t\treturn -ERANGE;\n+\n+\t\t\tif (!rte_eth_bond_is_valid_port(action_ethdev->port_id))\n+\t\t\t\tbreak;\n+\n+\t\t\tif (!nfp_flow_check_bond_action(representor, action_ethdev->port_id))\n+\t\t\t\treturn -ENOTSUP;\n+\n+\t\t\t/* We only add when all checks have passed */\n+\t\t\tkey_ls->act_size += sizeof(struct nfp_fl_pre_bond);\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ACTION_TYPE_SET_MAC_SRC detected\");\n@@ -1150,7 +1194,8 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[],\n static int\n nfp_flow_key_layers_calculate(const struct rte_flow_item items[],\n \t\tconst struct rte_flow_action actions[],\n-\t\tstruct nfp_fl_key_ls *key_ls)\n+\t\tstruct nfp_fl_key_ls *key_ls,\n+\t\tstruct nfp_flower_representor *representor)\n {\n \tint ret = 0;\n \n@@ -1164,7 +1209,7 @@ nfp_flow_key_layers_calculate(const struct rte_flow_item items[],\n \tkey_ls->tun_type = NFP_FL_TUN_NONE;\n \n \tret |= nfp_flow_key_layers_calculate_items(items, key_ls);\n-\tret |= nfp_flow_key_layers_calculate_actions(actions, key_ls);\n+\tret |= nfp_flow_key_layers_calculate_actions(actions, key_ls, representor);\n \n \treturn ret;\n }\n@@ -2160,12 +2205,45 @@ nfp_flow_compile_items(struct nfp_flower_representor *representor,\n \treturn 0;\n }\n \n+static int\n+nfp_flower_bond_populate_pre_action(struct nfp_flower_representor *repr,\n+\t\tstruct rte_eth_dev *bond_dev,\n+\t\tstruct nfp_fl_pre_bond *pre_bond)\n+{\n+\trte_be32_t version;\n+\tstruct nfp_bond_group *group;\n+\tstruct nfp_flower_bond *nfp_bond;\n+\n+\tnfp_bond = repr->app_fw_flower->nfp_bond;\n+\n+\tpthread_mutex_lock(&nfp_bond->mutex);\n+\n+\tgroup = nfp_flower_bond_find_group(nfp_bond, bond_dev);\n+\tif (group == NULL) {\n+\t\tpthread_mutex_unlock(&nfp_bond->mutex);\n+\t\tPMD_DRV_LOG(ERR, \"Invalid entry: group does not exist for bond action\");\n+\t\treturn -ENOENT;\n+\t}\n+\n+\tpre_bond->group_id = rte_cpu_to_be_16(group->group_id);\n+\tversion = rte_cpu_to_be_32(nfp_bond->batch_ver << NFP_FL_PRE_BOND_VER_OFF);\n+\tmemcpy(pre_bond->lag_version, &version, 3);\n+\tpre_bond->instance = group->group_inst;\n+\n+\tpthread_mutex_unlock(&nfp_bond->mutex);\n+\n+\treturn 0;\n+}\n+\n static int\n nfp_flow_action_output(char *act_data,\n \t\tconst struct rte_flow_action *action,\n \t\tstruct nfp_fl_rule_metadata *nfp_flow_meta,\n-\t\tuint32_t output_cnt)\n+\t\tuint32_t output_cnt,\n+\t\tstruct nfp_flower_bond *nfp_bond,\n+\t\tbool *bonding_port)\n {\n+\tuint32_t gid;\n \tsize_t act_size;\n \tstruct rte_eth_dev *ethdev;\n \tstruct nfp_fl_act_output *output;\n@@ -2177,18 +2255,31 @@ nfp_flow_action_output(char *act_data,\n \t\treturn -ERANGE;\n \n \tethdev = &rte_eth_devices[port_id->id];\n-\trepresentor = ethdev->data->dev_private;\n+\toutput = (struct nfp_fl_act_output *)act_data;\n+\tif (rte_eth_bond_is_valid_port(port_id->id)) {\n+\t\t/* Output port is bonding port */\n+\t\tif (nfp_flower_bond_get_output_id(nfp_bond, ethdev, &gid) != 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Cannot find group id for bond action\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\toutput->port = rte_cpu_to_be_32(NFP_FL_BOND_OUT | gid);\n+\t\tnfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_NULL);\n+\t\t*bonding_port = true;\n+\t} else {\n+\t\trepresentor = ethdev->data->dev_private;\n+\n+\t\toutput->port = rte_cpu_to_be_32(representor->port_id);\n+\t\tnfp_flow_meta->shortcut = rte_cpu_to_be_32(representor->port_id);\n+\t}\n+\n \tact_size = sizeof(struct nfp_fl_act_output);\n \n-\toutput = (struct nfp_fl_act_output *)act_data;\n \toutput->head.jump_id = NFP_FL_ACTION_OPCODE_OUTPUT;\n \toutput->head.len_lw = act_size >> NFP_FL_LW_SIZ;\n-\toutput->port = rte_cpu_to_be_32(representor->port_id);\n \tif (output_cnt == 0)\n \t\toutput->flags = rte_cpu_to_be_16(NFP_FL_OUT_FLAGS_LAST);\n \n-\tnfp_flow_meta->shortcut = rte_cpu_to_be_32(representor->port_id);\n-\n \treturn 0;\n }\n \n@@ -2196,8 +2287,11 @@ static int\n nfp_flow_action_output_stage(char *act_data,\n \t\tconst struct rte_flow_action *action,\n \t\tstruct nfp_fl_rule_metadata *nfp_flow_meta,\n-\t\tuint32_t output_cnt)\n+\t\tuint32_t output_cnt,\n+\t\tstruct nfp_flower_bond *nfp_bond,\n+\t\tbool *bonding_port)\n {\n+\tuint32_t gid;\n \tsize_t act_size;\n \tstruct rte_eth_dev *ethdev;\n \tstruct nfp_fl_act_output *output;\n@@ -2209,17 +2303,70 @@ nfp_flow_action_output_stage(char *act_data,\n \t\treturn -ERANGE;\n \n \tethdev = &rte_eth_devices[action_ethdev->port_id];\n-\trepresentor = ethdev->data->dev_private;\n+\toutput = (struct nfp_fl_act_output *)act_data;\n+\tif (rte_eth_bond_is_valid_port(action_ethdev->port_id)) {\n+\t\t/* Output port is bonding port */\n+\t\tif (nfp_flower_bond_get_output_id(nfp_bond, ethdev, &gid) != 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Cannot find group id for bond action\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\toutput->port = rte_cpu_to_be_32(NFP_FL_BOND_OUT | gid);\n+\t\tnfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_NULL);\n+\t\t*bonding_port = true;\n+\t} else {\n+\t\trepresentor = ethdev->data->dev_private;\n+\n+\t\toutput->port = rte_cpu_to_be_32(representor->port_id);\n+\t\tnfp_flow_meta->shortcut = rte_cpu_to_be_32(representor->port_id);\n+\t}\n+\n \tact_size = sizeof(struct nfp_fl_act_output);\n \n-\toutput = (struct nfp_fl_act_output *)act_data;\n \toutput->head.jump_id = NFP_FL_ACTION_OPCODE_OUTPUT;\n \toutput->head.len_lw = act_size >> NFP_FL_LW_SIZ;\n-\toutput->port = rte_cpu_to_be_32(representor->port_id);\n \tif (output_cnt == 0)\n \t\toutput->flags = rte_cpu_to_be_16(NFP_FL_OUT_FLAGS_LAST);\n \n-\tnfp_flow_meta->shortcut = rte_cpu_to_be_32(representor->port_id);\n+\treturn 0;\n+}\n+\n+static int\n+nfp_flow_pre_bond(struct nfp_flower_representor *representor,\n+\t\tchar *act_data,\n+\t\tchar *actions,\n+\t\tconst struct rte_flow_action *action)\n+{\n+\tint err;\n+\tint act_len;\n+\tuint32_t port_id;\n+\tstruct rte_eth_dev *ethdev;\n+\tstruct nfp_fl_pre_bond *pre_bond;\n+\tuint32_t pre_bond_size = sizeof(struct nfp_fl_pre_bond);\n+\n+\tact_len = act_data - actions;\n+\n+\tif (act_len + pre_bond_size > NFP_FL_MAX_A_SIZ) {\n+\t\tPMD_DRV_LOG(ERR, \"Maximum allowed action list size exceeded at bond action\");\n+\t\treturn -EOPNOTSUPP;\n+\t}\n+\n+\tif (act_len != 0)\n+\t\tmemmove(actions + pre_bond_size, actions, act_len);\n+\n+\tif (action->type == RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT)\n+\t\tport_id = ((const struct rte_flow_action_ethdev *)action->conf)->port_id;\n+\telse\n+\t\tport_id = ((const struct rte_flow_action_port_id *)action->conf)->id;\n+\n+\tethdev = &rte_eth_devices[port_id];\n+\tpre_bond = (struct nfp_fl_pre_bond *)actions;\n+\terr = nfp_flower_bond_populate_pre_action(representor, ethdev, pre_bond);\n+\tif (err != 0)\n+\t\treturn err;\n+\n+\tpre_bond->head.jump_id = NFP_FL_ACTION_OPCODE_PRE_LAG;\n+\tpre_bond->head.len_lw = pre_bond_size >> NFP_FL_LW_SIZ;\n \n \treturn 0;\n }\n@@ -3502,6 +3649,13 @@ nfp_flow_count_output(const struct rte_flow_action actions[])\n \treturn count;\n }\n \n+static bool\n+nfp_flow_check_action_first(const struct rte_flow_action actions[],\n+\t\tuint32_t count)\n+{\n+\treturn ((nfp_flow_count_output(actions) - count) == 1);\n+}\n+\n static int\n nfp_flow_compile_action(struct nfp_flower_representor *representor,\n \t\tconst struct rte_flow_action actions[],\n@@ -3517,7 +3671,9 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor,\n \tbool tp_set_flag = false;\n \tbool mac_set_flag = false;\n \tbool ttl_tos_flag = false;\n+\tbool bonding_port = false;\n \tuint32_t total_actions = 0;\n+\tstruct nfp_flower_bond *nfp_bond;\n \tconst struct rte_flow_action *action;\n \tstruct nfp_flower_meta_tci *meta_tci;\n \tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n@@ -3546,7 +3702,10 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor,\n \t\tcase RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:\n \t\t\tPMD_DRV_LOG(DEBUG, \"Process RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT\");\n \t\t\tcount--;\n-\t\t\tret = nfp_flow_action_output_stage(position, action, nfp_flow_meta, count);\n+\n+\t\t\tnfp_bond = representor->app_fw_flower->nfp_bond;\n+\t\t\tret = nfp_flow_action_output_stage(position, action,\n+\t\t\t\t\tnfp_flow_meta, count, nfp_bond, &bonding_port);\n \t\t\tif (ret != 0) {\n \t\t\t\tPMD_DRV_LOG(ERR, \"Failed when process\"\n \t\t\t\t\t\t\" RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT\");\n@@ -3554,11 +3713,32 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor,\n \t\t\t}\n \n \t\t\tposition += sizeof(struct nfp_fl_act_output);\n+\n+\t\t\t/* Output port is not a bonding port */\n+\t\t\tif (!bonding_port)\n+\t\t\t\tbreak;\n+\n+\t\t\tif (!nfp_flow_check_action_first(actions, count)) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Bond action should be first\");\n+\t\t\t\treturn -EOPNOTSUPP;\n+\t\t\t}\n+\n+\t\t\tret = nfp_flow_pre_bond(representor, position,\n+\t\t\t\t\taction_data, action);\n+\t\t\tif (ret != 0) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Bond action special move failed\");\n+\t\t\t\treturn ret;\n+\t\t\t}\n+\n+\t\t\tposition += sizeof(struct nfp_fl_pre_bond);\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_PORT_ID:\n \t\t\tPMD_DRV_LOG(DEBUG, \"Process RTE_FLOW_ACTION_TYPE_PORT_ID\");\n \t\t\tcount--;\n-\t\t\tret = nfp_flow_action_output(position, action, nfp_flow_meta, count);\n+\n+\t\t\tnfp_bond = representor->app_fw_flower->nfp_bond;\n+\t\t\tret = nfp_flow_action_output(position, action,\n+\t\t\t\t\tnfp_flow_meta, count, nfp_bond, &bonding_port);\n \t\t\tif (ret != 0) {\n \t\t\t\tPMD_DRV_LOG(ERR, \"Failed when process\"\n \t\t\t\t\t\t\" RTE_FLOW_ACTION_TYPE_PORT_ID\");\n@@ -3566,6 +3746,24 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor,\n \t\t\t}\n \n \t\t\tposition += sizeof(struct nfp_fl_act_output);\n+\n+\t\t\t/* Output port is not a bonding port */\n+\t\t\tif (!bonding_port)\n+\t\t\t\tbreak;\n+\n+\t\t\tif (!nfp_flow_check_action_first(actions, count)) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Bond action should be first\");\n+\t\t\t\treturn -EOPNOTSUPP;\n+\t\t\t}\n+\n+\t\t\tret = nfp_flow_pre_bond(representor, position,\n+\t\t\t\t\taction_data, action);\n+\t\t\tif (ret != 0) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Bond action special move failed\");\n+\t\t\t\treturn ret;\n+\t\t\t}\n+\n+\t\t\tposition += sizeof(struct nfp_fl_pre_bond);\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:\n \t\t\tPMD_DRV_LOG(DEBUG, \"Process RTE_FLOW_ACTION_TYPE_SET_MAC_SRC\");\n@@ -3770,7 +3968,7 @@ nfp_flow_process(struct nfp_flower_representor *representor,\n \tstruct nfp_fl_key_ls key_layer;\n \tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n \n-\tret = nfp_flow_key_layers_calculate(items, actions, &key_layer);\n+\tret = nfp_flow_key_layers_calculate(items, actions, &key_layer, representor);\n \tif (ret != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Key layers calculate failed.\");\n \t\treturn NULL;\n", "prefixes": [ "v6", "14/14" ] }