From patchwork Wed Oct 25 20:51:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 133318 X-Patchwork-Delegate: rasland@nvidia.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 4B83D431FE; Wed, 25 Oct 2023 22:52:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7011C4161A; Wed, 25 Oct 2023 22:51:55 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2048.outbound.protection.outlook.com [40.107.94.48]) by mails.dpdk.org (Postfix) with ESMTP id 534104111C for ; Wed, 25 Oct 2023 22:51:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e8DhqmdTz2uGbNao8gxq7e+v/1zTwfiCn1SKXNX0R83yGoq2618CgsJJTeMzE6f280+Up/VTugjLYbthubNXZRlYuYmrcLRnk55z83+m1R0XnEXGfT+4X6M1RxgA/Z7XyUMEK8CCMUp/Umm1yRIAcdchZeGNfZHcLcNi6ed96SUpbRCQIfngPFGRa/Hio76DxIXuFbAKkSjEg+HvkMcqZUT99VvQ/VxJBDCyyRtaeL17h4tSmL3Noj5zqXflotpoYu7LZKW3IhN1+KdYtqc0DkgHeU0u/Jf/wC//TX6rSrHRyf++CuCzqZsQUAJMP9rCkK+6HnW7C17NrIpcRvgOfA== 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=jmIl1o0cdVmiLP0K82vCc2JgG86RVuNsHuig2NIiKFA=; b=ayBv+vATnjA6B7fpmBAopoFV2Bz+sxFHS7w7/3ULF3H3DAPJkHODfzllcr4PiyxidKlTZQx6Ljo8RfRw9S47CJfOKarQTlVHOfd4qSCIo/LcjgMy52HTGYB3e3u6q9zFCqnv5vdZPqYTYjrtw+imBYvfOuMYeDJPo4UvKYhri71V8cELPj4hkrLs74/BCk0Mvou62uZtbmgos+RYNPfQnpd3IStMHWdbYZ5F5rErhEG/yH6ZG00r1qAqxg9PnmQKMvrQQ8pln79iOJOaKcMjCLf4nDJoRc/LlraSo3oYtcynfZQKSD9OViOs3PNjfgTmJ7+QM+6kCWWczOXbczaomg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jmIl1o0cdVmiLP0K82vCc2JgG86RVuNsHuig2NIiKFA=; b=cTLHMOISU3ilnX9Gn0TX/g8AQsIKxok7uhjZpCUHAu97fm9YndmIGmA7GkVQAdkOcLwQKEsHoe/vQ2rMki+URu55PjY8NaBvM8ZlanvV8NNW+uBikkAOW8fj9DA/6V54S9HOEmWHe+42+FN7jCfxrEb85tRuS6wnt89PNZakG3NRClr+q5rQUqrpe0xrNOFhOL7H6JKX2Uwx8H3NxTA9QlJRjL9oN1rSXJZfd0b5lffGWmqOl7V1wBKiOYzSX8ms770pQzogIaOFrf38CiaY5hOxRxQu8VFU0Nz0YFuz5NYkqKNTNP+/cfhR0izssMA5HBC6pV4WKmF6gMp88TZF1Q== Received: from DM6PR10CA0003.namprd10.prod.outlook.com (2603:10b6:5:60::16) by DM6PR12MB4340.namprd12.prod.outlook.com (2603:10b6:5:2a8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Wed, 25 Oct 2023 20:51:52 +0000 Received: from CY4PEPF0000EE30.namprd05.prod.outlook.com (2603:10b6:5:60:cafe::48) by DM6PR10CA0003.outlook.office365.com (2603:10b6:5:60::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19 via Frontend Transport; Wed, 25 Oct 2023 20:51:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE30.mail.protection.outlook.com (10.167.242.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Wed, 25 Oct 2023 20:51:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 25 Oct 2023 13:51:40 -0700 Received: from pegasus01.mtr.labs.mlnx (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 25 Oct 2023 13:51:38 -0700 From: Alexander Kozyrev To: CC: , , , , , , Subject: [PATCH v4 2/4] net/mlx5/hws: add support for fragmented ptype match Date: Wed, 25 Oct 2023 23:51:16 +0300 Message-ID: <20231025205118.1605321-3-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20231025205118.1605321-1-akozyrev@nvidia.com> References: <20231024175132.1435553-1-akozyrev@nvidia.com> <20231025205118.1605321-1-akozyrev@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE30:EE_|DM6PR12MB4340:EE_ X-MS-Office365-Filtering-Correlation-Id: b28a5b73-9d84-4c99-36cb-08dbd59c3728 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xiVZR2RnXXQDlXhRZBWJfp6FF2ow6EklPgtgOM/h88Zecy0IKNE8eRHwDnksjmez4b6+am6ILMqXlGc91wApGbrnJtxu1jvsl/AdTROP7kFml3+cw0jKCdlPJdLmjgCKDIFe2KtiD8WtGdPTK1qrw0oeOX3r5r40nr8cdGOxLAnov0T7R2SHlePupw6fnxH0pV0Ur3cIOXnvPUwqpc2UJlLNfrWoejAdU9lXN0l7uJ5V9qIlVZT+nMozRmhisTLrVpIWDm9T4MWcx7IjI+ZTWNs3V4HYwDnC6cSPpj/sU5uiXDLedSXtXUBQVsqWshJULP/HymrpYzeXtJHN8QATLlhz2pFQ50FEteUEjJNcP6kRe+nrMUD6WjrLfCqYcspSe/3HIA4iI7Z2lk5xWbieJ5CMjySENREaFp4W7CYyAFEq/oQdVH8Bu3tP+vgFwNz8p65BzW9HqsnwerzG2j3aTwRNHxLH1HAxa5YhdiAqVro24ut2E7/eh87eognLfgQ6Enx6Fnx1CnlKxXJ88PYdacv1F+lTKUG364kXbWtctOoZESwNZvwAagvHMwzp/SnaMd2bD2g+VHvn2UdcFjet2OcE4i/GfgsZ9b66gLqrOKxCXd2+58sixs/KKOa4XMCBhKlNGOJg1qy+QKTkou5yWxQdcixcNGLig9NUxIbrPOGLozQBk38YwMWxxOkTivf63aU5YveFAk5rFrvmFDisxlCno1Cl5waZmpeAt3buy2ZyqAl0bfQHl4vqFA0axHaDxBt0ubjgs3WZ6wP2HlPbYA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(186009)(451199024)(82310400011)(1800799009)(64100799003)(46966006)(40470700004)(36840700001)(40480700001)(40460700003)(83380400001)(8936002)(36860700001)(36756003)(2906002)(26005)(66574015)(8676002)(107886003)(82740400003)(47076005)(426003)(336012)(7636003)(16526019)(1076003)(2616005)(356005)(4326008)(478600001)(316002)(6916009)(5660300002)(6666004)(41300700001)(70206006)(54906003)(86362001)(70586007)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 20:51:51.8803 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b28a5b73-9d84-4c99-36cb-08dbd59c3728 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE30.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4340 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 Expand packet type matching with support of the Fragmented IP (Internet Protocol) packet type. Signed-off-by: Alexander Kozyrev Acked-by: Ori Kam --- drivers/net/mlx5/hws/mlx5dr_definer.c | 54 ++++++++++++++++++++++----- drivers/net/mlx5/hws/mlx5dr_definer.h | 2 + 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 8d846984e7..0e1035c6bd 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -357,6 +357,19 @@ mlx5dr_definer_ptype_tunnel_set(struct mlx5dr_definer_fc *fc, DR_SET(tag, tun_type, fc->byte_off, fc->bit_off, fc->bit_mask); } +static void +mlx5dr_definer_ptype_frag_set(struct mlx5dr_definer_fc *fc, + const void *item_spec, + uint8_t *tag) +{ + bool inner = (fc->fname == MLX5DR_DEFINER_FNAME_PTYPE_FRAG_I); + const struct rte_flow_item_ptype *v = item_spec; + uint32_t packet_type = v->packet_type & + (inner ? RTE_PTYPE_INNER_L4_FRAG : RTE_PTYPE_L4_FRAG); + + DR_SET(tag, !!packet_type, fc->byte_off, fc->bit_off, fc->bit_mask); +} + static void mlx5dr_definer_integrity_set(struct mlx5dr_definer_fc *fc, const void *item_spec, @@ -1840,19 +1853,40 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, } if (m->packet_type & RTE_PTYPE_L4_MASK) { - fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4, false)]; - fc->item_idx = item_idx; - fc->tag_set = &mlx5dr_definer_ptype_l4_set; - fc->tag_mask_set = &mlx5dr_definer_ones_set; - DR_CALC_SET(fc, eth_l2, l4_type, false); + /* + * Fragmented IP (Internet Protocol) packet type. + * Cannot be combined with Layer 4 Types (TCP/UDP). + * The exact value must be specified in the mask. + */ + if (m->packet_type == RTE_PTYPE_L4_FRAG) { + fc = &cd->fc[DR_CALC_FNAME(PTYPE_FRAG, false)]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ptype_frag_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + DR_CALC_SET(fc, eth_l2, ip_fragmented, false); + } else { + fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4, false)]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ptype_l4_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + DR_CALC_SET(fc, eth_l2, l4_type, false); + } } if (m->packet_type & RTE_PTYPE_INNER_L4_MASK) { - fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4, true)]; - fc->item_idx = item_idx; - fc->tag_set = &mlx5dr_definer_ptype_l4_set; - fc->tag_mask_set = &mlx5dr_definer_ones_set; - DR_CALC_SET(fc, eth_l2, l4_type, true); + if (m->packet_type == RTE_PTYPE_INNER_L4_FRAG) { + fc = &cd->fc[DR_CALC_FNAME(PTYPE_FRAG, true)]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ptype_frag_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + DR_CALC_SET(fc, eth_l2, ip_fragmented, true); + } else { + fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4, true)]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ptype_l4_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + DR_CALC_SET(fc, eth_l2, l4_type, true); + } } if (m->packet_type & RTE_PTYPE_TUNNEL_MASK) { diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h b/drivers/net/mlx5/hws/mlx5dr_definer.h index ea07f55d52..791154a7dc 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.h +++ b/drivers/net/mlx5/hws/mlx5dr_definer.h @@ -148,6 +148,8 @@ enum mlx5dr_definer_fname { MLX5DR_DEFINER_FNAME_PTYPE_L4_O, MLX5DR_DEFINER_FNAME_PTYPE_L4_I, MLX5DR_DEFINER_FNAME_PTYPE_TUNNEL, + MLX5DR_DEFINER_FNAME_PTYPE_FRAG_O, + MLX5DR_DEFINER_FNAME_PTYPE_FRAG_I, MLX5DR_DEFINER_FNAME_MAX, };