From patchwork Sat Oct 22 08:24:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118966 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id C5545A0032; Sat, 22 Oct 2022 10:27:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9EACC4281A; Sat, 22 Oct 2022 10:25:38 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2135.outbound.protection.outlook.com [40.107.95.135]) by mails.dpdk.org (Postfix) with ESMTP id A30C442BA0 for ; Sat, 22 Oct 2022 10:25:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=No/+y2VcEblxwJtFT02ykmJzEztBKl2rJggciihqTJsmUz0bdA+hODGnvY1qm3W9XgwIB+eHLRtQzqy08yLWgmn+R263gteFfdw7HOwX/ODK0vIobp6WBOuctnJzJ+Eyr7VGJjNJJcNdQDQbC+8jtrbJvCf1mcXgPz1n64ML3g37Fp57xrL4w0LnOsA9QUzltepIJiUndsSqQ7ET22+RHoSxF8zSwHbi/wjOJHkPi5ySxf4JG0hXB/1WAtlEnjRwil6J787UZCV9P+VmfWQgpwDm78Krgf47F7FI0xtyEnMApDohwIlSjfNfZHHey/AuXCFbWaJmvSXpekRdO0to2g== 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=f7tto17zYnUx2aIQHM4gxpr30fLJhY/vlCv6kH6kd1g=; b=B7BQAUZXuNocgKchwDnptRS3g7YMZ3Lp3hWeGQ8jRx9eEspPy0ziUKtDTaOhdtAto0Z1tNvapYA1rB+ySW8CU8XBPbmACWxN7S3KcLA7e/5U/BI+buXrvXTLG8ffbMSjzILPjfRawvBOfCq+ksHbEGJTYhL0M7F0LMikBxG94Gaz7ESIh4K14w3y/xuJCETKPHodkYbtb8JYB0QdIjNNubMPUrPnNBYeYs1LHZjRNcA/UPvqhGK2C3RjoaDIxHYwwOKvAcMEp7tD6nC03rN2aGacKqxdRUAZ4qJpMu1axJVFC9jtfhmYrKhnc/Ik6JqGg8f3bWxEESLnH0pIDHhdBw== 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=f7tto17zYnUx2aIQHM4gxpr30fLJhY/vlCv6kH6kd1g=; b=l9Rteq7cPJlAzxPra3zASP4oOIrbiz7xouSCTzK74atBpyP5XHOpjGdYRCNH++ZcCS9l5pGLHRg69ocKlUzwNQxEkFm82Dn6rSGvdCs1tWZtCr+lR5IALd2iDYz8XvzGg3zfIi5x/gp7jeEY75B/UYD+vqD7h9zVja9Zz1696F4= 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 CH2PR13MB3848.namprd13.prod.outlook.com (2603:10b6:610:9d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Sat, 22 Oct 2022 08:25:28 +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; Sat, 22 Oct 2022 08:25:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 19/25] net/nfp: prepare for IPv4 GRE tunnel decap flow action Date: Sat, 22 Oct 2022 16:24:23 +0800 Message-Id: <1666427069-10553-20-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> <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR02CA0056.apcprd02.prod.outlook.com (2603:1096:4:54::20) To SJ0PR13MB5545.namprd13.prod.outlook.com (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: 76388122-bd31-4f12-4429-08dab406f9ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 91TkPsCxMhe5TEETeHC9izwEPMQ4W9Xvt74Xmr4QxUHSYSX7mmE5SWV0/ik3MySl4p1qe3Bvd+NgK21cNFg1N+Na8HODQZRFb7N+Od3M9tmpjgj9SBRazyeOkph4LS58s3Yb+BWkX7dWE/tT+rUwoIdXjL6ZjzFymsomVyeF8gmhT3OmtjKA5wsBbLFNIWKnwrbB9uHW9xTYZhhopoc3oMjEzT02KsJDcz7Yx2aNDGTt0zkbT0ycWfGlLWzxSg1bIIVOzpqobeH6X5VLj1pc4q0r5Wt0201tISFxHGX0hgXs1JEe2craOBxyvdoFtBszYDsPwcLPbEIpwTaf7HS5CU5Psdwdt2/GvxNObUEKXuY+8IFk8rCKkmxPM5VhpPTG8bqOUtamRdX8fZB2+2qRqxZedlB5fL1FABmOvKpn3akSCv+hglZ6IABKMvX5vJNBsvBwYvMxz3X6OFAa+HMLWVoQxH8mlvNCaq3AcSaO5PXqQ4PwHpOtEK24LsT38aHQ4P9OK2hObndRrJwmvNbv8KNQbZ1hpW9+qYwbknj4IKhsAwpKLklQHu3B99BNdPkVLNvlRVHI8ZjFXp6W/9uc8tWLyV65Seevo1xkbxZNWWja6O5m0ANSupEV9r1th+0oOskwGR0sWcC50oYWOc3CH7D0QtGKw+I6FtBUtzRFQGFX9OXeNqS+cMsYp1FwrALEFXurOHEM08itqPB6AOFO0I/zCW03PLF5/c036v3umFPcK04Jo33nBTtdyijA8buielDcqYHfvb2oiWjMnABOUQ== 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)(396003)(39830400003)(346002)(376002)(451199015)(4326008)(107886003)(36756003)(38100700002)(66946007)(66556008)(316002)(6512007)(83380400001)(52116002)(66476007)(8676002)(44832011)(6666004)(6506007)(38350700002)(5660300002)(8936002)(6916009)(2616005)(478600001)(186003)(41300700001)(26005)(6486002)(86362001)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dNGfODxjOWMj144sfo43Gh2IzPTE?= =?utf-8?q?55sq3JNDgcotjMEdhU89xMc9ergTJY3j1uKUYSL6bb3OjKuw+6d/08IQ17WfnCAtd?= =?utf-8?q?WPMQGxOEIzzTrKSSV8iJQaX87AYJrKDNtxcqYqLzkJ2HqWYZQvfH5ttUq223fdAZq?= =?utf-8?q?TQLdfXmZLRU/TS3LFNiB90p2xQYFsOreKGnhSl6CGYtS1cqcWzXco3dJRdxodwy8O?= =?utf-8?q?k7x9Lu6YGhMp2zh/c38KDjuOrpFU5kDu4tcqlu7fBoXREICT3K6EI09sNDD8ZyNU4?= =?utf-8?q?asN3PN/XH6RNV2RwozfgooCoUmDCKj4r4EWxEZR2o0fNoO5+1HgIT0tOCs1RI9XtR?= =?utf-8?q?hszZ0l7q814e7FoIy8/g6DUkReLbwBraX4q4jjZpC0q5OOg87XO9lx9Crf2SvR0Am?= =?utf-8?q?pJVdvDLvyUn1fDvoAB1aPss4BTj7QWo6Lchb+Wc5N6mF9uqjs6fUZddyQ3U9NySTK?= =?utf-8?q?bwc+pQ/rIbw4pxVRCNFj+uJ5htk3Bh2S02Bn1JErPHS4Gjx2cwi8ss+z1jnVvoe2f?= =?utf-8?q?8HYrl4xD1lKj+f6dA/K3rzuRAe+QOAg8WDUJ6uDItqfkdhQ9x6AbU5oZRZdFfS6Sp?= =?utf-8?q?mQn1SJ2PBdsX1J7eAdb7K5Cq3FBqjBh25SVeKWdf6id/bcH+jIlQMBDxuEnlRK/c5?= =?utf-8?q?IKfbW1zflmcrlXUDzFUDkJJAiLZ0q6ajNDM5CjJZFIfFxECoU7yQgq7c55g8Qer7r?= =?utf-8?q?xOZT9txG9an5nlKM3HDbLLNNzBh0QNQrocBBbiPYQGbxeFG8Tit+XIkYJk0V0hW+L?= =?utf-8?q?vHRn9KUc5luT3Igt7+ZFTegdnWBA0rdmJOnPFguFGVZnAOG/+L5jiBVNsZ9polSEy?= =?utf-8?q?h9Yiqh9qWBcIYUSzhsIdfezb6qad3+Tqh9YIUYKTYfBcKAqlqqRiO9m9Ep1EQ31u4?= =?utf-8?q?QimWQ+Efx4uFj+CB8waGD6ES2pVyUzj6dtomyGTNiBluyD/666bsLk9IHEz85kFCr?= =?utf-8?q?aATm0Q8dmbbfMoztq4ga0B3O908UVQV74f7nSZaYuQcWLaGR58rPR2lSrzHQtQIOk?= =?utf-8?q?7izoKreEWJBJcFb31vUlSQR0WncFaEywwV8BfnVkSbFMzL8AqitMor3/WuBPur/nj?= =?utf-8?q?k2on6/GTS8GFdAsuTjT+fHQ7bywActENfZYxukiv60e99PhQArjj4vTmGCq7w8Nse?= =?utf-8?q?87BrZqpXBlM5WpmiqsCzTjnsK6MJKDeKeOw9MULaK8pgGQDrs1JUlChzBNq3xGW/q?= =?utf-8?q?US6eUCtu9VTA7U40Fyo1u9It7S7kXImS3IWhYTz2M6uvWv1NxoHrsV3OgeWAt9WuN?= =?utf-8?q?DFCf/jG2iYDT1x+sm87i1n2odn4Yjazy7zIUgyQWtBhRdg4Rsy+mYsmZkd+JBdG5+?= =?utf-8?q?cWtBfyh79BIzdwvs1s0bjhP8u6bYg8l2YNUSeoMGmEUwjirteRNeRYrZyaciIGEyP?= =?utf-8?q?zDX7vEMgYLN2lRAEQsdV5IYlDhvz/Gnv7+/JfLzcdny/GEbbWVr6JIeiLSVp7Ukd9?= =?utf-8?q?ngD7x065I3zpTfGvujLIqC53lDGok++MbexDVh7s+/q3XM5JzEGDLoSbmCHqPzZPV?= =?utf-8?q?lWSBoHzTZyj5BBRiD377Qv/lK8kCSjN/bA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76388122-bd31-4f12-4429-08dab406f9ac 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:25:28.0640 (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: Jl3et5f/nO94I3m+a5GTT2z65z86FRj04+ucA2uDoHO9FpFRu4DDNBEbLxnQhwjJtkY2YKAOBwq1MPM+m4w5xxI8Hujj1P+3t5UnIrvCj5Q= 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add the related data structure and logics, prepare for the decap action of IPv4 GRE tunnel. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower_cmsg.h | 29 +++++++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 40 +++++++++++++++++++++++++------- drivers/net/nfp/nfp_flow.h | 3 +++ 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 61f2f83..8bca7c2 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -575,6 +575,35 @@ struct nfp_flower_ipv6_udp_tun { rte_be32_t tun_id; }; +/* + * Flow Frame GRE TUNNEL --> Tunnel details (6W/24B) + * ----------------------------------------------------------------- + * 3 2 1 + * 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 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_addr_src | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_addr_dst | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | tun_flags | tos | ttl | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Reserved | Ethertype | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Key | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Reserved | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_ipv4_gre_tun { + struct nfp_flower_tun_ipv4 ipv4; + rte_be16_t tun_flags; + struct nfp_flower_tun_ip_ext ip_ext; + rte_be16_t reserved1; + rte_be16_t ethertype; + rte_be32_t tun_key; + rte_be32_t reserved2; +}; + struct nfp_fl_act_head { uint8_t jump_id; uint8_t len_lw; diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index fd64da8..01c6e9a 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -564,6 +564,7 @@ struct nfp_pre_tun_entry { uint32_t key_layer2 = 0; struct nfp_flower_ipv4_udp_tun *udp4; struct nfp_flower_ipv6_udp_tun *udp6; + struct nfp_flower_ipv4_gre_tun *gre4; struct nfp_flower_meta_tci *meta_tci; struct nfp_flower_ext_meta *ext_meta = NULL; @@ -579,9 +580,15 @@ struct nfp_pre_tun_entry { sizeof(struct nfp_flower_ipv6_udp_tun)); ret = nfp_tun_del_ipv6_off(repr->app_fw_flower, udp6->ipv6.ipv6_dst); } else { - udp4 = (struct nfp_flower_ipv4_udp_tun *)(nfp_flow->payload.mask_data - - sizeof(struct nfp_flower_ipv4_udp_tun)); - ret = nfp_tun_del_ipv4_off(repr->app_fw_flower, udp4->ipv4.dst); + if (key_layer2 & NFP_FLOWER_LAYER2_GRE) { + gre4 = (struct nfp_flower_ipv4_gre_tun *)(nfp_flow->payload.mask_data - + sizeof(struct nfp_flower_ipv4_gre_tun)); + ret = nfp_tun_del_ipv4_off(repr->app_fw_flower, gre4->ipv4.dst); + } else { + udp4 = (struct nfp_flower_ipv4_udp_tun *)(nfp_flow->payload.mask_data - + sizeof(struct nfp_flower_ipv4_udp_tun)); + ret = nfp_tun_del_ipv4_off(repr->app_fw_flower, udp4->ipv4.dst); + } } return ret; @@ -1013,7 +1020,7 @@ struct nfp_pre_tun_entry { ext_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1); key_layer2 = rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2); - if (key_layer2 & NFP_FLOWER_LAYER2_GENEVE) + if (key_layer2 & (NFP_FLOWER_LAYER2_GENEVE | NFP_FLOWER_LAYER2_GRE)) return true; return false; @@ -1102,11 +1109,15 @@ struct nfp_pre_tun_entry { struct nfp_flower_meta_tci *meta_tci; const struct rte_flow_item_ipv4 *spec; const struct rte_flow_item_ipv4 *mask; + struct nfp_flower_ext_meta *ext_meta = NULL; struct nfp_flower_ipv4_udp_tun *ipv4_udp_tun; + struct nfp_flower_ipv4_gre_tun *ipv4_gre_tun; spec = item->spec; mask = item->mask ? item->mask : proc->mask_default; meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) + ext_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1); if (is_outer_layer && nfp_flow_is_tunnel(nfp_flow)) { if (spec == NULL) { @@ -1115,12 +1126,23 @@ struct nfp_pre_tun_entry { } hdr = is_mask ? &mask->hdr : &spec->hdr; - ipv4_udp_tun = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off; - ipv4_udp_tun->ip_ext.tos = hdr->type_of_service; - ipv4_udp_tun->ip_ext.ttl = hdr->time_to_live; - ipv4_udp_tun->ipv4.src = hdr->src_addr; - ipv4_udp_tun->ipv4.dst = hdr->dst_addr; + if (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) & + NFP_FLOWER_LAYER2_GRE)) { + ipv4_gre_tun = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off; + + ipv4_gre_tun->ip_ext.tos = hdr->type_of_service; + ipv4_gre_tun->ip_ext.ttl = hdr->time_to_live; + ipv4_gre_tun->ipv4.src = hdr->src_addr; + ipv4_gre_tun->ipv4.dst = hdr->dst_addr; + } else { + ipv4_udp_tun = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off; + + ipv4_udp_tun->ip_ext.tos = hdr->type_of_service; + ipv4_udp_tun->ip_ext.ttl = hdr->time_to_live; + ipv4_udp_tun->ipv4.src = hdr->src_addr; + ipv4_udp_tun->ipv4.dst = hdr->dst_addr; + } } else { if (spec == NULL) { PMD_DRV_LOG(DEBUG, "nfp flow merge ipv4: no item->spec!"); diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index a6994e0..b0c2aaf 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -49,6 +49,9 @@ #define NFP_FL_SC_ACT_POPV 0x6A000000 #define NFP_FL_SC_ACT_NULL 0x00000000 +/* GRE Tunnel flags */ +#define NFP_FL_GRE_FLAG_KEY (1 << 2) + /* Action opcodes */ #define NFP_FL_ACTION_OPCODE_OUTPUT 0 #define NFP_FL_ACTION_OPCODE_PUSH_VLAN 1