From: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com> To: <gleb@redhat.com>, <mingo@redhat.com>, <jeremy@goop.org>, <x86@kernel.org>, <konrad.wilk@oracle.com>, <hpa@zytor.com>, <pbonzini@redhat.com> Cc: linux-doc@vger.kernel.org, <habanero@linux.vnet.ibm.com>, Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>, <xen-devel@lists.xensource.com>, <peterz@infradead.org>, <mtosatti@redhat.com>, <stefano.stabellini@eu.citrix.com>, <andi@firstfloor.org>, <attilio.rao@citrix.com>, <ouyang@cs.pitt.edu>, <gregkh@suse.de>, <agraf@suse.de>, <chegu_vinod@hp.com>, <torvalds@linux-foundation.org>, <avi.kivity@gmail.com>, <tglx@linutronix.de>, <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <stephan.diestelhorst@amd.com>, <riel@redhat.com>, <drjones@redhat.com>, <virtualization@lists.linux-foundation.org>, <srivatsa.vaddagiri@gmail.com> Subject: [PATCH RFC V9 3/19] x86/ticketlock: Collapse a layer of functions Date: Sun, 02 Jun 2013 00:52:29 +0530 [thread overview] Message-ID: <20130601192229.5966.49935.sendpatchset@codeblue> (raw) In-Reply-To: <20130601192125.5966.35563.sendpatchset@codeblue> x86/ticketlock: Collapse a layer of functions From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Now that the paravirtualization layer doesn't exist at the spinlock level any more, we can collapse the __ticket_ functions into the arch_ functions. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Tested-by: Attilio Rao <attilio.rao@citrix.com> Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com> --- arch/x86/include/asm/spinlock.h | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h index 4d54244..7442410 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h @@ -76,7 +76,7 @@ static __always_inline void __ticket_unlock_kick(struct arch_spinlock *lock, * in the high part, because a wide xadd increment of the low part would carry * up and contaminate the high part. */ -static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock) +static __always_inline void arch_spin_lock(struct arch_spinlock *lock) { register struct __raw_tickets inc = { .tail = 1 }; @@ -96,7 +96,7 @@ static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock) out: barrier(); /* make sure nothing creeps before the lock is taken */ } -static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock) +static __always_inline int arch_spin_trylock(arch_spinlock_t *lock) { arch_spinlock_t old, new; @@ -110,7 +110,7 @@ static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock) return cmpxchg(&lock->head_tail, old.head_tail, new.head_tail) == old.head_tail; } -static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock) +static __always_inline void arch_spin_unlock(arch_spinlock_t *lock) { __ticket_t next = lock->tickets.head + 1; @@ -118,46 +118,21 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock) __ticket_unlock_kick(lock, next); } -static inline int __ticket_spin_is_locked(arch_spinlock_t *lock) +static inline int arch_spin_is_locked(arch_spinlock_t *lock) { struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets); return tmp.tail != tmp.head; } -static inline int __ticket_spin_is_contended(arch_spinlock_t *lock) +static inline int arch_spin_is_contended(arch_spinlock_t *lock) { struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets); return (__ticket_t)(tmp.tail - tmp.head) > 1; } - -static inline int arch_spin_is_locked(arch_spinlock_t *lock) -{ - return __ticket_spin_is_locked(lock); -} - -static inline int arch_spin_is_contended(arch_spinlock_t *lock) -{ - return __ticket_spin_is_contended(lock); -} #define arch_spin_is_contended arch_spin_is_contended -static __always_inline void arch_spin_lock(arch_spinlock_t *lock) -{ - __ticket_spin_lock(lock); -} - -static __always_inline int arch_spin_trylock(arch_spinlock_t *lock) -{ - return __ticket_spin_trylock(lock); -} - -static __always_inline void arch_spin_unlock(arch_spinlock_t *lock) -{ - __ticket_spin_unlock(lock); -} - static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags) {
WARNING: multiple messages have this Message-ID (diff)
From: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com> To: gleb@redhat.com, mingo@redhat.com, jeremy@goop.org, x86@kernel.org, konrad.wilk@oracle.com, hpa@zytor.com, pbonzini@redhat.com Cc: linux-doc@vger.kernel.org, habanero@linux.vnet.ibm.com, Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>, xen-devel@lists.xensource.com, peterz@infradead.org, mtosatti@redhat.com, stefano.stabellini@eu.citrix.com, andi@firstfloor.org, attilio.rao@citrix.com, ouyang@cs.pitt.edu, gregkh@suse.de, agraf@suse.de, chegu_vinod@hp.com, torvalds@linux-foundation.org, avi.kivity@gmail.com, tglx@linutronix.de, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, stephan.diestelhorst@amd.com, riel@redhat.com, drjones@redhat.com, virtualization@lists.linux-foundation.org, srivatsa.vaddagiri@gmail.com Subject: [PATCH RFC V9 3/19] x86/ticketlock: Collapse a layer of functions Date: Sun, 02 Jun 2013 00:52:29 +0530 [thread overview] Message-ID: <20130601192229.5966.49935.sendpatchset@codeblue> (raw) In-Reply-To: <20130601192125.5966.35563.sendpatchset@codeblue> x86/ticketlock: Collapse a layer of functions From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Now that the paravirtualization layer doesn't exist at the spinlock level any more, we can collapse the __ticket_ functions into the arch_ functions. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Tested-by: Attilio Rao <attilio.rao@citrix.com> Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com> --- arch/x86/include/asm/spinlock.h | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h index 4d54244..7442410 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h @@ -76,7 +76,7 @@ static __always_inline void __ticket_unlock_kick(struct arch_spinlock *lock, * in the high part, because a wide xadd increment of the low part would carry * up and contaminate the high part. */ -static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock) +static __always_inline void arch_spin_lock(struct arch_spinlock *lock) { register struct __raw_tickets inc = { .tail = 1 }; @@ -96,7 +96,7 @@ static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock) out: barrier(); /* make sure nothing creeps before the lock is taken */ } -static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock) +static __always_inline int arch_spin_trylock(arch_spinlock_t *lock) { arch_spinlock_t old, new; @@ -110,7 +110,7 @@ static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock) return cmpxchg(&lock->head_tail, old.head_tail, new.head_tail) == old.head_tail; } -static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock) +static __always_inline void arch_spin_unlock(arch_spinlock_t *lock) { __ticket_t next = lock->tickets.head + 1; @@ -118,46 +118,21 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock) __ticket_unlock_kick(lock, next); } -static inline int __ticket_spin_is_locked(arch_spinlock_t *lock) +static inline int arch_spin_is_locked(arch_spinlock_t *lock) { struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets); return tmp.tail != tmp.head; } -static inline int __ticket_spin_is_contended(arch_spinlock_t *lock) +static inline int arch_spin_is_contended(arch_spinlock_t *lock) { struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets); return (__ticket_t)(tmp.tail - tmp.head) > 1; } - -static inline int arch_spin_is_locked(arch_spinlock_t *lock) -{ - return __ticket_spin_is_locked(lock); -} - -static inline int arch_spin_is_contended(arch_spinlock_t *lock) -{ - return __ticket_spin_is_contended(lock); -} #define arch_spin_is_contended arch_spin_is_contended -static __always_inline void arch_spin_lock(arch_spinlock_t *lock) -{ - __ticket_spin_lock(lock); -} - -static __always_inline int arch_spin_trylock(arch_spinlock_t *lock) -{ - return __ticket_spin_trylock(lock); -} - -static __always_inline void arch_spin_unlock(arch_spinlock_t *lock) -{ - __ticket_spin_unlock(lock); -} - static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags) {
next prev parent reply other threads:[~2013-06-01 19:18 UTC|newest] Thread overview: 177+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-01 19:21 [PATCH RFC V9 0/19] Paravirtualized ticket spinlocks Raghavendra K T 2013-06-01 19:21 ` Raghavendra K T 2013-06-01 19:21 ` [PATCH RFC V9 1/19] x86/spinlock: Replace pv spinlocks with pv ticketlocks Raghavendra K T 2013-06-01 19:21 ` Raghavendra K T 2013-06-01 19:21 ` Raghavendra K T 2013-06-01 20:32 ` Jeremy Fitzhardinge 2013-06-01 20:32 ` Jeremy Fitzhardinge 2013-06-02 6:54 ` Raghavendra K T 2013-06-02 6:54 ` Raghavendra K T 2013-06-01 20:32 ` Jeremy Fitzhardinge 2013-06-01 19:22 ` [PATCH RFC V9 2/19] x86/ticketlock: Don't inline _spin_unlock when using paravirt spinlocks Raghavendra K T 2013-06-01 19:22 ` Raghavendra K T 2013-06-01 19:22 ` Raghavendra K T 2013-06-03 15:28 ` Konrad Rzeszutek Wilk 2013-06-03 15:28 ` Konrad Rzeszutek Wilk 2013-06-01 19:22 ` [PATCH RFC V9 3/19] x86/ticketlock: Collapse a layer of functions Raghavendra K T 2013-06-01 19:22 ` Raghavendra K T [this message] 2013-06-01 19:22 ` Raghavendra K T 2013-06-03 15:28 ` Konrad Rzeszutek Wilk 2013-06-03 15:28 ` Konrad Rzeszutek Wilk 2013-06-01 19:22 ` [PATCH RFC V9 4/19] xen: Defer spinlock setup until boot CPU setup Raghavendra K T 2013-06-01 19:22 ` Raghavendra K T 2013-06-01 19:22 ` Raghavendra K T 2013-06-01 19:23 ` [PATCH RFC V9 5/19] xen/pvticketlock: Xen implementation for PV ticket locks Raghavendra K T 2013-06-01 19:23 ` Raghavendra K T 2013-06-03 16:03 ` Konrad Rzeszutek Wilk 2013-06-03 16:03 ` Konrad Rzeszutek Wilk 2013-06-04 7:21 ` Raghavendra K T 2013-06-04 7:21 ` Raghavendra K T 2013-06-01 19:23 ` Raghavendra K T 2013-06-01 19:23 ` [PATCH RFC V9 6/19] xen/pvticketlocks: Add xen_nopvspin parameter to disable xen pv ticketlocks Raghavendra K T 2013-06-01 19:23 ` Raghavendra K T 2013-06-01 19:23 ` Raghavendra K T 2013-06-01 19:23 ` [PATCH RFC V9 7/19] x86/pvticketlock: Use callee-save for lock_spinning Raghavendra K T 2013-06-01 19:23 ` Raghavendra K T 2013-06-01 19:23 ` Raghavendra K T 2013-06-01 19:24 ` [PATCH RFC V9 8/19] x86/pvticketlock: When paravirtualizing ticket locks, increment by 2 Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-03 15:53 ` Konrad Rzeszutek Wilk 2013-06-03 15:53 ` Konrad Rzeszutek Wilk 2013-06-01 19:24 ` [PATCH RFC V9 9/19] Split out rate limiting from jump_label.h Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-03 15:56 ` Konrad Rzeszutek Wilk 2013-06-03 15:56 ` Konrad Rzeszutek Wilk 2013-06-04 7:15 ` Raghavendra K T 2013-06-04 7:15 ` Raghavendra K T 2013-06-01 19:24 ` [PATCH RFC V9 10/19] x86/ticketlock: Add slowpath logic Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-01 19:24 ` [PATCH RFC V9 11/19] xen/pvticketlock: Allow interrupts to be enabled while blocking Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-01 19:24 ` Raghavendra K T 2013-06-01 19:25 ` [PATCH RFC V9 12/19] xen: Enable PV ticketlocks on HVM Xen Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-03 15:57 ` Konrad Rzeszutek Wilk 2013-06-03 15:57 ` Konrad Rzeszutek Wilk 2013-06-04 7:16 ` Raghavendra K T 2013-06-04 7:16 ` Raghavendra K T 2013-06-04 14:44 ` Konrad Rzeszutek Wilk 2013-06-04 14:44 ` Konrad Rzeszutek Wilk 2013-06-04 15:00 ` Raghavendra K T 2013-06-04 15:00 ` Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:25 ` [PATCH RFC V9 13/19] kvm hypervisor : Add a hypercall to KVM hypervisor to support pv-ticketlocks Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:25 ` [PATCH RFC V9 14/19] kvm : Fold pv_unhalt flag into GET_MP_STATE ioctl to aid migration Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:25 ` [PATCH RFC V9 15/19] kvm guest : Add configuration support to enable debug information for KVM Guests Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:25 ` [PATCH RFC V9 16/19] kvm : Paravirtual ticketlocks support for linux guests running on KVM hypervisor Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-03 16:00 ` Konrad Rzeszutek Wilk 2013-06-03 16:00 ` Konrad Rzeszutek Wilk 2013-06-04 7:19 ` Raghavendra K T 2013-06-04 7:19 ` Raghavendra K T 2013-06-01 19:25 ` Raghavendra K T 2013-06-01 19:26 ` [PATCH RFC V9 17/19] kvm hypervisor : Simplify kvm_for_each_vcpu with kvm_irq_delivery_to_apic Raghavendra K T 2013-06-01 19:26 ` Raghavendra K T 2013-06-01 19:26 ` Raghavendra K T 2013-06-01 19:26 ` [PATCH RFC V9 18/19] Documentation/kvm : Add documentation on Hypercalls and features used for PV spinlock Raghavendra K T 2013-06-01 19:26 ` Raghavendra K T 2013-06-01 19:26 ` Raghavendra K T 2013-06-03 16:04 ` Konrad Rzeszutek Wilk 2013-06-03 16:04 ` Konrad Rzeszutek Wilk 2013-06-04 7:22 ` Raghavendra K T 2013-06-04 7:22 ` Raghavendra K T 2013-06-01 19:26 ` [PATCH RFC V9 19/19] kvm hypervisor: Add directed yield in vcpu block path Raghavendra K T 2013-06-01 19:26 ` Raghavendra K T 2013-06-01 19:26 ` Raghavendra K T 2013-06-03 16:05 ` Konrad Rzeszutek Wilk 2013-06-03 16:05 ` Konrad Rzeszutek Wilk 2013-06-04 7:28 ` Raghavendra K T 2013-06-04 7:28 ` Raghavendra K T 2013-06-02 8:07 ` [PATCH RFC V9 0/19] Paravirtualized ticket spinlocks Gleb Natapov 2013-06-02 8:07 ` Gleb Natapov 2013-06-02 16:20 ` Jiannan Ouyang 2013-06-02 16:20 ` Jiannan Ouyang 2013-06-03 1:40 ` Raghavendra K T 2013-06-03 1:40 ` Raghavendra K T 2013-06-03 6:21 ` Raghavendra K T 2013-06-07 6:15 ` Raghavendra K T 2013-06-07 6:15 ` Raghavendra K T 2013-06-07 13:29 ` Andrew Theurer 2013-06-07 13:29 ` Andrew Theurer 2013-06-07 23:41 ` Jiannan Ouyang 2013-06-07 23:41 ` Jiannan Ouyang 2013-06-07 23:41 ` Jiannan Ouyang 2013-06-03 6:21 ` Raghavendra K T 2013-06-02 16:20 ` Jiannan Ouyang 2013-06-25 14:50 ` Andrew Theurer 2013-06-25 14:50 ` Andrew Theurer 2013-06-26 8:45 ` Raghavendra K T 2013-06-26 8:45 ` Raghavendra K T 2013-06-26 11:37 ` Andrew Jones 2013-06-26 11:37 ` Andrew Jones 2013-06-26 12:52 ` Gleb Natapov 2013-06-26 12:52 ` Gleb Natapov 2013-06-26 13:40 ` Raghavendra K T 2013-06-26 13:40 ` Raghavendra K T 2013-06-26 14:39 ` Chegu Vinod 2013-06-26 15:37 ` Raghavendra K T 2013-06-26 15:37 ` Raghavendra K T 2013-06-26 16:11 ` Gleb Natapov 2013-06-26 16:11 ` Gleb Natapov 2013-06-26 17:54 ` Raghavendra K T 2013-07-09 9:11 ` Raghavendra K T 2013-07-09 9:11 ` Raghavendra K T 2013-07-10 10:33 ` Gleb Natapov 2013-07-10 10:33 ` Gleb Natapov 2013-07-10 10:40 ` Peter Zijlstra 2013-07-10 10:40 ` Peter Zijlstra 2013-07-10 10:47 ` Gleb Natapov 2013-07-10 10:47 ` Gleb Natapov 2013-07-10 11:28 ` Raghavendra K T 2013-07-10 11:28 ` Raghavendra K T 2013-07-10 11:29 ` Gleb Natapov 2013-07-10 11:29 ` Gleb Natapov 2013-07-10 11:40 ` Raghavendra K T 2013-07-10 11:40 ` Raghavendra K T 2013-07-10 15:03 ` Konrad Rzeszutek Wilk 2013-07-10 15:03 ` Konrad Rzeszutek Wilk 2013-07-10 15:16 ` Gleb Natapov 2013-07-10 15:16 ` Gleb Natapov 2013-07-11 0:12 ` Konrad Rzeszutek Wilk 2013-07-11 0:12 ` Konrad Rzeszutek Wilk 2013-07-10 11:24 ` Raghavendra K T 2013-07-10 11:24 ` Raghavendra K T 2013-07-10 11:41 ` Gleb Natapov 2013-07-10 11:41 ` Gleb Natapov 2013-07-10 11:50 ` Raghavendra K T 2013-07-10 11:50 ` Raghavendra K T 2013-07-11 9:13 ` Raghavendra K T 2013-07-11 9:13 ` Raghavendra K T 2013-07-11 9:48 ` Gleb Natapov 2013-07-11 9:48 ` Gleb Natapov 2013-07-11 10:10 ` Raghavendra K T 2013-07-11 10:11 ` Gleb Natapov 2013-07-11 10:11 ` Gleb Natapov 2013-07-11 10:53 ` Raghavendra K T 2013-07-11 10:53 ` Raghavendra K T 2013-07-11 10:56 ` Gleb Natapov 2013-07-11 10:56 ` Gleb Natapov 2013-07-11 11:14 ` Raghavendra K T 2013-07-11 11:14 ` Raghavendra K T 2013-07-11 10:10 ` Raghavendra K T 2013-06-26 17:54 ` Raghavendra K T 2013-06-26 14:13 ` Konrad Rzeszutek Wilk 2013-06-26 14:13 ` Konrad Rzeszutek Wilk 2013-06-26 15:56 ` Andrew Theurer 2013-06-26 15:56 ` Andrew Theurer 2013-07-01 9:30 ` Raghavendra K T 2013-07-01 9:30 ` Raghavendra K T
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130601192229.5966.49935.sendpatchset@codeblue \ --to=raghavendra.kt@linux.vnet.ibm.com \ --cc=agraf@suse.de \ --cc=andi@firstfloor.org \ --cc=attilio.rao@citrix.com \ --cc=avi.kivity@gmail.com \ --cc=chegu_vinod@hp.com \ --cc=drjones@redhat.com \ --cc=gleb@redhat.com \ --cc=gregkh@suse.de \ --cc=habanero@linux.vnet.ibm.com \ --cc=hpa@zytor.com \ --cc=jeremy@goop.org \ --cc=konrad.wilk@oracle.com \ --cc=kvm@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=mtosatti@redhat.com \ --cc=ouyang@cs.pitt.edu \ --cc=pbonzini@redhat.com \ --cc=peterz@infradead.org \ --cc=riel@redhat.com \ --cc=srivatsa.vaddagiri@gmail.com \ --cc=stefano.stabellini@eu.citrix.com \ --cc=stephan.diestelhorst@amd.com \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ --cc=virtualization@lists.linux-foundation.org \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xensource.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.