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 1F1FA41D52 for ; Thu, 23 Feb 2023 16:08:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A696432D7; Thu, 23 Feb 2023 16:08:56 +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 00E1A432D7 for ; Thu, 23 Feb 2023 16:08:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164933; 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=tuItUOpHjxt6P8p7xVLTJewq0I+6JYGLski3HAVxOf0=; b=aW1AGibGDHO5VncYsCOD5qjVBIGZPzXdPbEqcpmi1A4Bm/waj+FpOBhFxH0EW9ILQn9sSM BxIl9S6AFdUvJiBlKWJOHsj89WIlxoVUOBulFVbPDg2KL9iMSugTcWhrtUBtg0I7zo3NhI YsMVG3a9FUy7//8uwW9M2EVWofb++rQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-451-TuvPhJ5ZNmyFGq6HEEK9LA-1; Thu, 23 Feb 2023 10:08:50 -0500 X-MC-Unique: TuvPhJ5ZNmyFGq6HEEK9LA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 957E5857A8E; Thu, 23 Feb 2023 15:08:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 693172166B2C; Thu, 23 Feb 2023 15:08:47 +0000 (UTC) From: Kevin Traynor 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 21.11.4 Date: Thu, 23 Feb 2023 15:06:28 +0000 Message-Id: <20230223150631.723699-97-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 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.4 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/28/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c791a30249dabb499b5d60b208d437059d151e2c Thanks. Kevin --- >From c791a30249dabb499b5d60b208d437059d151e2c 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/eal/include/generic/rte_atomic.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h index 276272f40b..f73825a3d3 100644 --- a/lib/eal/include/generic/rte_atomic.h +++ b/lib/eal/include/generic/rte_atomic.h @@ -176,9 +176,5 @@ 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 @@ -459,9 +455,5 @@ 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 @@ -741,9 +733,5 @@ 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 14:46:26.130901839 +0000 +++ 0097-eal-use-same-atomic-intrinsics-for-GCC-and-clang.patch 2023-02-23 14:46:23.888236377 +0000 @@ -1 +1 @@ -From 0c0eb1156e3d52ede4b19d687aa5387d1dca7666 Mon Sep 17 00:00:00 2001 +From c791a30249dabb499b5d60b208d437059d151e2c Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 0c0eb1156e3d52ede4b19d687aa5387d1dca7666 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index f5c49a9870..234b268b91 100644 +index 276272f40b..f73825a3d3 100644 @@ -29 +30 @@ -@@ -177,9 +177,5 @@ static inline uint16_t +@@ -176,9 +176,5 @@ static inline uint16_t @@ -39 +40 @@ -@@ -460,9 +456,5 @@ static inline uint32_t +@@ -459,9 +455,5 @@ static inline uint32_t @@ -49 +50 @@ -@@ -742,9 +734,5 @@ static inline uint64_t +@@ -741,9 +733,5 @@ static inline uint64_t