From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A0A80A0543; Tue, 25 Oct 2022 10:02:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FAEC42C3E; Tue, 25 Oct 2022 10:00:41 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2107.outbound.protection.outlook.com [40.107.212.107]) by mails.dpdk.org (Postfix) with ESMTP id B31E842C09 for ; Tue, 25 Oct 2022 10:00:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QAJE05OwTHJlqa4pvoYetKDl4aMVR9jro8QHfD65OOWqJLAWrAhVuwSND52MRJ1tgovD5pvWxyaP5UxZIX+uYQyePthkreuVgpcPiDnzWa0i1Z7YNebrvmPc9Lu/PR1+LLPOwOw73jK8WkvmRp8ME5Jf84vKYbXEcYqI7KJnv6d0gwF6UIGGOdiHygFAShzs5LTxkPeap8OZ2OAdmz7zuiT6I1JKk2cD9LjJqQC7gggWmLNVb6A2YuzHSWLvvfcPfMAOQ6Rn71/hbTH0KoOjy8cVvTdT4SqrErLCxvAW/e+udCos4rYa5zqFEy0nnWlZRczVIC9uUbIh9msl/wsZpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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; bh=0okx0KG8y96ZIasOQgOQzGnTwXMSBiVNmrNXwX1FK4E=; b=iR8o3boeSDOn2GoQsXtsDf8IKmLG3d9i50WYpFelBH9RrPLOKjnS7tJWioF9vm4Z9h390KUZeUIArgQWaHxOIoKKqoemi6KWdkSnNZj3BgvsrgMM+jCX1IKb7Qa+w+b3jPgWZn5o2wcJqUv5CzLGoJ1aLN3mjNkjpLvpUiVkujOP/XNUUJTkOPGj8HdwZ4I6cD32xldHPZL3nqD79SdeiJ0R5fASKRQRlyNt8gyWj23QiqflL+0zAc3koxg46vExSiJPhHTGbmdWLjYAxGWxhX32kKi4fZgk1CGEpxT9T9uakdt2uCnSNLhs08TIfTTDDBqeoh938o8VeiLi9mCBLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0okx0KG8y96ZIasOQgOQzGnTwXMSBiVNmrNXwX1FK4E=; b=sDrIKVVa1DvvNE1Q99BsxspoCEyMbdSEOz7LWOP3pbL6fulgQXjTkQAFMf5/pYYDp8TtA+VskhYknbE2HTnJt9jwSJUFRn2+PLr5aqOyrERYNqqXyaeDVvLSSA1jQthZzIzVfnkjWt6rXXnAcg5tZQYkx3KaodReufhjaXVQK9I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DM6PR13MB3924.namprd13.prod.outlook.com (2603:10b6:5:28f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Tue, 25 Oct 2022 08:00:30 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Tue, 25 Oct 2022 08:00:30 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 19/26] net/nfp: support IPv6 NVGRE encap flow action Date: Tue, 25 Oct 2022 15:59:11 +0800 Message-Id: <20221025075918.7778-20-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221025075918.7778-1-chaoyong.he@corigine.com> References: <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com> <20221025075918.7778-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR01CA0142.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3924:EE_ X-MS-Office365-Filtering-Correlation-Id: da6d7652-02c0-4ff2-d52c-08dab65efc51 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vlmHwnbd94IpIz5X7nmUce8BCdRy98B/a/N+zYt1dY50wwj4pi/26e5yGhc0fGfBDMC+2jSZ8TZhfKEt6LFyOSL6mdAF/lRCQUstsb/iYUBzaG75b7MfvtS3jLgOCccoNA0TTURkvKVP9y/+4617aCUzHWO7suZob7//BV+CbJ2PgSDP9mLc1FkokSHr5klma1oiwVFMj39I+C5JxNlNQXK4Qjh167B8KTuJ8a2gURcB+EIgVie2glzVNR/bk2JHOqTAvviAw670/c3ti3UdUSF5Z+v35dGWWUbe1uPJHreXuF5d/slqXvgou/fXTwwDBK/zPsMksVMyHjptVbR0DyLmdqWoqyCJ7+mCmEfI9TjaVnkEULGIH4JPW312m5mkpIRi4U6eX4smfYJRmgPoZHdOGRbKrzmmpenG93ymlbAKklnFzvlnz2HdUIv0N+f3NaIreSZKvBGS9hIZECMONfhox0j1KxbCPMFWamDKECRN0foyFj8XvjsfXycV95JUXPqrds/5yH95BIJ24iw6UW/eml9scktz3C/+eS9/XnFC3OU2mxNlZy01nX8Cufgyf8FQCE98q+rq1J6v7n6/xRxgSzG1WhkD9hXcMdHOb7BHR3pCobTjou4cWN+XsTfNN5PP4hKlhtxUOO/1LGEAKEFQiEYb5zrpZg4TNHn/EXfdhB9m509obaZxIaY2b/Cjg440cltDW5GdMgcwhKDMia+g1KA/k4aU25hJzJZTgaIDmK2MSXY+gcGz3hY6nRSjFqFBTTXuS94i+Ki4WS7Alg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(376002)(366004)(136003)(346002)(39850400004)(396003)(451199015)(86362001)(2906002)(6666004)(186003)(1076003)(107886003)(83380400001)(38100700002)(41300700001)(2616005)(8936002)(6512007)(36756003)(5660300002)(66476007)(66556008)(4326008)(8676002)(52116002)(66946007)(26005)(44832011)(6506007)(478600001)(6486002)(6916009)(38350700002)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d0NhMjIwY1dWTkhtdXIyNTM1dFVNUzJRVjQ3bVNUdUsrcmd1TEtEeDhCNElU?= =?utf-8?B?S0hJRG1BOTBYWGt3WXlNMzA0MVV0RGdIdmFkU3I0M2Z1MUZmQmF4Z2hUTUo2?= =?utf-8?B?MDlhUHh0Ni9GeVRWak9RQ2JIOFFaNEcyUHpYUm9sZmhuQXN3UnlDOEpXbUsv?= =?utf-8?B?MVJLSEdQajhwWlhXSk1RQlRwNnpqSFJPNlEvSWY1UWl1UFJQem1xZDhyT21U?= =?utf-8?B?cXBBMDZVb2xyNHBXOXZVcG9wdll3bTRtZ0w3RWhTcVFjck5xYWVtKzBaWDRJ?= =?utf-8?B?akFXUGRsSE5jclRuTHpxVkVQMEdUNEpYSjg2S0tHc2ZpNll5S05uOFBXRXRm?= =?utf-8?B?enArMFI2cUpxTDNsTitDSWV2eFZLNXZTRi9GR0oySkx2bk9BTHQrL3VQclJS?= =?utf-8?B?d1F6SHZWVElvc2YvOWludmRwWWtCN0w2RVNuUFV4WjUyaTlVa1VnQ3NtcjdI?= =?utf-8?B?U1NLZzNFQVp5azBMQTBqM25tMGUrZDdVM00zSzFjbTBiVGp2VitTejY1NEt4?= =?utf-8?B?UkRURFl5QSthWm1GNzlLcjgwUm5heFdpKzZjcitxTjJyc0p1VDNZenBFYVR3?= =?utf-8?B?QTZ1Qy8rcStSVDUreTlGUEhFTDRCWmYzcGx3aVNLTEd1MDN2SWUvWE5zelZr?= =?utf-8?B?OE1HMlVKNFBFeHBmeCtiLytSY0JoMFR2Z0JiL3hHa2lIcFpCMU9ZOXFVVEc3?= =?utf-8?B?eURuK0NoK09SMVY0U2pSSnBsV0QrTnhRa0xERU5xN1o5VjZsTHJiTURhdXJK?= =?utf-8?B?RitpR3kzOW9hUVJyQXhkOTRtSDVXMFI3KzlML2lZTWNrcGRWa3lCcStkL0ll?= =?utf-8?B?a1BQR09NV0FSVEU3cnM1MU43TDQwUUFJVitFVjl3WnhzNEZOZ21kUCtmZFQv?= =?utf-8?B?c3NReUpNcTUvTXZIeHdON045alFaZURwalV3ZkdCRmtpdm9TNzRwUmF5cXhh?= =?utf-8?B?cU1GVnBaZkhUclhISllITE54cnZyOElPWmJUdHRwbi8wNGttMkcyeUExZjJJ?= =?utf-8?B?M3lJKzZFNDJueWJ3WHF6S3lrTXJuKzVFQ3cvamQ5d1BMQ0l5N2lzb1Zab0pC?= =?utf-8?B?U0cxam5LQ0xnZmlFc3ZmN280K1M2Wm9YS01YbzlPNzAwaHBhTy8xNzNsQ2JO?= =?utf-8?B?S3F3c3RLV3lmK3pWV1A4NWdlTVNyWW41Tm9FeFI0c3MwY2lWUlI4WkpzUm9C?= =?utf-8?B?Z0t1bC9kV1ZLUHB4ZlNRcUF6Y0h4R3JicEpvL1JUWmFpUm53WVZVZ0tiWEV2?= =?utf-8?B?K1luRXhMbGpoWE9hblBlcitjcExkY1Y1bCtlTVlVekRXcmN1aXFLczliUW5k?= =?utf-8?B?KzNUbTBSRytkcmZrbHdLY2tmekFCaGlMZlZ6Wk5MeVNMT3RJU21zWHdIRSs3?= =?utf-8?B?bHBtMERFUmdrQ3V3S25YY0VzZGVjVXVqZElEVjB1a2JXTnJSQU94SCsyZCtK?= =?utf-8?B?U25MSDF2ZjVUWnRlQ1ZUelIzYnlvZUsxN3VJbzRJOFdnVGtTTlJTTWVDeFly?= =?utf-8?B?T2JKdERFaC9Fbnl1eGJGSmZ6N0VBOWQ1SkEvQlVTWXVSTkk0MVVnbkJqSWta?= =?utf-8?B?Uy9WS1BLci9ERkZpV3ZtbXU0d0VhL2pTdm9TMDFyTHkwaHpRajFHd3lCUlM4?= =?utf-8?B?Y211alNhSUsxZk92SjVnQWoxYWhDU0dva0xoV0lNb3AvdFV2Nlh4UmV6TzV4?= =?utf-8?B?SkFEbTk4ZGxoMmFMY0NCbkt3OHpMRDBuS0NuK0RyZ0FYSnpQTXZHWjFNZXNS?= =?utf-8?B?VzVNT3RhVXVsSDlYellQd0NtOVIyNGpIUEI1cWdUVlBiZzFRZ1RFd0YwNER5?= =?utf-8?B?QVF5bUp3b0pqalNGVEVrRFBQazFSdU1VTUl3QzVZR21mNmNrUzM2T2NJdm54?= =?utf-8?B?R3lTcXNLRmoxcFYzcjZidmIrY3BaWVhBbFJFYnNSS1Q4NlVxLzlvc01FMnJk?= =?utf-8?B?YWtKMEc0VEV2UW1YQ3ZIbEhIV29LaWtuSEtxbThrRnFFeis1UGRzME4zZVJY?= =?utf-8?B?WnljWnAvZ0praklUTlUyMWRtTHZFc1FRMFRNTUF6SEtBSDFkdXg1ZXpVL1BF?= =?utf-8?B?bGJGR0k5UWZNUGFqc3QwdDZjWFEyM0M1WU9Vd2tiMXQ2bHFtS3V3UTd2NFJ4?= =?utf-8?B?eWJubHd3ajd2YXJScjAweERyT1lPRVlEalpnNUtxK2QyQ3NyWnJua2FXdWQz?= =?utf-8?B?eFE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: da6d7652-02c0-4ff2-d52c-08dab65efc51 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 08:00:30.4623 (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: YfT4XwojYOp+G+m6pZrGqUD7++1se+fobhh2AKO7R9ppQ+aO+n0LjlPKW97HlJvw4vIOaktyBfNVd46T+oEhMPSIllhoOy/Fd/k6ZakrhrE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3924 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add the offload support of encap action of IPv6 NVGRE tunnel. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index cc09ba45e2..06115cc954 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -51,6 +51,10 @@ struct vxlan_data { sizeof(struct rte_ipv4_hdr) + \ sizeof(struct rte_flow_item_gre) + \ sizeof(rte_be32_t)) /* gre key */ +#define NVGRE_V6_LEN (sizeof(struct rte_ether_hdr) + \ + sizeof(struct rte_ipv6_hdr) + \ + sizeof(struct rte_flow_item_gre) + \ + sizeof(rte_be32_t)) /* gre key */ /* Process structure associated with a flow item */ struct nfp_flow_item_proc { @@ -2866,6 +2870,43 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, tun, eth, ipv4); } +static int +nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower, + char *act_data, + char *actions, + const struct rte_flow_action_raw_encap *raw_encap, + struct nfp_fl_rule_metadata *nfp_flow_meta, + struct nfp_fl_tun *tun) +{ + uint8_t tos; + const struct rte_ether_hdr *eth; + const struct rte_flow_item_ipv6 *ipv6; + const struct rte_flow_item_gre *gre; + struct nfp_fl_act_pre_tun *pre_tun; + struct nfp_fl_act_set_tun *set_tun; + size_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun); + size_t act_set_size = sizeof(struct nfp_fl_act_set_tun); + + eth = (const struct rte_ether_hdr *)raw_encap->data; + ipv6 = (const struct rte_flow_item_ipv6 *)(eth + 1); + gre = (const struct rte_flow_item_gre *)(ipv6 + 1); + + pre_tun = (struct nfp_fl_act_pre_tun *)actions; + memset(pre_tun, 0, act_pre_size); + nfp_flow_pre_tun_v6_process(pre_tun, ipv6->hdr.dst_addr); + + set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); + memset(set_tun, 0, act_set_size); + tos = (ipv6->hdr.vtc_flow >> RTE_IPV6_HDR_TC_SHIFT) & 0xff; + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, 0, + ipv6->hdr.hop_limits, tos); + set_tun->tun_proto = gre->protocol; + + /* Send the tunnel neighbor cmsg to fw */ + return nfp_flower_add_tun_neigh_v6_encap(app_fw_flower, nfp_flow_meta, + tun, eth, ipv6); +} + static int nfp_flow_action_raw_encap(struct nfp_app_fw_flower *app_fw_flower, char *act_data, @@ -2908,6 +2949,10 @@ nfp_flow_action_raw_encap(struct nfp_app_fw_flower *app_fw_flower, ret = nfp_flow_action_nvgre_encap_v4(app_fw_flower, act_data, actions, raw_encap, nfp_flow_meta, tun); break; + case NVGRE_V6_LEN: + ret = nfp_flow_action_nvgre_encap_v6(app_fw_flower, act_data, + actions, raw_encap, nfp_flow_meta, tun); + break; default: PMD_DRV_LOG(ERR, "Not an valid raw encap action conf."); ret = -EINVAL; -- 2.29.3