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 72E3745804 for ; Fri, 23 Aug 2024 18:24:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CB094339D; Fri, 23 Aug 2024 18:24:03 +0200 (CEST) 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 E28DC4336D for ; Fri, 23 Aug 2024 18:24:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430241; 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=EtQ9ScL6HEgJLotCF46UGq/j9LiyY0hMTZFS9fwAPPM=; b=cBlkIbqaq/XBZ8gtLANgCia0sAl8qyaZRpRRbtedGcd5noPFiIGKAblw/YhYyOMUJMJ/JT fYYgDbjg3i30cah16egqWmZqWg20jMt5979c4mrToawNzndLjU22RkkLlSZrQoQcskEOL8 sokwUrZQ7OOTCmgpl8LtESrl/BDEetY= Received: from mx-prod-mc-03.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-508-T4W1UbWaNw2_jaursd1oYQ-1; Fri, 23 Aug 2024 12:23:55 -0400 X-MC-Unique: T4W1UbWaNw2_jaursd1oYQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7FBAE1955D42; Fri, 23 Aug 2024 16:23:54 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0ADB31956053; Fri, 23 Aug 2024 16:23:52 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Ferruh Yigit , dpdk stable Subject: patch 'ethdev: fix GENEVE option item conversion' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:19:12 +0100 Message-ID: <20240823161929.1004778-124-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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/bff85ec3d12bd3e8afa238d1eb21867019f8ef04 Thanks. Kevin --- >From bff85ec3d12bd3e8afa238d1eb21867019f8ef04 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 15 Jul 2024 15:13:16 +0300 Subject: [PATCH] ethdev: fix GENEVE option item conversion [ upstream commit 841a0445442de154441ac2b4700658a9eb83c986 ] The "rte_flow_conv()" function, enables, among other things, to copy item list. For GENEVE option item, the function copies it without considering deep copy. It copies the "data" pointer without copying the pointed values. This patch adds deep copy for after regular copy. Fixes: 2b4c72b4d10d ("ethdev: introduce GENEVE header TLV option item") Signed-off-by: Michael Baum Acked-by: Ferruh Yigit --- lib/ethdev/rte_flow.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 2df4418aa9..a82dc48264 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -550,4 +550,5 @@ rte_flow_conv_item_spec(void *buf, const size_t size, union { const struct rte_flow_item_raw *raw; + const struct rte_flow_item_geneve_opt *geneve_opt; } spec; union { @@ -559,8 +560,11 @@ rte_flow_conv_item_spec(void *buf, const size_t size, union { const struct rte_flow_item_raw *raw; + const struct rte_flow_item_geneve_opt *geneve_opt; } src; union { struct rte_flow_item_raw *raw; + struct rte_flow_item_geneve_opt *geneve_opt; } dst; + void *deep_src; size_t tmp; @@ -591,11 +595,28 @@ rte_flow_conv_item_spec(void *buf, const size_t size, if (tmp) { off = RTE_ALIGN_CEIL(off, sizeof(*dst.raw->pattern)); - if (size >= off + tmp) - dst.raw->pattern = rte_memcpy - ((void *)((uintptr_t)dst.raw + off), - src.raw->pattern, tmp); + if (size >= off + tmp) { + deep_src = (void *)((uintptr_t)dst.raw + off); + dst.raw->pattern = rte_memcpy(deep_src, + src.raw->pattern, + tmp); + } off += tmp; } break; + case RTE_FLOW_ITEM_TYPE_GENEVE_OPT: + off = rte_flow_conv_copy(buf, data, size, + rte_flow_desc_item, item->type); + spec.geneve_opt = item->spec; + src.geneve_opt = data; + dst.geneve_opt = buf; + tmp = spec.geneve_opt->option_len << 2; + if (size > 0 && src.geneve_opt->data) { + deep_src = (void *)((uintptr_t)(dst.geneve_opt + 1)); + dst.geneve_opt->data = rte_memcpy(deep_src, + src.geneve_opt->data, + tmp); + } + off += tmp; + break; default: off = rte_flow_conv_copy(buf, data, size, -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:13.438141703 +0100 +++ 0124-ethdev-fix-GENEVE-option-item-conversion.patch 2024-08-23 17:18:09.886430685 +0100 @@ -1 +1 @@ -From 841a0445442de154441ac2b4700658a9eb83c986 Mon Sep 17 00:00:00 2001 +From bff85ec3d12bd3e8afa238d1eb21867019f8ef04 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 841a0445442de154441ac2b4700658a9eb83c986 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index ca2f85c3fa..4076ae4ee1 100644 +index 2df4418aa9..a82dc48264 100644 @@ -27 +28 @@ -@@ -624,4 +624,5 @@ rte_flow_conv_item_spec(void *buf, const size_t size, +@@ -550,4 +550,5 @@ rte_flow_conv_item_spec(void *buf, const size_t size, @@ -33 +34 @@ -@@ -633,8 +634,11 @@ rte_flow_conv_item_spec(void *buf, const size_t size, +@@ -559,8 +560,11 @@ rte_flow_conv_item_spec(void *buf, const size_t size, @@ -45 +46 @@ -@@ -665,11 +669,28 @@ rte_flow_conv_item_spec(void *buf, const size_t size, +@@ -591,11 +595,28 @@ rte_flow_conv_item_spec(void *buf, const size_t size,