From patchwork Fri Nov 3 06:26:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133813 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 0A51843275; Fri, 3 Nov 2023 07:27:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 751BC42DC0; Fri, 3 Nov 2023 07:26:46 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2105.outbound.protection.outlook.com [40.107.93.105]) by mails.dpdk.org (Postfix) with ESMTP id 639CA42DC0 for ; Fri, 3 Nov 2023 07:26:44 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RpHIU3Rz5CuLnkzZYuZgC4i1y0QNfW34/PLbmHOdIc0d99PBZj8h67Tvj0iCB7S2KslYxtcNHm/sgBLnUgn3eSjkWeZd0oqS2Cgi4vAdk1232MKLh6salo6IYHSDhYnJDYAtde/QI0nexlNCbkcKUxG2Wg8velLhpAhT+CpsVRSdmuWEY8kccs6nxneyIw3OgYhHV/+MI+xKAsOtAP+qFvvhiZNXJeSwYZQqtt5AyOFFJBmcMbw1671TfYZScihGUwFjTRP/LP/WERnBq/ibqifap5kRUkyA7iJxZOdEFvEm3i7Vw58+fNJkVJaG3HOa7h93ySGPfqJS4Bmb62EItw== 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=Hbgx6WzWeR5qkw6Y+ihjYNZhWBMzOQa6hYepPqC9LBI=; b=OqQmNwx17Lq8SWLQb0+Qkx/B/EO8xtg7Z/kyu28YTCi69WmKlfdy2P4YTr/EkulFAvTfu55gdLz0U0B5izuPXhkpXQzZOtIcWav4UlbkdLrkSiE2Jc7nk9m/TD+33eN1oTG7R0XwJp/6pbjibYau//qHE8Y09/EBI92eDTo7/kBLiSW4NG/sS/bQWJ7m3Z+1Q0O1LZGlxWnr2TNT+/wqASa7IoXO/c+XMXkAHBcCF/AN06foQkkciupZWhTCNgNEyQvhbH3NZmsy+mUNyVAF2ly76YqbRmQRdjdylJaNG1JP2dnYlOAE/NbBtrnTeySB9vibPF3oQqxu8ueV9xOUAA== 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=Hbgx6WzWeR5qkw6Y+ihjYNZhWBMzOQa6hYepPqC9LBI=; b=jeCuItYUoFiA8EqDnOYOug7Qso2niKhH8Ch4LDg59M3QMPYjMRrKFJLJ2bgSchzGggRJi+wrV0KHhv7gkVQSlKK87vGgIJTP9VS6n7DZ05HyePXjmyLrSv0UaHz1yMs/pEVRq5mvZKSyej0NVlUsBbKxXwh4Y5Z8FPfLSA4XGEU= 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:42 +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:42 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 07/11] net/nfp: support IPv4 flow item Date: Fri, 3 Nov 2023 14:26:02 +0800 Message-Id: <20231103062606.2632012-8-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> 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: 5a0541af-4c39-4039-9966-08dbdc35d856 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xNDRCMq3mHlhkH+fRGwblr+pLOlptotuQYB7pmZKxzo/zt6mA8BL7X5/BpzMeBd3w1MKrbZ0l8yk4cu2Qw9V2VOLvLmVTPgHdjF4lazIYgziM0xOSLFziMXm2kTiRsNvN1P3DjsneMVDQazhnj6sjHpnXafz4+6xRVblfJ6aJdo1g13gr/ZOnft13uJJYIWcEETI4u1tG7uJrQVt1oaOC0a7ktamjj7cE8aBy1PRqTmXR8+KnRnQRvjrM9reEssV5ue0gFI3prTN5rxYGEmz4kS1YTLZiZ7PM5YUjGXKCZEXS6vb90R9rVaAUpWUWbXs0f4pBsL4vef6Ihiwb+TRHJl2hNxs1pvUDEm+CUynL7BqleoH42t1y07UFfb1EdbXZk20iK9N6u0FbEOAPBIlSndLn2YJBnPotplrxKS7UDuRi7iUECQ6rT38Pp1RTZWBxLRK5/ry6Lo0MTly4g3AJ9qQsslloQB3xzp10vWZ+NYWFRsNj7sX9MjHupg9HjrdS7uFpPtkMAekgUNMydfZVYGJNXcRbj7J8xjN+HGQuWpTGUwEiFL69Tpw+TMyT1Z9m4c4sqM5Ptc86Mmkg2mOLoHVu1GoieF1ec6tN0erza4QTPo5D4TKBUsND/TSWT0j48XRi09nEtPI9m2JsRPzP0Z+o2I2JIYIfXdIbza7wa0= 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)(83380400001)(38100700002)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?v0XTewek2fm16CTngSLObH4JTqEK?= =?utf-8?q?6LoISfAhyjgWoYsCIPwqcy20JtZrHHynKbJnC/riJ0dXDoTAERdpdOlpmKWIGW8kL?= =?utf-8?q?jnvl9uMN7eMiGACUQNqwzhS0h+9akPH8wmYyUD6wGaHw14k6xpWi1FKiMfMW4JZ0P?= =?utf-8?q?+crmpr80uU9bbUzlHt8tfySu0Dh0K7XnaPLzEwd/ATEb+QNQrQnfTz0WGh0VOv6Hj?= =?utf-8?q?/yrY8C177UAwHDrYDCppz9lnwu6ZkuSF1XW5KZvDftkVFDC+vIbs0MdSi5PwGInRi?= =?utf-8?q?LJA6+UVDnYA58iiS3fS9YN6kFo/E/76EljXNwoGr7LAlVXHlTLfM81RI2P3xEhIY8?= =?utf-8?q?tL6SinywaSq/FwR9/Es5lxef3lue+3y6Pv0gUYQTMt7nQwy0nXPeHqeUuPD+fMm/l?= =?utf-8?q?gMZMcuxiO3nuLhwKe7dC5yKzUdxD5bfjtpLf4a1cVncme4/xK3GE0Ihzv34zPmQgI?= =?utf-8?q?ZVfT9/Gr/fP8VCjt38STCKUF6h5E9SFJSt3LgPLt8v7DTiM5ZBVSBwsljlNo9uTov?= =?utf-8?q?VXbdA7qXse6qeU4EQSIgP1Cu5VMgiN6bfSR2Hh6+aPRE/7qqn3q6teWFawp0SkLHI?= =?utf-8?q?zE/bggWW+1iPtojOVSA3Oz/ptFUohqhfgrPawV1/aEqb9k9N1WX+ESDhT34TOYywJ?= =?utf-8?q?DGXQt89EOWvUwb0QDROHVUfHmrxS63jCui4DJNo3cwA2NCWPW2gUIyHwD3xUh05ys?= =?utf-8?q?/5CgbErPTFZZNzXpt3Ylcpu1mHyRQtLipvUWDn2Zw2Qz6fxSRtTZraeg5EZLZ+pRd?= =?utf-8?q?vzG3njx/CjnUgZIgiT/56DaQHEMb6Axn0pOo9bsgVS6jGjkAxtaYALw5XxHxWsB2J?= =?utf-8?q?4aUcEEPOGGluTz3pqu6iPE1Y0oJumUbC+nYahFGhpIQTlV39JEmfvJtMRqO1lV5VU?= =?utf-8?q?4YH5MXOEoZZWQUaCcpkrPb6/kPKYeiLotX4UgK7nlTpzIpbELvlLL+MZbWCvtm666?= =?utf-8?q?P6AeoC/P1y3tsiJBPR4D4GhvmiayPCFn5tMavWFKGBqorjRej/5FHmgfCvHgKp1ob?= =?utf-8?q?BG26gGN4HkwTugBTwdDdS8aTIBLQ0yltljslptUUfu2zdiaoSHZG3pMAunOWlrRh3?= =?utf-8?q?Si1nWkYmxOYni0QkIQscmrk7TIWRE7DecGYC8BzSAZiorxtg6yxgry+D6nJnufx04?= =?utf-8?q?2uSJD9JhjT09waklXn6EPPt4/ZV/xPBSiICdltt4CgYvC98uDTuHBMpAtBDPUQc0Y?= =?utf-8?q?s1yViOrDW4MHT9eCOpEGPr99kD20A6HGtTKwsiNL8+2tavQ7c6XVb/4+hM4oSWH7J?= =?utf-8?q?Prtp4e7Tg6dH8sLuzPcXGtY9H4CthcvzghuoK1mDG6MGQgfPkg2QS1X1mYKhaU2UF?= =?utf-8?q?ke26QTsofEXMjiI3yBbFpTyHlWky7ZPWNcZ6IgMfnnQL1+u6LLSYuBISEa+p8oiO3?= =?utf-8?q?CfUqd4DkBGqIRypdNWqYdlsMlbUG7y71FsxaM1lOpq+bWmlp/YlggWPV/UKNVjqrD?= =?utf-8?q?+tAkNWQ0WvwBg5djUiXRLlPZu6n2S0AR9Ebf7ZaYYJGsJxxmqen+bgahCK5jAJEzf?= =?utf-8?q?strZDjqpR0UlVaf+XpJUfOmAFQEY0yfRBw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a0541af-4c39-4039-9966-08dbdc35d856 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:42.6774 (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: Uj5GAv8BkfmnH0E02ZeV8WOnO6MmP0tahdJTIoqHtcDrqJZTjd74ml4QiWMXvwGNUDDN7T18J06AARPFCHMx5RJAIgpXtr5Mwhu5T8VfrM4= 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 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 65c922071e..e918c67135 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; }