[dpdk-dev] [PATCH v2 01/22] net/ena: switch memcpy to dpdk-optimized version
From: Michal Krawczyk <hidden>
Date: 2021-05-05 07:34:07
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Igor Chauskin <redacted>
memcpy is now mapped to rte_memcpy macro on x86 architectures.
Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")
Cc: stable@dpdk.org
Signed-off-by: Igor Chauskin <redacted>
Reviewed-by: Michal Krawczyk <redacted>
Reviewed-by: Artur Rojek <redacted>
---
v2:
* Fix nested declaration of the rte_memcpy on arm64 architecture.
drivers/net/ena/base/ena_plat_dpdk.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index a1d749f83f..ae68f860a5 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h@@ -25,6 +25,7 @@ #include <rte_spinlock.h> #include <sys/time.h> +#include <rte_memcpy.h> typedef uint64_t u64; typedef uint32_t u32;
@@ -62,7 +63,11 @@ typedef uint64_t dma_addr_t; #define ENA_UDELAY(x) rte_delay_us_block(x) #define ENA_TOUCH(x) ((void)(x)) -#define memcpy_toio memcpy +/* 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 #define mb rte_mb
--
2.25.1