patch 'eal/x86: drop export of internal alignment macro' has been queued to stable release 20.11.6

Xueming Li xuemingl at nvidia.com
Wed Jul 20 10:20:33 CEST 2022


Hi,

FYI, your patch has been queued to stable release 20.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/22/22. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/10cdabfc105d755bbc5fcab507fb807c2024dd21

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 10cdabfc105d755bbc5fcab507fb807c2024dd21 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 21 Jun 2022 16:13:25 +0200
Subject: [PATCH] eal/x86: drop export of internal alignment macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d ]

ALIGNMENT_MASK is only used internally.
Besides it lacks a DPDK-related prefix.
Hide it from external eyes.

Fixes: f5472703c0bd ("eal: optimize aligned memcpy on x86")

Reported-by: Morten Brørup <mb at smartsharesystems.com>
Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/x86/include/rte_memcpy.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/librte_eal/x86/include/rte_memcpy.h
index 18aa4e43a7..b678b5c942 100644
--- a/lib/librte_eal/x86/include/rte_memcpy.h
+++ b/lib/librte_eal/x86/include/rte_memcpy.h
@@ -851,6 +851,8 @@ rte_memcpy(void *dst, const void *src, size_t n)
 		return rte_memcpy_generic(dst, src, n);
 }
 
+#undef ALIGNMENT_MASK
+
 #if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 100000)
 #pragma GCC diagnostic pop
 #endif
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-20 15:00:59.004076628 +0800
+++ 0004-eal-x86-drop-export-of-internal-alignment-macro.patch	2022-07-20 15:00:58.641000610 +0800
@@ -1 +1 @@
-From 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d Mon Sep 17 00:00:00 2001
+From 10cdabfc105d755bbc5fcab507fb807c2024dd21 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
- lib/eal/x86/include/rte_memcpy.h | 2 ++
+ lib/librte_eal/x86/include/rte_memcpy.h | 2 ++
@@ -22 +24 @@
-diff --git a/lib/eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
+diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/librte_eal/x86/include/rte_memcpy.h
@@ -24,2 +26,2 @@
---- a/lib/eal/x86/include/rte_memcpy.h
-+++ b/lib/eal/x86/include/rte_memcpy.h
+--- a/lib/librte_eal/x86/include/rte_memcpy.h
++++ b/lib/librte_eal/x86/include/rte_memcpy.h


More information about the stable mailing list