From patchwork Mon Oct 23 21:07:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 133203 X-Patchwork-Delegate: thomas@monjalon.net 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 54B95431E6; Mon, 23 Oct 2023 23:12:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F18A5402CB; Mon, 23 Oct 2023 23:12:53 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2056.outbound.protection.outlook.com [40.107.93.56]) by mails.dpdk.org (Postfix) with ESMTP id 75CE940275 for ; Mon, 23 Oct 2023 23:12:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aKi7QT2y3+Y+k065bR1DJsxLLOjwiU2wblbJxrEYAn/vGCzZvXq0jyX/i3/I//9KRe3zRuUBwwIlnkQHZeaKbyiybEuaCmVV8PNWynoBz9JRoB+QEabXqboreeXfwGXcCnxEKSc2JKAstVJXjjABL7ksiSftCgqHzoek8XVsqQ6eQzV/aCebltlsJXsnfaXIU/OtNwN1d92sX6pM/AnEhrp1DIuz71qxsgfZjg1YhcxGyl4BiNphhW+tMsdtjHuI2W/xWA0vZJaQhLepFp+WCg8V0KH60qGFeqPiaOqpOHR53gN9MiWIdj3ctT4S1tAD1rAD5O5OOjFxyPl4gtRGSw== 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=T39DKrAtQOiZBwJ1s8YEegdrEBsU1WKcQ+eN5TGalon0rWd7eRK1q1cFqxWPw2bywaKhxH/WyfIC3XCcRifwQoECOxdxOSXeSs5Tb80NhUEh689x6VJC7IB2OpoCKEt/sohrrH3Iby9VHpCZ2uhrdHFvOyIYmvWSkPPftKFmURpy+jjywBdW/R0uq86WLrkl+h5j99GT3z9JnOs3viuCVEa3LkIlfngBQ7yXrnCKvrXVhWG/OKtExhzKdCjgo2XIBeMqlya/NCKzhqDxr6hJcLXyehxZ/b7jkHBw18gHa93S89g1pu4mNe/gQ6w1DYIefbn2387GrrbmwCl4zh/d9g== 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=jmIl1o0cdVmiLP0K82vCc2JgG86RVuNsHuig2NIiKFA=; b=r3JIYShIbBs7bT1Ld9PBwcvDScDoJI/ak1OeQTpHf97zj/oQYR1g+lGHEH13BktphNmGeyDQMfyFHBJh3tiX8z8VH+WQSd4oQa03TjUXf8sHzlc/Q3CJiHfadoORWf5p34FRLhVO+uUNalReCDXzRzYBwgO3SABWd80q0J51F/Y5sCg6GKth886Gpsx8fBSkNz3P9eHqBJ17Cn3921a04ktqK2/DA9BVpMaIS0hP/joMhzrQAoFhHMXOsNAJQsXcTkEX6C5tjY+bfRqXiP+AvC793xBuutVyDKu3Mp6qWfS0/hWNcwY0RoUa5anrXyhEiwtrxrzj5YMjxu8itjh/rA== Received: from DM5PR07CA0106.namprd07.prod.outlook.com (2603:10b6:4:ae::35) by BL1PR12MB5078.namprd12.prod.outlook.com (2603:10b6:208:313::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Mon, 23 Oct 2023 21:12:50 +0000 Received: from CY4PEPF0000EDD3.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::b1) by DM5PR07CA0106.outlook.office365.com (2603:10b6:4:ae::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Mon, 23 Oct 2023 21:12: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 CY4PEPF0000EDD3.mail.protection.outlook.com (10.167.241.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Mon, 23 Oct 2023 21:12:49 +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, 23 Oct 2023 14:07:47 -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, 23 Oct 2023 14:07:36 -0700 From: Alexander Kozyrev To: CC: , , , , , Subject: [PATCH v2 3/7] net/mlx5/hws: add support for fragmented ptype match Date: Tue, 24 Oct 2023 00:07:03 +0300 Message-ID: <20231023210707.1344241-4-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20231023210707.1344241-1-akozyrev@nvidia.com> References: <20231009163617.3999365-1-akozyrev@nvidia.com> <20231023210707.1344241-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: CY4PEPF0000EDD3:EE_|BL1PR12MB5078:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f4640f7-8fe5-44bc-d541-08dbd40cd02e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6cCkjBh6SQ1jBYriufA0y8KlLJUDLIpYBGiG2cSio9v5xV/DD5nChEMM/G4GdNqApT99UfzRJgVp3cmWcd7xwRg8SX5QH6jWjEK6GgfepAa9Ob6ik5r2xTkULB7yHMP6AjwwjF1YB6jo5k1Rcyf/XzZxF1f/TRXIww3Y/row+wrEHLHOdY9DGIl4xDOi5vLsic2VcDAo7ncjxuGMiudxCICq2vEreVVQoGkbeUMZDb1fRmiErvza/RyTD9sx5FxhvgTiRjcXgAcHsEJ41/tLXuROZoJv7dyKOmbI32tleaLmK5Ts4KaEs/BQ6l2i8e7h17iNKgk5SajslbJFPs5pQKUWXodXzcLP7JhNUvXY4wM0Bdvw8hE+gNWihC1QMgGdlBkQLzoD7ISHoDWvonN1URNlcMqJ5ftivgors+4kIl/vQTuqp8EadObwzQufIHldsy05BcW+3tmvFq2s5JBveudJRW4Qo/lMqpLqxigNIB0+BsiirbrLFuvVWlm0tVloUw50HIopQSekDa7kqMr+0omX7RJRe2TpHGaL4t+jWfvjYTGWjNIFmrVt9NT5lf9S6f5Ix8zrk6q6Jq6jqTPz1ClZDtuAZsroC3nKUU0wIKCVzKyFHrk2lx4LwbNsaNhr/c33iBoZaqLeUUZGyDOjiROsx2k4xEAoyib/O8MiuuScNR6eUqeWsKxzgQZdoOAKoMq51C4uVbP5F/i5dmfeo2PiuCOmENR/1WqBOj+Kxmg6Txdej2Wswmw6e7c0P5esBgVir4WPV+u4z18XHlkq7A== 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)(396003)(39860400002)(136003)(376002)(346002)(230922051799003)(82310400011)(451199024)(1800799009)(64100799003)(186009)(36840700001)(40470700004)(46966006)(4326008)(8936002)(8676002)(41300700001)(40480700001)(40460700003)(2906002)(5660300002)(47076005)(83380400001)(36860700001)(6666004)(107886003)(16526019)(1076003)(336012)(426003)(2616005)(86362001)(36756003)(356005)(66574015)(7636003)(82740400003)(26005)(478600001)(316002)(70206006)(54906003)(6916009)(70586007)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2023 21:12:49.9389 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f4640f7-8fe5-44bc-d541-08dbd40cd02e 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: CY4PEPF0000EDD3.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5078 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 | 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, };