From: Michal Krawczyk <mk@semihalf.com>
To: dev@dpdk.org
Cc: ndagan@amazon.com, gtzalik@amazon.com, igorch@amazon.com,
upstream@semihalf.com, stable@dpdk.org,
Michal Krawczyk <mk@semihalf.com>, Artur Rojek <ar@semihalf.com>
Subject: [dpdk-stable] [PATCH v3 01/22] net/ena: switch memcpy to dpdk-optimized version
Date: Thu, 6 May 2021 16:25:05 +0200 [thread overview]
Message-ID: <20210506142526.28245-2-mk@semihalf.com> (raw)
In-Reply-To: <20210506142526.28245-1-mk@semihalf.com>
From: Igor Chauskin <igorch@amazon.com>
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 <igorch@amazon.com>
Reviewed-by: Michal Krawczyk <mk@semihalf.com>
Reviewed-by: Artur Rojek <ar@semihalf.com>
---
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
next prev parent reply other threads:[~2021-05-06 14:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210430125725.28796-1-mk@semihalf.com>
2021-04-30 12:57 ` [dpdk-stable] [PATCH " Michal Krawczyk
2021-04-30 12:57 ` [dpdk-stable] [PATCH 12/22] net/ena: fix parsing of large_llq_hdr argument Michal Krawczyk
2021-04-30 12:57 ` [dpdk-stable] [PATCH 13/22] net/ena: terminate devargs allowed keys with NULL Michal Krawczyk
2021-04-30 12:57 ` [dpdk-stable] [PATCH 14/22] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-04-30 12:57 ` [dpdk-stable] [PATCH 21/22] net/ena: report default ring size Michal Krawczyk
[not found] ` <20210505073348.6394-1-mk@semihalf.com>
2021-05-05 7:33 ` [dpdk-stable] [PATCH v2 01/22] net/ena: switch memcpy to dpdk-optimized version Michal Krawczyk
2021-05-05 7:33 ` [dpdk-stable] [PATCH v2 12/22] net/ena: fix parsing of large_llq_hdr argument Michal Krawczyk
2021-05-05 7:33 ` [dpdk-stable] [PATCH v2 13/22] net/ena: terminate devargs allowed keys with NULL Michal Krawczyk
2021-05-05 7:33 ` [dpdk-stable] [PATCH v2 14/22] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-05-05 7:33 ` [dpdk-stable] [PATCH v2 21/22] net/ena: report default ring size Michal Krawczyk
[not found] ` <20210506142526.28245-1-mk@semihalf.com>
2021-05-06 14:25 ` Michal Krawczyk [this message]
2021-05-06 14:25 ` [dpdk-stable] [PATCH v3 12/22] net/ena: fix parsing of large_llq_hdr argument Michal Krawczyk
2021-05-06 14:25 ` [dpdk-stable] [PATCH v3 13/22] net/ena: terminate devargs allowed keys with NULL Michal Krawczyk
2021-05-07 16:47 ` Ferruh Yigit
2021-05-06 14:25 ` [dpdk-stable] [PATCH v3 14/22] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-05-07 16:47 ` Ferruh Yigit
2021-05-09 14:20 ` Michał Krawczyk
2021-05-06 14:25 ` [dpdk-stable] [PATCH v3 21/22] net/ena: report default ring size Michal Krawczyk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210506142526.28245-2-mk@semihalf.com \
--to=mk@semihalf.com \
--cc=ar@semihalf.com \
--cc=dev@dpdk.org \
--cc=gtzalik@amazon.com \
--cc=igorch@amazon.com \
--cc=ndagan@amazon.com \
--cc=stable@dpdk.org \
--cc=upstream@semihalf.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).