From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5DCB3A0C3F for ; Sat, 12 Jun 2021 01:15:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54A3B4003F; Sat, 12 Jun 2021 01:15:06 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2051.outbound.protection.outlook.com [40.107.96.51]) by mails.dpdk.org (Postfix) with ESMTP id B7F7940DDB for ; Sat, 12 Jun 2021 01:15:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cv7EgUM0ML103wFnsJw7jDIjch7eeyUt7G+nQNxmUMSbz0HRQjX2f3T4dHmPU/dV59XBjogcoiT3nHaJJGgvNWnDOeBOV1wqVuo2Ccx7yQj00OUwzoZEYw9kUR91nd4lD+Bf6OKQ4PhWJMnF7Wp4tbDeT434g6ARk3VJdeS2GcgYrWl1adLkwmQZVJcZSRriOS+ihhGfzfHeCYKJhyCtPo+jkcptgtF9gsPBAQH84ihY9/oaWR1N7jT/bGy6RELlWmwUwIUwX0SGskfBeFH+MEfavxTMMkrFjAHWy2SSbajGUfwDJRv9LHBaSJrg1lRQnJq7aD2gakZqNMyXuB2K0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kScsmeZD+IWgvJK3lKwrQ7dnmgHoKEIkT4eryLgCauc=; b=D2DnSsoqsPV4160aW2CyvJRDlyaKOT0KboIQIxLaHRAG5PFnHAEeu2y6ok+sL79x3NRZRpNwZtCbyBhffNnJa0K0Nkj8mUxxrcQb6op9zbs+BFEd58XmoJY9ihyohDlOHi0/svWqoY/wobsHKlJ0jshc4aR8dT/MG1lAGQSigRbrwFZ5p/+IuE9UaamRnCK4D9AbWUnf+OdS1ZOCSdVxlozGSmJJ38VFjHPvfVby5kLBSgqWb/1C3V8TrOMn9vKDiDGi854qLEVz3Ix+YxgtPJJrKZF4jDErwMcv6u4Pm4zH5EH44nor1/6DZGYBPtIGqb0kLWlk5h3hxRxWTCDZHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=semihalf.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kScsmeZD+IWgvJK3lKwrQ7dnmgHoKEIkT4eryLgCauc=; b=s+2Y9kec55FkVpHKBJZ/FedjgIUzg5ws2eglaQkuBO+4BoWPWEGUMmbn5Jtdq4d+EtM2yZedKDTfvZORhI8la20+z3a+e1kRu9oNuHzcUfyPgqOlNNyJdl440ADKEbTZ9dwO+T/7ngPFNjk59TH7f5hvzSplEGWq/Vc90McfKvsGEP+YA0m3Y3cqV9hrjM5yC5t3mGC8vlrru9BuzLYQ4aMUjbph03lHOOhIQ0pk9d8MgbxmAxoqtaSequ3F5g0+4A94rpvZkhwVpBFkbB1xjD1ku3BPGZKIpTZUVB1gQORcLFTvwxTh3Tymhibc4bt3Xqf8tN2dJ2aOYSeAerURQw== Received: from BN1PR14CA0003.namprd14.prod.outlook.com (2603:10b6:408:e3::8) by CY4PR12MB1126.namprd12.prod.outlook.com (2603:10b6:903:3d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.23; Fri, 11 Jun 2021 23:15:03 +0000 Received: from BN8NAM11FT020.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e3:cafe::17) by BN1PR14CA0003.outlook.office365.com (2603:10b6:408:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:15:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; semihalf.com; dkim=none (message not signed) header.d=none;semihalf.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT020.mail.protection.outlook.com (10.13.176.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:15:02 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:15:00 +0000 From: Xueming Li To: Igor Chauskin CC: Luca Boccassi , Michal Krawczyk , Artur Rojek , dpdk stable Date: Sat, 12 Jun 2021 07:03:23 +0800 Message-ID: <20210611230433.8208-109-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08381815-bfaa-4b0d-f139-08d92d2ebe18 X-MS-TrafficTypeDiagnostic: CY4PR12MB1126: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Kp8WYhJavxM9VBaP7vYEdEKH9tpmzsydg//uSlT5WX3yfbrGRBX0CEXGms68Lwav3s/9ECb0edCGmyKBG6Q/Vlwc40Hw59ApcfCgu6ZW+wvsk6GiIkdl8LWZ4xMzpmmo7iYx8mMRdfOvDD3xFZwVevXV5UzW1XNSEkPRPjCVtpP8O8PAglKIJwAT8Nh/TpTltUUdEy9MHlVfXGVMSrDkJsABl1QNHnuWs/evximQFFe5D6M2gnOJaj5lnNHu8hxpjAVdQmpYgM+YWY0JuJ9pvs8TZbbf+iOxPr4gGGtIkqr/kUK3uy5onqAvO1vwC1pBEQsSRjeUjNzavQYnrgK5Tui/1JmqAVVmX2MgI+4CDEYz7lr+2SbTY8Xp7uWwMIGtVXKvgM3riTRG6hJinkslL2+Z49bknANFwba4rUvHlKTfvu736Cw/AAeOSIBFpSdHeVjmJhFEbsbNgAP0wlW69KRTeTRwXNbVkFiya9NdcdqjvpstBwnM5yM5qvUysAgaVWHAnpQgU8eza0cw/byfLVvkNsRmNUvP3zbPO+iUv32a3ORds2qghw2X8UlZSDtNI2DTMl2o+1AVQDj9f0Xv/d/VNBPFt8D7Mv1TutSOtlLtzwQ1mbH4wjMny+fX+8l+rIlgcf5Va9Wjb4Oxzl/jKmfGxUuo39/kpd0tlYHTotMyTS6rVg0w9WLB5ioetyz7X4owe50zhLIbFPEMaQn5nPxbMLg01DR67zaMfe2+nxlZm3/zEz1gAaUuyl6waW1KZ2f0IO+4/hFEREa693yrAbVfX3dOu9ucPof5IgCHBTSuasFT1QtYQeSZkGJyrfJI X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(346002)(39860400002)(136003)(396003)(36840700001)(46966006)(83380400001)(6286002)(82310400003)(55016002)(47076005)(1076003)(356005)(36860700001)(53546011)(6666004)(36906005)(2616005)(316002)(5660300002)(4326008)(8676002)(70206006)(7636003)(6916009)(966005)(2906002)(82740400003)(54906003)(186003)(26005)(86362001)(70586007)(426003)(7696005)(478600001)(336012)(8936002)(36756003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:15:02.8967 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08381815-bfaa-4b0d-f139-08d92d2ebe18 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT020.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1126 Subject: [dpdk-stable] patch 'net/ena: switch memcpy to optimized version' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 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/14/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/70f1f80edb6720fe3f836a84b5782a4f931f78fc Thanks. Xueming Li --- >From 70f1f80edb6720fe3f836a84b5782a4f931f78fc 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 Cc: Luca Boccassi [ 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 Reviewed-by: Michal Krawczyk Reviewed-by: Artur Rojek --- 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 #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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.406561600 +0800 +++ 0109-net-ena-switch-memcpy-to-optimized-version.patch 2021-06-12 06:53:56.470000000 +0800 @@ -1 +1 @@ -From 142778b3702a3acbe8efe2efc17722bfc1a7393d Mon Sep 17 00:00:00 2001 +From 70f1f80edb6720fe3f836a84b5782a4f931f78fc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 142778b3702a3acbe8efe2efc17722bfc1a7393d ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -15,3 +17,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 +19,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: