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 DD9B945BB6 for ; Wed, 23 Oct 2024 23:20:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9212432E4; Wed, 23 Oct 2024 23:20:20 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id AD3CD40261 for ; Wed, 23 Oct 2024 23:20:18 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43162cf1eaaso3008455e9.0 for ; Wed, 23 Oct 2024 14:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718418; x=1730323218; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xfXLcBM/8Eo/mLRwgaQQ/kmf5Jc2/12OYPGG3AYd25Y=; b=gFN3gsOxcWcueoqlhe4UpNtEt3bK16eq6hQQn3cpE43MP407M4EODUvU7dtxRUXNFs 0baEVp0KkAqYsUU9jM7ofRokxutDRMWDz2ZTsgoG6bOKWfi5yWIaFYeXV1vss4QLutPt s5m+RV4azl7JNJcooCDhn/V3aLM01V8zjo8xE2df++iKVy2Q84jROlsZNpuxFc7QE/rr p0o6NPuBi1NsXW2+IBHzJMODWtywgFxLUmuYqeqsm8yMIAFePf+TqYf8k7Ff+966i4Oo Np8VG31L8SB3mCXBcTVVQ/w3Yu0NjFGWTfrPJq+J6h2M2ot9mLM7m/oddDlk1BB+LoPu IGgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718418; x=1730323218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xfXLcBM/8Eo/mLRwgaQQ/kmf5Jc2/12OYPGG3AYd25Y=; b=WeHpPgh2B/pU/5F3C2X11nr6O3MhObifAkCMJzKk9p1BVlOAXaffIGFcEBHtEhJvgk /TRztjkivzyp53PxzZEowOa6VmZxv08W4C6swSPW8MtThdo45WDKJHospqp/vjOBQXkp EHTNA5JJ25Tk+dY0BB8eWYNYjfpXE+f4RrXt6PofItGhUvLf2z2iNGOmbxHzWzARRd/L 2pYoHNs1cR1izy6exRZ4/S66gTwbZBKg8/kSLAVFskFN4g7PYgckX4/ohsX+4ciGPACl Xx4lrsluowIyh7FN72HiDu6ldeKEn94LTObKVS4M9QTz/qHv66u1g+cZoM0PS/KD1IF5 RsNA== X-Forwarded-Encrypted: i=1; AJvYcCVMWQ4Kp5TMDBNfLdt/oV8meJv+BC2yZiRzvO4+skC6K3zgo3KEuUDHTAteW/iFM7uczTse1bY=@dpdk.org X-Gm-Message-State: AOJu0YxsQtVwbz8TNBwPjGkmTg2BRaiRTn8cCUTEiJ9W+ocFc4kWjAwZ TNrpNXY8nNSdZfYZkq1OenkbnldF4Xc1DVBWzxmLjcs01F+YEBou X-Google-Smtp-Source: AGHT+IGrKEHNXRv2b5oE+YaM8qF/U0OeTN/RZZjIQ3vTXL/fPQyXiW7RZf60OF4XYzfDLZuOpvuQWw== X-Received: by 2002:a05:6000:1b03:b0:37d:4cf9:e08b with SMTP id ffacd0b85a97d-37efcf1952emr3186115f8f.31.1729718418163; Wed, 23 Oct 2024 14:20:18 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0b9c6b0sm9742561f8f.109.2024.10.23.14.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:20:17 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.7 Date: Wed, 23 Oct 2024 22:16:32 +0100 Message-ID: <20241023211704.1216956-52-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e7c27b6ffec2df29611b53b00ed21d32c267a136 Thanks. Luca Boccassi --- >From e7c27b6ffec2df29611b53b00ed21d32c267a136 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 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 8f2b3a87c2..218bd4dd4b 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; @@ -67,14 +66,6 @@ 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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.491025274 +0100 +++ 0052-net-ena-revert-redefining-memcpy.patch 2024-10-23 22:16:40.511943208 +0100 @@ -1 +1 @@ -From 966764d003554b38e892cf18df9e9af44483036d Mon Sep 17 00:00:00 2001 +From e7c27b6ffec2df29611b53b00ed21d32c267a136 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 | 9 --------- + 1 file changed, 9 deletions(-) @@ -27 +28 @@ -index a41a4e4506..1121460470 100644 +index 8f2b3a87c2..218bd4dd4b 100644 @@ -38 +39 @@ -@@ -68,13 +67,7 @@ typedef uint64_t dma_addr_t; +@@ -67,14 +66,6 @@ typedef uint64_t dma_addr_t; @@ -45 +46,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) @@ -49 +50,0 @@ -+