Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118907/?format=api
{ "id": 118907, "url": "https://patches.dpdk.org/api/patches/118907/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1666339323-24016-12-git-send-email-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "https://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": "<1666339323-24016-12-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666339323-24016-12-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-21T08:01:47", "name": "[v6,11/27] net/nfp: support IPv6 flow item", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "49557b9dc51e84471804d14040923ac16f770f8f", "submitter": { "id": 2554, "url": "https://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1666339323-24016-12-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25363, "url": "https://patches.dpdk.org/api/series/25363/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=25363", "date": "2022-10-21T08:01:36", "name": "add the basic rte_flow offload support of nfp PMD", "version": 6, "mbox": "https://patches.dpdk.org/series/25363/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/118907/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/118907/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 44C0EA0032;\n\tFri, 21 Oct 2022 10:03:57 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C412642C14;\n\tFri, 21 Oct 2022 10:02:48 +0200 (CEST)", "from NAM11-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100])\n by mails.dpdk.org (Postfix) with ESMTP id C949642C02\n for <dev@dpdk.org>; Fri, 21 Oct 2022 10:02:44 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by BL3PR13MB5162.namprd13.prod.outlook.com (2603:10b6:208:339::8)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.17; Fri, 21 Oct\n 2022 08:02:43 +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; Fri, 21 Oct 2022\n 08:02:43 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=WM3sqHLKEhpxfW8Fg+0829w64/OokKHKg3apio3nqeSKEQQjuP2rqFgI6DkD8rlwtoutEUTZirbMlJCRJ/vfijJOcO+XGAxfeHaXBCwTplBHjpoMF33UkfSXInu+VZR1ZrD8EQP3sniMIHPjWGUuirFSYp6i9+dvH2dpUZfylMjtIoMbNnT6B01wmQhqAwv+KJoU07px9wDyCbJ734vB1B2v7ophuEF52uXNiK4zfolM21L5lW/XxYiR7kVcdlr94Ief3/6aJTP/Semf/q2qttNhr8aEikDqeWxtKbfKgZtWF30GCQCTPP4cp/bdMYK58DjGSOW4dpAtgR1zYFJ77w==", "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=6pxJkVOnhPjV/bpO9CvZ23XmxzUnXOhkWXb9vAXc8HY=;\n b=abLi7IAElwzh5m8CbuZTkqsaR/UIgr0fdqISV4yjHuW8bpP3aOSV/7AHELsArq3/u93l1WbWN91g33ZB5kPGpYg/aPl+gjMNzoWJh5bK9gzDcXEWon09S3sDd5ndgo7xQ9oy4DFmN3qIwC/dFRhxYHTuQfcY/cUaZhXa+6h1yWFywUBR7q1EMOy5NmCbNFJFGWebCbamMX1LxRb2np5JAkjSCSK6meAMz5IYbzbWcw4JFy8IfIzIzb5HxFK3vsOglflyd+Iw+cmFz+fDU82ZWrprD6IXUFPr5GbdFXR+Naj3TmFA3cIp79tKc+X98ct3tHfobGXOQ+TTYVFgIUX5NQ==", "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=6pxJkVOnhPjV/bpO9CvZ23XmxzUnXOhkWXb9vAXc8HY=;\n b=PtJ32yuAROetI8SNyV22DTx4sQzZ4mVAQGDz9Tf4nrs+flQWsBriIBtFFYe79zhbvze54Y2f0HXJEJr4s73OlE7mmNS7nlV0vBFTzSRVhEVwItSwkFdsYqrEBxJEJzRXd3r6ckzSIlMkgf+lO3c9AYgJcHBeE4x7L3YOdf/95Hk=", "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 v6 11/27] net/nfp: support IPv6 flow item", "Date": "Fri, 21 Oct 2022 16:01:47 +0800", "Message-Id": "<1666339323-24016-12-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666339323-24016-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666232391-29152-1-git-send-email-chaoyong.he@corigine.com>\n <1666339323-24016-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI2PR01CA0051.apcprd01.prod.exchangelabs.com\n (2603:1096:4:193::6) 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_|BL3PR13MB5162:EE_", "X-MS-Office365-Filtering-Correlation-Id": "07428453-0ac5-4cd9-cf87-08dab33aa1d8", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n FbtRoWPUm4VO0YUSXqdd+BM8Xb3Wtqe8ftWBHgj6K17t9Sj06CYwDthDcF0LiDNylz3pIVdui0ubO2xAeT3DascLWbb0Jq6kAVaBnCnmGIA1Jteoe68El9vDFmbrh/zC3hcldgc/oJgIvHYOni3ygeHmEJfHgeMGP2myrie2FWpIIBoq5BnRvH1VN3u/6vFHSvMz8rbj2xKS9Q+yYdX8Z4RSI0rzZY+5CRJ+dJ9FGdxaCKg1M0hov9rCboN4uWNW9xpcwR/PxQJS6/LNYJ3u0TtRkmlO9HD6SUdzb8PlLb/7EaJTpRvDJSe29EKNj7TUHTdvduQUJtuAwqMg01WjicvGJtlLPrxyUvtBJnFcBSFYqLXz96WHPxFWrHKENRaDIv8vixdOcua97T77lGsXyt8BOR2eyUamya7jvHk7HxKDz2yLLCIF//9GwT3a7x7zrcecNr9W2UDJ9lkcJD5J7FTQ8OUeid1jAQvE8kmBlviDPZhXO30LINIAUfRqdd5gor44lSiZH4t+VYBBLJLC6IWPszHLSrG0ttgQfx6zb4jrfYYlXaehJyNgsLsy2qPrqRRLGaI4YbRPiE3PAjsSYMf0laFlFpwK9F/7Np0To27fgM70y8I7Fr+03TyVuR793otIewYKAxuBQN63lTV6YXtlOeiY2pvmXflYxQJmqT+lbHIU9NPdL2/n/PSpRu8QDfITkhi/74pb87+cc8jLxkzGNJKR+OHqn3BdNFGN3La9isBLFbClYDTVohmI15Wnez+viFr8AbnC1ZIbLS1ngQ==", "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)(376002)(396003)(346002)(136003)(39840400004)(366004)(451199015)(2616005)(6916009)(38350700002)(6512007)(6506007)(52116002)(8936002)(66946007)(4326008)(186003)(107886003)(8676002)(41300700001)(2906002)(66556008)(316002)(66476007)(38100700002)(44832011)(26005)(5660300002)(83380400001)(478600001)(6486002)(86362001)(36756003);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?YLdY7zQjnvXS5Gq92TLrCWa7ZXS3?=\n\t=?utf-8?q?uVVoOCBQUexztfJo8y0nix5mfhruZUf4EzYFlKDgDW54ONfzJZqUPM4VTpRURDhM1?=\n\t=?utf-8?q?GHpTXtQllcycoDAxZvBMBplq1SQJy5MJN9o26lHP5Fi6W5h3G+cpi5wR0fpg2hsqH?=\n\t=?utf-8?q?qG4rpnRE6DfpS2PMKYfdbF4jlFan5/hSh0kDJoMgw57EciX8tMseBunIuRf1HY4vq?=\n\t=?utf-8?q?uq/IIXvSKA3MRM7IOzFHkgOTAR/+Qft1bP2c6kk426QDG1VVx+oQwRh53a+1lLd9T?=\n\t=?utf-8?q?0YSkMd3F6pKi6UyOFb2kiZ5okEAeRt/81NDzk72dOwtsbpXk9uNrGNKlWW9PVrXDm?=\n\t=?utf-8?q?6N2DwWzZkmYkmBLeK4eFj1s6dmDBTIYjPRBj7POGc6iDpkK4DrXlAFjUt2TJEYmiz?=\n\t=?utf-8?q?sJmRzqF95Icv9k7WT1HMnWjrRMKsLXIAuXjJnpjyl/58tU0YBn77vxG+rCGpT1bV5?=\n\t=?utf-8?q?ZJdvmc628Ml79Kg/s5d5u3N3Ai7W6LXdkzuCBIfkPtDo53J4RCsf73LWiwLNqO/9C?=\n\t=?utf-8?q?xWmviR/HfV1pLjHBddvia7ejDl0n1SSCdujSx6bGGYNeoS1Tjo8Cn9D+btJLl1oRS?=\n\t=?utf-8?q?RgWirK048nyxHrdzu8i3vIBERUTocpTHssqFMbAToEFkjwxZiHlEzDkHy51iYOwpt?=\n\t=?utf-8?q?Jn1l6nXIMzKmI0j8hbFZL/oMBuRwVvHK0di1ckWRxyAKWws6M/clEkPhzCmHoAQBm?=\n\t=?utf-8?q?CAtdFYQfFkYXQRWucEAPHiK7r6Lqw07UJGLfCp0ih8HxGcLCHhYjBG493LluedfFJ?=\n\t=?utf-8?q?S/2GSF7hQm4RP+QuHI7kbUYs30+VnJvYmgZEzsDyS8dkjCdCm5ibxg+4BJ2O2im+u?=\n\t=?utf-8?q?QzTJoM36Z2DABCwk8SlDmYUJmd3k1K4UflcHgP2gE9Y0E50tWELSyTU26PCqkVX2T?=\n\t=?utf-8?q?KyUauhU0AtCcrgA9KIIj3bYWu2Lv++Fmvb0w4Bho2BoFXeq4HD7eidtlogsPUmxgp?=\n\t=?utf-8?q?nteMz+/7sy2qsg76dYFnVweMQWYe0epU+/47sIxKPwKOpL9valO2x93h+sqixZodn?=\n\t=?utf-8?q?CWxSRpzMYR5La/wcnPwNxbQ5l99hrBEFdUOiN1CEllsJbrh4SZsJ/JOxXYeAsubJX?=\n\t=?utf-8?q?fWikPJuCIA2F1AYFQ7GULiX/OcIjYdhtFZYv2rnkIThsg3rgWyBYBqEdmP/ODK1rz?=\n\t=?utf-8?q?90psa9uuU6Wge0gKmk6KYunjkn9uRKAtai0bw78o0ohlHi9/48RgN+WMpLJWEw+Vt?=\n\t=?utf-8?q?dzLUwgIOU6W2NUM3883bDJs2gpDAi+W+/JC4soPqYLdy6juOIcrvgLS1sEpmK4uQj?=\n\t=?utf-8?q?13Vdn4fr2WLzj+kLvQcnoCsjR1T6a80A7nUuN1arLeAy0RfP2iuHUzHlDDoNXkJvZ?=\n\t=?utf-8?q?fUEBgHMpGHlM0hdz4E0O4DdgYZi5wJDFvAnbhI467Ev92C9yFUhBLrhLGiBubKYDv?=\n\t=?utf-8?q?wTYSox7+NN5TCuJAPamq3fyfPDZX9vv8npB+BO380Q5w+ckKff0TugXO+piiFCCOx?=\n\t=?utf-8?q?22uyGVADY1FvDwLPqzWsj7ENuljE4k1AHtTyucjbLAbk8K1YHaCD2jIYsaW/laz1V?=\n\t=?utf-8?q?W11Wp3gtoSDvbYX9PuKtRv7HLjTqZ4V8GA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 07428453-0ac5-4cd9-cf87-08dab33aa1d8", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "21 Oct 2022 08:02:43.4130 (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 pCQc44IT1YFIWyFqmw//1DxSxjeegp38uPP4GqK+6ujB73egekkUvNZKDcceBX3Usalg2cx4wHBF7PUR3TlgGMjT+TLZ3FDwqB7DrGVZqMc=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BL3PR13MB5162", "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 item.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n doc/guides/nics/features/nfp.ini | 1 +\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 33 +++++++++++++++\n drivers/net/nfp/nfp_flow.c | 73 +++++++++++++++++++++++++++++++-\n 3 files changed, 105 insertions(+), 2 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini\nindex bf59123..4869b45 100644\n--- a/doc/guides/nics/features/nfp.ini\n+++ b/doc/guides/nics/features/nfp.ini\n@@ -29,6 +29,7 @@ Usage doc = Y\n [rte_flow items]\n eth = Y\n ipv4 = Y\n+ipv6 = Y\n port_id = Y\n vlan = Y\n \ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 5964ecf..36d406f 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -291,6 +291,39 @@ struct nfp_flower_ipv4 {\n \trte_be32_t ipv4_dst;\n };\n \n+/*\n+ * L3 IPv6 details (10W/40B)\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+ * | DSCP |ECN| protocol | ttl | flags |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_exthdr | res | ipv6_flow_label |\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+ */\n+struct nfp_flower_ipv6 {\n+\tstruct nfp_flower_ip_ext ip_ext;\n+\trte_be32_t ipv6_flow_label_exthdr;\n+\tuint8_t ipv6_src[16];\n+\tuint8_t ipv6_dst[16];\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 7a7a873..1da3c89 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -527,6 +527,11 @@ struct nfp_mask_id_entry {\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_IPV4;\n \t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv4);\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_IPV6:\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\tbreak;\n \t\tdefault:\n \t\t\tPMD_DRV_LOG(ERR, \"Item type %d not supported.\", item->type);\n \t\t\treturn -ENOTSUP;\n@@ -705,6 +710,51 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n+static int\n+nfp_flow_merge_ipv6(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+\t\tbool is_mask)\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+\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+\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+\n+\thdr = is_mask ? &mask->hdr : &spec->hdr;\n+\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+\n+ipv6_end:\n+\t*mbuf_off += sizeof(struct nfp_flower_ipv6);\n+\n+\treturn 0;\n+}\n+\n /* Graph of supported items and associated process function */\n static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {\n \t[RTE_FLOW_ITEM_TYPE_END] = {\n@@ -712,7 +762,8 @@ struct nfp_mask_id_entry {\n \t},\n \t[RTE_FLOW_ITEM_TYPE_ETH] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN,\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\t.mask_support = &(const struct rte_flow_item_eth){\n \t\t\t.hdr = {\n \t\t\t\t.dst_addr.addr_bytes = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n@@ -726,7 +777,8 @@ struct nfp_mask_id_entry {\n \t\t.merge = nfp_flow_merge_eth,\n \t},\n \t[RTE_FLOW_ITEM_TYPE_VLAN] = {\n-\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4),\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4,\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV6),\n \t\t.mask_support = &(const struct rte_flow_item_vlan){\n \t\t\t.hdr = {\n \t\t\t\t.vlan_tci = RTE_BE16(0xefff),\n@@ -753,6 +805,23 @@ struct nfp_mask_id_entry {\n \t\t.mask_sz = sizeof(struct rte_flow_item_ipv4),\n \t\t.merge = nfp_flow_merge_ipv4,\n \t},\n+\t[RTE_FLOW_ITEM_TYPE_IPV6] = {\n+\t\t.mask_support = &(const struct rte_flow_item_ipv6){\n+\t\t\t.hdr = {\n+\t\t\t\t.vtc_flow = RTE_BE32(0x0ff00000),\n+\t\t\t\t.proto = 0xff,\n+\t\t\t\t.hop_limits = 0xff,\n+\t\t\t\t.src_addr = \"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\"\n+\t\t\t\t\t\"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\",\n+\t\t\t\t.dst_addr = \"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\"\n+\t\t\t\t\t\"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\",\n+\t\t\t},\n+\t\t\t.has_frag_ext = 1,\n+\t\t},\n+\t\t.mask_default = &rte_flow_item_ipv6_mask,\n+\t\t.mask_sz = sizeof(struct rte_flow_item_ipv6),\n+\t\t.merge = nfp_flow_merge_ipv6,\n+\t},\n };\n \n static int\n", "prefixes": [ "v6", "11/27" ] }