From patchwork Tue Oct 24 17:51:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 133270 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 54BA94316B; Tue, 24 Oct 2023 19:52:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A350940ED3; Tue, 24 Oct 2023 19:52:23 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2041.outbound.protection.outlook.com [40.107.92.41]) by mails.dpdk.org (Postfix) with ESMTP id 9FD1440ED3 for ; Tue, 24 Oct 2023 19:52:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LkSh0uSant1K1TZ8L1s2dt47oNsQA8auvJqqO5DlPtBgrJ09ajeyifYVetSVjJoPxuQ30V2W01uc8fm7pRSrCzkQYQKY9RsNwpmzCgrXOiiQnheAvKJB2WCOrw9hdYsNLOBSrdA6c/vqs3GOUL2J5EUB/RQJ/6XLCTcmIZaoTfgyFSe6sPCdV9aCYbNRbXdrYNepwCRIQ6uiUeGzXvVVwahiOP2+HCvFLhvZK2pwI/MiamugKDqkHNMSgX7Y7ldFhezhqFfOmVSi4wn0PrPNGlBvhKQmWuZ0xJBCnC3RPSJmZ8dUxovmyWoyGaII+yTqx9ZLCX7z6DA8xWc/3dvw0g== 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=nD/r6YeMsIk+iDvrTlEvB6LNDF+pzRNG85OewVmhfFgx+c5rA7e9BwPM8G4ccWkbpbJU1coNTVGojFgNrmdQBp2UoUaelGZYHebUX04PBEIpZLLzLtkQ/W/VnaD8MSgZBnFBZxGtxp6LedJj42VoT04fmGSycRTVPNNxTdf5+ZJI87LcCBuryzo3g1cCtJuWpzXAloqC/7xH4Dd505Q9H9iOQuXU0azwFq7J/lmZjEQhCndbQmwZhalTNmPEtwcyi8mz3BUprWbxs5aj3Y2yBOhMUt4jVPYc3LejtBRzH0/TAp4HxlGHmcc3HhHKoV2xokhKiUxKxlzKA1E0RDWw2w== 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 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=EhKgRu73EZeFTkcnLegU1H39qpFgnsA7e+w6XlKRyQSht7x4Jrf4UBsAI2/xr7R4BKbLMhp8OgK3/ZXPhNe7UJRQ0b8IextWH0uWpC4MzOAJWFSwBwh+O6rIOFPBdIu5IqZ+FJWTfPQ6gZyHVjY4JglL3RxD3QbxYUZIsFU1cgFvXMAHC6374QVjI59kxpnw7qHNThIn2SqKBYDyFNloWtji/mvpn/MfKguGFAjlDgowioxLdZSqdpOYVPp1l50/xOTCd+AgM4MQRMefHPDJFeCEu0g1OKOclB39rWJ4oeBye+xQc6BxnYOkid3ki5Zaoxh93M1rHBwhw7xI05HDEg== Received: from DS7PR03CA0313.namprd03.prod.outlook.com (2603:10b6:8:2b::18) by PH8PR12MB6964.namprd12.prod.outlook.com (2603:10b6:510:1bf::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Tue, 24 Oct 2023 17:52:20 +0000 Received: from DS1PEPF00017098.namprd05.prod.outlook.com (2603:10b6:8:2b:cafe::4d) by DS7PR03CA0313.outlook.office365.com (2603:10b6:8:2b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19 via Frontend Transport; Tue, 24 Oct 2023 17:52:20 +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 DS1PEPF00017098.mail.protection.outlook.com (10.167.18.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.18 via Frontend Transport; Tue, 24 Oct 2023 17:52:20 +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; Tue, 24 Oct 2023 10:52:08 -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; Tue, 24 Oct 2023 10:52:06 -0700 From: Alexander Kozyrev To: CC: , , , , , Subject: [PATCH v3 3/7] net/mlx5/hws: add support for fragmented ptype match Date: Tue, 24 Oct 2023 20:51:28 +0300 Message-ID: <20231024175132.1435553-4-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20231024175132.1435553-1-akozyrev@nvidia.com> References: <20230828182251.3917624-1-akozyrev@nvidia.com> <20231024175132.1435553-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: DS1PEPF00017098:EE_|PH8PR12MB6964:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b11230a-b89c-4466-21bb-08dbd4b9f890 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5aVW8+8JB6bajsdmOAPfquNu+jmRD4+4kgw4c86v43HbB17sMem/ONyjRrnF1i9VIQeXR0cJOuTHuPKsAzkjCfP5CwJOGLV29NwWW2QqPinyUPnd3By/NscXnU0Mr/orkeBtWKO8W/tjl1q7n9S6sK1FCvgXF+2p2eja2ZaEZv3H7+IjpKU/7N74KJGRFuLIX8tHWGOU9XI4YEiqDpZGT6lrT9PiHu7uok9jlXycPqIkGOtkWyO/Svyvxi5be1MYuNPKuwrf9LAuoNeZo3HS7bUm8D6wYf0wKRFUsfHKli12LAuUOaQy5kpqUB8b1XmtzNm1d8PSQmaKYSvgfod0RWwNJygH9E0gC08Nhie0QBfDlwMObJlOTmoPotkxRRRZbrGEdYpomee+Wjlyd9OVdh6yWLH8XibKP0DLRE2jS3zEatwpUZEixpSIZZZaHoKpYOnXKtvIj3zcXeWCbLhU9XpRVdhLfsz0uxY3kkxD2wn018I6ZtHgLO97QaL9QO7Kl9WTofJDYhOjssUCdYEp3ROK4k7p2gIdfX0pOGdHJZHYEzUM4mtu8v+rrR3v01gcv95qNl4xR3H/+rgr89f+sEPkjMGlFVjh73l3yKbuQ65Qn4QFqnVdkheDf6XV8OKl26xUJLs1VinBwrIZRXixRUeZ2KnA/EJFgziOAYhafnqq/oP+pSW9Ne+rhaOVWTXDShiylXo3hwK+gG4kwcI9yuch4wD64nBvmPD8F2Fei8Ymc9tHDQkeKL885ojOUhJDITkjHgzFCze2IKr+O/86Nw== 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)(396003)(136003)(346002)(376002)(39860400002)(230922051799003)(82310400011)(451199024)(1800799009)(186009)(64100799003)(36840700001)(40470700004)(46966006)(40460700003)(2906002)(316002)(6916009)(86362001)(36860700001)(2616005)(70586007)(7636003)(356005)(6666004)(70206006)(83380400001)(82740400003)(478600001)(426003)(40480700001)(4326008)(336012)(16526019)(1076003)(26005)(5660300002)(107886003)(47076005)(66574015)(36756003)(41300700001)(8676002)(8936002)(54906003)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 17:52:20.5728 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b11230a-b89c-4466-21bb-08dbd4b9f890 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: DS1PEPF00017098.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6964 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, };