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 D282E43DF8 for ; Thu, 4 Apr 2024 11:52:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C99DE402E9; Thu, 4 Apr 2024 11:52:40 +0200 (CEST) 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 A52F6402D8 for ; Thu, 4 Apr 2024 11:52:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712224359; 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=y0Te5YiI8Ded4xunebUiuJHkgAsVG4pLI8Eq31bWvVI=; b=eedetXpblCvx2Fj3Wol7ykCiI480AzFqWVV/uRkVj2hPCsXWm1IpgR2oSJWqYo2pnASU0d NNVRkmkIXXawJ9upW5LeiSUDMUtZk1O8BEnk21twyUjDSdWZfRBOBEAW3HTGkUZ+73QfJW qAeMtsCfKYagZI26tVnBWChAS/HKb3g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-225-YWLRWD9FMzKW5w0OCLb_Pg-1; Thu, 04 Apr 2024 05:52:37 -0400 X-MC-Unique: YWLRWD9FMzKW5w0OCLb_Pg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D786285A5B9; Thu, 4 Apr 2024 09:52:36 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3571C4890; Thu, 4 Apr 2024 09:52:35 +0000 (UTC) From: Kevin Traynor To: =?UTF-8?q?Morten=20Br=C3=B8rup?= Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix warning about copy length' has been queued to stable release 21.11.7 Date: Thu, 4 Apr 2024 10:51:42 +0100 Message-ID: <20240404095155.155427-12-ktraynor@redhat.com> In-Reply-To: <20240404095155.155427-1-ktraynor@redhat.com> References: <20240404095155.155427-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/09/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/307a7cc705b9a907a227c68933e64e7e546b310c Thanks. Kevin --- >From 307a7cc705b9a907a227c68933e64e7e546b310c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Br=C3=B8rup?= Date: Mon, 16 Jan 2023 14:07:23 +0100 Subject: [PATCH] net/mlx5: fix warning about copy length MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit c19580fb8e9ad6f153d46f731ec7cd2050b3021b ] Use RTE_PTR_ADD where copying to the offset of a field in a structure holding multiple fields, to avoid compiler warnings with decorated rte_memcpy. Fixes: 16a7dbc4f690 ("net/mlx5: make flow modify action list thread safe") Signed-off-by: Morten Brørup Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 1bf9517638..7a3e7ef96f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -5465,5 +5465,5 @@ flow_dv_modify_create_cb(void *tool_ctx, void *cb_ctx) return NULL; } - rte_memcpy(&entry->ft_type, + rte_memcpy(RTE_PTR_ADD(entry, offsetof(typeof(*entry), ft_type)), RTE_PTR_ADD(ref, offsetof(typeof(*ref), ft_type)), key_len + data_len); -- 2.44.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-04 10:49:34.319861495 +0100 +++ 0012-net-mlx5-fix-warning-about-copy-length.patch 2024-04-04 10:49:33.752457743 +0100 @@ -1 +1 @@ -From c19580fb8e9ad6f153d46f731ec7cd2050b3021b Mon Sep 17 00:00:00 2001 +From 307a7cc705b9a907a227c68933e64e7e546b310c Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit c19580fb8e9ad6f153d46f731ec7cd2050b3021b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 4badde1a9a..d434c678c8 100644 +index 1bf9517638..7a3e7ef96f 100644 @@ -26 +27 @@ -@@ -6206,5 +6206,5 @@ flow_dv_modify_create_cb(void *tool_ctx, void *cb_ctx) +@@ -5465,5 +5465,5 @@ flow_dv_modify_create_cb(void *tool_ctx, void *cb_ctx)