From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 5A739A0C41;
	Tue, 11 May 2021 08:46:19 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id 68EFC410F8;
	Tue, 11 May 2021 08:46:13 +0200 (CEST)
Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com
 [209.85.208.177])
 by mails.dpdk.org (Postfix) with ESMTP id 3221D4003C
 for <dev@dpdk.org>; Tue, 11 May 2021 08:46:12 +0200 (CEST)
Received: by mail-lj1-f177.google.com with SMTP id b7so23792114ljr.4
 for <dev@dpdk.org>; Mon, 10 May 2021 23:46:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=semihalf-com.20150623.gappssmtp.com; s=20150623;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=sFwQ2RSaTGKmeOqIbvTkmwVCc5/gQtcuqRtbe3pg/M8=;
 b=U44bAW7Sc+t/6jKHcy1xsIUHGSaLp6TroZ6R/uhfcqr2WkA/gwSiG9Ay0k/f/pcpyK
 IBiCM+LxQ9Joi5BWacwAmuwqvG14Inirke9rho+unPdBo4TxB3Pc2k9m9gEF4siUjo7C
 EY6YLJbCYIa+YY6pS0FTVosa/WiDQBvSdveForBoVy4pgVupAfbDh8U2Z74W+n9egHMa
 kld6ro2jMFTEl/OPmDiBzGdGQkPkWX0gwkkYcwVeouD6gMoSYKZAROeqmRY9UqlxCG7R
 hUPCPnvlxiwy0QZS+c/sdUToRQkd9LUC77UTKWFG2pFXLs4JUVqsW3/nULTauYADUwdV
 EWfQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=sFwQ2RSaTGKmeOqIbvTkmwVCc5/gQtcuqRtbe3pg/M8=;
 b=G+NDDp3DsdJXAZ7Kxvl2aC6BsLmU8oKiiJwqBWjeKrzP/u0ap2XjOFr++tN8JowmB0
 0Cl1Bzl6PWoKGXnlIVK+5oQKCtlbJ0AB6iyuM6c+uvhyZLJUzyvg/cbrYg6nLBzTuJ5u
 M9DGXe4zZ5rFGmkOyGyiFulYuKIRmZibBG6vlofHHVMiDryEx8lEeK75On6mJo/95Oa/
 cLWzXKbiKVhxaYj8fNAfpc/CNmAMYi0Z+hr/O4Mg+cVcZqJ6ivUOCcaWIVUU2pMVzY5d
 WiE3ki4tiAExwkOXTbksWqdcTMT1b9nKAoX7R6UcU7W7n1WHSuv/ANwnOIb1ESNY/BPA
 y98Q==
X-Gm-Message-State: AOAM5314ma/yQU7I/99ZfmrWeDJGPJcJ0Z/z7rqIMvlMFdnwCpDEj7pS
 Dr43MEXDjFSQlPutVMAITChPEw==
X-Google-Smtp-Source: ABdhPJwJFVllba6wq5Js8jDyriiX6ytxgLSz8UUPoCzVrCoKSyoORIplDNcT/BNa6MqgzXC0t/56rA==
X-Received: by 2002:a2e:8903:: with SMTP id d3mr7167125lji.373.1620715571761; 
 Mon, 10 May 2021 23:46:11 -0700 (PDT)
Received: from DESKTOP-U5LNN3J.localdomain (89-79-189-199.dynamic.chello.pl.
 [89.79.189.199])
 by smtp.gmail.com with ESMTPSA id v20sm2496776lfd.92.2021.05.10.23.46.10
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 10 May 2021 23:46:11 -0700 (PDT)
From: Michal Krawczyk <mk@semihalf.com>
To: ferruh.yigit@intel.com
Cc: dev@dpdk.org, 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>
Date: Tue, 11 May 2021 08:45:36 +0200
Message-Id: <20210511064554.10656-2-mk@semihalf.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210511064554.10656-1-mk@semihalf.com>
References: <87e65a42-4ae5-1a81-8f8e-74759fc14999@intel.com>
 <20210511064554.10656-1-mk@semihalf.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v4 01/19] net/ena: switch memcpy to
 dpdk-optimized version
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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>
---
v4:
* Add release notes

v2:
* Fix nested declaration of the rte_memcpy on arm64 architecture.

 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..eb1107729a 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -202,6 +202,13 @@ New Features
 
   Added packed ring support for async vhost.
 
+* **Updated Amazon ENA PMD.**
+
+  The new driver version (v2.3.0) introduces bug fixes and improvements,
+  including:
+
+  * Changed memcpy mapping to the dpdk-optimized version.
+
 * **Added support of multiple data-units in cryptodev API.**
 
   The cryptodev library has been enhanced to allow operations on multiple
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