Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118312/?format=api
{ "id": 118312, "url": "http://patches.dpdk.org/api/patches/118312/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666063359-34283-3-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": "<1666063359-34283-3-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666063359-34283-3-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-18T03:22:16", "name": "[02/25] net/nfp: add the offload support of IPv6 VXLAN item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "03a9509928f46f5c06d936324038a89ddacf5bc8", "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/1666063359-34283-3-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25269, "url": "http://patches.dpdk.org/api/series/25269/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25269", "date": "2022-10-18T03:22:15", "name": "add the extend rte_flow offload support of nfp PMD", "version": 1, "mbox": "http://patches.dpdk.org/series/25269/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/118312/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118312/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 B6D82A0560;\n\tTue, 18 Oct 2022 05:23:08 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 76A1241133;\n\tTue, 18 Oct 2022 05:23:06 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2131.outbound.protection.outlook.com [40.107.223.131])\n by mails.dpdk.org (Postfix) with ESMTP id 89C004021E\n for <dev@dpdk.org>; Tue, 18 Oct 2022 05:23:04 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by MN2PR13MB4149.namprd13.prod.outlook.com (2603:10b6:208:24f::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 18 Oct\n 2022 03:23:03 +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; Tue, 18 Oct 2022\n 03:23:03 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=lkGDSHlDPRJcbYroT241z0YqCxgcXPPlgLb8Wk20VmkWANGsjrcizuT5vjAF1cyE18Lr8lvQhsy7u3KmIDlZB67cdRCLHFWb3ooJG+aWTy93bhbrrMuu0kcHWHbjkoLG0DGyxAYqECeC6sWWJEHiUNo7XN4vLk9wfAfELjSQgwZtETX/viW+dbK4a0FlfaXXAYjJRlu3m+CLozr5FtiNfFrqP8eSCWBzD5PMd9W9XhGA2dvZuntK356dNkbXVwPq5PIaoN24y7wYJE0rv25XWet41RdWJ20cLyfv7uA4zDwWt6EVVYrglITvSZMROtLC1YfxujqufKH/94+8GfndBg==", "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=I1WC60XuYa5k+UGDbpEwLcW6dcyKdsZS7XnnDKfgbPs=;\n b=U1O9HX0Rl01kyaxZLTGrJc0qDsexex324F6cS757CsQ6lik1L+XRHj0sno5YDHJiGpKHfz1Fju++OqHIZItK1suaC39vbeSU1EpA2lRbzr7IdXfwpArQIS11c+lpaXEHkXT4503z4IpLaPM1DJlq87YwXx6ojpKhJRwKGUJiwzWTMcW43DXBZUsauODfliat345J+PtH8CcrG2XxUavndxvpL20mCLhbXMgFWVBQW8ertuZHjMhshfvej5SbcIz+AeIjUgvy2tXWQnil45ETzZzmyGzBfsTaFClqyKSkVBAOQut6QwHtlVFLTqXQblDSeZMSFNCwMSwvDCS3WUE2wA==", "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=I1WC60XuYa5k+UGDbpEwLcW6dcyKdsZS7XnnDKfgbPs=;\n b=NsSZ3YG31C7scdpNvr5xx4yKql35cpWB8Hy0o18RL9Kawxc2IxPgLyxiDdqnrWc75Y0pn9O+P6XHRcFK0HJnH9pyOJRUvN5Q4n3bd79vfd+gYTXVKOfKyFGob151L1q4T562Jk0ipyRlhJIZ70P0qyujwTX2q3/J/cQxzhd99v8=", "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 02/25] net/nfp: add the offload support of IPv6 VXLAN item", "Date": "Tue, 18 Oct 2022 11:22:16 +0800", "Message-Id": "<1666063359-34283-3-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR01CA0184.apcprd01.prod.exchangelabs.com\n (2603:1096:4:189::9) 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_|MN2PR13MB4149:EE_", "X-MS-Office365-Filtering-Correlation-Id": "e72dab46-af75-447d-5066-08dab0b810c5", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 6HajEuE9GoFY99hK8TeeJouHWqr3z+yPSKkQGQ31n4JTuyayVR66IKzDPHDxxM4VvbIpBYj+LETIlCfL54e7jeHHzGvbrxLZh1z8IkE0QuX6X12C7simq7Rpb5J8olLK+WzEM+Hqivl0M0KPUWO4pricH7S7U/53HWic/nEGnmtuoWE6wZ9qz2B5T9QrrzXti5wTcoiXRHEIDaoy0iUPrVkO8fpyJ65VPl482uoPwGFpRzGNoRIZTzglh8Vm3x9V6RgoY8DyvffPSSQM867n/oVuatRZmp+MyrGp6DAFW66Py4MVHJXP8gOgT/u+D7Em0AqBAoFiOVl10n9WEfkYsCHJexCvBatMMNiuEUncgev2TW72fBh/gil5ToSFwgTHyC4iQaIxlDZ5hp7eBfzW0hUo6eR4GIObc4zp2V7VV3msYpVF6pU/TnHWmi8P2BLIj8UClmDEyuHSiJAmb6VBtTkLzE9ae3D63nzsiPTDYoZNrpq1I6dhNWBQIVW/iRljj+IKrJHDqfvWxrM3BbV4V8R6kfzaV11Dtcv+C4NYyIU4pJJy7JD0tIUu0uGazbwln21gX3ZoGTwNxZEHyBF+Bb2egZ7AjoobSBaQNooQTeQasJmhggL92ijJH7RccUNX9WnJgw5oDm/o9uAIBP5ZyqfKUn6EQ8sNSstEspMqgC/AfVoFP9WcQdZjkqHO9dOk4LGoG9YaD333zuNtdykoqQfp1WDh9//Lp3sz8XfkAmUv8teB2VsB1Ayounm7rnmp+yLZCuE2owxLz43tgFhqD/y5WuZOJSnvJsjsyQsKwScEb/gUi6JYRAoW9kE110rX", "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)(346002)(376002)(396003)(39840400004)(451199015)(38350700002)(86362001)(38100700002)(36756003)(83380400001)(66574015)(5660300002)(52116002)(6506007)(2616005)(26005)(6512007)(186003)(6666004)(2906002)(6916009)(316002)(6486002)(107886003)(4326008)(66946007)(66556008)(478600001)(8936002)(44832011)(41300700001)(8676002)(66476007);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?ZUCcTCkNMywdL/nxfBneLdwiNtDp?=\n\t=?utf-8?q?NpB1nALyF0vT7L+0QhkFTqTSNs2fqAj/JRS4IoV4Uo0GxMw+XbrQaMZdtjJ4hvWPg?=\n\t=?utf-8?q?2MTuBz0TtVGZMTI2N5S7ypduFD3aXZV010rkwDdIXrPfReID6/mjvSy5aecUAADfC?=\n\t=?utf-8?q?q5/awzhijpwVsR0PAawCv9H+ySY0wgPwFLI/eQYvpC+2NX6WNNUDWtIB//9JnshIZ?=\n\t=?utf-8?q?GolYvY/bZDYv7Vv6AnqHlTnwwgdf1ZjTdkIMDvUYc8ojQawYc66mPQZlAzx3GThBU?=\n\t=?utf-8?q?d9nhiNJu2D7AxdW5dJQTgDCeH98QWj0z++uPyPFxlruUCWoYi2wJwfngwjG2yfy4t?=\n\t=?utf-8?q?Y+xJ5ntfiCl57puisCsmZ4HwfT+NDQi5tUcWqgU/EUYDjaF2mkBF86kyWPoiqakL+?=\n\t=?utf-8?q?fgCS/f+yX3rEQyYemj7lAwhaOjIZzCfJ+yoQcHpcG2QYVPNo5Hto8IRL5vgN2glsn?=\n\t=?utf-8?q?N7jAVAU7ShXTRjE8Brpa29w1M5dk8yQyUncLkjtQkYU4MiC7sgPVPYCFouMciXum3?=\n\t=?utf-8?q?N+93MzXlm4czT2aQsPp+1cndBSzdhYC5poZlTPdpw6AB5VsJO+MhIlrJ4vugj6AmA?=\n\t=?utf-8?q?L+3yM9Sx7BdlLST3n3kjXMypPhEr2oEKQ3IrXXYKSaBIbUGBfP5HTTTn4R5Q/RUEO?=\n\t=?utf-8?q?64Gy/4Y61kZCYbQdARAnFNIyUGjpjF/78lFzEBv5EQsb2EifKHJAba7NrouL6rmWs?=\n\t=?utf-8?q?rVswfBIdAKo1PYGwUV/VRfyl6MyHpDpkSmayTYC3ugHm0oy0tt6jYLrQn77S+c73C?=\n\t=?utf-8?q?XAUY1gMDYiooRFwP3d9wIKUyHFkUb9spMgUjVAmnyRyw9UjohJc8fK51rwaeCwpT+?=\n\t=?utf-8?q?PtLAYUYbe2zTT1Y4J4UxH3IUUgfVNMz00WfavAu2uHMh5sQnY89Ook036pWB2asgS?=\n\t=?utf-8?q?0NEagSMBuCrce5HSaw48315ox71MUDhCODyZH+EbM2N7rRDP++J0inV5Ro8FUunKs?=\n\t=?utf-8?q?huK1xMOGbP7PYCf+asuUNmxivOE3ZhLFbNri9o+uB1XcugnoW8cdH3HVt9yHtncj5?=\n\t=?utf-8?q?SRw55wncFTsAj4AAurDedaqScyiAZXljjtpj4DRmdBORGlJoluAmoykzs4IGSq9tJ?=\n\t=?utf-8?q?sRI/3bQqQpF6uwlZfV4tc8SEz+4F1LS1uXv3at8+/d09IjZtEZy0wMmgKg5O1WUXn?=\n\t=?utf-8?q?LSQ3k31f+XRWmjpEOpeXMA4Yl12pwVAmM2FUJV55EVDqnB3YJea53EF0U/HSem06S?=\n\t=?utf-8?q?NfpyrjWagn6u3Sci/8IpS6A7eIqQ6W1q5e7Dvc8qUC+gwgEo18FceaV/pOp+7WOgz?=\n\t=?utf-8?q?nuwtP/WVJ6grrV42rfvhv7HLI1TUdIauP7tGvzjQ9Lle1ePkex/yCPpFcuub8UypB?=\n\t=?utf-8?q?cr34+dECg7qrA1KgCSFB2hwu4zMdwqHF00omYU+ujNh6lIzL/5Nqe4Y3JzNYA/rIf?=\n\t=?utf-8?q?0gQYDDcyLyXMZ5deZ3p1hr28GaLp6o7GrqSc3flKJOIIB1ko81PYfkxIhlz87oLsW?=\n\t=?utf-8?q?l6dUePuXutZ/LkRvcpGpVywoif7Eap1cQIkq+O0fySXA/LV3qK8nCmSkWRHb7ZcUN?=\n\t=?utf-8?q?WlD8ZIkDjdhC+ADtjuWZW8CQwlIJ0qG/uA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n e72dab46-af75-447d-5066-08dab0b810c5", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Oct 2022 03:23:02.9746 (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 5522Tnt+mueRBDKBND2zEMzEP7UN4BPY3j3Qfy/gQcroLnylj7Il9WyxggtBmIlgbau1XVdhIiIjlM3K8fW85gSdYvK/XMA8W3MLoS0NGbw=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MN2PR13MB4149", "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 corresponding data structure and logics, to support\nthe offload of IPv6 VXLAN item.\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.h | 42 ++++++++++++\n drivers/net/nfp/nfp_flow.c | 113 ++++++++++++++++++++++++-------\n 2 files changed, 129 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 08e2873..996ba3b 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -329,6 +329,11 @@ struct nfp_flower_tun_ipv4 {\n \trte_be32_t dst;\n };\n \n+struct nfp_flower_tun_ipv6 {\n+\tuint8_t ipv6_src[16];\n+\tuint8_t ipv6_dst[16];\n+};\n+\n struct nfp_flower_tun_ip_ext {\n \tuint8_t tos;\n \tuint8_t ttl;\n@@ -359,6 +364,43 @@ struct nfp_flower_ipv4_udp_tun {\n \trte_be32_t tun_id;\n };\n \n+/*\n+ * Flow Frame IPv6 UDP TUNNEL --> Tunnel details (11W/44B)\n+ * -----------------------------------------------------------------\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+ * | ipv6_addr_src, 31 - 0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_src, 63 - 32 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_src, 95 - 64 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_src, 127 - 96 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 31 - 0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 63 - 32 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 95 - 64 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 127 - 96 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved | tos | ttl |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | VNI | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ipv6_udp_tun {\n+\tstruct nfp_flower_tun_ipv6 ipv6;\n+\trte_be16_t reserved1;\n+\tstruct nfp_flower_tun_ip_ext ip_ext;\n+\trte_be32_t reserved2;\n+\trte_be32_t tun_id;\n+};\n+\n struct nfp_fl_act_head {\n \tuint8_t jump_id;\n \tuint8_t len_lw;\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 5f6f800..1673518 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -505,6 +505,7 @@ struct nfp_mask_id_entry {\n {\n \tstruct rte_eth_dev *ethdev;\n \tbool outer_ip4_flag = false;\n+\tbool outer_ip6_flag = false;\n \tconst struct rte_flow_item *item;\n \tstruct nfp_flower_representor *representor;\n \tconst struct rte_flow_item_port_id *port_id;\n@@ -547,6 +548,8 @@ struct nfp_mask_id_entry {\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_IPV6 detected\");\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_IPV6;\n \t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv6);\n+\t\t\tif (!outer_ip6_flag)\n+\t\t\t\touter_ip6_flag = true;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_TCP:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_TCP detected\");\n@@ -565,8 +568,9 @@ struct nfp_mask_id_entry {\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_VXLAN:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_VXLAN detected\");\n-\t\t\t/* Clear IPv4 bits */\n+\t\t\t/* Clear IPv4 and IPv6 bits */\n \t\t\tkey_ls->key_layer &= ~NFP_FLOWER_LAYER_IPV4;\n+\t\t\tkey_ls->key_layer &= ~NFP_FLOWER_LAYER_IPV6;\n \t\t\tkey_ls->tun_type = NFP_FL_TUN_VXLAN;\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_VXLAN;\n \t\t\tif (outer_ip4_flag) {\n@@ -576,6 +580,19 @@ struct nfp_mask_id_entry {\n \t\t\t\t * in `struct nfp_flower_ipv4_udp_tun`\n \t\t\t\t */\n \t\t\t\tkey_ls->key_size -= sizeof(struct nfp_flower_ipv4);\n+\t\t\t} else if (outer_ip6_flag) {\n+\t\t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_EXT_META;\n+\t\t\t\tkey_ls->key_layer_two |= NFP_FLOWER_LAYER2_TUN_IPV6;\n+\t\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ext_meta);\n+\t\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv6_udp_tun);\n+\t\t\t\t/*\n+\t\t\t\t * The outer l3 layer information is\n+\t\t\t\t * in `struct nfp_flower_ipv6_udp_tun`\n+\t\t\t\t */\n+\t\t\t\tkey_ls->key_size -= sizeof(struct nfp_flower_ipv6);\n+\t\t\t} else {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"No outer IP layer for VXLAN tunnel.\");\n+\t\t\t\treturn -EINVAL;\n \t\t\t}\n \t\t\tbreak;\n \t\tdefault:\n@@ -902,42 +919,61 @@ struct nfp_mask_id_entry {\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n \t\tbool is_mask,\n-\t\t__rte_unused bool is_outer_layer)\n+\t\tbool is_outer_layer)\n {\n \tstruct nfp_flower_ipv6 *ipv6;\n \tconst struct rte_ipv6_hdr *hdr;\n \tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item_ipv6 *spec;\n \tconst struct rte_flow_item_ipv6 *mask;\n+\tstruct nfp_flower_ipv6_udp_tun *ipv6_udp_tun;\n \n \tspec = item->spec;\n \tmask = item->mask ? item->mask : proc->mask_default;\n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n \n-\tif (spec == NULL) {\n-\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv6: no item->spec!\");\n-\t\tgoto ipv6_end;\n-\t}\n+\tif (is_outer_layer && nfp_flow_is_tunnel(nfp_flow)) {\n+\t\tif (spec == NULL) {\n+\t\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv6: no item->spec!\");\n+\t\t\treturn 0;\n+\t\t}\n \n-\t/*\n-\t * reserve space for L4 info.\n-\t * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv4\n-\t */\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n-\t\t*mbuf_off += sizeof(struct nfp_flower_tp_ports);\n+\t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n+\t\tipv6_udp_tun = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off;\n+\n+\t\tipv6_udp_tun->ip_ext.tos = (hdr->vtc_flow &\n+\t\t\t\tRTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT;\n+\t\tipv6_udp_tun->ip_ext.ttl = hdr->hop_limits;\n+\t\tmemcpy(ipv6_udp_tun->ipv6.ipv6_src, hdr->src_addr,\n+\t\t\t\tsizeof(ipv6_udp_tun->ipv6.ipv6_src));\n+\t\tmemcpy(ipv6_udp_tun->ipv6.ipv6_dst, hdr->dst_addr,\n+\t\t\t\tsizeof(ipv6_udp_tun->ipv6.ipv6_dst));\n+\t} else {\n+\t\tif (spec == NULL) {\n+\t\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv6: no item->spec!\");\n+\t\t\tgoto ipv6_end;\n+\t\t}\n \n-\thdr = is_mask ? &mask->hdr : &spec->hdr;\n-\tipv6 = (struct nfp_flower_ipv6 *)*mbuf_off;\n+\t\t/*\n+\t\t * reserve space for L4 info.\n+\t\t * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv6\n+\t\t */\n+\t\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n+\t\t\t*mbuf_off += sizeof(struct nfp_flower_tp_ports);\n+\n+\t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n+\t\tipv6 = (struct nfp_flower_ipv6 *)*mbuf_off;\n \n-\tipv6->ip_ext.tos = (hdr->vtc_flow & RTE_IPV6_HDR_TC_MASK) >>\n-\t\t\tRTE_IPV6_HDR_TC_SHIFT;\n-\tipv6->ip_ext.proto = hdr->proto;\n-\tipv6->ip_ext.ttl = hdr->hop_limits;\n-\tmemcpy(ipv6->ipv6_src, hdr->src_addr, sizeof(ipv6->ipv6_src));\n-\tmemcpy(ipv6->ipv6_dst, hdr->dst_addr, sizeof(ipv6->ipv6_dst));\n+\t\tipv6->ip_ext.tos = (hdr->vtc_flow & RTE_IPV6_HDR_TC_MASK) >>\n+\t\t\t\tRTE_IPV6_HDR_TC_SHIFT;\n+\t\tipv6->ip_ext.proto = hdr->proto;\n+\t\tipv6->ip_ext.ttl = hdr->hop_limits;\n+\t\tmemcpy(ipv6->ipv6_src, hdr->src_addr, sizeof(ipv6->ipv6_src));\n+\t\tmemcpy(ipv6->ipv6_dst, hdr->dst_addr, sizeof(ipv6->ipv6_dst));\n \n ipv6_end:\n-\t*mbuf_off += sizeof(struct nfp_flower_ipv6);\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv6);\n+\t}\n \n \treturn 0;\n }\n@@ -1106,7 +1142,7 @@ struct nfp_mask_id_entry {\n }\n \n static int\n-nfp_flow_merge_vxlan(__rte_unused struct rte_flow *nfp_flow,\n+nfp_flow_merge_vxlan(struct rte_flow *nfp_flow,\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n@@ -1115,8 +1151,15 @@ struct nfp_mask_id_entry {\n {\n \tconst struct rte_vxlan_hdr *hdr;\n \tstruct nfp_flower_ipv4_udp_tun *tun4;\n+\tstruct nfp_flower_ipv6_udp_tun *tun6;\n+\tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item_vxlan *spec;\n \tconst struct rte_flow_item_vxlan *mask;\n+\tstruct nfp_flower_ext_meta *ext_meta = NULL;\n+\n+\tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n+\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META)\n+\t\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tspec = item->spec;\n \tif (spec == NULL) {\n@@ -1127,11 +1170,21 @@ struct nfp_mask_id_entry {\n \tmask = item->mask ? item->mask : proc->mask_default;\n \thdr = is_mask ? &mask->hdr : &spec->hdr;\n \n-\ttun4 = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;\n-\ttun4->tun_id = hdr->vx_vni;\n+\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6)) {\n+\t\ttun6 = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off;\n+\t\ttun6->tun_id = hdr->vx_vni;\n+\t} else {\n+\t\ttun4 = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;\n+\t\ttun4->tun_id = hdr->vx_vni;\n+\t}\n \n vxlan_end:\n-\t*mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);\n+\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6))\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv6_udp_tun);\n+\telse\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);\n \n \treturn 0;\n }\n@@ -1140,7 +1193,8 @@ struct nfp_mask_id_entry {\n static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {\n \t[RTE_FLOW_ITEM_TYPE_END] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH,\n-\t\t\tRTE_FLOW_ITEM_TYPE_IPV4),\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV6),\n \t},\n \t[RTE_FLOW_ITEM_TYPE_ETH] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN,\n@@ -1413,6 +1467,7 @@ struct nfp_mask_id_entry {\n \tchar *mbuf_off_exact;\n \tbool is_tun_flow = false;\n \tbool is_outer_layer = true;\n+\tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item *loop_item;\n \n \tmbuf_off_exact = nfp_flow->payload.unmasked_data +\n@@ -1422,6 +1477,12 @@ struct nfp_mask_id_entry {\n \t\t\tsizeof(struct nfp_flower_meta_tci) +\n \t\t\tsizeof(struct nfp_flower_in_port);\n \n+\tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n+\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) {\n+\t\tmbuf_off_exact += sizeof(struct nfp_flower_ext_meta);\n+\t\tmbuf_off_mask += sizeof(struct nfp_flower_ext_meta);\n+\t}\n+\n \t/* Check if this is a tunnel flow and get the inner item*/\n \tis_tun_flow = nfp_flow_inner_item_get(items, &loop_item);\n \tif (is_tun_flow)\n", "prefixes": [ "02/25" ] }