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 E50CE45CE3 for ; Mon, 11 Nov 2024 07:37:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD61C4067A; Mon, 11 Nov 2024 07:37:14 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2066.outbound.protection.outlook.com [40.107.93.66]) by mails.dpdk.org (Postfix) with ESMTP id 7FE7C40E3E for ; Mon, 11 Nov 2024 07:37:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=J+d3v0parDVO7tszkZh+iCDx+8fKX/ENdMMOzbN0Yt28gYhzGvwtn47BypqZM8xzbaDQKhvH80y1WKeZ0HnSDC03gqzPTTD+ZlGBfdkiVhOzdoE2evhgBJ7BglFB9KphAilQroKdM93W2Qb0bXQ2pDP9dBP+aCvRGxtoB0BxgetDztqANAczht3vXNshVv2BxKE9h+xR1BkHm8I61I9y/EniZIJmW6NE64MSiymlnWUfMVLphdMlgzVjtJ0/Us6khixJh5AdA66fpYl+76HxStA2QMKAOT9At1buzT9TW+EY5RNoXTITkoMBwORXoClcvy6fk/h6pgaGlckahCdbpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6hNvOJM9JjSoGCCy1IVstG5sOIZRsdTGtum4OPNiBrM=; b=rBIm/1uP1gv+fyR3lIyusfGaCVoKq6xJ8FToe6RN+JyV4Crdja4bDECkbVuoydsZn3MvPu7zfDw4HWtt5SZTzFW1QFMggAQxbBLe9ZhRviLOW6xma7r+/R097/VoCYkn9BIsmgd1avpCRrLp/wWXCuJ22DOEYzYhGdXkg7gU/UGlftPCNDRGnWhXvJipcd3x8vTAw1pGotSFMBxV6XYUa8ZcP8xmD6wy+hH5E7R8XrA0yoQqN/KwweU9FX0NnetgX4L0QsRYzOj+imrPTrSS3lARUaXILtAt5S5/iPZUZeg9PHejGKHKmouECsf01jYzRUwVVAjImLl0ODRwkUd3xg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=6hNvOJM9JjSoGCCy1IVstG5sOIZRsdTGtum4OPNiBrM=; b=oPzcDcMdYFOM/AKoquknyXYly46mZbYKbauJyEswIPXI/zaLsYGFunWKtZ4MRYX+Z2uVv8GwEd9W5AUCPrTcymUd8XZ0WZ6N1lStsNH+vxn8c7QKstRzNHi7i05yqhvXQQQJYGUV9jx6yNc2fantDvn+L9I1nsYERXZFxKQUx7WCmHDkdH0LHabJ+jfNMPmDinE5UVWGloVoOTWqVeKV6dJ8tFMF037Wj1NnprYzpU8KGpkvMBcMgtY8sn/O9V1hSutB1qFmhgU4LDOv9qw5XZk5FP0tyUpE6FoXUyrN6O/P0kGu6FBSaTIIRLG0mH54jem2hxV2FylM3UvOmXSoXA== Received: from BN0PR04CA0152.namprd04.prod.outlook.com (2603:10b6:408:eb::7) by SA1PR12MB8644.namprd12.prod.outlook.com (2603:10b6:806:384::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.25; Mon, 11 Nov 2024 06:37:10 +0000 Received: from BN2PEPF000044AC.namprd04.prod.outlook.com (2603:10b6:408:eb:cafe::b9) by BN0PR04CA0152.outlook.office365.com (2603:10b6:408:eb::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 06:37:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN2PEPF000044AC.mail.protection.outlook.com (10.167.243.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:37:09 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:37:00 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:36:57 -0800 From: Xueming Li To: Stephen Hemminger CC: , Wathsala Vithanage , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Tyler Retzlaff , Shai Brandes , "dpdk stable" Subject: patch 'net/ena: revert redefining memcpy' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:05 +0800 Message-ID: <20241111062847.216344-80-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044AC:EE_|SA1PR12MB8644:EE_ X-MS-Office365-Filtering-Correlation-Id: b40df91d-3d71-4111-79b9-08dd021b44de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WGdLbmRZZVdnQW9DNm1xNDhkOVE3aVpXR01peHdXaFkvUFlZdlUxc0pqckVi?= =?utf-8?B?NnBEN1dTdG9HNUtrQXYvTFE2R3VDZ3BYL1pxR0lFWnJTZEE3SWM4ZkhITDZ0?= =?utf-8?B?YWxROGtlcW9mVEVBeGdSSTQyVkxEY2paWUNaYzZqbzluRXk4RjFZay81dkFN?= =?utf-8?B?QVk5QXdFYjdoWXhiQS8xaU1jTjFzUFJQTEhhZEtOMm16UGgxdGE5TGNZSjd0?= =?utf-8?B?ZFBqTHpOUURnbExYRXZlRi96Nk1nemE3MTljSC82OUFvYTNVdW9YNnUvWjV6?= =?utf-8?B?ZWhMdXhUbE5PVEtQcUM1VjY3eUh3Nit1UkYxckVJWmthVG4xWGtMYUI5alBX?= =?utf-8?B?Y1dTQSs2bTZ0SVVsSGZZdSsrYWN4a0xObHVWUmFKZHQ5bjhuWEJEUWJhKzh3?= =?utf-8?B?TG84RUpOQXAzYzNGT3g5WDRYZDRqejQ3T2IyRE8zQWd0cUFNSjAwVjE0Lysy?= =?utf-8?B?T1BsQ1AzYjh5MndNNThwODlpbEQwOFJxSG4wSEMzOWpBYkJ0SWM3UmY1QmxW?= =?utf-8?B?dGlOUVZNem1VbmFvZXRrcjdzYnd4bG0vVm12U0E3d0NMNGwzV2RRTEo0bG1B?= =?utf-8?B?VmM2SEpneW0zU3plTk0vYkEzbmc1YmxDL0lxdzMrNzlvVXBhTWhROVAzczFI?= =?utf-8?B?bExWMVJyZGVBNE82QVF0Mjc4WFNjbzNnS2theXB4c1AxUmxQRUdLUW9lbXVQ?= =?utf-8?B?SVJPYzhkRXZobm1kWkpMV0R0RFNDT0pFcVpNOXNrVzVIZWlDak5JdUFSQWJJ?= =?utf-8?B?Q1JXdkt2eWQ2SllNanUyanZUUGVJN2o2ejV5UEkyaGRmeTVXUmF2MnN2aFhS?= =?utf-8?B?Wi9OeThTa3IzWE43VGJNTFRuWWNyMU1hNnpvdUlGeW9pN2lTeXRJTjVuNS9B?= =?utf-8?B?UitUMmVlK3BnVmk2bkcxOWtWdXRPVXhGRkJyeGwxS0ZIT1dQNTVzSCtxeURQ?= =?utf-8?B?SkxPSFRsOENaK25zbWJwa1F5YUFnWVd5aS8zZUxEcEpka01wd3Zwa1FsWXkz?= =?utf-8?B?YVdyRktxY0Yzdkk0cTBMV09IZ0YxdVhUSDJCa01CaFg4MlNxWVg2TFNnRlY4?= =?utf-8?B?elZiZ3ZoVGNNYmdEc1JWYUxqSnNoc2x2dTRuakVzWmM2dFBma3VQdlZOZWZi?= =?utf-8?B?QmNmODJVUzFmQ3pwQXFvWkF4ZkdBYnVFYisyK1MzeHZ0YnBrcjB0V2EzczNt?= =?utf-8?B?dWkza0JlV245Z0oxYk5jeHNXTFN0Y3FpRmdzbFQrcWdmQTlTN2RSdUl3MUFi?= =?utf-8?B?MlZ6TWhJb1hsMHJBU21RTEFzMzVuSVlySExZMDl5bm9lZFNmVWFOS3hqMGZ5?= =?utf-8?B?L3ZsUC9zaExFNW1pUHNMYzNodFYrTFN1Zk12emxRRC9KZnFvNEVWOGRDK3dL?= =?utf-8?B?WXlkekJPNDQxMGIvZ210RFJlRGNKcUo0cnlJUWs1cWFCbHhaWEFrdVhDTVpr?= =?utf-8?B?WHRLRmlNcWZnUTN5RGJoY3VPMFA5WGQ1VWJzelpUV2xFL2p1cWl2Qm1mOWxG?= =?utf-8?B?c0hGdnNwcVQ3OVpIUFVXN2ozN2h5U1Z3cG1sYnUraElmUzl5QUs0RStyMXQz?= =?utf-8?B?NVBINkdBNUVWckJnSFJkaUYrWFdOSmxsNWhGWUZBR0xRZU9hTGxwTi9OM1hj?= =?utf-8?B?MGd3aTdRcFR6c2VZakx6RE5qdkZjSlZTSEcwNWRCUFR4dlNSc1lsc1RPNDZS?= =?utf-8?B?d0k5YTk4UmpvMHNUWExMbURzZWFBcko4QnZBeHI4c0dBd1RoYk9LdFVrN1Zy?= =?utf-8?B?YTZLQjhLaW1kSXFpanNQbUp1NzNkbDQ1RUhrd2RXcXJxRkE1NCtrVzRjNjZR?= =?utf-8?B?bStEZnVUYlhKYXJQUUNHd09DeEdCQXlyOG1YSHpLZE9hNHRlNUxjTU1lUDBU?= =?utf-8?B?ZWc2ZTgvaDU3bmw5Ty95RFd0Y09zbmJnNENoOXhNa3VtQ2c9PQ==?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:37:09.7250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b40df91d-3d71-4111-79b9-08dd021b44de X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044AC.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8644 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 Hi, FYI, your patch has been queued to stable release 23.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=ac6feb7694793f1d084c443a5788725e0bb9630e Thanks. Xueming Li --- >From ac6feb7694793f1d084c443a5788725e0bb9630e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 12 Aug 2024 08:34:17 -0700 Subject: [PATCH] net/ena: revert redefining memcpy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 966764d003554b38e892cf18df9e9af44483036d ] Redefining memcpy as rte_memcpy has no performance gain on current compilers, and introduced bugs like this one where rte_memcpy() will be detected as referencing past the destination. Bugzilla ID: 1510 Fixes: 142778b3702a ("net/ena: switch memcpy to optimized version") Signed-off-by: Stephen Hemminger Acked-by: Wathsala Vithanage Acked-by: Morten Brørup Acked-by: Tyler Retzlaff Acked-by: Shai Brandes --- drivers/net/ena/base/ena_plat_dpdk.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 665ac2f0cc..ba4a525898 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -26,7 +26,6 @@ #include #include -#include typedef uint64_t u64; typedef uint32_t u32; @@ -70,14 +69,7 @@ typedef uint64_t dma_addr_t; #define ENA_UDELAY(x) rte_delay_us_block(x) #define ENA_TOUCH(x) ((void)(x)) -/* Redefine memcpy with caution: rte_memcpy can be simply aliased to memcpy, so - * make the redefinition only if it's safe (and beneficial) to do so. - */ -#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64_MEMCPY) || \ - defined(RTE_ARCH_ARM_NEON_MEMCPY) -#undef memcpy -#define memcpy rte_memcpy -#endif + #define wmb rte_wmb #define rmb rte_rmb #define mb rte_mb -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:08.821629465 +0800 +++ 0079-net-ena-revert-redefining-memcpy.patch 2024-11-11 14:23:05.202192838 +0800 @@ -1 +1 @@ -From 966764d003554b38e892cf18df9e9af44483036d Mon Sep 17 00:00:00 2001 +From ac6feb7694793f1d084c443a5788725e0bb9630e Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 966764d003554b38e892cf18df9e9af44483036d ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -23,2 +25,2 @@ - drivers/net/ena/base/ena_plat_dpdk.h | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) + drivers/net/ena/base/ena_plat_dpdk.h | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) @@ -27 +29 @@ -index a41a4e4506..1121460470 100644 +index 665ac2f0cc..ba4a525898 100644 @@ -38 +40 @@ -@@ -68,13 +67,7 @@ typedef uint64_t dma_addr_t; +@@ -70,14 +69,7 @@ typedef uint64_t dma_addr_t; @@ -45 +47,2 @@ --#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64_MEMCPY) || defined(RTE_ARCH_ARM_NEON_MEMCPY) +-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64_MEMCPY) || \ +- defined(RTE_ARCH_ARM_NEON_MEMCPY)