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 A2DCCA0560; Tue, 18 Oct 2022 05:24:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05D5E41155; Tue, 18 Oct 2022 05:23:29 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2109.outbound.protection.outlook.com [40.107.92.109]) by mails.dpdk.org (Postfix) with ESMTP id 8B7584114B for ; Tue, 18 Oct 2022 05:23:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWHMwonQ//e82JxXm4kml6UiW/f8YbfMVLvpFmT2zWDpivjEGeK9MPbsn5Zl12mNajTk4xqYTbAUYDo37MeHoeQDick0QgzWluokKhKiNzN7mjgXdeMZXjpqTwP5O/Dgw+mSX3iguf0ETvcAwRH51xeI9koFkieT0GYvLMGd3eWU/lWocdai1EZMt9VKkPaaikp1H4fATUfsbXkeWTeJMlHUgJFe/iIpJHClO/6PeVDMTOZKoTYPRYvSKZe3tfUon0Q0wEu8S/4w1ji6BeQNdyv8Bz5jOAyhKEN81FpA2pVpGqTSk/iX6MjHVbTfaWwRq4N4wM8nvWXy4NacdjU6qw== 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=oka3cHiMEOHbxXL1sE1KTiQP3F1ZkaCxQuU1I1+O5Ps=; b=XNE37KnI7urd5ndflv9KS8kIR1vzG68nuXM5Ql/7L6sXKjHQhWrOfGw6L1Cb8plnqApIZpfl8ikhT0A8dNVnISOxYWP5oODqQBUfgyqO8dccxSMOvnfIZVZNsTdK6NgAT0xgOes6mp1EeLntyPPuuf5SIc11tHEcDikwiCLuuGRZS3OmGErOu+RlsjFTd0Z3eK86LG2b14MbbnCf61ep9TjI42/tn++XJm2HpLsQfNiMa2Fmtf3EUbdYCKzRkS0gfO4bzcboW/HID0nGaYhlWvSIa1OLRNwHVWgukA1bKoXKAwGCe/3U0+taIZI6NYd84x33BJVBczu/oG6SDPVxFw== 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=oka3cHiMEOHbxXL1sE1KTiQP3F1ZkaCxQuU1I1+O5Ps=; b=RQUdpZ7SiV+J8B/BhhEF7KbvpZ82bqxDOTj8tfeJ4dZwt5FxzzHGxIfZo79++SZZDTG7TMAkDoSOmxpvMJicapBQG8ZveZHz/BBFypnjEQuYlKQOnhrbN5ROClOBg8xecjx0tinZX6VqcY4RqDB6aergzle2fKj/8F9V5nB3+JI= 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 BL3PR13MB5147.namprd13.prod.outlook.com (2603:10b6:208:33a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 18 Oct 2022 03:23:20 +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, 18 Oct 2022 03:23:20 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 11/25] net/nfp: add the offload support of IPv4 GENEVE encap action Date: Tue, 18 Oct 2022 11:22:25 +0800 Message-Id: <1666063359-34283-12-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 (2603:1096:4:189::9) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BL3PR13MB5147:EE_ X-MS-Office365-Filtering-Correlation-Id: d89c67e6-7aa0-4fd9-a29f-08dab0b81b5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6m7ecIzFQyeEnTM90WN5mu7vwh0PXLZBeteUyyLrOMEuCojayxpLmFyEoB7qMtQDqqnPtpkK5fY0c4aUkjiNUAMEMHopI4YqTHSEAAe75MUQ3hIWPj06kpp9edQOFguzj5ZL4aW7KfZb9cfWLNP/k5eYsBBbl3rPsfy/PIC/IyTbpiJuUHHKeuNNUTG++GwEH4tfXCYugCQ9/hZNTySMTEVKhIpoA3GcLbmHshSjB6Vgx9rff1vj2AA3pgdiDOCYvvuv3/S/AA8qZEhmXzcZOCsuagBwSa2j4GOB8carIRAONEaCnjmjdD2ZHShxA9TbGOMGTtkc45a8DetU4cabjr18OKjlKXvPvOMB+9dj6T2S5WXgSGchhHd2VyGOOviQWoXTbdgJOuc9b9UrUQx53l3SC710U42VwkOeBMmlTgYX2uaWCpj2e+bOu6spx7U/t3QZLfDvj960PJyV+YmWDxZmh5ocIdvQut16RHm5oenhjzZzHgwfjRXxiT2QrtEpzrgCULmIVc05SO3x+SFuA78AX76g6KPJr6UamdRrhEqT5DAA2ozbMMGs0+6UmaBQVCIOnqkK6yTUQKHDqvqu7Q9kh1ThumxipYY9RyaPI5/ctmxVzQWDCPgNZ23Q2Ps8RCRU2RSipi5ZkRe304zQB4d/eJ7lJV7N3+R1ai6BzPt43aE2C/wB/ffecmgtEW+IV/yuZxNrRVWVQ+gBnp/+fokbwJBUg+jfMZvyZ7WlGgiyaHMWZDjLdfnUohqbVhn5Ll2dIINNpVxZyUMhHJVLsQ== 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)(136003)(366004)(346002)(39840400004)(396003)(376002)(451199015)(36756003)(4326008)(66946007)(6916009)(316002)(5660300002)(66476007)(66556008)(38100700002)(38350700002)(86362001)(107886003)(6486002)(478600001)(26005)(6512007)(6506007)(52116002)(41300700001)(8936002)(2906002)(44832011)(8676002)(83380400001)(186003)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VWVjckE3UExtS3ora1gzMTEwempubXk3eU1uZG42RTFLRXZ6V08wb05vQ3JS?= =?utf-8?B?Z1RTbGJPcEFjYXdTQkNxcTVrVmRaWEJFM3RjeE40bVkwM2o4RzgvcXA3VklM?= =?utf-8?B?b3M3YzF6aWxMTnd3ajVTUDByeVd1RkVjVFVQVXpuK3NoTEJJSXR2WDRaNUhU?= =?utf-8?B?QXc4UC9HbmV1S1JHcnFMb3hLZzRVQm1kLytZV3N5dEtwNWlRbmo5RDhvZWNr?= =?utf-8?B?MFlnY2h6NG9lUk1ocXZjaGhhWkE3dGVSSFcwemgxWFZWUnpvMmRGcWt1Vm52?= =?utf-8?B?NEw5ckNxOUt2cjQ4dUZVMlVLVkZGVW13M2dsYXhLN1lMWENaWVk3QzJEMS9v?= =?utf-8?B?cWlNblZXWWtsK1BBeTAwSUJOWS9paHJZS05HVXV5QWI0VWFuWVFGNkZza1pH?= =?utf-8?B?M1hyT1pxQ0FwenNWYTBnU2xTMEcvN0JLUGVJckxNajI1elF3N3lwclhyWjdL?= =?utf-8?B?THVNdXpVVnh0a0xZa3puNUNObVlQTTNJV1psdTRzK2UxTytiN1RLNzgvUi9E?= =?utf-8?B?Q3JuN2tFWjkzazRuYytiKzk4SG1VYzNLOVhCcVJyQ0dVbWQzekNMcGF1L21v?= =?utf-8?B?aDBhdnRsdlZyRmlndkFPL1BjQlcxM3NINU0zMEtJQVpXUGtvcGh2dnJoMy9v?= =?utf-8?B?YXgxUjU4akU5NSsrWjFVdXVyWVJQZ1Fka0luMmQwOWRXSnVSdkt3d3JTeU8v?= =?utf-8?B?TEZvRW95cnZKZ1UyaGkxRmRwRDBhbmFnY2ViTi9Lc015bGo2Y3JFSUhBYXJP?= =?utf-8?B?ZDNMR0Frd2lXa3VRZDZ3M3R5Nk1MOGNjRjRFeHJ2d1h0MytaOUZLR29vWlZ0?= =?utf-8?B?RFFpSEtRT3N6cVdjcGw5UEdEcHhTSnZqZEZGdjRMdU1ha21ob2lrSmw1eGNT?= =?utf-8?B?MWFhWWV1ZTVpQWFjblZrOFZ1M0lHUk4xLzAyU1ZmbVBwMW1JcHJVYTJCWVdI?= =?utf-8?B?bTU0NWtVWGNFMDh5eUFLd01SRDNreTJIVEtDUHlwdXZrZ0Q2WU1zeW1XYk1E?= =?utf-8?B?bmhzdnNrWHQydWhPK1JQRkJrWWd0Q0lGOVZJbVpkYlhxK2hXaGw3bFp5dndW?= =?utf-8?B?ZlhkVXNybERQVnlYSlE5WW8vY2U0bUlZWjhuTEhGVFdoK1dsK2ZDWXpPTFpw?= =?utf-8?B?QUVRYnF1dHdJREN3SGI3YncvMEFkRVZ5a3hiaUxMNkJHUkVkK1dpTmxNd2VJ?= =?utf-8?B?bks0RWwyL2p4dCtrcllnTmh5aGNyTzh2cEdCd09lWEVPelZnSExMUWpTUFla?= =?utf-8?B?bzUvNm9TQ0pXdnJBZnlXVGQ3aC80cGgrdE1TbS8xT25URWRiTTBROUZ6eUt0?= =?utf-8?B?Ly8zRXZPOUZ5OW5jejZHQlFncTF2SVRYSElJb0Ura2FSRVRBU2srNEFnSUxh?= =?utf-8?B?anR6TEVVZkVFcGtjM1JNcm5UclcvYStHKzVhNFRPWlZGNG05T0RYR0pENmhY?= =?utf-8?B?bGlPUmU5SWkrZ3g3R0psZUk2U0JmMEE5eU5DN3FCcHNkaStJSENSOVV1TUhR?= =?utf-8?B?UE9nYVpySys3ZTdoSER0bnBXS20yNUNteXpqbEJjWDBnSVQzN3F5WGZPUXRC?= =?utf-8?B?YmswZlI0NHhlTzlUdTV1dG9pUU9SL2RxNlNROStiTUR2dEhsdmxWL2hQcmJP?= =?utf-8?B?eUZpTkh1R0tyMWN2aUNNei9XUjNIeHVDMlF0U013QWd4REZTZVR0MEY5WTJD?= =?utf-8?B?aXVSK0FoY3AvNjlUT2ZpK3B3SEJDc05qVmRPN3M2cnB3QnFvVFV5cVFnc0Fq?= =?utf-8?B?dUFDQW1jcTRtYmFDb3FuR2R2TTQzSVZvaGsxS1NkMHRrVVZuR2owN2QrYVJC?= =?utf-8?B?cVFFbllHQ3NiNHRlcVE1VHB0ZStWalUxM1dpTG85Y2pyWjlMWU5tamh0T3Y5?= =?utf-8?B?b09RZWQ0SVNPZVNadTEvWVlZUkk5OFVYT0lMVzl0c01wU2JSTEpGVS9xTDNX?= =?utf-8?B?SUpQVXpqdUtVR1pUU013eW9mWWt4Z2VuRDB4bjVTbDJiMWVndjhvTVJiRXdG?= =?utf-8?B?WGYydWlGU0NZa3VmM1VDem1qb1hDWGkwMGUyY3d3WUFwZzl3SVZ2NVhpZUlL?= =?utf-8?B?eWdKTDB6eE5oUm96NFNWMDFFcnIyRG02Q1l2V0xUdDdGRTNXK29sR1lDNGxG?= =?utf-8?B?Tm9NeW0xSml3b00wd1FPbjZOVGtGeGV1dVFjc1JUOGo4by9BekVFWHlsd3J0?= =?utf-8?B?QUE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d89c67e6-7aa0-4fd9-a29f-08dab0b81b5b 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:20.7229 (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: 3AXqUW9i3UaGGj3lkwChCAJdCNfjCtU1b/3+DZ7pLGtfTtE/nHEtH0gzC448eOHs8BDVahUCbfspGlyGnjpKDJTSGhuIP5md01MQPu4AALM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR13MB5147 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 for IPv4 GENEVE tunnel. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + drivers/net/nfp/nfp_flow.c | 107 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 3b5b052..171b633 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -46,6 +46,7 @@ of_pop_vlan = Y of_push_vlan = Y of_set_vlan_pcp = Y of_set_vlan_vid = Y +raw_encap = Y port_id = Y set_ipv4_dscp = Y set_ipv4_dst = Y diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index e212e96..265c7e8 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -38,6 +38,12 @@ struct vxlan_data { __VA_ARGS__, RTE_FLOW_ITEM_TYPE_END, \ }) +/* Data length of various conf of raw encap action */ +#define GENEVE_V4_LEN (sizeof(struct rte_ether_hdr) + \ + sizeof(struct rte_ipv4_hdr) + \ + sizeof(struct rte_udp_hdr) + \ + sizeof(struct rte_flow_item_geneve)) + /* Process structure associated with a flow item */ struct nfp_flow_item_proc { /* Bit-mask for fields supported by this PMD. */ @@ -926,6 +932,11 @@ struct nfp_pre_tun_entry { key_ls->act_size += sizeof(struct nfp_fl_act_pre_tun); key_ls->act_size += sizeof(struct nfp_fl_act_set_tun); break; + case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_RAW_ENCAP detected"); + key_ls->act_size += sizeof(struct nfp_fl_act_pre_tun); + key_ls->act_size += sizeof(struct nfp_fl_act_set_tun); + break; case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_VXLAN_DECAP detected"); break; @@ -2641,6 +2652,88 @@ struct nfp_pre_tun_entry { } static int +nfp_flow_action_geneve_encap_v4(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) +{ + uint64_t tun_id; + const struct rte_ether_hdr *eth; + const struct rte_flow_item_udp *udp; + const struct rte_flow_item_ipv4 *ipv4; + const struct rte_flow_item_geneve *geneve; + 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; + ipv4 = (const struct rte_flow_item_ipv4 *)(eth + 1); + udp = (const struct rte_flow_item_udp *)(ipv4 + 1); + geneve = (const struct rte_flow_item_geneve *)(udp + 1); + + pre_tun = (struct nfp_fl_act_pre_tun *)actions; + memset(pre_tun, 0, act_pre_size); + nfp_flow_pre_tun_v4_process(pre_tun, ipv4->hdr.dst_addr); + + set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); + memset(set_tun, 0, act_set_size); + tun_id = (geneve->vni[0] << 16) | (geneve->vni[1] << 8) | geneve->vni[2]; + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GENEVE, tun_id, + ipv4->hdr.time_to_live, ipv4->hdr.type_of_service); + set_tun->tun_proto = geneve->protocol; + + /* Send the tunnel neighbor cmsg to fw */ + return nfp_flower_add_tun_neigh_v4_encap(app_fw_flower, nfp_flow_meta, + tun, eth, ipv4); +} + +static int +nfp_flow_action_raw_encap(struct nfp_app_fw_flower *app_fw_flower, + char *act_data, + char *actions, + const struct rte_flow_action *action, + struct nfp_fl_rule_metadata *nfp_flow_meta, + struct nfp_fl_tun *tun) +{ + int ret; + size_t act_len; + size_t act_pre_size; + const struct rte_flow_action_raw_encap *raw_encap; + + raw_encap = action->conf; + if (raw_encap->data == NULL) { + PMD_DRV_LOG(ERR, "The raw encap action conf is NULL."); + return -EINVAL; + } + + /* Pre_tunnel action must be the first on action list. + * If other actions already exist, they need to be + * pushed forward. + */ + act_len = act_data - actions; + if (act_len != 0) { + act_pre_size = sizeof(struct nfp_fl_act_pre_tun); + memmove(actions + act_pre_size, actions, act_len); + } + + switch (raw_encap->size) { + case GENEVE_V4_LEN: + ret = nfp_flow_action_geneve_encap_v4(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; + break; + } + + return ret; +} + +static int nfp_flow_compile_action(struct nfp_flower_representor *representor, const struct rte_flow_action actions[], struct rte_flow *nfp_flow) @@ -2821,6 +2914,20 @@ struct nfp_pre_tun_entry { position += sizeof(struct nfp_fl_act_set_tun); nfp_flow->type = NFP_FLOW_ENCAP; break; + case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_RAW_ENCAP"); + ret = nfp_flow_action_raw_encap(representor->app_fw_flower, + position, action_data, action, nfp_flow_meta, + &nfp_flow->tun); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Failed when process" + " RTE_FLOW_ACTION_TYPE_RAW_ENCAP"); + return ret; + } + position += sizeof(struct nfp_fl_act_pre_tun); + position += sizeof(struct nfp_fl_act_set_tun); + nfp_flow->type = NFP_FLOW_ENCAP; + break; case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP: PMD_DRV_LOG(DEBUG, "process RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP"); ret = nfp_flow_action_tunnel_decap(representor, action, -- 1.8.3.1