From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9B4D146364 for ; Fri, 7 Mar 2025 13:49:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93CD540E42; Fri, 7 Mar 2025 13:49:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 06D3440E49 for ; Fri, 7 Mar 2025 13:49:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DMWvQCPJ4LMQ+HBfJYXD5S/m7qcReqcus367WUBIMyo=; b=CMEEhXhBXiTP2Z7NKBSoiqk8gibmWOuxuy2i4ZNHwhnDT4oX5UO+Fqk9jKV72Bd6apVp0G fkhrSa/850UjF1KdoYIADzcn7OZ8YI3Tl5yX8dBKRySk6m02MVLU9K7Z8BhzfWpNIrkphy 1CPUPRALE2YUHthlq7zHeKVY5CX4A2Q= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-344-6_IDXpN1MfGgtrnqtGCyDg-1; Fri, 07 Mar 2025 07:48:32 -0500 X-MC-Unique: 6_IDXpN1MfGgtrnqtGCyDg-1 X-Mimecast-MFC-AGG-ID: 6_IDXpN1MfGgtrnqtGCyDg_1741351711 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7708719560B3; Fri, 7 Mar 2025 12:48:31 +0000 (UTC) Received: from rh.Home (unknown [10.45.226.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E23D01956095; Fri, 7 Mar 2025 12:48:29 +0000 (UTC) From: Kevin Traynor To: Alexander Kozyrev Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5/hws: fix fragmented packet type matching' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:46:59 +0000 Message-ID: <20250307124726.475001-26-ktraynor@redhat.com> In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com> References: <20250307124726.475001-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CKO6WeYj7TapujAQk0vCKlG8yMvXrcpan_l0DajG9M8_1741351711 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/12/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/6a821d8a7747958a6aee9db1e00d00b331ae390f Thanks. Kevin --- >From 6a821d8a7747958a6aee9db1e00d00b331ae390f Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 19 Dec 2024 18:05:49 +0200 Subject: [PATCH] net/mlx5/hws: fix fragmented packet type matching [ upstream commit 5782bb1a5902a498176cb2fd0903d7a97be1b01a ] Fragmented PTYPE matching requires setting the mask to the exact RTE_PTYPE_L4_FRAG value to avoid conflicts with other L4 types. Adding L2 or L3 types to the same mask should be allowed, but there is a check for the exact value for setting the definer. This prevents the fragmented packets from matching in case of L2/L3 mask is provided as well. Mask out L2/L3 types when setting L4_FRAG. Fixes: 761439a20f82 ("net/mlx5/hws: support fragmented packet type matching") Signed-off-by: Alexander Kozyrev Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_definer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index e6d3dbfa46..837e0c47bd 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -2206,5 +2206,5 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, * The exact value must be specified in the mask. */ - if (m->packet_type == RTE_PTYPE_L4_FRAG) { + if ((m->packet_type & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_FRAG) { fc = &cd->fc[DR_CALC_FNAME(PTYPE_FRAG, false)]; fc->item_idx = item_idx; @@ -2228,5 +2228,5 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, if (m->packet_type & RTE_PTYPE_INNER_L4_MASK) { - if (m->packet_type == RTE_PTYPE_INNER_L4_FRAG) { + if ((m->packet_type & RTE_PTYPE_INNER_L4_MASK) == RTE_PTYPE_INNER_L4_FRAG) { fc = &cd->fc[DR_CALC_FNAME(PTYPE_FRAG, true)]; fc->item_idx = item_idx; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:57.866236346 +0000 +++ 0026-net-mlx5-hws-fix-fragmented-packet-type-matching.patch 2025-03-07 11:02:56.878335733 +0000 @@ -1 +1 @@ -From 5782bb1a5902a498176cb2fd0903d7a97be1b01a Mon Sep 17 00:00:00 2001 +From 6a821d8a7747958a6aee9db1e00d00b331ae390f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5782bb1a5902a498176cb2fd0903d7a97be1b01a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org