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 22CDA41D4F for ; Thu, 23 Feb 2023 10:40:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EE9943150; Thu, 23 Feb 2023 10:40:52 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 2AF22427E9 for ; Thu, 23 Feb 2023 10:40:50 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id t15so10248599wrz.7 for ; Thu, 23 Feb 2023 01:40:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=w5ZRmq1TU/0RTnh6kSqDGjPXPNbq/X4guS0wtTlywoM=; b=YXDaLdMD0XUsRyXRUwfYZ+D+kQzTc4KnrMNZ+ZDNONpoKZpMaGprRnLLLfdDIsurMu plg+pNKBMIriuwtNiNvuTyjieEWv6OFm2lcQfTStMoHdgDn3pwj0bDpnqngMnY7R884s tCOv4QqTFs1KYYpZygWd8hMgzXantXPrW7fYCoaP6sqACOOQohDy6i+dRaehMg5yRPW8 s4+yVNMaTWINcc61pq8o0jiF2FS3BOnOZI7ROktu7kfTK9JFUv/X4QWJtxuVIWyrAenT AJdffQvVdCv15yN3CCZrWHkI7I2bxDCFtzjLQ0sGm595GE1RPndpYodrPltEwFY8ZyPM 9tFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=w5ZRmq1TU/0RTnh6kSqDGjPXPNbq/X4guS0wtTlywoM=; b=byyzK+ZT68jOLc/nIb1Yz6zaOYPgQthmXShViiqEYKO0aLy5PpT1Pq+zUGx7H9KaI/ 1sApeXHNNSYXjbyJSx+yFY20bu3TYIxanOjCdnlc/r4fN4+6aNF5t6dBa9pGt0VBV6UM wmTIJNpnMkg2XIeG49zN+QT5Z+2mEPfDIKvbjvBoD8JqpaKOxv0vlVhrx8eE6jQ9g2xt KEjWfgF1mdSaAY9y2n0tdOPbngV2iKNr4DijC7zwfhNHpvbj62MeWklZTasHbQZfMv1H ehcH6wVthkeCzrLOKu17G0rIOzupcJr6SvYV+8iVW3x4vb22kTko43n+QQf/7T60KbsJ XxBQ== X-Gm-Message-State: AO0yUKXg3kehxSMlHp4DddgxEvKXaaSxkwKl4IGjF3uuducx/PZVC5Zz dKJEdKxDHiYseZVV3ITgGz0osYLLgaQPfw== X-Google-Smtp-Source: AK7set82bvRJmWqZfo+FPmaYL6aLdBEy2Olkpb8kyDNqVP2d08gJw6xBAVzAoaUKWknHO33WN7SwQA== X-Received: by 2002:a5d:62c7:0:b0:2c5:55cf:b1ab with SMTP id o7-20020a5d62c7000000b002c555cfb1abmr8832224wrv.48.1677145249780; Thu, 23 Feb 2023 01:40:49 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id bl1-20020adfe241000000b002c54d8b89efsm10423206wrb.26.2023.02.23.01.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:40:49 -0800 (PST) From: luca.boccassi@gmail.com To: Honnappa Nagarahalli Cc: Ola Liljedahl , Ruifeng Wang , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Tyler Retzlaff , dpdk stable Subject: patch 'eal: use same atomic intrinsics for GCC and clang' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:37:13 +0000 Message-Id: <20230223093715.3926893-69-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-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 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. 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/60ac57c2f188bb85ba6bf6437aa9ec978b900369 Thanks. Luca Boccassi --- >From 60ac57c2f188bb85ba6bf6437aa9ec978b900369 Mon Sep 17 00:00:00 2001 From: Honnappa Nagarahalli Date: Fri, 17 Feb 2023 19:58:03 -0600 Subject: [PATCH] eal: use same atomic intrinsics for GCC and clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 0c0eb1156e3d52ede4b19d687aa5387d1dca7666 ] The size generic atomic intrinsics generate the same code as the size specific intrinsics for gcc. Use size generic intrinsics for both gcc and clang. Fixes: 7bdccb93078e ("eal: fix ARM build with clang") Signed-off-by: Honnappa Nagarahalli Reviewed-by: Ola Liljedahl Reviewed-by: Ruifeng Wang Acked-by: Morten Brørup Acked-by: Tyler Retzlaff --- lib/librte_eal/include/generic/rte_atomic.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/librte_eal/include/generic/rte_atomic.h b/lib/librte_eal/include/generic/rte_atomic.h index 276272f40b..f73825a3d3 100644 --- a/lib/librte_eal/include/generic/rte_atomic.h +++ b/lib/librte_eal/include/generic/rte_atomic.h @@ -175,11 +175,7 @@ rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val); static inline uint16_t rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val) { -#if defined(__clang__) return __atomic_exchange_n(dst, val, __ATOMIC_SEQ_CST); -#else - return __atomic_exchange_2(dst, val, __ATOMIC_SEQ_CST); -#endif } #endif @@ -458,11 +454,7 @@ rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val); static inline uint32_t rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val) { -#if defined(__clang__) return __atomic_exchange_n(dst, val, __ATOMIC_SEQ_CST); -#else - return __atomic_exchange_4(dst, val, __ATOMIC_SEQ_CST); -#endif } #endif @@ -740,11 +732,7 @@ rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val); static inline uint64_t rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val) { -#if defined(__clang__) return __atomic_exchange_n(dst, val, __ATOMIC_SEQ_CST); -#else - return __atomic_exchange_8(dst, val, __ATOMIC_SEQ_CST); -#endif } #endif -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:31.066224032 +0000 +++ 0069-eal-use-same-atomic-intrinsics-for-GCC-and-clang.patch 2023-02-23 09:36:28.354172297 +0000 @@ -1 +1 @@ -From 0c0eb1156e3d52ede4b19d687aa5387d1dca7666 Mon Sep 17 00:00:00 2001 +From 60ac57c2f188bb85ba6bf6437aa9ec978b900369 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 0c0eb1156e3d52ede4b19d687aa5387d1dca7666 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ - lib/eal/include/generic/rte_atomic.h | 12 ------------ + lib/librte_eal/include/generic/rte_atomic.h | 12 ------------ @@ -25,5 +26,5 @@ -diff --git a/lib/eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h -index f5c49a9870..234b268b91 100644 ---- a/lib/eal/include/generic/rte_atomic.h -+++ b/lib/eal/include/generic/rte_atomic.h -@@ -176,11 +176,7 @@ rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val); +diff --git a/lib/librte_eal/include/generic/rte_atomic.h b/lib/librte_eal/include/generic/rte_atomic.h +index 276272f40b..f73825a3d3 100644 +--- a/lib/librte_eal/include/generic/rte_atomic.h ++++ b/lib/librte_eal/include/generic/rte_atomic.h +@@ -175,11 +175,7 @@ rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val); @@ -41 +42 @@ -@@ -459,11 +455,7 @@ rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val); +@@ -458,11 +454,7 @@ rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val); @@ -53 +54 @@ -@@ -741,11 +733,7 @@ rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val); +@@ -740,11 +732,7 @@ rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val);