From patchwork Tue May 28 01:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 140338 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 67C98440E1; Tue, 28 May 2024 03:55:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9866140649; Tue, 28 May 2024 03:55:29 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2112.outbound.protection.outlook.com [40.107.236.112]) by mails.dpdk.org (Postfix) with ESMTP id 09C344026F for ; Tue, 28 May 2024 03:55:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XpTFjsd8U2DbYMPjkhWT037xxjrMPb6f+Qv4nMcygU/7703gqpDbDPNGCb1FVBC1krp4O6E0PVIoBlquDMO2fdATxXtVBcgAkK8k++IA0B+5i8bDn1DDdsi5dp1sn0VM24JJbOkII+UmCM98Afv1DAUrV9QjJvX+lHzmgh0xAlAVYLe3Vz2NVFS2hj4MYDkQ3+KNEtqv47D1eJ7K2nE6J2jAMi5pePm+IpX2PUgKVUuJ7gyl9pAekIaRF8hVJW2kvU1RW0kauQFQgZbYXPDHpKi3yxCrShcNFetaujGXdiY5wdhejI5n0St6vLKKK0CZaA+a2RCM4SXOl7oMCjj/PQ== 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=5YtMz0dkRdtiV7KM7VvNapAzJDCv2XHkyBCwzf7nkaA=; b=PWK31iTTPYBIpKIdKPPZRxuE9o0SzJdtmHZDp1cYZSzigalfglng7/1IFnOrMI3phihS7nmv9Uzj+JqpJ9/bHplYDF35jMlH0TznC9viBhTCp9x+VICKBax4vSMBxTdk0L1xslyU20OztDNUv7H7bYc3YfeCNeU64brDl6VGPb4BN668WZefSddrr5tJM6ITd+aOh0QnVvOdIKVzs+HrIJ/9OZTkFgktVfQeAa7CHB8h5pXFbhXl0xB4psAv7p8D0PDxPXIVsnEfep/mOCvwmZ292ncUue4R0IBloIm+c++iORsmzHjcT+lThwIXGyyWgun6DOXmUeXB3320iU0uhQ== 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=5YtMz0dkRdtiV7KM7VvNapAzJDCv2XHkyBCwzf7nkaA=; b=KeDmiIHZPNlFKzYvqWhdrzuTRMDma40wbBwb4peClDBow0fPQ2nKYXRswUSKVXnQ4+0++2avSp/aR+iouvDXjBa3ZY6qc1Pxfd4p/esc4rhs8IliUSz5Xg2u3hkU9h1n15c6+xzG/QW+gvUtpUEELa/9siHlXAmI4MxvfBOO/Xs= 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 SA1PR13MB5053.namprd13.prod.outlook.com (2603:10b6:806:1aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.16; Tue, 28 May 2024 01:55:26 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%7]) with mapi id 15.20.7633.001; Tue, 28 May 2024 01:55:26 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 1/4] net/nfp: support generic ETH flow item Date: Tue, 28 May 2024 09:55:01 +0800 Message-Id: <20240528015504.2376070-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240528015504.2376070-1-chaoyong.he@corigine.com> References: <20240528015504.2376070-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0096.apcprd03.prod.outlook.com (2603:1096:4:7c::24) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5053:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d5dd9d1-b288-4e08-ee8b-08dc7eb93e59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|366007|1800799015|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: 2m+YyXdJNKhRmSD0GlR4dn4309iWrgKTYO4TvgcdqiZEH/ZtIx79GrNzCgyCfdw7fIZU5HkkDkkCbY9Bt8GNE3f682k2KdJO3y1Tw8qXhaxf3/Jjg5hSuO0kN904X/reHTdj1BBFzrTBkwHGt2FwqvWBSgzs+F1dedctt5MTPNdewaKlrDhg6KXZ0Li59LXMfgYVORvjNbea/Z4A7mH3EOdoL0F9FY0c1LuMZWgsMZVZhlVF0wou3l4ZeizgwTKtuj/YA4kebC35RKY77dQcMhdqBJK6xywm4XAd0j5hiIIs6PA9xBQ9LfroH6G5QGJinHdcnRcvOBOTzPKxWzqbokJUnboQs0vrIPnuJu/pilcIa0xTZKyB9MNjs9LOuuACVTroxtnAS4bRe3fQYYKNxy1JSWBpgrFMHD2Mn6+YsEnRzPcBrIpb6VcihE+fLtj/oDii9GfZUkLTo6ppc5pwdpS0+NUnoD7WewpGHbLaLwqNKod9gKxuA3tknjMZ8lfwvj1FvZOJES8NJxzx8bucCSmE3BsQfjRvyQzpriiPMQnnEl7pN3LyQRw8x9KhCbgopfm+FpH/sa6WxR68w0WhdmBBz2ho8MKgmKR40PuShquv5H3FU3SidvEO2X5nvclKNlx0UyoiysObMa/2LrlNg6jKIncRV2tk8MBwk7oo4faFifKAt75SP4DmuzkzgQdBxebdfDCItmGXqTrf7VMRs7OVjlXCXTm2sfKcaLyPHjlv8zQo/prN2khIuNKs9LXbfkMf3AmxCmLhVLGHrJWPvkZvabTzShWHZforaPiQsRa8PJawI5MoTK49h23ecgj6trAVzBMSykPQVK/rETl761TDZBG8Us+J0RbtpWdRxAffr+rRStBbNpRZEYREvOnDltROkT3TSsq7v5rjEk9vS4zmOQ7r4Kud2ay4qEqo8R+urREKcJe/thOjIcuSazazM+uyUWrtRWdcxHuqBnrYgkdd08TMrlVnKLjBa/DFSR3/g08RTDJ+urxVlZWK55cHgDIP2SulgrzruW1SJ6i7sHliXF4T47DQm2mwVGl/M4cc0pKfVm2TZkYkdAVgacBnNq07KddRG3n1Bt4MhSsRbYgfPCZQITvvEu/UjU+whO1YNIgTR39krEovxUmWMFdCmKOlE6Kf/LO5j9K/okDL5vRmCEtQIxx2VRwHMVquLCrfn28zVupgYuLvD9eQSPFdQ79vZQpQ7nt2V911bcgEjzvM6cTtAmHLWoUZG8KpDWpQUs6CMvsV0LUYKXJ1Szie3itI4hYs+q5arC3sygjEEu5ptML0Qc2t/AyTAVdTG7FK7AoXZmZBRPB9c0rPmoLwRMYI3mKoUGdnY3HPEq/ozw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 659WO517xPvLKPMA2SZtIGZNoAJ7oUbXbOC+EWwms6/d5adcNbaAtR+O/0rU4t01X5ilDiQSUl5/CliJ5UuH0zXQRFEnWYNDbNeCRTDbAcq+MzLC6miS17gRGSpoKuKE/RJ8+SrhGaTpW3kF85T7L8JFkkWaV/tEXTwOkm0jIYxQzYpkX4R6HM0Zdzr18Q2ZKBYpRFh6a+wIVnCtUBvNkytqbCStHlvYYygwc+tzrSExvcqmK4cRu018W5ggqQSvQeyZngKLqTbIqz7aJhZrXoyTEUIECiv/MUQ8mM9acgKLCJldEY/kfTowCDQLqKJIngIT/ppv6KeirBVo6VWYxXoWJ04xEwqH1hzkrZ+E37tKmhxnv3BBlWmFmzdegYfeLpZE43NwVrs/pu7I1xgtZtxRlsccxuQEaI8o0q/zPmzbNkS6QYv2Xdfb9mcp6E4oqSOTZ9jOwt7arecyBtsCziP+MtYpOXIHouJrgmL0i/svF33efCq2VsfDoDlknVAR1w3tIT6uoRIsMnvdfHmH2kZyqnNc7eXpbY+88BZL6J922jHLUFxx9BXXi5HKJVWfYaV9jChBD33JCjWMPc5ZIHAWyXi2tXxYs3yTyQPhY25BvnBx79+xU15/7Nw6+6Xfu8E11ZyQ3Cdw/xTF8MiNGSjJvN1KnxxDC9pgzXeukVKzMhJsHayjNrCaD1rxmPao9JP69BJVWPx6HrvicgEHB3GpPWcSOp8bHavj6Fw0K8fYjLXtw8a5OGsjyDpULjcDIyfZ9vA5/O2lIShznAGrehdOyit7RkqAxqGQosWaong/IrRID5QBuw3ZLBgsrjShlhJ1TKwGR6Nb0ijHZhZDJlN58ewJAvT6E1TdWj1OYEzSv4kEAAclWzOuVY4y/Qqm0WKdy2Er4IXbLiZnhU0Gprm+IL2nW1s2W+RuKRcdIPy0DUNrxS8noneLjxAglhqailbhtLfH5MtNyKtpI0b2j2j/1oPRlhIAiW7dFIiT4kuDyTIDsLCFLk+15wKvKoJFPWR0y7jQvHsHH0lTVjoJkUhJESCxAwy1XZciUDYrtdpMn+G+OFnF0UpBBXl6JC7+6M2EF+4KgGuVRk+VaYJO6dLJqRsEqUebqqwTy6s/xuuiN+gWpWby2y5QMvgl0jq0YzHAZNJQvuqspHhWCRAqpM5oJMrSbGDjQ348RRB4sf6E+xr3dOAZDZguNZlhv5Eh1Nha8IKDdvI4GtH/sxJgsDeU7tcAb71mV6vu+329sxDGwTkbyakM80+W8aIa8vEjGDeOLEJNGNOo6QRcYDK2DWeRo97qEHuIXTB+V5HiA/kFdf9hJUWBBw92cFOVnkvqThoT5etRxJpptWy0FVHQGhOm+UMqvBrAkM6HxGQwatKT1AAUZRXszMoBfOnA7TordljWGWta9bIfY63KYmWHsmDvJprmvXZjcwUzV37Kjc4rYjHYGy6YgeaZwlvoZCdunrbB1KoXNS1NEIscfOwqDHNg1RYRg9J2iVDTjyk6zImiN0TJK4HpzB0SbOBhEZqJX+woirloMqPCPTOl0DqOgfcS816IOOFRxaXUt5evkGZOQCNPx4TOQbcn5G6jmBXzfWChI4/WFGdUlgne66RpxA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d5dd9d1-b288-4e08-ee8b-08dc7eb93e59 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 01:55:26.2849 (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: zKRHowkt0yh/8xm6MyDxccNpQnGlKZJnreHPTKW/O1tLv43c4J2vNp61sBszdE/sVZiqChFyuVSqwnY3riOoZSo/8ZH20Mhhy4QmQmZ34Gc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5053 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 support of ETH flow item with a NULL 'item->spec' value. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_flow.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index ae3f25e410..098a714ea5 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -1230,10 +1230,9 @@ nfp_flow_merge_eth(__rte_unused struct nfp_app_fw_flower *app_fw_flower, } eth->mpls_lse = 0; - -eth_end: *mbuf_off += sizeof(struct nfp_flower_mac_mpls); +eth_end: return 0; } From patchwork Tue May 28 01:55:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 140339 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 9A12E440E1; Tue, 28 May 2024 03:55:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E66D4068E; Tue, 28 May 2024 03:55:32 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2129.outbound.protection.outlook.com [40.107.236.129]) by mails.dpdk.org (Postfix) with ESMTP id B5E7B40687 for ; Tue, 28 May 2024 03:55:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AbYLzyRJL0Xy3bWYiDelvLndL9xkQeOZDtRLT5E4AiljfiIEJTGHA3h9IRmsgow3MyVb063I+uvIgIOGweBP+Ty343lurABN1piAZVZ/yC6mYHVpbsTRVnLELMNFDf/nh79MvmUyVWYPkmJl2G7nopRmpqv16enFSMCiRJ02F8RX7MsM9zezxxKGFxBipMDc+DqgoKkETrg93JZe/TaYDp0bA5RO+ggS43yU08/R3SL7XtcGX1yzBzMnJISIjPClh8d3a1uqIre77TOe6CK6o3PBCxUP9jCRIkANSgZCdTO7ec/WOGBA078U9b1WGXKokqumKM9PNEPOWs1+ZqwB6g== 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=wpPqFRkNO6kxjQbdSDGQ1/e912pMBMPXSbWt4cZQyes=; b=Sxr8et85aUMlpx8CpFrN6brqydmnAw8/MptqwOAZmdPhrn4fmNcNaKpgLYvt0FHhpv1am/qoj5PaimBlveZBBQY9P62q91Aj0gQZQRoiu86fI588gGsaxpdvE5SfNnR43Ex+pOd8R7FDPJl/WK82tJUpqjkuBj+xPBtkg59qSVdhWKsp5mwir5Jh6FYSwBp68XAPYg2U3P+aYkplzVTrC8KcEUQZW4l6k5gMofd4ouo52X/yOqeqRsLaVZcuWPhAYVBE0drjTvM+GyZ3Vvkym9Bp/B/7e5yLEos727Z19QbtN0/EEAA5WQdY2m8l//+RxO3NhIx6fOfvjhXxU3k5EQ== 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=wpPqFRkNO6kxjQbdSDGQ1/e912pMBMPXSbWt4cZQyes=; b=CTvh+IDbTj+brKjiluZea1QX59XG1NIaRptMAG//ApmmN0pKmYzslkLvzii8OS18pljiZ1FdVVLeyAAODlqIpfGzOB205LTbhJLQ83E+4gyx06dd35Swq8YrIodW81nb5IpIu07mvAFnQBa7EXA/nsWMR1nkFCeVtBfxKzIIcGo= 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 SA1PR13MB5053.namprd13.prod.outlook.com (2603:10b6:806:1aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.16; Tue, 28 May 2024 01:55:28 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%7]) with mapi id 15.20.7633.001; Tue, 28 May 2024 01:55:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 2/4] net/nfp: support generic TCP flow item Date: Tue, 28 May 2024 09:55:02 +0800 Message-Id: <20240528015504.2376070-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240528015504.2376070-1-chaoyong.he@corigine.com> References: <20240528015504.2376070-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0096.apcprd03.prod.outlook.com (2603:1096:4:7c::24) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5053:EE_ X-MS-Office365-Filtering-Correlation-Id: 69a5f858-2a1f-4e0d-ab64-08dc7eb93fbb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|366007|1800799015|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: RSDgY5o1cnBOsDO9Y6HQiHoOqf68lWKHEn1cqqqh8RUEviXz1YgEl3N83aJfMHnrWa1I/wstTxn70IQ8uJhYvOhwxpWBkfTPV4fEQhwbKPTH3cO4gxoO/JQZ21lSRSdiNo9kqpIdcGPyAc2YUBLm3OJ5VFCH/GXcNYDKOiIuaNlsn5hPwcexsMTHj+9wDhuZC2dBi6m7ftjMu5u5RxCBs2Rad3wDYyvcU+vn4+qxC0yhfYtuRAtVwCZ8enoEjgcFLbVuLntiI6KSN9eU/NvbiseGE17tVtEuLhIkPXh/t8pR7fT4nk5wmv1qqHLouZj2E1sLLyZ9cyNpG0IzKjEoI5hih+onGmgjc26rG359ABMeR2hXGBBU1efZ1gSWW8HNAPad46c42iYxWolDsoDQSl66H7dMgURIdF5naC0hkp5YHmNT0BLVvAkD6rcFHfHl8GRfWPNbdlOcjtmRidw7uLx+8cj1ISf09o1ndXT5vK1KfjE0zD+7uQrglmQisP4cyTW3zvv9WXSKURIbZNwh53k8zD8888dfPq999l85eJDEVgq92tq9KW6qN+HcA+J+lcq/iBKBOTtoSebCCSO7CR2xLY1uVspLa6OQdykwGYY0gLvXWqiJCpnwm7gBpePJKDZ69X2Sl6csl365by576TQNpQ0NUqvpXFw2YWV04PDwORzOukIkhnLUsJCaoTGSidH4NC90sTekB2NAX+ecfjAbjOwwjAx06E9NZyRkTv9a1pycHKc/cHfVC25if6CqJs7wwsSRWuXHP8bmn8l4MclkAnrCV7xl2BUXjdb4PLwWlhS7enoGBoNGdTmHoQAxaCBOk/uUa7Jfo3ihhiB8z6OGI9Wsd7LSnI2ffB+vXHCEQn7YnprKZ3ppZefC4zUpUGmmWuqu1tiWWfhEtbEXzFDdCVC8X+cIXa9faTj/3/F5S8F+FmjTLxOqBdbd5qOn26onp7Lkl3QR4SiqEQLQwUnJP7HRV+komlfaHJYxSBH+uK+m0ldNSXUff8cKT1cD0uso1jo0Z9cBfmkvv0e1JvGSER38wjO4QnlNkkBr+qlxjC6wqfTUJ+7l5RhFV1p2jATAhDLEhljNB3f4kGFsCP46fDKkke0v4Cl2Jb8YobI+HnzN/5WJasIwMmUsHNiJvgYvNIm05mu1/LVO6183E2nOa6AKQ08JrVZxG8g9oPW2P9QilmmahZXG0W5LRvFMgj3XvbVNK8aAXXBwTGnq20BymLUvOuPrmsAt1q/NzBRx58dNLw78iJYjPuQt29X1DIVx8VW98vZGsHvCOG+H+DAPkZAgaVzU8u7XO7uX8NBOhPEZ6njczFRpMhRrZNpVenJsf56wjFCFPIegjI9gKw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3RhVwVgmoO7j6gPcwYpuzPw24LwImDm3JV7I+KXGcLh3YAyZCcmZL0BgjewAh3f4ku9rsGZN17tSD6KlZDBLxL0qeV+ewzwYj2/kbPSJG4dNInQgjERqnlhfVOIeT9BkT6vbzV2YaR2SQ4TdriFpj4PkMsCRhIUS+ZW4jFy/IqeDRa4QG24Xew1OBJP6/g4cHDqdshdXmlXP+WhIpKvAaOfGqgUiS2RL+xpwdpEYeSRoXW8J2uKSGiEH3qNGPWnZlGsQZNDp92245rR5xBekqoFnoJvca70Vgyi3prJSLSut/VIWttvsZ/4XQGg3wZko+5y1t2oid8FpI9l6Z0OEEMnlqN2Kf4NrpRxxHDylYHVMnmxvxpSGvpvmk1JWBrH6CgOcreI6qo9Bp+JD+LcxlxLJyH06b8Feyp/82n2fjQS2Ok4q56Vh0itcl4Lsj46IgOLGJwA3Mj6PJiGkD1/SdOmTYNunxu3+1dpYeDD/0mVEGGyoP4xqum5lb8k9L92DtHMszz7bbyP+JBbHLg6vsqwD0c9RrZ45Gem4PXE6ryFJlUkCzDtCgfWdTAPkwjuoDoeHg2B0MZgnREM+EJgYeaKUTG1gbzcg93SYXYF5qbmxesZkw50XnVXoWqbAcXlpg5Rt110PFFehOArb0ZqPKdUskb4/kk4FqTZpU1oWGCqHpdQ8Lz48ClmpTzOrmBdogi5sZd/kyqC49Bg+A7+n5twgkbuRSZJgoDEPm68sj+Bja+6jDOSj8zCvxsyaLsu47y1MTIng/bCYzHOch251cY+qoFYil9rjP/k93fW+hyBB8Tup+MpPclhO+dLslSiq//6nuU+HY+hlj6gZZbBLYcPK6jRRmZA+te+feh+eTS99FlQQ45+DOCOiy3vQU1oYkHBtYSLgF+edIWtA5rbOwUQ8TSeAzKCFVMBU7A1T/Ceimwym/9tmGKv50DTB0Ilhm/pVIeYhxwGi1dNZ3p1x1VjRfSepSodW/e4nPZadnapj4ysqaceBbadssO0iXCuMhqyJLuz783URza3Gw9LjB8CLgS9R7RSWfeqoq9SW1ZN+FgDi+XiaZ5MnS0TX+zjqkH7U4JeE669DdtUohz5+D13TgRNTbGym5fBHRz993/qD+Pk7I3WfGFH/v4mszGxGPFhW98D7HoSUnU257tKOHfGboxhFhCoIvIVTx2aHL3DkN6FaqAxQhVoYEzoRpjUpd7fQUK9eq3XjPMA9ErS6itBYnkSeHR5cU1vkKL4Ad9WmNjeI7jicQ1WKflH4ds4g538EsyhdeWvGDSgV6wkz2hVcdUiVlafgfEDJyKJQO0BFczXbLLlkNX0VzhSaQ7+7deLqDVcnw0E+LAlhcZ8oRwC/ufBNShQfir93toeZ8/N5NAvtTBjRNXscXumZo7igY3xLzH1++QAv4coTwQRQvINsn7UCVucYC/r6bOc6Uw/A88Os9R6xYaz0dPQP62Z/hjK7eX7CPcTnmF57UOFFT1gN8io5xk3P7jnqzkSJ7zLqylWHYMKsO254j2ktlAM7jeAsTDRDAGcLrTnMauRzD2AU1JvQSPAsviaz0yTuGuLmUxWPr+lFCLdhRI5AYhm7gDl2WkimctyMh8Rtk/1EpQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69a5f858-2a1f-4e0d-ab64-08dc7eb93fbb X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 01:55:28.4700 (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: LBntkmj9A/J/XfS1wBvjNoY0oyXQHJOSZhLxpJtx8E6o4lHN9IyKO1Ouc7gUc79dwDhK5KZzJ2SPs9ciVyHD6i1vh29FudQcV0Gt7hk4o40= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5053 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 support of TCP flow item with a NULL 'item->spec' value. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_flow.c | 45 +++++++++++++++--------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index 098a714ea5..810f55f805 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -1316,11 +1316,6 @@ nfp_flow_merge_ipv4(__rte_unused struct nfp_app_fw_flower *app_fw_flower, ipv4_udp_tun->ipv4.dst = hdr->dst_addr; } } else { - 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. @@ -1328,6 +1323,11 @@ nfp_flow_merge_ipv4(__rte_unused struct nfp_app_fw_flower *app_fw_flower, if ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) != 0) *mbuf_off += sizeof(struct nfp_flower_tp_ports); + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge ipv4: no item->spec!"); + goto ipv4_end; + } + hdr = is_mask ? &mask->hdr : &spec->hdr; ipv4 = (struct nfp_flower_ipv4 *)*mbuf_off; @@ -1399,11 +1399,6 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, sizeof(ipv6_udp_tun->ipv6.ipv6_dst)); } } else { - 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 ipv6 before L4 but NFP flower fw requires L4 before ipv6. @@ -1411,6 +1406,11 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, if ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) != 0) *mbuf_off += sizeof(struct nfp_flower_tp_ports); + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge ipv6: no item->spec!"); + goto ipv6_end; + } + hdr = is_mask ? &mask->hdr : &spec->hdr; vtc_flow = rte_be_to_cpu_32(hdr->vtc_flow); ipv6 = (struct nfp_flower_ipv6 *)*mbuf_off; @@ -1445,23 +1445,34 @@ nfp_flow_merge_tcp(__rte_unused struct nfp_app_fw_flower *app_fw_flower, const struct rte_flow_item_tcp *mask; struct nfp_flower_meta_tci *meta_tci; - spec = item->spec; - if (spec == NULL) { - PMD_DRV_LOG(DEBUG, "nfp flow merge tcp: 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) != 0) { ipv4 = (struct nfp_flower_ipv4 *) (*mbuf_off - sizeof(struct nfp_flower_ipv4)); + if (is_mask) + ipv4->ip_ext.proto = 0xFF; + else + ipv4->ip_ext.proto = IPPROTO_TCP; ports = (struct nfp_flower_tp_ports *) ((char *)ipv4 - sizeof(struct nfp_flower_tp_ports)); - } else { /* IPv6 */ + } else if ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV6) != 0) { ipv6 = (struct nfp_flower_ipv6 *) (*mbuf_off - sizeof(struct nfp_flower_ipv6)); + if (is_mask) + ipv6->ip_ext.proto = 0xFF; + else + ipv6->ip_ext.proto = IPPROTO_TCP; ports = (struct nfp_flower_tp_ports *) ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports)); + } else { + PMD_DRV_LOG(ERR, "nfp flow merge tcp: no L3 layer!"); + return -EINVAL; + } + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge tcp: no item->spec!"); + return 0; } mask = item->mask ? item->mask : proc->mask_default; From patchwork Tue May 28 01:55:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 140340 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 6C456440E1; Tue, 28 May 2024 03:55:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 499A540698; Tue, 28 May 2024 03:55:33 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2107.outbound.protection.outlook.com [40.107.236.107]) by mails.dpdk.org (Postfix) with ESMTP id D0ADE402D2 for ; Tue, 28 May 2024 03:55:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ezGprOuHYyknqcrLOpzNUhgAjRTAIDa5/SbZNvpdrG1GCI2l9sh04LxUxL7aK1A5Xwz8m0WlvPoDg47LeNV1hAkfK2aYjNlGcqYlkRCfbV0k5bhngwUPyG1C0HE7mR/h70r7DrbEQ3TyOfuoyI4j48tLdi6ohThj+4fBA/l7S4qIc8iAgZueBvlQ7gn6ue4jpFLO9joBmfQqm7+45QM/BOSo7HVVGPDRiPFTdGVjUA7PUWsFdM7reO5foJNy1Popgeec68nIkm7AzrsRb0+8zoB77IQv3NMKT9TryyQjTwTCC4x/WBSNReF6bE4B+OwQRoK900muLRC/LPdjPvzFiQ== 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=9OFyVgAAzDB0+VqEhMDX0y5Q9USxbFvhT56+I3XPFAE=; b=FKxybyzm/Rnf6bNQuKze2ztl19wZUvDJbKZu9tDR1t2Bk2NHJfJyjDIX91i+LimFErDsmOX1aftWIM+vIn9ApVd4IJzIgOipP1/HILMzr8I4xmRQ4pT4uxRZtg/0TB1s0BJTBt7IvHDTUOE1h8DD7mcLSgiWcBNlwiBPN/RgoKMpLFKNqZxyGwkb7rDufk6wM+nEdVj2oIYaPiZJNe0WojG9brzlEfPrLT/9gLVGXl8NriPa/6AWaxthmM1hGsKa31JQlw2AH/VlLMHq7CHncUuNqBfWeyAqlGhFEmxefjWTs6e1pqYBenHgA95m5GU7yVdwlnyVM5md54QmFXnSxA== 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=9OFyVgAAzDB0+VqEhMDX0y5Q9USxbFvhT56+I3XPFAE=; b=ZBA81sKSIfY+SMAFhGjm/6BkIOVgJ/mxi8BxANW3hNjFtAvS1rKv8g0z4yypbguY2hdXVltPAC5pH7V8OD7vH7X5X+/mU+dEeVhAP7KbP4KYXeYUAwRpZKfUpZxGJOV/Ges95he0qmd3KNigWavnk4A7qAFDtnelk+CDAabLue4= 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 SA1PR13MB5053.namprd13.prod.outlook.com (2603:10b6:806:1aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.16; Tue, 28 May 2024 01:55:30 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%7]) with mapi id 15.20.7633.001; Tue, 28 May 2024 01:55:30 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 3/4] net/nfp: support generic UDP flow item Date: Tue, 28 May 2024 09:55:03 +0800 Message-Id: <20240528015504.2376070-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240528015504.2376070-1-chaoyong.he@corigine.com> References: <20240528015504.2376070-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0096.apcprd03.prod.outlook.com (2603:1096:4:7c::24) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5053:EE_ X-MS-Office365-Filtering-Correlation-Id: 908ea25d-8f34-47c6-31c9-08dc7eb94104 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|366007|1800799015|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: xhNDez6LIK+BveXW28haJAKbT+w0hBg5z9NaSynnenTt3h7ZVc/NEXjWFPIUrhAFxcNEaEGlbwfZWvvav9Y5e3nk9AHseqClqRQU57BZ8Vhx/vDxjgcH0+wI0yh2svdP9mTF5yVq5RpKyfB7B64pb2WCvrIse9GCZS3DQ7HoKzj+MZq0eoxFkyh560U9FtwJg8bMzbt+A+Jkb1Bux7DAaqQPItNszWXGIS542Ugs7Ug6PlRNvwAZz8Z028BeP1dsFNBPEL8d+wX8ymlvq7iEE50XdlI668OJXFmYWRgUT2z9PaHWEhrDT9JvfhT7uD0nNJrZwwIdF7dLvYRZ0stY276+tn78QUpSNMBrsnWbE/W289Z3lmqwwjyagf9riB+GFzmZYqDn97pouJK5/7N2I+etiJ1HpWgnmjzaVhcBY8sXzh7WDbo3hcn0NC1Crt/tTmbBtCw0iTwGs2pntF01eDpLbaqPNa61NyjmjdzmT7RXULJWxa/7M5COnAcGkkXn3tAlaRolQWZ/gyEZmdTYd6j0X6dXaIMQ9wyga5c/8MFWRFzMfXuPtFaIQqxmfxHq90jqNXw+C8fDSylp6bcAvrrio9B/cNGyEmN/7PxhFMrJrk8ONZge09qNKa7WlXyzB3YXS8nIzDvVicmpYLzV+uArwG+K/GZL3xx/nMzDox3QH3UiEQisLddLPisXOPvqX23LDHJKiUn9A7zLv7dxK69OKBTSPnSTXobrqWUfRuqnYzQVmSmKhJ7VJv6h45v0V6yrUQzD9GU2IkcucntjgOcM4LIQykajEZFlPgYJFB/01MaY7plvqaQNGjXG4Ys1loXP+p0xOLn+MzDF9fy8/pxrTmPFFY7FPNPbPC9D7BaQ4SJvJxu3YDg6FoJ2H3BTny4b7RMSC+x+xyjPySFTa6EgpiHCYH0K3Ss2ZlS/GGVqJrwZ40iczLyrXbALify9XTeelvnKRXtSElcjRfa8Yl7hhHgNVmQ5ktuvBhfHtv4a1DHlpSJbMThqi9e4F8QRFPT4H1vRzZGTGSSpZCl/sPnFzwFOFSlyZJ+wy1PWDLYsdpkxt7NaHrrqiHDbyfe4/yOqhMrzyEjtLiF026ZoW05cUrZvq8OrabZ483bhtMfdZsAGHIlYDGkLiqrnhB75k7S72S6gNnAZhOdiwv7ALHY7ubSSjYI8JkL0U59kMUFUER6+iYoGb9C4hGuWTvCv92XzvKAv8ej8CXNWi05/PrOhZxHJmZIjZ5zH2R4InGg43koV4jLeUhbWJRHV7Bw3GR2Wxuv2wx7A26xEPth0eEeSmY4NuKjVde5f21EnLQP46PKrOZtQMnJTKJOYg8qfRy8TXj1HboFrv6I3tqHegg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nWqh6uGM7rK4m9/yyTEtP1jK2WlebdU0u9fvPOlzmnkAz4fRxkOVjK8PflN7IEn/KfN1BFcKSKjtUuqvzcrfV6gi0cKeHgLA679vQtPzg8fdWimfcvAEJ7GZB2qVq1ZRr+7FTRoEz3BqEhCe+JXbeMfVdOBzBSSIOc4COFt/6psNc86LFiHRpfpNYUddcdRgfCHzJUy7HUHVWdvXj8eV6UkPlO/u5Kk0Peos1reTlWhA/GNVET7tIMcAMi3Zi7YwaicmqqfaVci4yL2A8+DQugI0w7mLTeFrLDQ+XAanGpzpqUHgmmmj7VnSBFdYKOuWX7IkUGhRNi5opzyc8BvCJ1bTzXo2i1kVOmH0L7zz/eKhk72wLp7XXv17EnXE77gXmYei662QWt5e1jrcqlOsR9nw8A2+iNS5SZkjFcdsVoj+awNNhgGclDndMkKXRrmy58MUWFeJYGtcI0wrfEDwpd2KCkE/KOGvwQaKc14595kQrhLfPSBsMLQF9wG0udDVqOLjVzQAEeydlXReIBYBoc0Lf7gsdWoIdY4Su8oaP8nFFbj9VKkglbttcnWJ72cKzjVXpllGc49J3CAHdkc61osWnwgDgdM2pTGQGxAUHh6RwsFjSf8puDBensRXNRzDONmPcncGkO55cvMYQKpkwCmDZgXR8OP4Xi3HlIqYBHch8F3kvKSx0edfuEZ85YR2PDJ3L0VOm89jxRMsHM/JxwcEttvDRBSFE38xo/IZ1p/TquMTHeUbYp0vA8ok7mV68/xawpzrpRGhRbiu37rCjx288CI5rvPqbuwv85oCNhJ8QceTjLFrS7Jq8213jL827GKnoVdWSvofKWzbp3xNFiehyIetF4BApT/qmgAuPJoLw1iafy4VT+F5D9SGV7d/2MKfIOz79SCDJ5fvKhqp76qIEwmso4HHetbJ3XcIvMMWoTreOLReFnCps9GmKIYc1iELFMeq1QuwDAe68jqFGCAT5QsFYIISRzNXilX9heYy53i4jvgXRoaLB/9QR0OCbC3nViIvR+fHxiFFumQRCiEWJdqKqGF2+sZiA1masJZmfBDM7gBwSyS9zDMAZloLg8/qYXArVaHpvv1l3En5Nb2GW0CY7jGeYA4gs2bN31Mz5zueu+pLOVRU5BV2rPYXIHKPOZ8uTDeCsoBT3Vn3aFeCREGoN5tphx3lVcxlb7vW9Khm6oHiDRTiyCTOQlDfOSh67qAuXvP2+ZksangBmQLYMx7ua8iO5Ubu/lYoT6dErBetvV8E2+duhHeAISf7ZIKgqlodVfUh7h9nbEy9tMluCk7C4vJ2oVaki7HxWpBT5KsRxpeqQwWZcKn9FKJJxwnLYrZt/ONirmf3wrzvAZO8CYBHAzZL/8QruLSLoSpV7w5g8UtMMxW7YCS+YjOt5hY+LuXNvPUuLTppmg1l7er8XLZCjuNLtLMfMtgvZiYAa4bXkIWkCTX+X+SsAhULLffUR7S5gKBZKdjEjPiwNvbcm+2nWozPYylQSC+VxqNyCXYs2vzVHEtvFQyXJepiaxdvNXj+I0cHwGxhwazAzLdYw5iG3sHp9wHXc/o4T6WwJAm/UyUyjbAwziifZ0McTqhKFUmZ5vbwJdooO1P3sg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 908ea25d-8f34-47c6-31c9-08dc7eb94104 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 01:55:30.5943 (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: 7yo+qicaDW52uzTveC1sirOroxfzksrmDRo8QbmjuB1dyTxI0FmDEi2Xz8j096e8dlbdsZXifw4SeSscBaX38B30aRRr8eDOPW8AwrUZ2vo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5053 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 support of UDP flow item with a NULL 'item->spec' value. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_flow.c | 41 ++++++++++++++++-------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index 810f55f805..4cbdfd02b8 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -1522,18 +1522,13 @@ nfp_flow_merge_udp(__rte_unused struct nfp_app_fw_flower *app_fw_flower, bool is_mask, bool is_outer_layer) { - char *ports_off; struct nfp_flower_tp_ports *ports; + struct nfp_flower_ipv4 *ipv4 = NULL; + struct nfp_flower_ipv6 *ipv6 = NULL; 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; - } - /* Don't add L4 info if working on a inner layer pattern */ if (!is_outer_layer) { PMD_DRV_LOG(INFO, "Detected inner layer UDP, skipping."); @@ -1542,13 +1537,33 @@ nfp_flow_merge_udp(__rte_unused struct nfp_app_fw_flower *app_fw_flower, meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; if ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) != 0) { - 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); + ipv4 = (struct nfp_flower_ipv4 *) + (*mbuf_off - sizeof(struct nfp_flower_ipv4)); + if (is_mask) + ipv4->ip_ext.proto = 0xFF; + else + ipv4->ip_ext.proto = IPPROTO_UDP; + ports = (struct nfp_flower_tp_ports *) + ((char *)ipv4 - sizeof(struct nfp_flower_tp_ports)); + } else if ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV6) != 0) { + ipv6 = (struct nfp_flower_ipv6 *) + (*mbuf_off - sizeof(struct nfp_flower_ipv6)); + if (is_mask) + ipv6->ip_ext.proto = 0xFF; + else + ipv6->ip_ext.proto = IPPROTO_UDP; + ports = (struct nfp_flower_tp_ports *) + ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports)); + } else { + PMD_DRV_LOG(ERR, "nfp flow merge udp: no L3 layer!"); + return -EINVAL; + } + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge udp: no item->spec!"); + return 0; } - ports = (struct nfp_flower_tp_ports *)ports_off; mask = item->mask ? item->mask : proc->mask_default; if (is_mask) { From patchwork Tue May 28 01:55:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 140341 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 ACEEE440E1; Tue, 28 May 2024 03:55:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89337406BA; Tue, 28 May 2024 03:55:35 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2092.outbound.protection.outlook.com [40.107.236.92]) by mails.dpdk.org (Postfix) with ESMTP id EF821406A2 for ; Tue, 28 May 2024 03:55:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j9pGpbht8Es1GHOb3lhKgSVb8JKZiPWUA/hwXXw5Xv9vfiFo5bjB2jZ5hB0lGbJi8rl4897VYzeYQNS9l9EvJ+xcKf1NC93zMU/AqGhdbWL6k0OQ/8ZYysf+/pqUzUEh48mLj5lm/+VwYczhS+2CSuxPG9AlQMRvwDRQ9SWyzpMX28i67rjWAbgkl3gNu/e7kPIJ/rt9z7nZkiUZQ8cSdECQZPvs0GiS/nyYVTfkoLA05qATVbUWF2OiNzXpHUSq2icSvyJIjcE/RYPr2ly4aShzlcE5NkMrAtsESDBIyNSpOE+EAlTtDtxe08duCo/QEFxcsrl0AOL6j9MI1hWf7A== 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=P2DiU3RQq3F12yv6YqxNUhEtjpJV7bvLgZATeiDAQPE=; b=RqzCOBRsQgPdfEv3kiW/wIMbnYFkJ43faUP+l6zFLHrWSd+KF4vuz7LB6qA3qD3y6A7io0iyQOo+za9/8T0Iynu+fl1AHnTFr8BkUKUaEtlPtvXdNdPs2TEVOWtKmErNybGApSS5E0Ke/RH9JIMKvCTZ5Pwdlg6k577Yypg55cJz+Vuvv9CcIFfVZdymFJVTteDy+UEx6r5ZU58HV6rMQFd+G1s1eS9FuIxYanZiCu+FosAlN2RX15Ys8jJfS8G65rX9ZheMWt/ypdO2jxZpPY+Erf6yJO+PVwzQk8dfNVBLlopMYlr7NU+xM7CfbiBUxEbyEVodje6JpjeSRuOeRg== 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=P2DiU3RQq3F12yv6YqxNUhEtjpJV7bvLgZATeiDAQPE=; b=HUGWBBETWJcckaLlgw8moAddPFI3sF8HA4UQjfv1kAsjfM25x/dz+3tOarFZLMQluntTlBtLMzHXl24wvbJf893w9/yrYNf+gDwN1Ri0C0Bf48nKUOAvdqvLI03xSD9LvkVUknVOxzqwmEuPIBG43ONcHEGNAO8oq1fOUs2ZMHU= 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 SA1PR13MB5053.namprd13.prod.outlook.com (2603:10b6:806:1aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.16; Tue, 28 May 2024 01:55:32 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%7]) with mapi id 15.20.7633.001; Tue, 28 May 2024 01:55:32 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 4/4] net/nfp: support generic SCTP flow item Date: Tue, 28 May 2024 09:55:04 +0800 Message-Id: <20240528015504.2376070-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240528015504.2376070-1-chaoyong.he@corigine.com> References: <20240528015504.2376070-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0096.apcprd03.prod.outlook.com (2603:1096:4:7c::24) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5053:EE_ X-MS-Office365-Filtering-Correlation-Id: a8ad0d29-7d53-4b1e-f19e-08dc7eb94247 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|366007|1800799015|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: cccH5/bsdUpsfYxWResf202L7I4In4w/s/uEYOvimqHQeVjIm41le7CLxxVowaSnq8lSBhueAIMF8AHTHF6c6ILajr7zIMrvm+kRqjI/0Bo00laIRguX5fn2yGOurHy4pxi3t5X0d+JVfvRy67QxzzIg9NtuTDzmWR3wsUi27NoO5q4ENuYdaiQHu7BrffOFDTjW3Ir5uKLyZcI2BZJSKWq50cmxWhZ+DBN+N1jsY/6vQcozoj2uHmbQKqZ2SEw+GoDPKdgLfKyeV7LP1qnjCTdh7iBI3fzEX3oWf7VCAzD9e5062wsrJjKm+FR4wMmp8d1wLpgXOv+wPLWepAWABP9oLHFph1jBqPqZpA3UML8bBiC5qWqzwEmrVfroHm+/eGhqKd3bNqvlpJz+duSTj3+B49JY+KP1dh+uP2sVPPj5RzwFXfEHZP7TyLHrEMj916RfELBrDVe3nYsO5L/TaNRiSv1FPDJU4OJn1JP2p7SkFTKMcL765EHzt+UeJIIeiEtj2fVek0sj0JsPrm7yUbzphAc7+e66tanQKCBs+ci0aQ9slCuUPZO7nfZ6zKvjC51wAEKRhvHnIs4UAWuMHY+lL9DBFVYq+sksUzLXBGKbQUY5YiiopjWNJQbuXp3aminuxY3IC+evhRapf9CvORHS0I8fdz7J7tRDcN4sviuIJ1F4taNK7S+QmxEJPz0rzxSzKmBSbUtUkjTZey2bxmF9Zu7cxdtqNPjqBaW0/YYs27tTJoCzOT8tgEcBVkaO9Q6DxhA8EFjuZOe+/iSzvMRFtKpll2dL9HcEXEN1esQxC6+IKnLyA4uIxG0fPAbVVm/DMMpfYQn8fdyAaXkcnXLFQC7FAJYm/O8ieDBvf4dw7wJnff0YaTDPZorIHYH5axkBflCOg/CRyKQhuGzImq2gpjV+UvsEjSFspf/45VeOKHyiMjSEWxw/furFLwfF5kX6a6HQxX/y1US/Coh6bLltvbvqYUVhUOLR2n64aJfNBx+7BLUJJhdyp3P2bMAuPlVfWxSc06BJDjjh0wTpiCaziCTDx+qiKPQW4PLCFCCludrgJvN33myBHgRAwp06UEblhi0SBek8VL0TObvws124vsNwB3I8W2eZCKvnBMdBk3qMrYgoYnWacFTvVcFvKyOkRrUmYAKwZXnWNUQOZuOoz6yAcDnlf8HclsOqf/53mp7W3tTj6BawkDo14M4HNqYCoSTruDRfcXdu6vplUWk+Y+h/wjzE8CFXGQkyW5V3Bf19TQeU7RqGZBdCRu89hRSUns0Y32byY26h1/3ToyE9HPnxq1CASzfQy9YoaNb36jQYHkdIRbP1RC42bfDsjsjHcs6V/3nqquz0DPZXNQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: X+7CsgjVW0GBPmhLFT66DwwpTSydwxxaLzJvHFCsydPQUPIGdqZuDqFx0yZ2PyDmckwq+BDr0PIUnebkopZ/oeXmgch4TxYFMXTV4RJSaE5vPkLnHQI7aj93JuPVK0XelYtWhyhaCfak0e6I82h9EjVGYRWqdVt+qn5tR29cMD3JAtjkfEEhmBHolO0u3DgXXAVNdUc25Ru4zAX/zUFmadXhIMKsKeTQTXfykNdpxRppseS6/tWJO2h5QoSPUB2GrteG6KShw073W7UMtCzWJLkIGq8O6rkx3Fl1Fi4n/6a2VV10Tq3JIoBHL7QPyv2HCtDTBzWzCq4kIPCXUfesKYnoRsmk2F6kHl3ReF4RMlvckoQhEgAHCGuxPfURhvZtFCYXQUrQkKe12MZZCgAyY1ezo+WWK7NDOfNN/RJpmx5L93xjkHcP9FXfL72NCLYTIa7yCOYoJZinB5uTij91X5T1yAFS088d00ViroC4d5KE0EgBk76PdvT8FUhw18QT8kHpvtTGE4JDMRlYsnYD5SKmHCJmBmqk/5NysVe3eBp7blZjng19Okrkbac+oLfrDpXpOR4tCqq1Fsvkgbk8vFkBoq5IT3uoXqQ/3t8oRWmPHlSFaASKsQN2qFGxD1AgnOrBINb++aLdAqWB3idFZ6/ZIpBVDl15CQmJ9UQv+lI2LpEdk4GGZT+cER8tRVi0lmecnmT0mbM8OroasZdYs1GUQcSnWYYAq1Wk/heBa/ab5JVDc45SLqwXcMam8h+6ArQ47YVpekua27seWOh3zjSMrjR4zt2m1aWinjtxblxG1gpkkYNqNiFNbxYcnE6eTuj7C5S0oelbLe4pKtccOpmXVvsYctGTJv6TrvSLen1m9GKYwMrJCgh1nsfByEvea+01qgVV9+1ETODBENFL10KkQh2AsoGZctGn0O7qaww0yQ1hq1uNBCvlw7qMekmQ2Fz50st/L4nryj+5Cih0zQasXCjK54nWgl6A/7KIGXmmCMybW7KkQTKTPXw13i6IdgsVGV5Vunz3gNSqcmhgGba8mWYksBzvBvRF95duCyswGQfDzWDRegKTtylPs3MfqFu57NhdCMOidrWBIsgjzgDW1d+25NgRKhFKxjhzHffs06XDNUrHzm34cTSZlYuQPFJVaZ+ti/TgHg6v8GR5xZqkaWDM639Edsbo66UaNokQ68eDbgFC57fVfE72Ese5+SDZ9wXC5xHHomfGgpjD0pn4TY2DFOcHk2pKHQNs4eTUS17BL1Tqvt9ffCnRAnXUPLEODci9ESaYmqaGOvtxlGyw9U9aoK2Q/1ng+5BAYSMZTyvxhc7xcs2iUcmJqffosaidd9/0k5DoQQz3AINHK2pHEDQATqu8JEABmtI80yjsAOuC/eRVR7A1RuG5MK+7za0W8TWJdzv3cvpaoHHvgePYJyoz/S1FXiqFMDphSU7iAjrweCHSNdSBwTSUpAtLkVt2rwx9eHCZFGi/O9hidJ9Gso/6eUdCTN13qX59sJ1uwzjY1wUbCwjvWNk5UGppH2afRc7oNytjQygAjBArvglX5/gRne/fdGS2v2yPE2oE4YiGWXhttPStEFuThoxU7LCJCGOwCit6kZ7+ww1VnQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8ad0d29-7d53-4b1e-f19e-08dc7eb94247 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 01:55:32.7172 (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: TyTQpvSEcthh75nFWAmKlIbSINAbiFgP6Uua5UcvPjD9Tha/rWTSGdlqZArUzZUHhE6bPxNj+e/SFZL/wRKbSVwR5JUwEB9nKbcHVfzWw1M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5053 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 support of SCTP flow item with a NULL 'item->spec' value. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_flow.c | 37 +++++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index 4cbdfd02b8..bd77807db0 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -1586,28 +1586,43 @@ nfp_flow_merge_sctp(__rte_unused struct nfp_app_fw_flower *app_fw_flower, bool is_mask, __rte_unused bool is_outer_layer) { - char *ports_off; struct nfp_flower_tp_ports *ports; + struct nfp_flower_ipv4 *ipv4 = NULL; + struct nfp_flower_ipv6 *ipv6 = NULL; struct nfp_flower_meta_tci *meta_tci; const struct rte_flow_item_sctp *spec; const struct rte_flow_item_sctp *mask; + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + if ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) != 0) { + ipv4 = (struct nfp_flower_ipv4 *) + (*mbuf_off - sizeof(struct nfp_flower_ipv4)); + if (is_mask) + ipv4->ip_ext.proto = 0xFF; + else + ipv4->ip_ext.proto = IPPROTO_SCTP; + ports = (struct nfp_flower_tp_ports *) + ((char *)ipv4 - sizeof(struct nfp_flower_tp_ports)); + } else if ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV6) != 0) { + ipv6 = (struct nfp_flower_ipv6 *) + (*mbuf_off - sizeof(struct nfp_flower_ipv6)); + if (is_mask) + ipv6->ip_ext.proto = 0xFF; + else + ipv6->ip_ext.proto = IPPROTO_SCTP; + ports = (struct nfp_flower_tp_ports *) + ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports)); + } else { + PMD_DRV_LOG(ERR, "nfp flow merge sctp: no L3 layer!"); + return -EINVAL; + } + spec = item->spec; if (spec == NULL) { PMD_DRV_LOG(DEBUG, "nfp flow merge sctp: 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) != 0) { - 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;