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 DB66FA0560; Tue, 18 Oct 2022 05:14:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2468842825; Tue, 18 Oct 2022 05:13:15 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2132.outbound.protection.outlook.com [40.107.220.132]) by mails.dpdk.org (Postfix) with ESMTP id 4A15E4281B for ; Tue, 18 Oct 2022 05:13:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oM3duiOzXALoZMwx2I+2gItK6bJazPVfl4FsYt+MTObfqBAu1lRWFDClvsLcbIfZvJ7PWhqnRwPg+i+or1M3OabFBZA9jsu7xYxSFMuFK66XxfEQN0jjY3t9wIkah6yxvgIHHBgOgywFzHMVRGt23mu9PXDdpwy9yU245HKXdgxLlVihRLt14TU3A3OegRAEaRLzGO1mbUPGL8pYpD9TK0qI09FCwyFvOvCUVCyeNoawykURGEUOkcsQNa3yVKAO3mu9KkpNJI9TH3DEVJm3XRmlxuoo9rSGemUbdarSXyYk04hgxihnA6eLOyBPaN7QppLetHuTEpwX6pWUCAWiBw== 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=R9lu/3vOVV57efbYwyElYTmwAOELdPU6MBRXMWiLrzU=; b=AGbz+6rW9ah5YGPJ6q+OA9TO6E7GcrUfPUVw6F+Lbx0ddmrS3CHzs1hIjBNXnzyHQ7FDi4Jjdb08yS4lk58+Odq0QnaVjqhjwPSnIO+vZemaZ7+43t6HqGKao4++VQiNk0UKjNKkkwpPSvTboBz5IrlN2IWDo32HNC5NxzT7uIoqrYgaOS7C7Z0FSDO5ToU/cSxBg8/5oHAveZ3iSdMXG2tBftKggpZHW9sH9jCzvXWncQ52Se87Mguj2tz/n5Y7bBLPdTs3UDd34Ai83898MGnrI56O9gpXMJ2b5i68ZH9rbLma7IZu2WiZPTMhDfG/UaikaDgh3wNEoGPUuGdwwg== 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=R9lu/3vOVV57efbYwyElYTmwAOELdPU6MBRXMWiLrzU=; b=GW4LZ3D7sTntT8WrwqLXb8wIPY15FM47/pnVTnld42zGzsjKV8eRbIJBzYU81ZvoaxEbTPVaavGsRkRR2GAfkNVQXEn8/SF7aEXrF4oLCvK7jV/oMerRqjkY4SH/jTMURf+E7KeRac+ZhqF3PqIGNzE33upbuwYT7BZozayFe24= 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 DM6PR13MB3865.namprd13.prod.outlook.com (2603:10b6:5:1::15) 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:13:11 +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:13:11 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 11/25] net/nfp: add the offload support of UDP item Date: Tue, 18 Oct 2022 11:12:18 +0800 Message-Id: <1666062752-33689-12-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> References: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI1PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:1f7::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3865:EE_ X-MS-Office365-Filtering-Correlation-Id: d3b7d5ff-e5b9-48a0-a99e-08dab0b6b003 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t/Y2izVPtgko5HJpoK9DxtUp41+thyVBrEUaUWLQh0xZeAclvD9/iARlgqQ2dVXcVdnv54dLvg26dNPsaTMmjc4e+xeQCuVTdAqlAdRTyhPH71L3ZNCtiKpSXUdstkxyhsmSeOl91ltPu6fKGtt+234Ghif+zZOboG2zKmRb/nWgC4sgRSEpJD9O0EIQV1/5AriMSSOD4B49+Z7e7XrLrVKzHHuADVo7IyQ7Lk+3R2A0qf/Zg9gBdTmHspEbghhrm/eoA5Q/k+yHDGGq+midYb+YoSkZfYgw70qV1HoEZwIVRy1o7UmnFiD3c+caqk5jMqstctZwbWRRiRYBDT0YkMTdwkxy7RIBAOqfU9onIAPJedlv0eJpER0Z4hGyuOxNC1as1uUmk91gCaK3poBYmSb2Yz7ifJ9eWI6oTXmZDF0kyjKFDLSnDlQA75mGw5vxyvO1wxDxPFjoBD2AlDd7dpmLwcDbX/94i7SBs+evejsuHEQbX1EJTmG25SKQ3wOf5B1mv1wm2NisCx1/hzZcNgsZeTxjV4lPaCDHZ3Hv1nspJrq9XOeHSRtK4YxcEEL60ztxyjKJzh/RFz3DNCY0x3KA56zfwnDV9M5iq96c/yPiBYxFkLYIewhsBEupORehGY/kOjQv0JYgOjTB65cYJxsELnnKE67oIohEZChTLXERiH3RX8BF+3BDZlz61k2axtV1wOWAqA9CtlqPJuWpjGJ3r2nRW/XpOfZ1U4Jwc/QZ2+1C53+Bij6ioaoilsXOYKxPtKwtL0z+7rv0Jao3KA== 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)(39830400003)(376002)(366004)(136003)(346002)(396003)(451199015)(66476007)(6916009)(36756003)(2906002)(8676002)(86362001)(38100700002)(38350700002)(44832011)(186003)(41300700001)(66946007)(66556008)(8936002)(6512007)(26005)(52116002)(107886003)(6506007)(5660300002)(316002)(4326008)(2616005)(83380400001)(6486002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QVBncS9yckNXYjJkbEVkaTN3b1U1L1kyZTVZUW1nbFFZcnYrNVBWQnBGZDJx?= =?utf-8?B?cXVBYmVjajB5bDFmbDNXL2Q4TFppaHB5bktLd2EwWWVwRTBYcm1ZaDFBNmZ3?= =?utf-8?B?eHFjSlFjUFh3WFFaazZQRkpaOWxJNklYV1BnNi82Ym5YMnZORjN6UWZhdDhI?= =?utf-8?B?aXRuY3ZBZDhWQjNiaVdkN09OdUYvUzNabEx4TXJDSE9zVlFHdnVuRVVyQ0dW?= =?utf-8?B?ZmJuL0wxaUZ1WDJpTHp1bmNnVFNUaVpkb2V0SlV3R2dGU2haL2ZEOHA3S3Fx?= =?utf-8?B?WmZPZFpPK3pLNkRSWkFEWE1qU1lzaE10R2V5MlJqUVE3REUxd2M1OWluMnli?= =?utf-8?B?QlhPanlocUxwUkxSSm1VVWdCQ21ydU4xZjZnOFVkU1VMamRUVFpXNmFyT1ln?= =?utf-8?B?SnJMUEdPOGg1ek9lVFNDVTR0SFlpTGdaU3dvbVdOeHJYY212R3pvb1NFYXFS?= =?utf-8?B?UzROdXI2dE9yaDBGbzd1eE1rZU9FczRyUEdteHBpeHcySjN2L1JOTVkweHNW?= =?utf-8?B?VDFlZWgxWFFpc1BOaWhybTE3U2xZZXJNN1hBZ2dZWW0vZWpVbEY5UWhOTlp3?= =?utf-8?B?SmZzdzZYMXFnK1MyWTlMT25HTEdoaHJQQlpuVXlmdXU4T0h6aWI4b2t4QTR2?= =?utf-8?B?OU9aM1BLbjJYWEg2U3NRZzVIakhYMkNDMWJsYTd1Q0ZPaGx0Sjl3RWRodHFh?= =?utf-8?B?TEJvMklHNDVsQ1hac3JUaExsWFhtdnZoUmlQaVlwZ2FCOW83cUZZVEg5VDJq?= =?utf-8?B?aEZkSmFTcE9TSHp0a2wrWXFVblBNd1R5aCtEZzczUlYxV0hjK2dGZ0ZiMnRZ?= =?utf-8?B?bURUc3pDQ0E3T1Uyb2lqc3ozeHdzcWNMY1htaGRQY2txeTEvbllseVFFVUVG?= =?utf-8?B?UG9vVW1Cb1VRejhkYXU2L24rTExQbkxPemZSc2szZ1Y2cW8rYVhRMmU2eDhm?= =?utf-8?B?aktWVHpnZENBbGhkVVN6N2YyMzllUXNaaGE5d0dncWI3am9TQnF5U1VobE9O?= =?utf-8?B?RXU5S2krbGJoK01lMGpVbU5keUx3Tlh4RmsvUWpsV0Jud05abEV0NGQ4MmpP?= =?utf-8?B?V1Y0RG1HTitTV1V0QTFmM2JiYnpHQ1orbFg3ZHNyZ1hoQmNLS3VBWTlNb2Rn?= =?utf-8?B?Sm4rVjdaa0loMlNobmlONWljd0JYTyttaUQrUWZTWTkrS1pDTXFTandlT2dk?= =?utf-8?B?L2doMk8vbW83VVFuMTcrdDNpM2hwWjFJeHkrR1hwUm1nZHkwQWlhTUd1YmxI?= =?utf-8?B?bkpzdnpqOVNwSTlBalFQRHN5NHNZRTVTMGZXRG1pL0c4QlVHY0NQVmZORWNa?= =?utf-8?B?akJWK0xKMGlRLzdWUTZ4VGliRS9SWGY0ZGZybzJOdE8rSGVRVjdWVlhwYlpU?= =?utf-8?B?cXczMVN2eitzRjNqNnVxL0JMLzJuSmtCZ2JEQlVOcWNySXd4L0tNMlB0eWNW?= =?utf-8?B?dEJqK3A0SXVneE5icThsM0pmdHJvRGVGUEF2cE16bnJ5cnE1aUdjVXl3Z1A2?= =?utf-8?B?Nmp5VnZ3Mk5NcFdkZ1Q0NFdQZUlTTmszV2JsSWtWWGJJR2NlNk15L0xCdFBL?= =?utf-8?B?K3VUeU03ZTZrL29kcm5QbTB6MmkxRUd6b1gvV0pQTWZ5c3FXZUF2MmRGdERL?= =?utf-8?B?TnJldDNXZW9MYU0vSVpUanpSQUxVV2o0QWhFck4veXB3aG5WL28yU2s4eHB5?= =?utf-8?B?bkJ5Tzk0Y1pZTFBMRkRPaXJWTUkrN0RwakU3dUZ0MkNyYzRxa1R6V0w2d1VN?= =?utf-8?B?QWs1akZac1NpWlorQU1Gc1grWHdlZm9wb1JadXp4WGFHaHZBS1A5elhOdTUy?= =?utf-8?B?OVpOUXZJcUFJMHZjS0duVXVVbVExSHFtUnpWVHp1VnU5QktUVFQweUJaZnUy?= =?utf-8?B?eVJZaHdPdzVRTUZrUnVXbVpRcGRmSDVjWi83dXhrdFlXWmNyTkhwN1g5eURI?= =?utf-8?B?eVNxSTJmVVh4ckptam9mbHJLazZoYndtN1lad2ZBK0VXSTBwUEc1R0VrSE1a?= =?utf-8?B?aUhkSy8xM2VyNEZQMmhRNlRwMFQ0MEd1Q0M3ZzM3eGllczlRZU9WQ2o5cnB2?= =?utf-8?B?ajZzekMzUEc0aS90SnVjNmd2WWV4Y3pxaC9uU1RwWXp2Vm4zSWozQXJxTzlS?= =?utf-8?B?ZlRzZ3RhZ1FFcFZtSFFPQVVYVTlaMWkwL0lsbk1BdDErdHo1cGYvZFJWL090?= =?utf-8?B?WkE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3b7d5ff-e5b9-48a0-a99e-08dab0b6b003 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:13:11.2880 (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: hWs0R378eUNhABQY0nIddXaMgVLJhSxIKn0NXlVEYC5Goypy+N2EmFqvXg1ueVrPS8DF5PJhiFpDNeoP9Mxfo7eG/VsRK0By0v2lFfru2hU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3865 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 logics to support the offload of UDP item. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/nfp_flow.c | 63 ++++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 66ee03c..f6ba2eb 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -33,6 +33,7 @@ ipv6 = Y ipv6_frag_ext = Y port_id = Y tcp = Y +udp = Y vlan = Y [rte_flow actions] diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 0ec1c07..7972725 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -170,6 +170,7 @@ New Features * IPv4 * IPv6 * TCP + * UDP Add the support of rte_flow actions as follow: diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 739d980..dc917fc 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -549,6 +549,11 @@ struct nfp_mask_id_entry { key_ls->key_layer |= NFP_FLOWER_LAYER_TP; key_ls->key_size += sizeof(struct nfp_flower_tp_ports); break; + case RTE_FLOW_ITEM_TYPE_UDP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_UDP detected"); + key_ls->key_layer |= NFP_FLOWER_LAYER_TP; + key_ls->key_size += sizeof(struct nfp_flower_tp_ports); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -850,6 +855,47 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_udp(struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + char *ports_off; + struct nfp_flower_tp_ports *ports; + const struct rte_flow_item_udp *spec; + const struct rte_flow_item_udp *mask; + struct nfp_flower_meta_tci *meta_tci; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge udp: no item->spec!"); + return 0; + } + + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) { + ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv4) - + sizeof(struct nfp_flower_tp_ports); + } else {/* IPv6 */ + ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv6) - + sizeof(struct nfp_flower_tp_ports); + } + ports = (struct nfp_flower_tp_ports *)ports_off; + + mask = item->mask ? item->mask : proc->mask_default; + if (is_mask) { + ports->port_src = mask->hdr.src_port; + ports->port_dst = mask->hdr.dst_port; + } else { + ports->port_src = spec->hdr.src_port; + ports->port_dst = spec->hdr.dst_port; + } + + 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] = { @@ -886,7 +932,8 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_vlan, }, [RTE_FLOW_ITEM_TYPE_IPV4] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_UDP), .mask_support = &(const struct rte_flow_item_ipv4){ .hdr = { .type_of_service = 0xff, @@ -902,7 +949,8 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_ipv4, }, [RTE_FLOW_ITEM_TYPE_IPV6] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_UDP), .mask_support = &(const struct rte_flow_item_ipv6){ .hdr = { .vtc_flow = RTE_BE32(0x0ff00000), @@ -931,6 +979,17 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_tcp), .merge = nfp_flow_merge_tcp, }, + [RTE_FLOW_ITEM_TYPE_UDP] = { + .mask_support = &(const struct rte_flow_item_udp){ + .hdr = { + .src_port = RTE_BE16(0xffff), + .dst_port = RTE_BE16(0xffff), + }, + }, + .mask_default = &rte_flow_item_udp_mask, + .mask_sz = sizeof(struct rte_flow_item_udp), + .merge = nfp_flow_merge_udp, + }, }; static int -- 1.8.3.1