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 767E045DB9 for ; Wed, 27 Nov 2024 18:21:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71CB04066C; Wed, 27 Nov 2024 18:21:57 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7E7904066C for ; Wed, 27 Nov 2024 18:21:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728116; 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=5YujQqWZUMC0KBhTI65EW1JTVL/UVll7Dh49umi+YbI=; b=YwYZKCHYSQ9IfL53NyYGzAkzLLDS//29HkZWs8fbRPwOG0oiR4EMjp/iDhWFLhKBqltsAC CDyAWb5pXxHhEL1xeSalKPzSx2z6Kqncst/D4N68mKVJPfBQ4l4FydseE2/9zNcJVGuFlH UMBKs1idditd4UhRirMmWrZ4YAaLSmA= Received: from mx-prod-mc-05.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-615-gN_8MOn1MAeexvMBvXRH_w-1; Wed, 27 Nov 2024 12:21:50 -0500 X-MC-Unique: gN_8MOn1MAeexvMBvXRH_w-1 X-Mimecast-MFC-AGG-ID: gN_8MOn1MAeexvMBvXRH_w Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 658111956095; Wed, 27 Nov 2024 17:21:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2BEBE300019E; Wed, 27 Nov 2024 17:21:47 +0000 (UTC) From: Kevin Traynor To: Viacheslav Ovsiienko Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix next protocol validation after flex item' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:12 +0000 Message-ID: <20241127171916.690404-65-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -V_d-N5VpdUVGVt5UwugCq0jN1vyyzmxeuNtAfl6RzA_1732728109 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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/3fa30c119ed3d8edbe4b6227b701516ff9a8ee3b Thanks. Kevin --- >From 3fa30c119ed3d8edbe4b6227b701516ff9a8ee3b Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 18 Sep 2024 16:46:21 +0300 Subject: [PATCH] net/mlx5: fix next protocol validation after flex item [ upstream commit 3847a3b192315491118eab9830e695eb2c9946e2 ] On the flow validation some items may check the preceding protocols. In case of flex item the next protocol is opaque (or can be multiple ones) we should set neutral value and allow successful validation, for example, for the combination of flex and following ESP items. Fixes: a23e9b6e3ee9 ("net/mlx5: handle flex item in flows") Signed-off-by: Viacheslav Ovsiienko Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index b54b4793cc..c83f4dc6ef 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7250,4 +7250,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, if (ret < 0) return ret; + /* Reset for next proto, it is unknown. */ + next_protocol = 0xff; break; default: -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:40.310003441 +0000 +++ 0065-net-mlx5-fix-next-protocol-validation-after-flex-ite.patch 2024-11-27 17:17:38.259269549 +0000 @@ -1 +1 @@ -From 3847a3b192315491118eab9830e695eb2c9946e2 Mon Sep 17 00:00:00 2001 +From 3fa30c119ed3d8edbe4b6227b701516ff9a8ee3b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3847a3b192315491118eab9830e695eb2c9946e2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index e8ca2b3ed6..4451b114ae 100644 +index b54b4793cc..c83f4dc6ef 100644 @@ -24 +25 @@ -@@ -8195,4 +8195,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7250,4 +7250,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -30 +31 @@ - case RTE_FLOW_ITEM_TYPE_METER_COLOR: + default: