From patchwork Thu Oct 20 02:19:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118686 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 1C869A0A02; Thu, 20 Oct 2022 04:22:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8787142C8E; Thu, 20 Oct 2022 04:21:18 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2104.outbound.protection.outlook.com [40.107.101.104]) by mails.dpdk.org (Postfix) with ESMTP id 1CB8D42C7B for ; Thu, 20 Oct 2022 04:21:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WxStisOYi9iIWt+E2MTHsgMGtjUJe0sGZl9hNwRE50M1i/GBx1ygZb7XEW3R8Cfxg+avH0sQIjJaq9Erm5QXmN2RBRq9mtZNM1xf2PyY8x44N6g82jVVlObaUtDndq+EKZYkfWCyB4hYNRijqDXHFmJdkHStdFAga3CySPKvHGEi+k+57JJyzcssA+GUopwQuxfi0GdVUZpzspIWeiZYaYDIDfau+DF8sYFw7sPhkX2KGVJVNhcxhznz/OEC8duTmx2tvhfp98ZjEGSAHY5j5/tjoyctpphBLbyg5FiniYm/LEnqXI8BoiexUBMycRKN3EZ1po0VQCnixnarx2AGtA== 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=jjyZY3AtpgiWlRxrb78tUKCiHpNSybtdOE4ss3uG+Iw=; b=b+bjBep7OHGBNa592O/NMVgKkgeO9ihBZjBQ9d/WBLOy/6cs+S0lCPPxzcN36gNqGRuiPDq2LrM4LOt0Vm7s4a1bsfBFq5ES4WzTjo+416Ebn3CW/rQV4S/uzJ5OtHFBY4e0RPDG9cqFlJydSvsIjz7GUyMi8Ro1fuuILd69cYKU46MEc9B6PX6N7qOtvtTKNx2ERA3s4oLRzC8t58UY1YpzkbdrU8zz3kPR9GBxJ8XDgpAMTYQmdWff9t3xdWNFbM3l/eYdVsh1OuGzBGpgFjCO+ZjeTwTxfhwNiD4467UXfRBf8Wy1cVW/b52oKi7ckXQXmRt7RPPjUta0e62dzw== 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=jjyZY3AtpgiWlRxrb78tUKCiHpNSybtdOE4ss3uG+Iw=; b=HimDVUK20ltqw9H2xeG9LWu3L3t/n2LGmRvaLjHQWBNTp77EoZO7/VNwFSeI3m9GJIOCnHgnEXzcF2IBE49dOxC1GvKi/9zT9SiHh3l5z4EQw/dpv0xsiXLBcd3noxTPax9nBU9SNUlcmGFP2apEQ7DwlXXXpnAcy8gGAAbWTAA= 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 DM4PR13MB5906.namprd13.prod.outlook.com (2603:10b6:8:4c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16; Thu, 20 Oct 2022 02:21:12 +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; Thu, 20 Oct 2022 02:21:12 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v5 09/25] net/nfp: support IPv6 flow item Date: Thu, 20 Oct 2022 10:19:35 +0800 Message-Id: <1666232391-29152-10-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> References: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:196::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM4PR13MB5906:EE_ X-MS-Office365-Filtering-Correlation-Id: 1af9ce29-b597-436f-7abd-08dab241c1df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qo82GnbA1poyxL+Jg0FxfV8nScG4hac3ldRS/ANa3uc7jmAvLBRMdBzq7gScNvmQIYSEiWzdAZ7FP+KIW39yhvppMQm9Fw7m/GW/MR/di+uF9gGpgVFojLvb+Jh8Ydmb0CrZ7JtodlctpaDf1D2kJwXNCeYHRnQBTTNry+RRRljieMgZ5rp+cgPAmiNcAHS5v7+Bxzl7p/ogL3Mpa4GdsEArqKIuCBtg8M9dbdOWZz1iOUF/LTyR3FKNI7sJ1r9Jpe7nIcFToVVPjFR1zSdNf5L15LigjlNjpsRoqsySMr6wNWjMKQOS+Par4dQA6hXjNbWR/P8cvKil5+SrhHQXAv15/Cq1WixaAT5/b3mukm7wlf89qGMqiBfgrgxjsD0TeZ2+EmKIz9rQ8BN3dvaHdmWruLck/+bfxB1YnzzpwMbPp0xOT1rDJYWlhvj8GPFLXU9897v30d/HW8acJY9NV+pTjGf17x6IHvk54P5JRp3SPeYY5ycuqpsotCwspintUng9eCgG/Usfcpg9QKQOgty3gc6cEJkWEkiVS5zED06TckILrcmQqBAlPV1SF+rTE8FfEFc+lSCBB2AMWCvHy/L3FTUv5POe65iAaHOCpiND/X4RriNsSixqFS4lccFY/difYZcFSBdvzzXn37wD50J/YuOAA3adAB53zcHr73UfaiRUr9wJGqqCAThya2OaqWjvyyrn1aK3AHjDJRRdr6+Vsz+awYBd+PU9HvnWGj1CQg7vHTdZLTJQQCJNU9ldZMEPd+V0xy9XeQugabRU1fK5PGXSwCV574N+EazX6gzVv185B5A2QoYXs8GWhji5 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)(376002)(39840400004)(346002)(396003)(366004)(451199015)(38100700002)(478600001)(38350700002)(316002)(6916009)(2906002)(186003)(66476007)(52116002)(66556008)(6666004)(66946007)(107886003)(4326008)(6506007)(2616005)(41300700001)(5660300002)(36756003)(8676002)(6486002)(8936002)(26005)(44832011)(86362001)(83380400001)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?byKLf8YwXpGK1Rmk5vgNaVhB3Fnu?= =?utf-8?q?a/S27D2pN03RLggwZWPqEm7z8QqFADlTqeznG7yG0GTOCz0sOBuA5sCzS02bjjaCI?= =?utf-8?q?X08Tn0EIP0BauTGC56Cd+dtLMriM3UtGWGbGMcJq64Upe+lpoGPis0jqWjJRegfY2?= =?utf-8?q?5JwpUqlFFml5JWuYNv3dWCkG+fYGuA8+jSmXGSEEDpuGROltInbfzKk5z0R6f4RCg?= =?utf-8?q?P0cy23D7TLrRVuRdyMxmskuXmNYeFRuhJhzxnN2/KrQsKlc6BfTdbGGK+VhPHKInj?= =?utf-8?q?ibD4wdJDUIg+F6bdXg3r+Jtl6Tdn5tQNNxLEt9up8qsFJx5puotNNaDHfyrvEVj6g?= =?utf-8?q?5MnWMXe4yR/Ju6YYokx7yHLjNs53it8sLx99Nt3rBEn29e4xTezruTkQ/bdokABHw?= =?utf-8?q?A06lpETOGZUbFf9IxiIHFHfMBvyRGsWEm22XlAPuZMG7xymzuObeXkR5wcQB1hcC0?= =?utf-8?q?/REjNS88BCV9QqWltoL4I7IDn1H2FZ+uUZxIhCeTyysAdY9rUJl2k7aFgQYnfVQnd?= =?utf-8?q?hq2AAYDKEcXhkGW5nUSU22CoEv+FImPdjXo9BLMMtphpph4bqhJkpHJ2vnYZVzWho?= =?utf-8?q?8TRpnHUmGFPqWXACwfkjDiPZ94VqmGVL0cluHCbT2W/cZ6tnr+hT/hZPvyhM08bfS?= =?utf-8?q?G90BULTHZvRvvEJweAg+3YWM7hfBcKElavEQYQbGljGEsJCKy8Ez8T7ZTl10UU3tD?= =?utf-8?q?rM2V27XXDv3f3MZOQ3sj0QCttqgW2vFg5FjnQuQPaJXNqpItf22gaNcv3k2MkWk9F?= =?utf-8?q?XZBYysmo01EGFZYzPwtUnmnOgPcT9MBK0mDa+nqlF783u7+h1iSagxEI2HWEJt+1j?= =?utf-8?q?baeGSG3lyCXok0OvWXYDttmzMo4zJ/8gbXWtmhUzlg8pBTIFnRf/yKXrVyc5BPCUw?= =?utf-8?q?Pl2y4oZe+Jn1Pa0pL/2Mn5/iatWTV0r4uZLfn+jL1Se+RO6Tar6KnfGOa3U6AQ2px?= =?utf-8?q?O4z3/eRNt/1sQ1jvaxgrw3OPeUncktQue2oB5WO2T/jsFCyMhkIBq71ST/rYDVbPJ?= =?utf-8?q?CE9C/GsMs1ecD+CKSOQmK3zDVI13bkHmUzNp7Q49aftNCNL6woruIFkEJbMpeBGzf?= =?utf-8?q?AXiwuJ/ZgdVKFvwZH39TxhZBpY8gle5Xp+bGx5C0HVIhEuUwzuz1TbMnNWOnWgrQe?= =?utf-8?q?FypC6yJLFIJaz/b3xmT5eOFWrzZ1HMK3immYW8ZK/xBlrMbzP75sr6OYF3XGbI98u?= =?utf-8?q?vsviq+DwAkKMw41dbgSUBq7040bmY8me/ROzY+QOX6A4xqafpEd1wqU7Q01xgjAYY?= =?utf-8?q?rmciJG3QuW0lMFbL+zRJiAGGZ9H8NHMolViT0n0HSsojDBxo3DEBV+UE2fSzF37el?= =?utf-8?q?FTLk5QhZ32FtdTmiHtWclAlcmrCTljHqq5NHoc/nYnSO5oaG8/TU98W+2NsFRuW4R?= =?utf-8?q?G0AUcIwFCO8NkzwxRQyEi52QIY7tlgOQc3AID7F/xoVaKFzglG9ZYeiMBLbMmG8vw?= =?utf-8?q?50y5wvcIfBpWx0wqmkYH1+vT4QZm1oe8yhiF3fbE+9ma/zzywC8LpdYUDZIBEwIZe?= =?utf-8?q?4wvhJ4AHKr4eZERBpJrrjcsHHFLSVkL8aA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1af9ce29-b597-436f-7abd-08dab241c1df X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 02:21:12.4737 (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: Sgah6j/89Hd561VygEef9uE4aoK6Pc1rG3WM5yYgcPkyY1CwC8ZCKK0YFOuaMwCly0U9dPj3aRzRvJEEN313Siq6DImWr+8J2zAAkulXcto= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR13MB5906 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 corresponding data structure and logics, to support the offload of IPv6 item. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + drivers/net/nfp/flower/nfp_flower_cmsg.h | 33 +++++++++++++++ drivers/net/nfp/nfp_flow.c | 73 +++++++++++++++++++++++++++++++- 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index bf59123..4869b45 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -29,6 +29,7 @@ Usage doc = Y [rte_flow items] eth = Y ipv4 = Y +ipv6 = Y port_id = Y vlan = Y diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 5964ecf..36d406f 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -291,6 +291,39 @@ struct nfp_flower_ipv4 { rte_be32_t ipv4_dst; }; +/* + * L3 IPv6 details (10W/40B) + * 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 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | DSCP |ECN| protocol | ttl | flags | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_exthdr | res | ipv6_flow_label | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 31 - 0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 63 - 32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 95 - 64 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 127 - 96 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 31 - 0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 63 - 32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 95 - 64 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 127 - 96 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_ipv6 { + struct nfp_flower_ip_ext ip_ext; + rte_be32_t ipv6_flow_label_exthdr; + uint8_t ipv6_src[16]; + uint8_t ipv6_dst[16]; +}; + 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 928f149..b2360fd 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -527,6 +527,11 @@ struct nfp_mask_id_entry { key_ls->key_layer |= NFP_FLOWER_LAYER_IPV4; key_ls->key_size += sizeof(struct nfp_flower_ipv4); break; + case RTE_FLOW_ITEM_TYPE_IPV6: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV6 detected"); + key_ls->key_layer |= NFP_FLOWER_LAYER_IPV6; + key_ls->key_size += sizeof(struct nfp_flower_ipv6); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -711,6 +716,51 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_ipv6(struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + struct nfp_flower_ipv6 *ipv6; + const struct rte_ipv6_hdr *hdr; + struct nfp_flower_meta_tci *meta_tci; + const struct rte_flow_item_ipv6 *spec; + const struct rte_flow_item_ipv6 *mask; + + spec = item->spec; + mask = item->mask ? item->mask : proc->mask_default; + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge ipv6: no item->spec!"); + goto ipv6_end; + } + + /* + * reserve space for L4 info. + * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv4 + */ + if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) + *mbuf_off += sizeof(struct nfp_flower_tp_ports); + + hdr = is_mask ? &mask->hdr : &spec->hdr; + ipv6 = (struct nfp_flower_ipv6 *)*mbuf_off; + + ipv6->ip_ext.tos = (hdr->vtc_flow & RTE_IPV6_HDR_TC_MASK) >> + RTE_IPV6_HDR_TC_SHIFT; + ipv6->ip_ext.proto = hdr->proto; + ipv6->ip_ext.ttl = hdr->hop_limits; + memcpy(ipv6->ipv6_src, hdr->src_addr, sizeof(ipv6->ipv6_src)); + memcpy(ipv6->ipv6_dst, hdr->dst_addr, sizeof(ipv6->ipv6_dst)); + +ipv6_end: + *mbuf_off += sizeof(struct nfp_flower_ipv6); + + return 0; +} + /* Graph of supported items and associated process function */ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { [RTE_FLOW_ITEM_TYPE_END] = { @@ -718,7 +768,8 @@ struct nfp_mask_id_entry { }, [RTE_FLOW_ITEM_TYPE_ETH] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN, - RTE_FLOW_ITEM_TYPE_IPV4), + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_IPV6), .mask_support = &(const struct rte_flow_item_eth){ .hdr = { .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", @@ -732,7 +783,8 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_eth, }, [RTE_FLOW_ITEM_TYPE_VLAN] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_IPV6), .mask_support = &(const struct rte_flow_item_vlan){ .hdr = { .vlan_tci = RTE_BE16(0xefff), @@ -759,6 +811,23 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_ipv4), .merge = nfp_flow_merge_ipv4, }, + [RTE_FLOW_ITEM_TYPE_IPV6] = { + .mask_support = &(const struct rte_flow_item_ipv6){ + .hdr = { + .vtc_flow = RTE_BE32(0x0ff00000), + .proto = 0xff, + .hop_limits = 0xff, + .src_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" + "\xff\xff\xff\xff\xff\xff\xff\xff", + .dst_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" + "\xff\xff\xff\xff\xff\xff\xff\xff", + }, + .has_frag_ext = 1, + }, + .mask_default = &rte_flow_item_ipv6_mask, + .mask_sz = sizeof(struct rte_flow_item_ipv6), + .merge = nfp_flow_merge_ipv6, + }, }; static int