Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118949/?format=api
{ "id": 118949, "url": "http://patches.dpdk.org/api/patches/118949/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666427069-10553-4-git-send-email-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": "<1666427069-10553-4-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666427069-10553-4-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-22T08:24:07", "name": "[v2,03/25] net/nfp: prepare for IPv4 tunnel encap flow action", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "309ec3c3378f6c8f04d07ef7822887680ac099b8", "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/1666427069-10553-4-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25372, "url": "http://patches.dpdk.org/api/series/25372/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25372", "date": "2022-10-22T08:24:04", "name": "add the extend rte_flow offload support of nfp PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/25372/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/118949/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118949/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 CB6B3A0032;\n\tSat, 22 Oct 2022 10:25:08 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 65BD042670;\n\tSat, 22 Oct 2022 10:24:57 +0200 (CEST)", "from NAM10-BN7-obe.outbound.protection.outlook.com\n (mail-bn7nam10on2118.outbound.protection.outlook.com [40.107.92.118])\n by mails.dpdk.org (Postfix) with ESMTP id 358A040042\n for <dev@dpdk.org>; Sat, 22 Oct 2022 10:24:54 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by CH2PR13MB3848.namprd13.prod.outlook.com (2603:10b6:610:9d::12)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Sat, 22 Oct\n 2022 08:24:52 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Sat, 22 Oct 2022\n 08:24:52 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=djhXFM80xl3ntLZjGKwSZbH4emhn/tdkVRL4fmXK5WNzm6vIga+/rxN6CmnVXH9xg5hwqx0yZ9kQGvRSpR7IwQc2D5cXU59JNGZ0iB6ULJmDgswFhcwrfmRt2B3Nkup0O3fcsafgPUvcEv2JOGupUePKlJmCPMcsLHqbwe6GbOYp6Ve7AGIeOEUtv9R/Rv9RKWH6v9RRPr/tn1+P9IFcsCwqkB5MfRYefpVlFuRPNsSpkQizoApfhiFqFugUB1dnDP7Xo58AOgtUIeDKkN9eZ/XB/I9T3EwzqIrJV6//JcFoFeXvGiyIBc03VLMGEXOOkOSMFoqSILSt/ZijmT6O2A==", "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=vNZn2FgEk5oatDEcEXneuTB+ZkcT1erk2q+Yvsv4088=;\n b=Hl9ingtsrgwKU27tvwGAajbDFtmWUxpIRv93vX1sqIAKgjRyp3Nw/STmM963T+5pA0CWudjoyryDXii4sKQR4SJJpUcFagFOmjSSSVWBEhFH+d+d0aa6bKMtibz1t136zsrxwkdVzPDQ22p1MxjGa/TWS3UOcnCxhom1LFqio2+G1gro6DF7uuEHCZNDnjquC6uJmCGLOK4dM0Saw8oxwe8X80A7Ak3dLg6pZD9aWX2n+a00Y2LUVAV1X+JKnGmYyrQSWTuDBV1aB2cMzQwlNI4an6zR1aPlzZy0F0a3lMjAF0bXsQKwC5Q0xW/BwwTIAurfFxuihjJ/wyx0D3TlNQ==", "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=vNZn2FgEk5oatDEcEXneuTB+ZkcT1erk2q+Yvsv4088=;\n b=ZDIZyk86aK0IMkDZWO0i919AMYgZ+kZ/83qTGXOFcRRf32Vbet7yCvlFsdpotEZlCbulepTp89v3403qfGZxDl/VYGhVxmZuGXmUGRxqeosNeAcenm/imchr/5Gw9woOeghuZfUJsMju05INTyZGMdmFyrF3LjpaHASVUN/mojs=", "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, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v2 03/25] net/nfp: prepare for IPv4 tunnel encap flow action", "Date": "Sat, 22 Oct 2022 16:24:07 +0800", "Message-Id": "<1666427069-10553-4-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666427069-10553-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>\n <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR02CA0056.apcprd02.prod.outlook.com\n (2603:1096:4:54::20) 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_|CH2PR13MB3848:EE_", "X-MS-Office365-Filtering-Correlation-Id": "69ad5777-75b9-471d-1b63-08dab406e46f", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 9aBV3EfnGvSLAqFolnM72jUhZf0kcv+Q8nF9umqE9t3tikIgmeyUcrkWPmpWh+DPgo6uEYYaRHoJrcQbnFeaxpfNkZ7nt1dlbYDqmJ9mrrbZe5LYGEpQOAJesk0SwURNHEH0f9ep+6/LKMKUPziv4sHr2J7nEu/5ZuRECKsNFtxrDB6Z4UtjDio9NU5zkEIKrzWjO7IB0X1YsYucF3D6zueZgmw2brE2Rw9/Oho9aI1u/qxFW93hDFbAqOgr6pDt6bMC0QSPfObJVWJXH2jMWsrnqWCgbbXA7Bvv8Y2WC+bkGUrHsJjo3alfn8QOkfxTIFmtlQaekQNWG25qqE/mXXnZXG1O82il9DUlRrhjThtV7rxrHepmjNhfBoJBopWleVTP1Sgiho1YoIb0IBWAfUHcOA9LoIl2DlCYO/BmVpPl084wtkPG3B3Grtay8jFggdX3UfPJcjzPVqYYacSxmQBzRvBTWQLJ6+M96ST3cix6N7d+8zobICSkif2DH5MJzSJAarLCxWXCDwD8u2wDZ7K5gN3cCJqK7RcUmupcKflJyZTLbKlRFWrcrlrZtgDqBOGoEsndzoUMg/lt3+WL0iVHqgN4lSZr+4LJHutR3fqVFNOkNpgJiAAUdJ3GwbiyDmb7namZvocANtPUFKR2n2H5HNHdfRQV6/OtxV5Ixkd+YacM2zPOY96dKPEn5FndKZYxeativiL/bEwXkIkRzw/BeH7iTZ2jISVM02ZvNCvOJrHhgRJz5kXiut2NfRhuvfUCUVLrOtX9e6X8/TYbSw==", "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:(13230022)(4636009)(136003)(366004)(396003)(39830400003)(346002)(376002)(451199015)(4326008)(107886003)(36756003)(38100700002)(66946007)(66556008)(316002)(6512007)(83380400001)(52116002)(66476007)(8676002)(44832011)(66574015)(6666004)(6506007)(30864003)(38350700002)(5660300002)(8936002)(6916009)(2616005)(478600001)(186003)(41300700001)(26005)(6486002)(86362001)(2906002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?Pqe/W7YCQcP1/Ty2ewFt0hhH0PFo?=\n\t=?utf-8?q?tpyNVkNhOrWsyxiqcxZ/S5dJ8f0RiqQ3Zir+BnPcdWr0SEaPonC1ykFBWScBOJxZ1?=\n\t=?utf-8?q?5hIX4GoQoSBZGqdz4xtKnER/89nkUijx3C7lvVRvN8ryHybFM3TmJ4vQam/zY5BXX?=\n\t=?utf-8?q?KqbjL4O6Dw9+Ro5y2fqSwSAFYURci6e9PO+iN4eUuSawDWBEBjMrCTA3Nu50EXoQN?=\n\t=?utf-8?q?a1X4kFBzmY6VcFrtUzIxXH0YBFXn2BxFVAS0SzHxtdxNk/6bU/yzmCVQ9CcU0bAK5?=\n\t=?utf-8?q?TiO4kxlPGchLnlEMRYDYuxAdwKCy9d2Zpxq7BhbQgtcUJ8/etQ6/bFShUyTCPf+Cv?=\n\t=?utf-8?q?AUF9+lE7qBTeW5cFLk5x2bHZZ5AgPT2T0AT32Lid6WHo7at8K4u34Xx3L7daG+Vb5?=\n\t=?utf-8?q?02/TwBsmVuHKaN/qNW2smWJ8HUz1DQ57m/+/Ome88ZuAdrBSz4n60cNojOpkBYmDu?=\n\t=?utf-8?q?RU+hbqufrZmx3yLUmUvTr1sbPS4VFUz7+nm35WxTsw+QYk3FALfHoYYpe+ZDI5hQ9?=\n\t=?utf-8?q?qZnF5IBU8R6SXrC4GxY4Xuoui/Q0uAZG7VE+wGO1vWJt0b3S0KM2G7xeSERSdI+XC?=\n\t=?utf-8?q?8uUTUTPVjF5MHPtdHh7sbgUstJIacPhpaO8GcyZv6HP+eYHfXiFL4/0hJX9SpXeox?=\n\t=?utf-8?q?m+EweKQ73h3EkUvUvcHkJQkhxJTBcK2l+FHhxJO893NjLxzxO/VTMmKn23QF0qAEw?=\n\t=?utf-8?q?rQSgjJ+wRRfti1Ft3wbabkrS8vZRw4NsXtOutWsJYeZh7A5UQ0t4Cq9mSi8cj0OaO?=\n\t=?utf-8?q?Vv7hvsRWT+fL3dGHRFjxhQgGySxcXtjiD9j1lL6y+ZEJuTNAgCH2Y8UcBbHh0kEjH?=\n\t=?utf-8?q?KmP2NdbGttIsqwwusIW8XyPEkpYV8z8wL8UQWMIXX3BYC4LS5Qy7n7t+htL3JqHax?=\n\t=?utf-8?q?hyA8stbO49fX4xJzHg+wib9wbNT5eXTFaJOpu9LVo3/zzhEXUH6K+zNRCKbbCdoXM?=\n\t=?utf-8?q?IMyPEdzdsIdtWTLlZrkBx/gVL6b7uATcyHgD6XIhAozG72KOyOFfTIEiNm60YQzfZ?=\n\t=?utf-8?q?Ayqpqu1ntt97JG/zSHDIL9tC/WQfaGX0eDXprMOcBU3F+8Qn4jo11El5xl7IeyxC0?=\n\t=?utf-8?q?uid+73BUEASIJ70IXyzPAZGCpY1ZGjeoV1g/sD7jNd5vi4Nbmm5LwIWUZnzTP3dNO?=\n\t=?utf-8?q?Y4TrPXflL/g3i5s/Pzh6gyqZMW0nVn8qWlf8c3WbfhvbH1FQr4f+HEe+FhtgYk45C?=\n\t=?utf-8?q?Xy1voOJ8dNGRYBE04o5+T0Al7ZnMUqrGLbT+pEC1JlE2DLOOHoB0UC9mHtbGXLfSU?=\n\t=?utf-8?q?ydIPb1wiZrgdPCpWLMt1WjU+wlLMd/wOlZqzm+oQvdcFdDu6pbNSnacZZxQ2U8t2A?=\n\t=?utf-8?q?N9pdfHCe5zCXiU4mY3EYbQ0HXXBwF7yaDChxuLBkvo89NEzsH1KgMkKGtjipaH6Vy?=\n\t=?utf-8?q?5LguTFsd1MH1yFlISS6OVDHx5JUxQ8kIWpGp/n9AvckYOoNO61DNDw56iTV2/f+sW?=\n\t=?utf-8?q?Y2Lno9xewBVUF25ZirspMEVb3mkAil4vfgxYlgSD3Y+izelV2tVn4sPDrK2p57iJq?=\n\t=?utf-8?q?ASQW4CAvMPAQAQsn12gp3R1kD9zS45Z6sQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 69ad5777-75b9-471d-1b63-08dab406e46f", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "22 Oct 2022 08:24:52.2886 (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 tcOc55/bqL4LeEH+M3ApJ4UhIXQ9HR0NL5/80eN6uoVGBtUgWl5JQ7mOGJd36F/Fjmohuud/Crm/O+YJVRGg9ZNdYmjxqnHee75qQoLic1s=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CH2PR13MB3848", "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 related data structure and functions, prepare for\nthe encap action of IPv4 tunnel.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower_cmsg.c | 29 ++++++++++\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 93 ++++++++++++++++++++++++++++++++\n drivers/net/nfp/nfp_flow.c | 88 ++++++++++++++++++++++++++++++\n drivers/net/nfp/nfp_flow.h | 27 ++++++++++\n 4 files changed, 237 insertions(+)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c\nindex 15d8381..7021d1f 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.c\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c\n@@ -246,3 +246,32 @@\n \n \treturn 0;\n }\n+\n+int\n+nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower,\n+\t\tstruct nfp_flower_cmsg_tun_neigh_v4 *payload)\n+{\n+\tuint16_t cnt;\n+\tsize_t msg_len;\n+\tstruct rte_mbuf *mbuf;\n+\tstruct nfp_flower_cmsg_tun_neigh_v4 *msg;\n+\n+\tmbuf = rte_pktmbuf_alloc(app_fw_flower->ctrl_pktmbuf_pool);\n+\tif (mbuf == NULL) {\n+\t\tPMD_DRV_LOG(DEBUG, \"Failed to alloc mbuf for v4 tun neigh\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tmsg_len = sizeof(struct nfp_flower_cmsg_tun_neigh_v4);\n+\tmsg = nfp_flower_cmsg_init(mbuf, NFP_FLOWER_CMSG_TYPE_TUN_NEIGH, msg_len);\n+\tmemcpy(msg, payload, msg_len);\n+\n+\tcnt = nfp_flower_ctrl_vnic_xmit(app_fw_flower, mbuf);\n+\tif (cnt == 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Send cmsg through ctrl vnic failed.\");\n+\t\trte_pktmbuf_free(mbuf);\n+\t\treturn -EIO;\n+\t}\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 996ba3b..e44e311 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -129,6 +129,36 @@ struct nfp_flower_cmsg_port_mod {\n \trte_be16_t mtu;\n };\n \n+struct nfp_flower_tun_neigh {\n+\tuint8_t dst_mac[RTE_ETHER_ADDR_LEN];\n+\tuint8_t src_mac[RTE_ETHER_ADDR_LEN];\n+\trte_be32_t port_id;\n+};\n+\n+/*\n+ * NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V4\n+ * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0\n+ * -----\\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0\n+ * +---------------------------------------------------------------+\n+ * 0 | DST_IPV4 |\n+ * +---------------------------------------------------------------+\n+ * 1 | SRC_IPV4 |\n+ * +---------------------------------------------------------------+\n+ * 2 | DST_MAC_B5_B4_B3_B2 |\n+ * +-------------------------------+-------------------------------+\n+ * 3 | DST_MAC_B1_B0 | SRC_MAC_B5_B4 |\n+ * +-------------------------------+-------------------------------+\n+ * 4 | SRC_MAC_B3_B2_B1_B0 |\n+ * +---------------------------------------------------------------+\n+ * 5 | Egress Port (NFP internal) |\n+ * +---------------------------------------------------------------+\n+ */\n+struct nfp_flower_cmsg_tun_neigh_v4 {\n+\trte_be32_t dst_ipv4;\n+\trte_be32_t src_ipv4;\n+\tstruct nfp_flower_tun_neigh common;\n+};\n+\n /*\n * NFP_FLOWER_CMSG_TYPE_FLOW_STATS\n * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0\n@@ -574,6 +604,67 @@ struct nfp_fl_act_set_tport {\n \trte_be16_t dst_port;\n };\n \n+/*\n+ * Pre-tunnel\n+ * 3 2 1\n+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | - | opcode | |jump_id| - |M| - |V|\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_daddr_127_96 / ipv4_daddr |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_daddr_95_64 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_daddr_63_32 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_daddr_31_0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_fl_act_pre_tun {\n+\tstruct nfp_fl_act_head head;\n+\trte_be16_t flags;\n+\tunion {\n+\t\trte_be32_t ipv4_dst;\n+\t\tuint8_t ipv6_dst[16];\n+\t};\n+};\n+\n+/*\n+ * Set tunnel\n+ * 3 2 1\n+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | res | opcode | res | len_lw| reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | tun_id0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | tun_id1 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | reserved | type |r| idx |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv4_flags | ttl | tos |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | reserved_cvs1 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | reserved_cvs2 | reserved_cvs3 |\n+ * | var_flags | var_np |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_fl_act_set_tun {\n+\tstruct nfp_fl_act_head head;\n+\trte_be16_t reserved;\n+\trte_be64_t tun_id;\n+\trte_be32_t tun_type_index;\n+\trte_be16_t tun_flags;\n+\tuint8_t ttl;\n+\tuint8_t tos;\n+\trte_be16_t outer_vlan_tpid;\n+\trte_be16_t outer_vlan_tci;\n+\tuint8_t tun_len; /* Only valid for NFP_FL_TUNNEL_GENEVE */\n+\tuint8_t reserved2;\n+\trte_be16_t tun_proto; /* Only valid for NFP_FL_TUNNEL_GENEVE */\n+} __rte_packed;\n+\n int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower);\n int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower,\n \t\tstruct nfp_flower_representor *repr);\n@@ -583,5 +674,7 @@ int nfp_flower_cmsg_flow_delete(struct nfp_app_fw_flower *app_fw_flower,\n \t\tstruct rte_flow *flow);\n int nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower,\n \t\tstruct rte_flow *flow);\n+int nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower,\n+\t\tstruct nfp_flower_cmsg_tun_neigh_v4 *payload);\n \n #endif /* _NFP_CMSG_H_ */\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex bbd9dba..f71f8b1 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -1772,6 +1772,91 @@ struct nfp_mask_id_entry {\n \ttc_hl->reserved = 0;\n }\n \n+__rte_unused static void\n+nfp_flow_pre_tun_v4_process(struct nfp_fl_act_pre_tun *pre_tun,\n+\t\trte_be32_t ipv4_dst)\n+{\n+\tpre_tun->head.jump_id = NFP_FL_ACTION_OPCODE_PRE_TUNNEL;\n+\tpre_tun->head.len_lw = sizeof(struct nfp_fl_act_pre_tun) >> NFP_FL_LW_SIZ;\n+\tpre_tun->ipv4_dst = ipv4_dst;\n+}\n+\n+__rte_unused static void\n+nfp_flow_set_tun_process(struct nfp_fl_act_set_tun *set_tun,\n+\t\tenum nfp_flower_tun_type tun_type,\n+\t\tuint64_t tun_id,\n+\t\tuint8_t ttl,\n+\t\tuint8_t tos)\n+{\n+\t/* Currently only support one pre-tunnel, so index is always 0. */\n+\tuint8_t pretun_idx = 0;\n+\tuint32_t tun_type_index;\n+\n+\ttun_type_index = ((tun_type << 4) & 0xf0) | (pretun_idx & 0x07);\n+\n+\tset_tun->head.jump_id = NFP_FL_ACTION_OPCODE_SET_TUNNEL;\n+\tset_tun->head.len_lw = sizeof(struct nfp_fl_act_set_tun) >> NFP_FL_LW_SIZ;\n+\tset_tun->tun_type_index = rte_cpu_to_be_32(tun_type_index);\n+\tset_tun->tun_id = rte_cpu_to_be_64(tun_id);\n+\tset_tun->ttl = ttl;\n+\tset_tun->tos = tos;\n+}\n+\n+__rte_unused static int\n+nfp_flower_add_tun_neigh_v4_encap(struct nfp_app_fw_flower *app_fw_flower,\n+\t\tstruct nfp_fl_rule_metadata *nfp_flow_meta,\n+\t\tstruct nfp_fl_tun *tun,\n+\t\tconst struct rte_ether_hdr *eth,\n+\t\tconst struct rte_flow_item_ipv4 *ipv4)\n+{\n+\tstruct nfp_fl_tun *tmp;\n+\tstruct nfp_flow_priv *priv;\n+\tstruct nfp_flower_in_port *port;\n+\tstruct nfp_flower_cmsg_tun_neigh_v4 payload;\n+\n+\ttun->payload.v6_flag = 0;\n+\ttun->payload.dst.dst_ipv4 = ipv4->hdr.dst_addr;\n+\ttun->payload.src.src_ipv4 = ipv4->hdr.src_addr;\n+\tmemcpy(tun->payload.dst_addr, eth->dst_addr.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\tmemcpy(tun->payload.src_addr, eth->src_addr.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\n+\ttun->ref_cnt = 1;\n+\tpriv = app_fw_flower->flow_priv;\n+\tLIST_FOREACH(tmp, &priv->nn_list, next) {\n+\t\tif (memcmp(&tmp->payload, &tun->payload, sizeof(struct nfp_fl_tun_entry)) == 0) {\n+\t\t\ttmp->ref_cnt++;\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n+\tLIST_INSERT_HEAD(&priv->nn_list, tun, next);\n+\n+\tport = (struct nfp_flower_in_port *)((char *)nfp_flow_meta +\n+\t\t\tsizeof(struct nfp_fl_rule_metadata) +\n+\t\t\tsizeof(struct nfp_flower_meta_tci));\n+\n+\tmemset(&payload, 0, sizeof(struct nfp_flower_cmsg_tun_neigh_v4));\n+\tpayload.dst_ipv4 = ipv4->hdr.dst_addr;\n+\tpayload.src_ipv4 = ipv4->hdr.src_addr;\n+\tmemcpy(payload.common.dst_mac, eth->dst_addr.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\tmemcpy(payload.common.src_mac, eth->src_addr.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\tpayload.common.port_id = port->in_port;\n+\n+\treturn nfp_flower_cmsg_tun_neigh_v4_rule(app_fw_flower, &payload);\n+}\n+\n+__rte_unused static int\n+nfp_flower_del_tun_neigh_v4(struct nfp_app_fw_flower *app_fw_flower,\n+\t\trte_be32_t ipv4)\n+{\n+\tstruct nfp_flower_cmsg_tun_neigh_v4 payload;\n+\n+\tmemset(&payload, 0, sizeof(struct nfp_flower_cmsg_tun_neigh_v4));\n+\tpayload.dst_ipv4 = ipv4;\n+\n+\treturn nfp_flower_cmsg_tun_neigh_v4_rule(app_fw_flower, &payload);\n+}\n+\n static int\n nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor,\n \t\tconst struct rte_flow_action actions[],\n@@ -2487,6 +2572,9 @@ struct nfp_mask_id_entry {\n \t\tgoto free_mask_table;\n \t}\n \n+\t/* neighbor next list */\n+\tLIST_INIT(&priv->nn_list);\n+\n \treturn 0;\n \n free_mask_table:\ndiff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h\nindex 0ad89e5..892dbc0 100644\n--- a/drivers/net/nfp/nfp_flow.h\n+++ b/drivers/net/nfp/nfp_flow.h\n@@ -90,6 +90,11 @@ enum nfp_flower_tun_type {\n \tNFP_FL_TUN_GENEVE = 4,\n };\n \n+enum nfp_flow_type {\n+\tNFP_FLOW_COMMON,\n+\tNFP_FLOW_ENCAP,\n+};\n+\n struct nfp_fl_key_ls {\n \tuint32_t key_layer_two;\n \tuint8_t key_layer;\n@@ -118,6 +123,24 @@ struct nfp_fl_payload {\n \tchar *action_data;\n };\n \n+struct nfp_fl_tun {\n+\tLIST_ENTRY(nfp_fl_tun) next;\n+\tuint8_t ref_cnt;\n+\tstruct nfp_fl_tun_entry {\n+\t\tuint8_t v6_flag;\n+\t\tuint8_t dst_addr[RTE_ETHER_ADDR_LEN];\n+\t\tuint8_t src_addr[RTE_ETHER_ADDR_LEN];\n+\t\tunion {\n+\t\t\trte_be32_t dst_ipv4;\n+\t\t\tuint8_t dst_ipv6[16];\n+\t\t} dst;\n+\t\tunion {\n+\t\t\trte_be32_t src_ipv4;\n+\t\t\tuint8_t src_ipv6[16];\n+\t\t} src;\n+\t} payload;\n+};\n+\n #define CIRC_CNT(head, tail, size) (((head) - (tail)) & ((size) - 1))\n #define CIRC_SPACE(head, tail, size) CIRC_CNT((tail), ((head) + 1), (size))\n struct circ_buf {\n@@ -161,13 +184,17 @@ struct nfp_flow_priv {\n \tstruct nfp_fl_stats_id stats_ids; /**< The stats id ring. */\n \tstruct nfp_fl_stats *stats; /**< Store stats of flow. */\n \trte_spinlock_t stats_lock; /** < Lock the update of 'stats' field. */\n+\t/* neighbor next */\n+\tLIST_HEAD(, nfp_fl_tun)nn_list; /**< Store nn entry */\n };\n \n struct rte_flow {\n \tstruct nfp_fl_payload payload;\n+\tstruct nfp_fl_tun tun;\n \tsize_t length;\n \tuint32_t hash_key;\n \tbool install_flag;\n+\tenum nfp_flow_type type;\n };\n \n int nfp_flow_priv_init(struct nfp_pf_dev *pf_dev);\n", "prefixes": [ "v2", "03/25" ] }