[dpdk-stable] patch 'net/ena: switch memcpy to optimized version' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.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 06/12/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/0019c2b0283a89b53318e208a58b232e54bcda0e

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 0019c2b0283a89b53318e208a58b232e54bcda0e Mon Sep 17 00:00:00 2001
From: Igor Chauskin <igorch at amazon.com>
Date: Tue, 11 May 2021 08:45:36 +0200
Subject: [PATCH] net/ena: switch memcpy to optimized version

[ upstream commit 142778b3702a3acbe8efe2efc17722bfc1a7393d ]

memcpy is now mapped to rte_memcpy macro on x86 architectures.

Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")

Signed-off-by: Igor Chauskin <igorch at amazon.com>
Reviewed-by: Michal Krawczyk <mk at semihalf.com>
Reviewed-by: Artur Rojek <ar at semihalf.com>
---
 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 9773be09e7..58767fdf30 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -24,6 +24,7 @@
 #include <rte_spinlock.h>
 
 #include <sys/time.h>
+#include <rte_memcpy.h>
 
 typedef uint64_t u64;
 typedef uint32_t u32;
@@ -59,7 +60,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.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-10 14:04:58.650338989 +0200
+++ 0012-net-ena-switch-memcpy-to-optimized-version.patch	2021-06-10 14:04:58.018024288 +0200
@@ -1 +1 @@
-From 142778b3702a3acbe8efe2efc17722bfc1a7393d Mon Sep 17 00:00:00 2001
+From 0019c2b0283a89b53318e208a58b232e54bcda0e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 142778b3702a3acbe8efe2efc17722bfc1a7393d ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -15,3 +16,2 @@
- 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(-)
+ drivers/net/ena/base/ena_plat_dpdk.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
@@ -19,18 +18,0 @@
-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:
@@ -38 +20 @@
-index a1d749f83f..ae68f860a5 100644
+index 9773be09e7..58767fdf30 100644
@@ -41 +23 @@
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
@@ -49 +31 @@
-@@ -62,7 +63,11 @@ typedef uint64_t dma_addr_t;
+@@ -59,7 +60,11 @@ typedef uint64_t dma_addr_t;