patch 'net/ena: revert redefining memcpy' has been queued to stable release 21.11.9

[Kevin Traynor]

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/98dee27f649801afedf0c4a695093a9adc26c55a

Thanks.

Kevin

---
>From 98dee27f649801afedf0c4a695093a9adc26c55a Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Mon, 12 Aug 2024 08:34:17 -0700
Subject: [PATCH] net/ena: revert redefining memcpy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 966764d003554b38e892cf18df9e9af44483036d ]

Redefining memcpy as rte_memcpy has no performance gain on
current compilers, and introduced bugs like this one where
rte_memcpy() will be detected as referencing past the destination.

Bugzilla ID: 1510
Fixes: 142778b3702a ("net/ena: switch memcpy to optimized version")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Wathsala Vithanage <wathsala.vithanage at arm.com>
Acked-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
Acked-by: Shai Brandes <shaibran at amazon.com>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index 4e7f52881a..47b137a401 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -26,5 +26,4 @@
 
 #include <sys/time.h>
-#include <rte_memcpy.h>
 
 typedef uint64_t u64;
@@ -67,9 +66,4 @@ typedef uint64_t dma_addr_t;
 
 #define ENA_TOUCH(x) ((void)(x))
-/* Avoid nested declaration on arm64, as it may define rte_memcpy as memcpy. */
-#if defined(RTE_ARCH_X86)
-#undef memcpy
-#define memcpy rte_memcpy
-#endif
 #define wmb rte_wmb
 #define rmb rte_rmb
-- 
2.47.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-27 17:17:39.703186636 +0000
+++ 0045-net-ena-revert-redefining-memcpy.patch	2024-11-27 17:17:38.218269337 +0000
@@ -1 +1 @@
-From 966764d003554b38e892cf18df9e9af44483036d Mon Sep 17 00:00:00 2001
+From 98dee27f649801afedf0c4a695093a9adc26c55a Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 966764d003554b38e892cf18df9e9af44483036d ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -23,2 +24,2 @@
- drivers/net/ena/base/ena_plat_dpdk.h | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
+ drivers/net/ena/base/ena_plat_dpdk.h | 6 ------
+ 1 file changed, 6 deletions(-)
@@ -27 +28 @@
-index a41a4e4506..1121460470 100644
+index 4e7f52881a..47b137a401 100644
@@ -30 +31 @@
-@@ -27,5 +27,4 @@
+@@ -26,5 +26,4 @@
@@ -36 +37 @@
-@@ -69,11 +68,5 @@ typedef uint64_t dma_addr_t;
+@@ -67,9 +66,4 @@ typedef uint64_t dma_addr_t;
@@ -39,4 +40,2 @@
--/* Redefine memcpy with caution: rte_memcpy can be simply aliased to memcpy, so
-- * make the redefinition only if it's safe (and beneficial) to do so.
-- */
--#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64_MEMCPY) || defined(RTE_ARCH_ARM_NEON_MEMCPY)
+-/* Avoid nested declaration on arm64, as it may define rte_memcpy as memcpy. */
+-#if defined(RTE_ARCH_X86)
@@ -46 +44,0 @@
-+