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 7203DA0560; Tue, 18 Oct 2022 13:28:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C5C142825; Tue, 18 Oct 2022 13:27:53 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id DDD0042825 for ; Tue, 18 Oct 2022 13:27:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N2tn9g7nNuiypdAyLCq3TgZkCRyje0VWxOsdEBxaJk/3JZ2M5kgVK3j9zQHBVRYZBnGtSN419uCKkIzfBP63XDkrjHzmZTT5FXykmk0HaFtFTi9S3y88IAIo24UBGaibF6Rh/PxWDvviMtKKUOey8TSJZBIrc+QjfcqqXBouM8LR06seWtnrGffymbqLR1kmUKHVcF6eiW7Bx1nbJrdjmJDJZognLmNMaWbmpcwBH4QIJFv2PSv4ejTbOZfoCcmA4jKvTgfD4Nao9izLXbLM0gMB/UJKR/+vrMZ2fjQQZKfyqM3dqgT44sojSdqf6lPbhnSul4b1sEX0TFNKdT4GwA== 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=+NEVMev4lb1YcJnFYlizjapQKja5zd/AZRvaZW9fla4=; b=aUB7vdto+z+9z4ldTWZoQsy3RwdlbrwUCmlLEp/YqYoE1o2m10YMhFE4xeT3tNKWlC0S+ELGLMjlXuojyXceC0ocBi1uJcxAzHamGisSP2Cg7uyI4GzhtLJkWwYpCvwwJcj6POJc9/DSuHCoXK2p3ozQwyVLodC77zcLJ1SwH1NDXB4IsIcJ/SHJEqFiTnUT5zv1raKmUUrQUaajk9vu9F2GUg0QcAgP/lbIcbzA5Agd1A9PcmSsqOkpQ4YF5iNuOEAdoEjdq/8qGWbvMV4eFpgqKPhHnPoHAyLh+KQxAe9nR0MS8QYFQycM/c9TkBHpUi407iwtAS0K7tb57Uv4fw== 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=+NEVMev4lb1YcJnFYlizjapQKja5zd/AZRvaZW9fla4=; b=VmJklV+L7Rl7Z5Ac6n7yB5j9p9mFtPrzN+TgrMuwwtvleikp+TBBjxhFYInEf7vC0SK0iKH6oo9Adb1Aa9xVEOv2X6ghaKVlRbQVZg49D9/5ATlm2C6zdvgDXlIf//FluXcF/Ze+ufeYyTyFwANCMXRf6seiNmSElORif/TVCpw= 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 CO3PR13MB5686.namprd13.prod.outlook.com (2603:10b6:303:179::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16; Tue, 18 Oct 2022 11:27:49 +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 11:27:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v4 08/25] net/nfp: support IPv4 flow item Date: Tue, 18 Oct 2022 19:26:57 +0800 Message-Id: <1666092434-10357-9-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> References: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR02CA0052.apcprd02.prod.outlook.com (2603:1096:4:54::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO3PR13MB5686:EE_ X-MS-Office365-Filtering-Correlation-Id: 3972b8cb-ef24-44de-739d-08dab0fbc996 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MfZAd3kahvz1vEON6r7UGN7y54U8Py8UJJ4/lygJI11klAD6FMgt4TBU69sImBlClL0QlxIuJ/z31qTzjIrlvxGVtzus20ae+ee7lG2/71GyDlz+5FEr4vz/1bGLwbqW2TUF3Ke4BeWU+sTBKA8crIdQgzqhcpKrQHmLrUd0Uz9Eyf86Up/LexONPldXlbw6KYpP0nTIH8E7R12fg+lvVbNCy+PrtIgpv+gZoNNIE2KpfsZ9lvZl8Ms/4RuU/IDqIpFg5O9RwnhiqTGWh3gPfbwIS+7tuW2AvQyDmM1VJqcdzOzZAWqiokCIubw9bW2ec2lWSQcxSIKE2CIG8k5FnAolST5aprfp26B9mdMULPbeM/htCERh47fpYIQsFFWVwH84kM8ANlHbmhaManB61oumJ3cjNQHcEFkEJZvjgnPPOI56BuyeDXGBQPAbUTofMf2D1SysQFosOoOQ89pkJKKkoPgWHvdwrtzkyBQdQB6O4xIAM5bemT9Sw63WjWCnc/sfZmq2bOQLwry9hqcMsoH2AzjuO9PimnS2LB8SYqWqHYtzb/SRZZUeE1Cq6xMUhxXAibyFsJC5ei+fdvj75Zqym9k5Mm79ZHozVdkEuIq25Zs5JihHDerUcElcDQ7QBCF9LyYSF9soFA+ElJg1i8M0pMtLOiMtGWSw9cG1XwNrDiJLq8HVVbOv3FH2UnOB1qs1HZU6j7pG0fSqHLwFP0TAFpAHRUnE17U3XVd0Rp8aZAZPgT2oDw9kEvh1Hf/vokr4hvX9SkgWQXVUKUGz4O9XPlsXJfvgSY9Yuqnci1R6p6gXpSM1Q8Leb5ID/3qb 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)(346002)(366004)(39840400004)(396003)(136003)(376002)(451199015)(38350700002)(38100700002)(2906002)(66574015)(41300700001)(316002)(66946007)(66556008)(66476007)(83380400001)(4326008)(8676002)(6916009)(86362001)(44832011)(2616005)(8936002)(186003)(36756003)(5660300002)(6506007)(107886003)(6666004)(6486002)(478600001)(26005)(6512007)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?N1QvSUJsUnZzQ045ODRFTnhTVkF0VVoyYTdqVDZwNHVZQ0JibW01TmtYWlB5?= =?utf-8?B?YzI1QVhQNnQvV1JXVUFTcWw5R1FVdE5qZ1ZadUN1eVFsL0xTYWdPNi9DUTdw?= =?utf-8?B?SWVnVFRsUUJrbnM4eWlZZFBDSGZDRkZzQzVBOWdLcCs2SUcyZ1YxQzRQRmZr?= =?utf-8?B?b3NURTlNdHo3RDFkNXk3ZXYvY2JWb1RIVXpwK05CbThSTHZCYW1tYzYycllR?= =?utf-8?B?OUlSSTAxQ2YyUGRBUWIvN00rRnNHR29IQkZ3SWk2a0VtZjRmQXF1Yi9ibGF2?= =?utf-8?B?S2VPdU5mdDBrWlJWWFRLZE5YLzVFNGRhbVU0bE5Ib3FBSU5NS0xqOE40SGNQ?= =?utf-8?B?Sis4eXdTSTNxQmJJeFlSYld3akV0WWxGcXAxdlpnMDdBUzBjclBHSHZiSTBj?= =?utf-8?B?VDYzV3NmK2NjeTVkcC82aWs4NW9TdEczeDFvK05nbnQ5SGxYSnRNbjlNUmZv?= =?utf-8?B?czFXVmhCM09kalV4WjY4K0VyalpxYWI1MVJ0bVZzQTVlQlNyRUtIOUUxd0Fy?= =?utf-8?B?Y2JET2M3NmtjZTB5SHlnZzdCaThyRldFZTAzcUlqY0dzMFMyQ0dvUDZjVUMw?= =?utf-8?B?V3pGV2JpazNUM1FmeCtOR21HY1h1aHlieEpjbktrRlRLVHYzcEw4UkNZT3BC?= =?utf-8?B?MGJwVGVDSWtZZURVUVdHbnJpR1E4WWd2aEZaVEJzcnY1a1NJVFA5YysxdWh2?= =?utf-8?B?Um40Z0RRaXU5U21OOWRiOW1LLzJlUTlVSVJtZjYxa0t6QzVyTkZqY0w4R3VL?= =?utf-8?B?eXM5V2YwU25CSFdWRXFlcDBlVWhQU2NwZDMyTmJhKzFOenlJZDZ4d2FZUjV6?= =?utf-8?B?Rk10SGdiTFh4MjFVTkZ6UEJFZ2I2b21hUjNiQnZVd3A2YzFvYlc3RjFhU04w?= =?utf-8?B?aEowVVBzZVVmTVdORWNPMGx0cVV2cktaN0F5N1U5dGdaQk0yTGR3S1FsWmg4?= =?utf-8?B?MTkzWlI1WVIybWFVbm00MlpPclNKWGpYd3NoT2tZbGozOHpwM1ZpTHZFTS9Q?= =?utf-8?B?emQ2dVJ6SWZjR2tjRVNtcm5uMW1xZjY1TUdoQkNKVVVzMmJxUjh0UjZRTFFw?= =?utf-8?B?VFZnOWt3cThKK2t4QzZzSVRUcVg3dnJTT2lyOFo5V0dGb1JPSWR0cGZDQytM?= =?utf-8?B?WXhmRTJpa1lpU0EzaGIrM2FJWVRLN1M5V3hycEFPZjRPSTlYaU5HbjhUUCtz?= =?utf-8?B?dXlJM3EyZW15dWN6YUVjeUtzYURBUzNwQ0VGRzhER21EL1Q1RGRzc0xuUGFa?= =?utf-8?B?WS9CaCtNZ0pYSGRkSDdQOEgySzRrZ1ZZV3oybW1FanRvYUtvUnZIQVNtdm5F?= =?utf-8?B?YmxKZ3JGNERSTnFmd1VNQStxVUlHdnVocFlHdVhTVjY3UlNXS3FzNS9hQWdu?= =?utf-8?B?N0w0TVJkSzc0VjNzVXBKTGFEYVdWV045cjVhTmtjZmJHQU5rbjBBOVVjcTJx?= =?utf-8?B?d2hsVFhIQUU0aTZaT2g3MnliT2x3Z21xR21wWVpyd3p6YnBhcXF2aG14Q1J5?= =?utf-8?B?SzBpSjRxZjJXcEwrbzVjQ3RqZGtvbU9USSs5cWNKRTdQbmt1WHdsTmREbDlz?= =?utf-8?B?QXpHMWk2cEdncWFkcVFqaFFqay84d2tKemhoVk1KdUY2c09scFFnYStVOXdr?= =?utf-8?B?WVgwVWljWGVGQ0ZGZDhJREdPNVl2bTBDZkgwUGdEVjg0ZUlXZUl2TXVxVy82?= =?utf-8?B?Z2JUcGpzWEoxejZyY3NCcFdyNlJaMzZPT1RHQnd5NnRESzFpU2xWRG5PL3Mv?= =?utf-8?B?a1hBR3l3SzgxRTl0RmgxVVlsWTc2TXM5V2hGaGNyYXh6N00rMVhHYUkwQmxm?= =?utf-8?B?RERIMzExTkhTNDlMNU85Y0tISUlONWVRL2tVeEtVMW1abWhnNm03WFpmckVk?= =?utf-8?B?YytCalZtYmYwZTU3SkwvTmhqalFSVmZxWHo3Ny93UFRDT3dPNlFxSWV0Z1pZ?= =?utf-8?B?c1FJckEyWk45eitheUhtM0lLTjFYSFZSN2xNMmE4Yk5JRGVMN1I1cStBSUNC?= =?utf-8?B?TU15SklNMTVHZUhTYzJrVDFqcHIvOCs5WDRzVXVYM3lKZHdXMFdteXhwdTZ2?= =?utf-8?B?SVcyUnhPcXN0dDYwc2ZqQmF1VmxhNGZLSWluOEJmVm1XbnUvdXUrTWxUWHAy?= =?utf-8?B?bGhPcXpjN1NOMitxbEZyKzFnenJxaGZXRzh5aDl1VmMwZE1WYVFVaUFaYzZL?= =?utf-8?B?eVE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3972b8cb-ef24-44de-739d-08dab0fbc996 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:27:49.4831 (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: HJHpVjamRmo183JRSC2ayQCxWmGIDGKS1qA0819byveW1RtqNAkErx+aKmYp61QFPQv0Lna7eUke8t5MnobzxKJPQRhJ3GYOKxat3n5wVno= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO3PR13MB5686 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 IPv4 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 | 38 ++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 68 +++++++++++++++++++++++++++++++- 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index b0af2a0..bf59123 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -28,6 +28,7 @@ Usage doc = Y [rte_flow items] eth = Y +ipv4 = 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 d776e37..5964ecf 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -253,6 +253,44 @@ struct nfp_flower_mac_mpls { rte_be32_t mpls_lse; }; +/* + * L4 ports (for UDP, TCP, SCTP) (1W/4B) + * 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 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | port_src | port_dst | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_tp_ports { + rte_be16_t port_src; + rte_be16_t port_dst; +}; + +struct nfp_flower_ip_ext { + uint8_t tos; + uint8_t proto; + uint8_t ttl; + uint8_t flags; +}; + +/* + * L3 IPv4 details (3W/12B) + * 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 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_addr_src | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_addr_dst | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_ipv4 { + struct nfp_flower_ip_ext ip_ext; + rte_be32_t ipv4_src; + rte_be32_t ipv4_dst; +}; + 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 72e642c..08c6ef8 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -534,6 +534,11 @@ struct nfp_mask_id_entry { PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_VLAN detected"); key_ls->vlan = NFP_FLOWER_MASK_VLAN_CFI; break; + case RTE_FLOW_ITEM_TYPE_IPV4: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected"); + key_ls->key_layer |= NFP_FLOWER_LAYER_IPV4; + key_ls->key_size += sizeof(struct nfp_flower_ipv4); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -674,13 +679,58 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_ipv4(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_ipv4 *ipv4; + const struct rte_ipv4_hdr *hdr; + struct nfp_flower_meta_tci *meta_tci; + const struct rte_flow_item_ipv4 *spec; + const struct rte_flow_item_ipv4 *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 ipv4: no item->spec!"); + goto ipv4_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; + ipv4 = (struct nfp_flower_ipv4 *)*mbuf_off; + + ipv4->ip_ext.tos = hdr->type_of_service; + ipv4->ip_ext.proto = hdr->next_proto_id; + ipv4->ip_ext.ttl = hdr->time_to_live; + ipv4->ipv4_src = hdr->src_addr; + ipv4->ipv4_dst = hdr->dst_addr; + +ipv4_end: + *mbuf_off += sizeof(struct nfp_flower_ipv4); + + 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] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH), }, [RTE_FLOW_ITEM_TYPE_ETH] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN, + RTE_FLOW_ITEM_TYPE_IPV4), .mask_support = &(const struct rte_flow_item_eth){ .hdr = { .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", @@ -694,6 +744,7 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_eth, }, [RTE_FLOW_ITEM_TYPE_VLAN] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4), .mask_support = &(const struct rte_flow_item_vlan){ .hdr = { .vlan_tci = RTE_BE16(0xefff), @@ -705,6 +756,21 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_vlan), .merge = nfp_flow_merge_vlan, }, + [RTE_FLOW_ITEM_TYPE_IPV4] = { + .mask_support = &(const struct rte_flow_item_ipv4){ + .hdr = { + .type_of_service = 0xff, + .fragment_offset = RTE_BE16(0xffff), + .time_to_live = 0xff, + .next_proto_id = 0xff, + .src_addr = RTE_BE32(0xffffffff), + .dst_addr = RTE_BE32(0xffffffff), + }, + }, + .mask_default = &rte_flow_item_ipv4_mask, + .mask_sz = sizeof(struct rte_flow_item_ipv4), + .merge = nfp_flow_merge_ipv4, + }, }; static int -- 1.8.3.1