From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 509631B130 for ; Thu, 3 Jan 2019 09:14:32 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 Jan 2019 10:14:27 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x038EJfX008603; Thu, 3 Jan 2019 10:14:26 +0200 From: Yongseok Koh To: Andy Green Cc: Stephen Hemminger , dpdk stable Date: Thu, 3 Jan 2019 00:13:27 -0800 Message-Id: <20190103081400.14191-4-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190103081400.14191-1-yskoh@mellanox.com> References: <20190103081400.14191-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'spinlock/x86: move stack declaration before code' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 08:14:32 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/04/19. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From 4a87afb90a3197866ad0676029c999ac26e95030 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sat, 12 May 2018 09:59:17 +0800 Subject: [PATCH] spinlock/x86: move stack declaration before code [ upstream commit f7f18e92a51276f1e23a0595f59615f79323b358 ] In function 'rte_try_tm': rte_spinlock.h:82:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] int retries = RTE_RTM_MAX_RETRIES; Fixes: ba7468997ea6 ("spinlock: add HTM lock elision for x86") Signed-off-by: Andy Green Reviewed-by: Stephen Hemminger --- lib/librte_eal/common/include/arch/x86/rte_spinlock.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h index 5675c2b45..10cd7a30c 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h +++ b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h @@ -105,10 +105,12 @@ static inline int rte_tm_supported(void) static inline int rte_try_tm(volatile int *lock) { + int retries; + if (!rte_rtm_supported) return 0; - int retries = RTE_RTM_MAX_RETRIES; + retries = RTE_RTM_MAX_RETRIES; while (likely(retries--)) { -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-02 23:59:12.316305572 -0800 +++ 0004-spinlock-x86-move-stack-declaration-before-code.patch 2019-01-02 23:59:12.006815000 -0800 @@ -1,8 +1,10 @@ -From f7f18e92a51276f1e23a0595f59615f79323b358 Mon Sep 17 00:00:00 2001 +From 4a87afb90a3197866ad0676029c999ac26e95030 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sat, 12 May 2018 09:59:17 +0800 Subject: [PATCH] spinlock/x86: move stack declaration before code +[ upstream commit f7f18e92a51276f1e23a0595f59615f79323b358 ] + In function 'rte_try_tm': rte_spinlock.h:82:2: warning: ISO C90 forbids mixed declarations and code @@ -10,7 +12,6 @@ int retries = RTE_RTM_MAX_RETRIES; Fixes: ba7468997ea6 ("spinlock: add HTM lock elision for x86") -Cc: stable@dpdk.org Signed-off-by: Andy Green Reviewed-by: Stephen Hemminger @@ -19,10 +20,10 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h -index 4b16887ea..60321da02 100644 +index 5675c2b45..10cd7a30c 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h +++ b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h -@@ -76,10 +76,12 @@ static inline int rte_tm_supported(void) +@@ -105,10 +105,12 @@ static inline int rte_tm_supported(void) static inline int rte_try_tm(volatile int *lock) {