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 BBA7043275; Fri, 3 Nov 2023 07:27:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 376FA42DFC; Fri, 3 Nov 2023 07:26:50 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2126.outbound.protection.outlook.com [40.107.93.126]) by mails.dpdk.org (Postfix) with ESMTP id 4FE3A42DFC for ; Fri, 3 Nov 2023 07:26:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J0aFUPqv4t3V3dVxqnYvYcFYBy0mIrirEQzvQoGEpKu2HUFsMH0J1idAM4Di1cXsBL6yCJ8yJlXP0nCAwycUJJ/50toLTnAA6Bptsu/g9dssf0O3Uym991Uf0cTa5OMKPoAyC6cCos3pgbKAZxAAwyo108mwpbIPceI/G+jgMyIBIHVwgL6H/sFsfOMzhWSHu3EtmDTzNb+m/sgpLCMNfiQJVT3fkKrIliLvFEB0VyltVht1kNKVQZupto4trB6mjF7ZESiF9qmsAOAxEl4Xoc5S8YbUev64BUL5MhanGifSLWM1DR4DcywqYEs3HLIDdLwZlYN3p0gLg5ZCNdwL9Q== 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=BD0kvMtwrMRAmCmKgToHcpmZuyvTMl4jeqG1DGoAfAM=; b=egyeUIFYHl27yQJp7hQmPB6xIgMTjQU/WmCnZ+GkQ0dDJOuN5+aqSH/FznnxEIy4I0mATErkGsVn1sqaOj7QGWexHfgT3L9yCxNw/ceyetbVEMHglcprNIjQdfV9qWb3LM/XyJEQFTegb7Cs63M7xA7hJD+jdhsspJ2wYo4adcyWSGu9yd03JG8g4irGoxkvm3S+ska2gh2BgkvG9jS4v58/zFgzqI3YGYraolTC/IWkSqQQZWPa7a86VKi1ZurlrqcmV721ssrrmf/I8XPfTvjIKA0ek/a+hNjBKT6RlLGUAxTbh5RNwqEbrGbxBUif0bC4vn332e6/blcXWcKI7Q== 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=BD0kvMtwrMRAmCmKgToHcpmZuyvTMl4jeqG1DGoAfAM=; b=SRhKiHiCA3epk6cxbyiw7jN2ROD7pKEnDJ3Zq4G5HTPKljB0tJgZUHIS532up2VlrYAs7I4mmZ3qpT7RxATMGS1oWO42vCIdskCjSuS7Ee07v2Y7V1EduqyTOC8bkxKYoe/sI0eHPEBsqZhR+O0+V/vOJ/jlSKQlnoGn0fkUZrk= 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 MN2PR13MB4102.namprd13.prod.outlook.com (2603:10b6:208:262::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.24; Fri, 3 Nov 2023 06:26:46 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6954.021; Fri, 3 Nov 2023 06:26:46 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 09/11] net/nfp: support TCP/UDP/SCTP flow items Date: Fri, 3 Nov 2023 14:26:04 +0800 Message-Id: <20231103062606.2632012-10-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231103062606.2632012-1-chaoyong.he@corigine.com> References: <20231103062606.2632012-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR02CA0044.namprd02.prod.outlook.com (2603:10b6:a03:54::21) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MN2PR13MB4102:EE_ X-MS-Office365-Filtering-Correlation-Id: 43449dd0-da2e-433f-5634-08dbdc35dabb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SMs2OrfCXiZ1Nyaj/5KvisvmqR3k9jNmh6vF2QUq31Tdc2ATElYhg8J+BS6VGBH8WGPJBjJQ3VEEMpcyjKSLFz4iLgPSexFXS5uCNEYEqhj3HloGgVVDiLIYxcJJzkJDYaKkcJQ+gJHxS6k+scHEEBRwd7avDz2PkO5LKp2TupbLdqvsUWfmcnVyA/S1gobpMxBmOLaZmcUh2TB2p2ERsfwzLk4z3gkamA1QMTBXzUYgjqXjZmMIHkvMiyois9Hw+8EUKnebeumhSI6ONXANrPh63DW9RZ58XcFSxznpvcysN/wKHGwJ1ffPVyjlWb0aDlJODmwFXqVYT0t9Xnnj0Fv6kdfosH8vnb/b4Tu1SDefDw/iP7meNZBXRbJF1MKl7IOkOYPgmOsdzo/uwOHnbWBjDd9y9klWZ1e4TQq4nNHaAuGphai3TawRCo3w10pIv9Qt6b9iB7SPRq6XxzVnWjbt5DPr6meQm5zw/4NsIaHmaUxdUEeSQjL1h0zaAEOX9FN3V1hvAMGJqjH5b4nRZ8tHm+lA9vWF6J5k6yt7yv7b8EK9AWbNzWupHwhF/dccgg3o2dkvIyzo0SvHIlY5FuAmRydAo6HUADT3Oi+z77E2VGYn8S45KkenAhIFhuL+8155UwwWWDM6zqkaEK1pdmagYNZeVWkQL45dOaxMZojL7EP02I4hlv/r9KVJXguUSoMW7wUlzQfLd1/dqTDAPA== 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:(13230031)(39840400004)(346002)(396003)(366004)(136003)(376002)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(316002)(6916009)(54906003)(66476007)(66556008)(66946007)(6666004)(6486002)(478600001)(52116002)(6506007)(5660300002)(38350700005)(41300700001)(36756003)(2906002)(86362001)(4326008)(8676002)(8936002)(44832011)(107886003)(1076003)(2616005)(26005)(38100700002)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?khJxz9/fBYcrD3sNs7GvpXhk/1o5/t5XbA7C85jVmFWkDifzkkO6vPVAXFym?= =?us-ascii?Q?Q2cQy5jCTb66FEZ89fD+wsC2argblsPTgiIUh6G/WqJ2ZfglCFClmNj7zDj0?= =?us-ascii?Q?scy6zFFpexCur7nClYlorTHzTBCLhGrguBHa09vCQQY/9d/YH6vNTE2eLF9u?= =?us-ascii?Q?Zs119bRf/f/FwqFXLxmRde/eDLZi941YIcRyBrLngvbDZT7UYUMyOunDEcui?= =?us-ascii?Q?dX7h7M5SanUaBdPkj5J7lGVIhyq2i/ZjqF7bK4JC/Q+ECll5Kxh3gcnYrp0E?= =?us-ascii?Q?RSXfzEpazCwaCUI9c3GQFxOr4szbEUI3S1X2/3lw+ZZMxKuEKY/dJcw1q10Z?= =?us-ascii?Q?M/JaGL9VXPbsY3BEXlxAIFBn8pOqBopzwS0VCPg8hTJwfJ4OhZhOQ6zsYs+W?= =?us-ascii?Q?htFWXlFZcEcXcPMmp9uVNEItdDjPmbKesDp7ofEbexqjXYj0t4HlIi7oO59h?= =?us-ascii?Q?tOLKDhyqh3MXEiVC6z3pmuFVZ9RzPtiprtIfKFr/o1zX9vo3HTF5pjVhUqtb?= =?us-ascii?Q?/4YRb/KTvvRp66Bu+WmT3pOeHxijDhMIpjGwkOfB4KWGOuSuBLjtANfxFuqk?= =?us-ascii?Q?6nBqMsCohXXhfKghNF3Ipphav2hh83jc7DQoRwlMb1cj+sf9vJkdhCoBJ11U?= =?us-ascii?Q?uvEo+r4sxFkYxbJBTzxB5plPaOIhpJ4n6unpzGJFweZvrTMXLd3QuPnzuIME?= =?us-ascii?Q?9OnKMvtV8KuCiZNUmjymB4IzV3FEI2oyjqO+IO2lnbYonVwC02jhxjoqeOS8?= =?us-ascii?Q?UWtsR4zysWFNsmBbEacmJyBEFykh35DKG2Gq2IZ+ybeEWDbpQEyEVyY0EwYN?= =?us-ascii?Q?WU6lpURp5yAszZvxWRh/7d258P+aMHSaEx/xPFkSAQDtglR1C2iK9v20IVbN?= =?us-ascii?Q?YBc1N7h6vA6HK/oBycaHnMQPumfoDSIw72XPNwt4LRhk3VkmPcMVkMPMeDiZ?= =?us-ascii?Q?pnezsc88jCTI/VbUBpxACZK9yU3WA+Y6Geizl3hU0qNpc4qob8LWvMMaDKrE?= =?us-ascii?Q?bzBv8qzHrBhMtvNpduCGNdb/4iMKawIjG1zxPlU7XF9X3k8hBD7fblFl++UC?= =?us-ascii?Q?/t+EmBxtotrMAPdP/ULWBPqL6xa5eSLww4uJunUzvLDAjSH9Wxtwj7Xsr21+?= =?us-ascii?Q?6MFZuFggcGWESmHziAGAijQnkuXqqRVrBZ9evB831Eu8LBHxVvfARdJgJDxJ?= =?us-ascii?Q?/yInCETlszucUpff2RH1aQO5yTMeGjJYs0S6jVtu2xLCAEtNtRoEdsTu4vHd?= =?us-ascii?Q?9LtbPUWd967BHZPYfMglbbl5kbw8+KQtDCgG2BKDqILgPu9LZteq0o4SvpMK?= =?us-ascii?Q?MvfbxQ2XSrLcLfjiywuezdu2+uQ2duksuaVOB0v4kuXGwKsSIfD3d7fCbnDE?= =?us-ascii?Q?IiLD36fDpLplalA25xwNiwZer8dZxhj3D8tkR/F7yPN0EUnSxRHt1jnvF15j?= =?us-ascii?Q?XTAcvQzkf/Npt6zQAkVr7zAsKWcmDk7FX3Ltyf0gplBqIS4MO9oqVNr9D0vf?= =?us-ascii?Q?G6wFsMc7zDSfs8d1NoUwdNFttZc3bZ2r3Ir+6EB1U1lBeOkytljkJssdpVVb?= =?us-ascii?Q?6SCt9OeMsaYtJaE+0Ea+aC4279VvQQjmh2QBN4OOiIaLLucBPAPRMfXsOhY1?= =?us-ascii?Q?9Q=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43449dd0-da2e-433f-5634-08dbdc35dabb X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2023 06:26:46.6736 (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: QtPdD34uMzvH95HLDThmWpMq7b2v9mqGaorzAeNAVTtTkjIpY+KAgkb5DSmQ6+v/zTTJmQOgJmbL+NPmImTSqRgEAYEiFbGFD4w6azvIRRI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB4102 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 TCP/UDP/SCTP items. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_flow.c | 86 ++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index c57f5d6328..d07667a62a 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -299,6 +299,53 @@ nfp_net_flow_merge_ipv6(struct rte_flow *nfp_flow, return 0; } +static int +nfp_flow_merge_l4(struct rte_flow *nfp_flow, + const struct rte_flow_item *item, + const struct nfp_net_flow_item_proc *proc) +{ + const struct rte_flow_item_tcp *mask; + const struct rte_flow_item_tcp *spec; + struct nfp_net_cmsg_match_v4 *ipv4 = NULL; + struct nfp_net_cmsg_match_v6 *ipv6 = NULL; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(ERR, "NFP flow merge tcp: no item->spec!"); + return -EINVAL; + } + + mask = (item->mask != NULL) ? item->mask : proc->mask_default; + + switch (nfp_flow->payload.cmsg_type) { + case NFP_NET_CFG_MBOX_CMD_FS_ADD_V4: + ipv4 = (struct nfp_net_cmsg_match_v4 *)nfp_flow->payload.match_data; + break; + case NFP_NET_CFG_MBOX_CMD_FS_ADD_V6: + ipv6 = (struct nfp_net_cmsg_match_v6 *)nfp_flow->payload.match_data; + break; + default: + PMD_DRV_LOG(ERR, "L3 layer neither IPv4 nor IPv6."); + return -EINVAL; + } + + if (ipv4 != NULL) { + ipv4->src_port_mask = rte_be_to_cpu_16(mask->hdr.src_port); + ipv4->dst_port_mask = rte_be_to_cpu_16(mask->hdr.dst_port); + + ipv4->src_port = rte_be_to_cpu_16(spec->hdr.src_port); + ipv4->dst_port = rte_be_to_cpu_16(spec->hdr.dst_port); + } else { + ipv6->src_port_mask = rte_be_to_cpu_16(mask->hdr.src_port); + ipv6->dst_port_mask = rte_be_to_cpu_16(mask->hdr.dst_port); + + ipv6->src_port = rte_be_to_cpu_16(spec->hdr.src_port); + ipv6->dst_port = rte_be_to_cpu_16(spec->hdr.dst_port); + } + + return 0; +} + /* Graph of supported items and associated process function */ static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = { [RTE_FLOW_ITEM_TYPE_END] = { @@ -310,6 +357,9 @@ static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = { .merge = nfp_net_flow_merge_eth, }, [RTE_FLOW_ITEM_TYPE_IPV4] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_SCTP), .mask_support = &(const struct rte_flow_item_ipv4){ .hdr = { .next_proto_id = 0xff, @@ -322,6 +372,9 @@ static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = { .merge = nfp_net_flow_merge_ipv4, }, [RTE_FLOW_ITEM_TYPE_IPV6] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_SCTP), .mask_support = &(const struct rte_flow_item_ipv6){ .hdr = { .proto = 0xff, @@ -335,6 +388,39 @@ static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = { .mask_sz = sizeof(struct rte_flow_item_ipv6), .merge = nfp_net_flow_merge_ipv6, }, + [RTE_FLOW_ITEM_TYPE_TCP] = { + .mask_support = &(const struct rte_flow_item_tcp){ + .hdr = { + .src_port = RTE_BE16(0xffff), + .dst_port = RTE_BE16(0xffff), + }, + }, + .mask_default = &rte_flow_item_tcp_mask, + .mask_sz = sizeof(struct rte_flow_item_tcp), + .merge = nfp_flow_merge_l4, + }, + [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_l4, + }, + [RTE_FLOW_ITEM_TYPE_SCTP] = { + .mask_support = &(const struct rte_flow_item_sctp){ + .hdr = { + .src_port = RTE_BE16(0xffff), + .dst_port = RTE_BE16(0xffff), + }, + }, + .mask_default = &rte_flow_item_sctp_mask, + .mask_sz = sizeof(struct rte_flow_item_sctp), + .merge = nfp_flow_merge_l4, + }, }; static int -- 2.39.1