From patchwork Tue Dec 5 02:54:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134855 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 4F4F7433FD; Tue, 5 Dec 2023 03:56:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 353B542E0E; Tue, 5 Dec 2023 03:55:38 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2094.outbound.protection.outlook.com [40.107.237.94]) by mails.dpdk.org (Postfix) with ESMTP id B4AD342DF3 for ; Tue, 5 Dec 2023 03:55:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JRTQeuiNWAKwjqnsaQOv6yzlSgzPiyGt95LpxsYj4ouHxt8nfSlBv7PlBiwoc6venSw60tN6MMIkkyL9BVQIYbL9pe0ssCytv4JAct2RRZ7wvDWMzxHoFzRDAB+OQ4iNJanbVCl+5fv5AyQyJPDYQd/5znP+QG/QpFgNP7nGhzqa3FWqqS8mw56kvnOzPihIqFC6zyIIDYasssB4c8nGyB0UBnCsROfYBK2QhCVBiP1gfeCeb7YmRdP2t6GItg/lvGWGaQKA/LY1zdfyaol/7/VWlkzErUed1NRW/xjQMAXX0BEHexlSMefR+daynpLUYkyXoINl07bnAA5iAutKWA== 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=E62V24IU+ijATdOqB4qMe6Glq9QHqR+SnPvZSpZZrZ4=; b=f6Y68+ySEvh440v0WrFD58rCt6YR4nAK5FVoro1i2lc6VhTVdm4WrGSC3pk4WeaOOQ2m8Yzelc2/Qxtt+XYSqZhmEWeBHnVCfHWQVUdHdbCIRMHp4+ZJ+hLDrZSTZzugNXE/sI5yB2128J+pVvwAi9HBI4OTv/POTR1XJiCjtiHA4VNg/trAaAxkEhNrpU0DLmY3aHcIJgaI7myAs0AM0IonMKpzXAWVcMhn0xkyjt2neAZDfUdC05ige2ikhi8fu4Oqp6j4swCvMFKw0oFP1pFEoeOiwAuVNlGrQURxgwilhQ+IFAMIsYb8Cl5bz/9YyrvOYoMeOk+pSGiu2118pQ== 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=E62V24IU+ijATdOqB4qMe6Glq9QHqR+SnPvZSpZZrZ4=; b=pw0gNcK9aNrs8XvQfTjVlLPJVkUpFMfMcVSkVypoEa7PnmHJ8OQWkptcQW1IgKMf5h0bv3QUeq1QY2T0MJ+4ONmtulLnSyAcsUpZ3+Z45gV0UDguxDKT9a2on2QbPa0sl0G80xwbwb2Ws9rCYJWDFUmnhHG4uKgxIHxqF1+OBdA= 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 BY5PR13MB4439.namprd13.prod.outlook.com (2603:10b6:a03:1dd::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Tue, 5 Dec 2023 02:55:34 +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.7046.033; Tue, 5 Dec 2023 02:55:34 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 09/11] net/nfp: support TCP/UDP/SCTP flow items Date: Tue, 5 Dec 2023 10:54:55 +0800 Message-Id: <20231205025457.1067372-10-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231205025457.1067372-1-chaoyong.he@corigine.com> References: <20231103062606.2632012-1-chaoyong.he@corigine.com> <20231205025457.1067372-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0214.namprd03.prod.outlook.com (2603:10b6:a03:39f::9) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BY5PR13MB4439:EE_ X-MS-Office365-Filtering-Correlation-Id: a2b0e58b-bf47-4949-65bc-08dbf53da6a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UTuSSTnJKP8iUTYwqA+aDQ42NWoLPIys1vEZmFwjJNURgjIRFLW3ix2FchT0zey0ktrFoOv2UInsPlSUV1QkEgYQi9WoDnKIL1+RB2QW9un1QSoi+qpI2DvUIIDoKUsLKhz9fie7X6f2g3Ls/9Z2KnhRMWkuAsVcnJqrhVggPg20cDJZ5a3M94rZRTgyEy2R34xA1h/K7wh24p4u26HKXU/kAwdutbyxQlSLb+s/NBZk6lUQAlwyIkO5UruMK770fHav2InPXezAv7wGtoUXqKB1mgp4EiRIRrtIO5cjLE7DMRd0k76kVC1PcK9m9UBzkf70hQqMR0Y9hoWPrwRFJ4hg0XsBWRT+hQtwtVEtNELfQdeG//cWeA7aOQJsWRX26PJ+dI9OgJ4e/VvWhogkFSHq5mk0Vej3eX24rlMzWeXaknj/mSyqe+5FGrJ/YNkeRvbU7wfqMI6S+V4zYP07Ei3c+0tsMztpyhnJaBDGU3HllVtXiea3wozEais5AkP3uiTpzsRLkOC2mkK1C+HlCDqN3c0Ea+ENlSO75OHSJG0bi/wW3JjEAqKQLu9za2CdKHCWeBwlqduXf7/otjU8jAjH1/86rSSCRWH+mOQBOJ4yhINYRDWKuhsj+b46qOaDDmsuIv075bLn1t4ZilhAaj448/zNvnIEXqUbcb/FORuHkTX990E7XREADylmzKRj8oMbT9xHjUV+d7FfQVwh7w== 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)(366004)(136003)(396003)(346002)(376002)(39830400003)(230922051799003)(1800799012)(451199024)(186009)(64100799003)(6486002)(478600001)(6512007)(52116002)(2616005)(6506007)(26005)(6666004)(1076003)(107886003)(316002)(66476007)(54906003)(6916009)(66556008)(66946007)(86362001)(41300700001)(36756003)(8676002)(4326008)(8936002)(38350700005)(2906002)(44832011)(5660300002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ApI8JXq44ou/41ciH1niuamI2VEbDQZ5TM6CQ2aAfWmVDtXwAQzDsnOJwklEvmSJr53Uh9CuVoh3QB9jny8jkLI5qqBGRxoNn0L3XsFvBB1YXUDmg2ZP78t0nBoC4PSPEwZlmDHV5g5K8U60iUzEzHew5NoS8qJOI3aoNHvJl8tYVxucV1vwfYU6lI4hUzhn34+5txvAJbBbiuVix8h2yavaxA3eUN+2b5c6bbLz5a8t+9L3wCxCP1jd4KZyINl1jdB1iqoqzYnAiKIgaotTo56YqdsftRT6GwsuTH1Z3yO+8R4HZw8poA9cfArfTKNnm0Hv9xtST8yEcp5E2Hxt79ir7PLIX9mhrBGzMe7iYESq7Udu/sCtZvTHXq3D+K0vw2z3XaDMFOLCoc53dNpSNJ422pG+yE6Rdj8brKvcT4k0Y/faIzQGp1cBsBCzIC/h07xfsIBZEpIlgFDXo3mdm49lLZJQIU0m0jvvRxGhXCVdN6w3IGG4OsuIs57kmVLmur1LRzVuHrCdCU9St95KKI5/d4OKLgf3WyrWFvLUBMPbXc9F384bvMsFy4dTq9UiAgiNRGbo97Opi+tmdgz0j20I361usYPGznVu3iX67cQLGy6U5svD3tP7TKuzR/Bpnu9G23dkdHUWT3m+cffxKlDUhxU5HtQNIzRwD0NkEwHo+brPCOOa9VW7NsW3vtKNg0LRLGwjO9PGHqn/fQ6deg3AleDGGyTdn88Beah1XJkL4IhsOpxqfFacMxAL/Lfa62w5bSs9XflEP/SBFFgtdxQGEBBXCe2UAnLg53gkrc3HMb+4bCzXRqqdEmTShOfdomlpMGBbZeOY+mEZ0c93ShxRlNQzZCXSc79+nTfi7uQmnBx0EMb37vV4Q8Pd0r/H8dLO+z0oNYhMouQSfX1YdYwed+A9NJIkrSMMeqrokkW40GHNoAKSNUW3gYNk3Os6tnuYNcvlok3T8P8jiEScESKjEO59nbAccciWf9HdHzRqXb+2CJmbO0AVc72VO4nU8wUi3+9aKS/igf8KzzchBKhO1KMVWUm97caJEuOSfdZRkIscnzqVGA11VKP8hx4A2GmWfmyQj1XVMZ7C3PvpnjIHOK40lXB7BMiLyM3VitSREOTJ2Dc3mQutLVBj9Ha0Wz2sOdq8UwV/fAsx+fiWvYq22rkxYTWK9HXzCQSn+gP7pP/QGs7s+Y99hPWzZ3O9JiMFKhjsY+pG9iv9DZ986yuAnsg+2zJl0mF20hMz/wFcrLLlOvtX0yJKSl2zEVP0bTKlilM/FGOuH+kdRav9lBL5gbAVWn5yA1XjoapshEKVojexfWkyR0Du6T+fw/hea5dsaU0Z5D674ehUEJY95JKH4sG19dGmmzOPMt6keUUu34kothRcZxOtcXqlPeyd6h15rVB4j831VJXya0YTA6Sln+yey+Wv7G0rWO0OrCt3Hk88+AV8gOgwt0Dg0pAMPm6HhpCtRPpdQhOnKwk46pyQB3BSAJcb0bkkG0biNCJp97wug/ETqzgEYIEI4FBNb1W1s5p6ZQSNzR67VB/UXq6jkQcRUu6nvBbHzUh0ItwBS3DfdC02nKrV1G5Z15VuXm4XBTJvmAt3AH7ts1lWSg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2b0e58b-bf47-4949-65bc-08dbf53da6a7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2023 02:55:34.3600 (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: fH3N4G9i/CbFtoYUkUxWgpUrz/fe24Gk60uqkg6h8qzssYj5XHZcZPKnbExdiNbvqJcEXgewMS37NW7f1H27Cpbw8AmMSmpXGeCnsNrXBXY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR13MB4439 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 56846e3935..f561e9ecbe 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -309,6 +309,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] = { @@ -320,6 +367,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, @@ -332,6 +382,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, @@ -345,6 +398,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