From 142778b3702a3acbe8efe2efc17722bfc1a7393d Mon Sep 17 00:00:00 2001 From: Igor Chauskin Date: Tue, 11 May 2021 08:45:36 +0200 Subject: [PATCH] net/ena: switch memcpy to optimized version 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 Reviewed-by: Michal Krawczyk Reviewed-by: Artur Rojek --- doc/guides/rel_notes/release_21_05.rst | 7 +++++++ drivers/net/ena/base/ena_plat_dpdk.h | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst index 30dec1c1d1..d054b10793 100644 --- a/doc/guides/rel_notes/release_21_05.rst +++ b/doc/guides/rel_notes/release_21_05.rst @@ -111,6 +111,13 @@ New Features * Added conntrack item and action for stateful connection offload. +* **Updated Amazon ENA PMD.** + + The new driver version (v2.3.0) introduced bug fixes and improvements, + including: + + * Changed memcpy mapping to the dpdk-optimized version. + * **Updated Arkville PMD driver.** Updated Arkville net driver with new features and improvements, including: 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 #include +#include 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.20.1