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 2B44445DB9 for ; Wed, 27 Nov 2024 18:21:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 253C1402DE; Wed, 27 Nov 2024 18:21:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E28CA402DE for ; Wed, 27 Nov 2024 18:21:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O/Uzm/0ccAtK6QXWgRemlx+0LHkQP/3y1byjs1XlpIU=; b=OhYRXd2dy2BuB1lSpQHFl1QCnGlxCP/9/tKQSJGfYnKVKrAncersMRrb3JdVFC9aGHMm8H Lx3z/s5uE/1X667Eu7C6XaOhrkkujUIpW0GwFZQmDO0eDJlP27BsXW5e9olWN39ReR7JM1 59meHShQTJEQaEMJ3XRqtDiAMdD0UKk= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-TsAllcp4MrqJFlHQBGgutA-1; Wed, 27 Nov 2024 12:21:10 -0500 X-MC-Unique: TsAllcp4MrqJFlHQBGgutA-1 X-Mimecast-MFC-AGG-ID: TsAllcp4MrqJFlHQBGgutA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AC24D1955F42; Wed, 27 Nov 2024 17:21:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 20744300019E; Wed, 27 Nov 2024 17:21:05 +0000 (UTC) From: Kevin Traynor 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 21.11.9 Date: Wed, 27 Nov 2024 17:17:52 +0000 Message-ID: <20241127171916.690404-45-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: p8LIj_9vcTUhCyKu9bSabUkRms8Pz6O1PJsImRwtn10_1732728068 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 21.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 12/02/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/98dee27f649801afedf0c4a695093a9adc26c55a Thanks. Kevin --- >From 98dee27f649801afedf0c4a695093a9adc26c55a 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 [ 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 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 4e7f52881a..47b137a401 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -26,5 +26,4 @@ #include -#include typedef uint64_t u64; @@ -67,9 +66,4 @@ typedef uint64_t dma_addr_t; #define ENA_TOUCH(x) ((void)(x)) -/* 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 -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.703186636 +0000 +++ 0045-net-ena-revert-redefining-memcpy.patch 2024-11-27 17:17:38.218269337 +0000 @@ -1 +1 @@ -From 966764d003554b38e892cf18df9e9af44483036d Mon Sep 17 00:00:00 2001 +From 98dee27f649801afedf0c4a695093a9adc26c55a Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 966764d003554b38e892cf18df9e9af44483036d ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -23,2 +24,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 | 6 ------ + 1 file changed, 6 deletions(-) @@ -27 +28 @@ -index a41a4e4506..1121460470 100644 +index 4e7f52881a..47b137a401 100644 @@ -30 +31 @@ -@@ -27,5 +27,4 @@ +@@ -26,5 +26,4 @@ @@ -36 +37 @@ -@@ -69,11 +68,5 @@ typedef uint64_t dma_addr_t; +@@ -67,9 +66,4 @@ typedef uint64_t dma_addr_t; @@ -39,4 +40,2 @@ --/* 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) +-/* Avoid nested declaration on arm64, as it may define rte_memcpy as memcpy. */ +-#if defined(RTE_ARCH_X86) @@ -46 +44,0 @@ -+