Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1491491 > unrolled thread

[PATCH] x86/cmpxchg: Remove superfluous definitions

Started byNikolay Borisov <n.borisov.lkml@gmail.com>
First post2016-09-26 20:20 +0200
Last post2016-09-30 14:10 +0200
Articles 4 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] x86/cmpxchg: Remove superfluous definitions Nikolay Borisov <n.borisov.lkml@gmail.com> - 2016-09-26 20:20 +0200
    Re: [PATCH] x86/cmpxchg: Remove superfluous definitions Peter Zijlstra <peterz@infradead.org> - 2016-09-27 13:10 +0200
      Re: [PATCH] x86/cmpxchg: Remove superfluous definitions Ingo Molnar <mingo@kernel.org> - 2016-09-27 14:20 +0200
    [tip:locking/core] x86/cmpxchg, locking/atomics: Remove superfluous  definitions tip-bot for Nikolay Borisov <tipbot@zytor.com> - 2016-09-30 14:10 +0200

#1491491 — [PATCH] x86/cmpxchg: Remove superfluous definitions

FromNikolay Borisov <n.borisov.lkml@gmail.com>
Date2016-09-26 20:20 +0200
Subject[PATCH] x86/cmpxchg: Remove superfluous definitions
Message-ID<slIFr-7fo-7@gated-at.bofh.it>
cmpxchg contained definitions for unused (x)add_* operations, dating back
to the original ticket spinlock implementation. Nowadays these are
unused so remove them.

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
---
 arch/x86/include/asm/cmpxchg.h | 44 ------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index 9733361fed6f..97848cdfcb1a 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -158,53 +158,9 @@ extern void __add_wrong_size(void)
  * value of "*ptr".
  *
  * xadd() is locked when multiple CPUs are online
- * xadd_sync() is always locked
- * xadd_local() is never locked
  */
 #define __xadd(ptr, inc, lock)	__xchg_op((ptr), (inc), xadd, lock)
 #define xadd(ptr, inc)		__xadd((ptr), (inc), LOCK_PREFIX)
-#define xadd_sync(ptr, inc)	__xadd((ptr), (inc), "lock; ")
-#define xadd_local(ptr, inc)	__xadd((ptr), (inc), "")
-
-#define __add(ptr, inc, lock)						\
-	({								\
-	        __typeof__ (*(ptr)) __ret = (inc);			\
-		switch (sizeof(*(ptr))) {				\
-		case __X86_CASE_B:					\
-			asm volatile (lock "addb %b1, %0\n"		\
-				      : "+m" (*(ptr)) : "qi" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_W:					\
-			asm volatile (lock "addw %w1, %0\n"		\
-				      : "+m" (*(ptr)) : "ri" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_L:					\
-			asm volatile (lock "addl %1, %0\n"		\
-				      : "+m" (*(ptr)) : "ri" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_Q:					\
-			asm volatile (lock "addq %1, %0\n"		\
-				      : "+m" (*(ptr)) : "ri" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		default:						\
-			__add_wrong_size();				\
-		}							\
-		__ret;							\
-	})
-
-/*
- * add_*() adds "inc" to "*ptr"
- *
- * __add() takes a lock prefix
- * add_smp() is locked when multiple CPUs are online
- * add_sync() is always locked
- */
-#define add_smp(ptr, inc)	__add((ptr), (inc), LOCK_PREFIX)
-#define add_sync(ptr, inc)	__add((ptr), (inc), "lock; ")
 
 #define __cmpxchg_double(pfx, p1, p2, o1, o2, n1, n2)			\
 ({									\
-- 
2.7.4

[toc] | [next] | [standalone]

#1491817

FromPeter Zijlstra <peterz@infradead.org>
Date2016-09-27 13:10 +0200
Message-ID<slYqR-n8-1@gated-at.bofh.it>
In reply to#1491491
On Mon, Sep 26, 2016 at 09:11:18PM +0300, Nikolay Borisov wrote:
> cmpxchg contained definitions for unused (x)add_* operations, dating back
> to the original ticket spinlock implementation. Nowadays these are
> unused so remove them.

https://lkml.kernel.org/r/20160518184302.GO3193@twins.programming.kicks-ass.net

should go first though... Ingo?

[toc] | [prev] | [next] | [standalone]

#1491881

FromIngo Molnar <mingo@kernel.org>
Date2016-09-27 14:20 +0200
Message-ID<slZwB-YB-19@gated-at.bofh.it>
In reply to#1491817
* Peter Zijlstra <peterz@infradead.org> wrote:

> On Mon, Sep 26, 2016 at 09:11:18PM +0300, Nikolay Borisov wrote:
> > cmpxchg contained definitions for unused (x)add_* operations, dating back
> > to the original ticket spinlock implementation. Nowadays these are
> > unused so remove them.
> 
> https://lkml.kernel.org/r/20160518184302.GO3193@twins.programming.kicks-ass.net
> 
> should go first though... Ingo?

Sure, no objections from me!

Thanks,

	Ingo

[toc] | [prev] | [next] | [standalone]

#1494054 — [tip:locking/core] x86/cmpxchg, locking/atomics: Remove superfluous definitions

Fromtip-bot for Nikolay Borisov <tipbot@zytor.com>
Date2016-09-30 14:10 +0200
Subject[tip:locking/core] x86/cmpxchg, locking/atomics: Remove superfluous definitions
Message-ID<sn4Nz-1Be-15@gated-at.bofh.it>
In reply to#1491491
Commit-ID:  08645077b7f9f7824dbaf1959b0e014a894c8acc
Gitweb:     http://git.kernel.org/tip/08645077b7f9f7824dbaf1959b0e014a894c8acc
Author:     Nikolay Borisov <n.borisov.lkml@gmail.com>
AuthorDate: Mon, 26 Sep 2016 21:11:18 +0300
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 30 Sep 2016 10:56:01 +0200

x86/cmpxchg, locking/atomics: Remove superfluous definitions

cmpxchg contained definitions for unused (x)add_* operations, dating back
to the original ticket spinlock implementation. Nowadays these are
unused so remove them.

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: hpa@zytor.com
Link: http://lkml.kernel.org/r/1474913478-17757-1-git-send-email-n.borisov.lkml@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/cmpxchg.h | 44 ------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index 9733361..97848cd 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -158,53 +158,9 @@ extern void __add_wrong_size(void)
  * value of "*ptr".
  *
  * xadd() is locked when multiple CPUs are online
- * xadd_sync() is always locked
- * xadd_local() is never locked
  */
 #define __xadd(ptr, inc, lock)	__xchg_op((ptr), (inc), xadd, lock)
 #define xadd(ptr, inc)		__xadd((ptr), (inc), LOCK_PREFIX)
-#define xadd_sync(ptr, inc)	__xadd((ptr), (inc), "lock; ")
-#define xadd_local(ptr, inc)	__xadd((ptr), (inc), "")
-
-#define __add(ptr, inc, lock)						\
-	({								\
-	        __typeof__ (*(ptr)) __ret = (inc);			\
-		switch (sizeof(*(ptr))) {				\
-		case __X86_CASE_B:					\
-			asm volatile (lock "addb %b1, %0\n"		\
-				      : "+m" (*(ptr)) : "qi" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_W:					\
-			asm volatile (lock "addw %w1, %0\n"		\
-				      : "+m" (*(ptr)) : "ri" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_L:					\
-			asm volatile (lock "addl %1, %0\n"		\
-				      : "+m" (*(ptr)) : "ri" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_Q:					\
-			asm volatile (lock "addq %1, %0\n"		\
-				      : "+m" (*(ptr)) : "ri" (inc)	\
-				      : "memory", "cc");		\
-			break;						\
-		default:						\
-			__add_wrong_size();				\
-		}							\
-		__ret;							\
-	})
-
-/*
- * add_*() adds "inc" to "*ptr"
- *
- * __add() takes a lock prefix
- * add_smp() is locked when multiple CPUs are online
- * add_sync() is always locked
- */
-#define add_smp(ptr, inc)	__add((ptr), (inc), LOCK_PREFIX)
-#define add_sync(ptr, inc)	__add((ptr), (inc), "lock; ")
 
 #define __cmpxchg_double(pfx, p1, p2, o1, o2, n1, n2)			\
 ({									\

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web