From patchwork Mon Oct 9 16:36:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 132442 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 92B144233F; Mon, 9 Oct 2023 18:36:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 386A440E4A; Mon, 9 Oct 2023 18:36:54 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2084.outbound.protection.outlook.com [40.107.243.84]) by mails.dpdk.org (Postfix) with ESMTP id 1AD3740DDE for ; Mon, 9 Oct 2023 18:36:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oa9hcVQs6yH3g8OONsxB+bEHRW4aGW3VprzjVck5ekqlPh079Dheaxop6PSp98PjHJcjDMaqavXnYQp4Z7mBhimrxEiw7W00baZckdbtpEegpBUUhyTzmfgUXO2qQfISio3c3nceBxMCZrqArr/brRR+7eVCabh1wHPTOPUttmYKgiqhzdbMedLUGUOK+EnhREEJM63B24yJQcWCIvdd0YprhvkavN9MWKnOssCmcISf6z/P0PJcPZZDgftCwcfCLJj2KB835UCGnJnlEii9yK3j7ncQ6vkq2uinntoh2E/Cf7bMTu/m1C5gQibTNhZtQnB54yhsGe+bLArbHVlQfQ== 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=QijHCmQvQiFewbV7lNrvqvwfrE0vY5Q40qtDLdE97EE=; b=LR1xUy1DbsPgQSWKwtNCWk8pUATH7kp22widLHi0a3/qUn0tejBdkub6Uy8qpMLxrqpurIeecGZwEIfyccT/HpgGsANoLfYuQ7NBE/dfgNYPzwyvICIwRRrf1MrhuhuSOlsw0kIm441I+INPPeGgV9ab4Zt0bYhzn1NWuALLaNIjO8sEb7tUzCuINHH5qzO8pU1ny7l/BVqMJZMK8bfMVj/KZpTvl5FE3bJWOzVid6Dfr9Muyrb0ed/CwVRYtaeZNM9+EU1eRPogDTPoqx+182YAXhZObvBYoYaD8KuJ/sZsYzxlHyzjZ4EuuagF7MTpz8wKwyPyiifuhTHVXdWxnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 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=QijHCmQvQiFewbV7lNrvqvwfrE0vY5Q40qtDLdE97EE=; b=tzk80tBV59vMExRBL4PKLmSVAQrDYRZ8A1SnMh7nK6LtfxYkl7l7xIR3JCDH0RxSBFv7rmlPnrKEUypN7jVaT2ylgT7KREX/QOoP2rscRlT1P2I7rXQmYn5zJj2BpBCNUH//cjt/g+Mr75LqjI+H5MObGaFtjg5v8MBHYhbO3Se20V2azN0dSz1LrCrWvQCAb+Z9XpT/1Ck/6iwaD7MC+jPxNRC3euWvOEWm91pg5JC/So9aumbZSe8WGwYRZ3uJ4V6BeT2oyopXbCbIMMZ2licN9RuAI9adBaeLJyn9Iedl3P8g7VJIf7aY7yG76FgjSfmiVVmtVzk6Qhdkp5prSg== Received: from DM6PR13CA0066.namprd13.prod.outlook.com (2603:10b6:5:134::43) by DS0PR12MB7631.namprd12.prod.outlook.com (2603:10b6:8:11e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.43; Mon, 9 Oct 2023 16:36:50 +0000 Received: from DS2PEPF0000343E.namprd02.prod.outlook.com (2603:10b6:5:134:cafe::df) by DM6PR13CA0066.outlook.office365.com (2603:10b6:5:134::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.20 via Frontend Transport; Mon, 9 Oct 2023 16:36:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF0000343E.mail.protection.outlook.com (10.167.18.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.14 via Frontend Transport; Mon, 9 Oct 2023 16:36:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 9 Oct 2023 09:36:39 -0700 Received: from pegasus01.mtr.labs.mlnx (10.126.230.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; Mon, 9 Oct 2023 09:36:36 -0700 From: Alexander Kozyrev To: CC: , , , , , Subject: [PATCH 2/5] net/mlx5/hws: add support for fragmented ptype match Date: Mon, 9 Oct 2023 19:36:14 +0300 Message-ID: <20231009163617.3999365-3-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20231009163617.3999365-1-akozyrev@nvidia.com> References: <20231009163617.3999365-1-akozyrev@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: DS2PEPF0000343E:EE_|DS0PR12MB7631:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a9b5965-e1c7-491c-446e-08dbc8e5f056 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0GpUg9JeOiveKdCVQNY8jkqMp6Q68C7Z2nBqehS1k8SwAMiqSd4VPxOTbT9kwQQURPsKHZtU/Fx+VF850F3fK3tf/prq/BMsn+aF2YulwxMXiORYwZ7QpXOOBetFUyxnhhGlOak/Y/yyoIELex/sYoxmaANlTydskkyPvxGujtQdH3IiAUFhYtSx0U4OM7pI585HqSEjSOoVVhzCAlAEhlTp16JWKfaeMi4vfm5qliMtG5pj25emTsQp7GZMpodHA3n7n6LRYGU9EMLoE2N1X/Gh3f+AzYjZjFQWPnewazwAyPZ8Zxx6EKIxlOUxvzO5TEjb6Ao82UCdOwlh0O3oC8w+Z/zcBBU2cCCHEMTVn3dJ9ag0T8CpMOOxgdmjnISgK5Lb4W9spMj+i48p6bLUyhhXBIN8j7WLR1sC9ppud0ACrcpKqGUaY2k9BXoLfCBfgJRzITzctBAXlYaStXNqql2qrPoD8qyWZWxv4pOK/wHhU6XDAoCh3MUoy+pZ2OQogoc6WBVkrXlxhfLtQ8M3AGi2++oMZu8rlEPL+0vd14DdyV4X9Bt6nPjvDUzpHGhFzqu5BGbOzazHeYREdrujpKqwCUqsIufVGqPU9aja3VXttf/m48tDi5oF0zcOb1MGXxokaJffCQItq0kwb+Jy0j5Mlspl0Qzxr8QTmpGUvomUECGQdFEHX/XcD543DEkAVqbR9ZN7GG3lt2BDa/9iYv/TEB6JLf6HyvzedZNGiikI9Cd1dYHIgmnQVjcNdOy4rxvLdoukCSUku6CID7wsNA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(39860400002)(136003)(396003)(376002)(230922051799003)(1800799009)(186009)(64100799003)(82310400011)(451199024)(46966006)(40470700004)(36840700001)(40480700001)(66574015)(40460700003)(83380400001)(426003)(2616005)(107886003)(1076003)(336012)(26005)(16526019)(47076005)(54906003)(36860700001)(70586007)(6916009)(316002)(70206006)(8676002)(4326008)(6666004)(8936002)(478600001)(2906002)(5660300002)(41300700001)(82740400003)(36756003)(356005)(86362001)(7636003)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 16:36:50.6902 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a9b5965-e1c7-491c-446e-08dbc8e5f056 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7631 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 --- drivers/net/mlx5/hws/mlx5dr_definer.c | 74 +++++++++++++++++++-------- drivers/net/mlx5/hws/mlx5dr_definer.h | 2 + 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index e3f4a3c0a8..b2c0655790 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -361,6 +361,19 @@ mlx5dr_definer_ptype_l4_ext_set(struct mlx5dr_definer_fc *fc, DR_SET(tag, l4_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, @@ -1828,31 +1841,52 @@ 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_bwc, 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_bwc, false); - fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4_EXT, false)]; - fc->item_idx = item_idx; - fc->tag_set = &mlx5dr_definer_ptype_l4_ext_set; - fc->tag_mask_set = &mlx5dr_definer_ones_set; - DR_CALC_SET(fc, eth_l2, l4_type, false); + fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4_EXT, false)]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ptype_l4_ext_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_bwc, 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_bwc, true); - fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4_EXT, true)]; - fc->item_idx = item_idx; - fc->tag_set = &mlx5dr_definer_ptype_l4_ext_set; - fc->tag_mask_set = &mlx5dr_definer_ones_set; - DR_CALC_SET(fc, eth_l2, l4_type, true); + fc = &cd->fc[DR_CALC_FNAME(PTYPE_L4_EXT, true)]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_ptype_l4_ext_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + DR_CALC_SET(fc, eth_l2, l4_type, true); + } } return 0; diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h b/drivers/net/mlx5/hws/mlx5dr_definer.h index 6b02161e02..e87b4108f9 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.h +++ b/drivers/net/mlx5/hws/mlx5dr_definer.h @@ -144,6 +144,8 @@ enum mlx5dr_definer_fname { MLX5DR_DEFINER_FNAME_PTYPE_L4_I, MLX5DR_DEFINER_FNAME_PTYPE_L4_EXT_O, MLX5DR_DEFINER_FNAME_PTYPE_L4_EXT_I, + MLX5DR_DEFINER_FNAME_PTYPE_FRAG_O, + MLX5DR_DEFINER_FNAME_PTYPE_FRAG_I, MLX5DR_DEFINER_FNAME_MAX, };