From patchwork Tue Dec 5 02:54:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134853 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 06B8D433FD; Tue, 5 Dec 2023 03:56:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E173A42DF0; Tue, 5 Dec 2023 03:55:34 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2116.outbound.protection.outlook.com [40.107.237.116]) by mails.dpdk.org (Postfix) with ESMTP id E8F1142DBB for ; Tue, 5 Dec 2023 03:55:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MFljSxGt5q8hRq5m98wbMpoDekZRTapCyBju4OJgwjfnDBFHNoFWsAfVbCB0YhmTtCgEQykWso1yd96k4Efcvm2jCTrNm/ivUJumW9u3f1uj8AosKJB9wSk21NgYSo6LQRsqIAqQUlui6egBhqgOb9xHx4JUsBycL5Ynr/skWXjlKubSlOVzV4URykxOwzlvOsaLtUAEWFwlXGQD+TIlI8s5xHK2AOViu3dVv2VgBs/Hpm2MxHgafITxP3V3B5FuMEt6/Huz9tjI9aAt+zgNQy2KA9WmXwIG2cNsIGh/huikqmTUKURGA4rwd+DacqMdNULFeJN7yvORpCWplepedg== 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=/vNUyXZP4+b0jvR3PLDL1/tQSlF8pVwoPVJJUFthq98=; b=I4XewHXIW1hMTcVCrtPvux37r5IQT5fD9nn30JAe+tM9AuUdWkSt1uWwyQObpR+Jld32j0fAVCuUv7RTx5LPLqNqwLfLWx3C9AaFN7wmehBi4fAdmwsZgpPdaiDuZIaJr5beLhPh63foEHN03bOVbKxrVdNm9i6LmSE/RcVSuMoIJc2iLBwxzkiXcVYu6Qpd3zlrzqe8JdLhdfTTNzRKqOLMN9xWRHaiptKaOalB8jnpsguPKCajWAcoso2wDM5zrkmkgZauu23sjO4Vac1GNLjZ0PCHHxpl9UeXPA29j+H8YY2DpBFlO7bFmmBSYoY+8+VE0wKxIsvMmmMHCCys8g== 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=/vNUyXZP4+b0jvR3PLDL1/tQSlF8pVwoPVJJUFthq98=; b=YGS/ob5uTDFseiWkdbmm8xVoyWDPoBiU2FOmCsnG5+t7ijGpvlHGMtrdah53wNRTAxK3nWaIXr4bROoouxI5omeTsCQX+exrwN0SYVADDzDUNzoa2RiUpM72sPZ+7qZhe5bMbfV2m3RCdZ1PEEO5TsZPypC42VCO3HlFhmiKMLY= 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:30 +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:30 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 07/11] net/nfp: support IPv4 flow item Date: Tue, 5 Dec 2023 10:54:53 +0800 Message-Id: <20231205025457.1067372-8-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: 15ca10d3-fa1f-4919-30b7-08dbf53da46b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2arWrCKxNn8ElOnYcEOkbCuOyvQt95Jdv8EtshUAltBmeD69xLAy5pzVH+cMNxWvA7vrFwbqLyq0X1mf7N/FbKtLEWIkj5gwKCFGoEhWget2IPziAtjtwxtGdQalf9c6acD1dslWPbrhb6+FxLBD5JiBmLbJwS3HyVdtob90W4Goh54jRFZw9KC+ibdUFjn5EMvjd9n0XKpHOli5ugeUv+0/VnircYv/kc+a6YkAeNw3R515k1HJN+r4plu9zVN4CimvLx/egGwNdFJ0hnP/h5I/aIWPckYWIbj7N1udmYPQJQ42xzuGOWhmSs0MBLsTdK9d3U6WwhtibIVbvrn26bXvLsSU1n59B/YWgOhx6W8znaF7m3e8NmmugElQ0UElU+b2LA5LASBZqExMbjYMyadQ0ygZFaeyuHY/Yj+kftTmRbArbtagz72TKEbOUHzDObYall3nklVVzIedF2EChFpgmGFO2IIVVjDRomIIZOFRHsSpK5/pe/L9ZzlDjUfcRVboa2t//2ocnkxtb/5YIAGanMNNq1zzD3oJecptphdenbm6cAKxedOmmdqVHqTDZqTAzTw1WB7wh1yCz99gdtAXZIQt7/yQsNxrkcJgzGauzIk3BM+8epfnMnTwAoDBp6QvQSIxXaOWwONJXKaEmGdBKt+O9Lz38ZKkffynhmU= 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)(83380400001)(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: =?utf-8?q?k2uvY+8rHR0DoeHoUICXTrNA2YIW?= =?utf-8?q?Zuh7qk4dte+2lsamHBCCKIidk27XaG2+5SVwsoVGntwnXd/SdC4/blC6L4B2HJa6D?= =?utf-8?q?Ixy1rqnaw2ncrsNiriX9B25wi3LiW26dnzPOAcB3xbpeeZq8/DpZdLm/iH4aXn9gC?= =?utf-8?q?2h2veMib9hiQLrbl92w9uwO9sz6mjg9CrTtySJu2Vh0R6TwYScLp23/TJJ98p+KZO?= =?utf-8?q?ZTXWs+pN7pCvP9UKQVw6ipjjkP9WpLYMtc6VwaLrTSP8X3fAO9g4RRCwIXVXeYSAy?= =?utf-8?q?wW0XOhoa52w9+dYSsL/7/dur0gdohz3kmEU0FA4GvIerUu0dCCqQB0VxAw6zltcYu?= =?utf-8?q?nNBgL/WJIkB8yuAueiSgZHv1KQy7fpRQw0Cyg97lxxaFPVvqhZgTXpt/2rgmUR4ik?= =?utf-8?q?DgqpHf3vaGlTYHXq7cARM4pnEghycrmsw/OPGLV8AeAOUqaMRiWasnIEg14zX66LL?= =?utf-8?q?DA3dxLBGeQcDhwGlj6QlvRzpSZNknALdj6fPtdy/af3gzUgDVCax4NWBKh/8Agm2B?= =?utf-8?q?6AV/jlg2Jk67DNW2FND0YAJax34f+x2CVtLMZY56lgJx3btaFQs4Zb/uCOkqz23kJ?= =?utf-8?q?7xD3FQAKqcxM7A7EDyCHZ+kzs6OxvhyjNrjatD6iaEeKEN1Lf9WtOwvfKvv555vsA?= =?utf-8?q?nMu9osn1FGBRMurPOhiNnP1G94s+obKn4bueHulFODG1vbXB6Ad8LTPeV35xk7h3z?= =?utf-8?q?b0YDK61yj4Z+36p87CoHF6DL7SMySwFsyLGf8RU3qN2LyrzdWlt80Fn8Ap5bI+fKV?= =?utf-8?q?ZkgGtJcaUjmDTho5Qc0eslRqqJW/MDK2iEzztCON6mfMDoN2+1d0/PttN1/TWkj2n?= =?utf-8?q?DCmF/t6nKAo2D2DvDKwIVkRcTcYHAL5az3WWMbfpNbr9eEBEFtBfFKnpPI+T8ZOq0?= =?utf-8?q?GkJqH7l0I6kTg1kBT/qiSqhIt7einOcZmmX5aKCs9+hiefloBeF4dL2s49Wb/rcaJ?= =?utf-8?q?TNz1WIRAgAmqVic4nGURMHkxJlhT6aExq9cQYVS0i9JtLF6ZLJ1+ddM7wzO9BiGA5?= =?utf-8?q?sXQODXS+p+YuaSDQuV5TU+sTsidYPqhLlMkZQAmeu8ir9qD5KjbapQqZMTjZYrEiR?= =?utf-8?q?9LEPwdM0+o/bizQhZT6rgJxGFM3M3d6GRntKAmeqwVdzJ0kMHwZYtWuQwIitiPakA?= =?utf-8?q?btdruw1+h6ok7MpD+WMYJA06/QEyT1alXuinJfSzv3NefB6uMNq7uSn2VUlrE5crp?= =?utf-8?q?0dUFvLcbISZzyt03HTEy3v3Qubennf8J4FttXFtuy1V3dYB+mmsLc6ZSl+p1PLk/A?= =?utf-8?q?aYJesxq0H6wMGTSp7cFnzsY0PhynyTgISTL/xq9yyp1lqseaiVeOpWSua7OeUDsYj?= =?utf-8?q?OKuSAmrCDP/aXXY5fGknmKqNBIPAbYG+hmHjFtQQ+4ujdXQmy/yo1UBgGIjFRlqYR?= =?utf-8?q?QVzgZV2i51qaplbBZWOYE7ZI0mss30zQ0eDVEDg1bLJyjXzQ1q/2DyQ5t3EiklMKP?= =?utf-8?q?yn0C/l9Q+inQhEnA6g/l+tzOjxMKMAOu3oogKx6HGIRYSJtnsROkk+5a5Ub5D+0Hw?= =?utf-8?q?/CXcfIIl3CKI/u1CCrV4oGpFH1LCpK1fMw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15ca10d3-fa1f-4919-30b7-08dbf53da46b 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:30.6156 (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: r7aegcRp6aL4X8Kis0a4Mp9ufRzmkmLMcHsIO4+M6UUW+IItHRprXCmg0AMl4X3Csrivsar+8+mBiAdPSGDFWGyNc5fY9ewJCl1GHQ0yAb0= 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 data structure and logics, to support the offload of IPv4 item. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_cmsg.h | 37 ++++++++++++++++++++++ drivers/net/nfp/nfp_net_flow.c | 58 ++++++++++++++++++++++++++++++++-- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h index a95f4ef831..9bc064d9d7 100644 --- a/drivers/net/nfp/nfp_net_cmsg.h +++ b/drivers/net/nfp/nfp_net_cmsg.h @@ -21,6 +21,43 @@ struct nfp_net_cmsg_match_eth { uint16_t spare; }; +/** + * Match IPv4 data + * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 + * -----\ 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 + * Word +-----+-------------------------+---------------+---------------+ + * 0 | | Position | L4 Proto | L4 Proto Mask | + * +-----+-------------------------+---------------+---------------+ + * 1 | SIP4 | + * +---------------------------------------------------------------+ + * 2 | SIP4 Mask | + * +---------------------------------------------------------------+ + * 3 | DIP4 | + * +---------------------------------------------------------------+ + * 4 | DIP4 Mask | + * +-------------------------------+-------------------------------+ + * 5 | SPort | SPort Mask | + * +-------------------------------+-------------------------------+ + * 6 | DPort | DPort Mask | + * +-----------------+-------------+-------------------------------+ + * + * Position – Position index of the rule, 13bits. + * As priority, smaller value indicates higher priority. + */ +struct nfp_net_cmsg_match_v4 { + uint8_t l4_protocol_mask; + uint8_t l4_protocol; + uint16_t position; + uint32_t src_ipv4; + uint32_t src_ipv4_mask; + uint32_t dst_ipv4; + uint32_t dst_ipv4_mask; + uint16_t src_port; + uint16_t src_port_mask; + uint16_t dst_port; + uint16_t dst_port_mask; +}; + #define NFP_NET_CMSG_ACTION_DROP (0x1 << 0) /* Drop action */ #define NFP_NET_CMSG_ACTION_QUEUE (0x1 << 1) /* Queue action */ #define NFP_NET_CMSG_ACTION_MARK (0x1 << 2) /* Mark action */ diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index c8b6902bf1..6edb96c17a 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -188,6 +188,10 @@ nfp_net_flow_calculate_items(const struct rte_flow_item items[], PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_ETH detected"); *match_len = sizeof(struct nfp_net_cmsg_match_eth); return 0; + case RTE_FLOW_ITEM_TYPE_IPV4: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected"); + *match_len = sizeof(struct nfp_net_cmsg_match_v4); + return 0; default: PMD_DRV_LOG(ERR, "Can't calculate match length"); *match_len = 0; @@ -220,14 +224,58 @@ nfp_net_flow_merge_eth(__rte_unused struct rte_flow *nfp_flow, return 0; } +static int +nfp_net_flow_merge_ipv4(struct rte_flow *nfp_flow, + const struct rte_flow_item *item, + const struct nfp_net_flow_item_proc *proc) +{ + struct nfp_net_cmsg_match_v4 *ipv4; + const struct rte_flow_item_ipv4 *mask; + const struct rte_flow_item_ipv4 *spec; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "NFP flow merge ipv4: no item->spec!"); + return 0; + } + + mask = (item->mask != NULL) ? item->mask : proc->mask_default; + + nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_V4; + ipv4 = (struct nfp_net_cmsg_match_v4 *)nfp_flow->payload.match_data; + + ipv4->l4_protocol_mask = mask->hdr.next_proto_id; + ipv4->src_ipv4_mask = rte_be_to_cpu_32(mask->hdr.src_addr); + ipv4->dst_ipv4_mask = rte_be_to_cpu_32(mask->hdr.dst_addr); + + ipv4->l4_protocol = spec->hdr.next_proto_id; + ipv4->src_ipv4 = rte_be_to_cpu_32(spec->hdr.src_addr); + ipv4->dst_ipv4 = rte_be_to_cpu_32(spec->hdr.dst_addr); + + 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] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4), }, [RTE_FLOW_ITEM_TYPE_ETH] = { .merge = nfp_net_flow_merge_eth, }, + [RTE_FLOW_ITEM_TYPE_IPV4] = { + .mask_support = &(const struct rte_flow_item_ipv4){ + .hdr = { + .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_net_flow_merge_ipv4, + }, }; static int @@ -367,10 +415,16 @@ nfp_net_flow_compile_actions(const struct rte_flow_action actions[], } static void -nfp_net_flow_process_priority(__rte_unused struct rte_flow *nfp_flow, +nfp_net_flow_process_priority(struct rte_flow *nfp_flow, uint32_t match_len) { + struct nfp_net_cmsg_match_v4 *ipv4; + switch (match_len) { + case sizeof(struct nfp_net_cmsg_match_v4): + ipv4 = (struct nfp_net_cmsg_match_v4 *)nfp_flow->payload.match_data; + ipv4->position = nfp_flow->position; + break; default: break; }