From: Michal Hocko <mhocko@kernel.org> To: LKML <linux-kernel@vger.kernel.org> Cc: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, "David S. Miller" <davem@davemloft.net>, Tony Luck <tony.luck@intel.com>, Andrew Morton <akpm@linux-foundation.org>, Chris Zankel <chris@zankel.net>, Max Filippov <jcmvbkbc@gmail.com>, x86@kernel.org, linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-arch@vger.kernel.org, Michal Hocko <mhocko@suse.com> Subject: [RFC 04/12] alpha, rwsem: provide __down_write_killable Date: Tue, 02 Feb 2016 20:19:21 +0000 [thread overview] Message-ID: <1454444369-2146-5-git-send-email-mhocko@kernel.org> (raw) In-Reply-To: <1454444369-2146-1-git-send-email-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> Introduce ___down_write for the fast path and reuse it for __down_write resp. __down_write_killable each using the respective generic slow path (rwsem_down_write_failed resp. rwsem_down_write_failed_killable). Signed-off-by: Michal Hocko <mhocko@suse.com> --- arch/alpha/include/asm/rwsem.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/alpha/include/asm/rwsem.h b/arch/alpha/include/asm/rwsem.h index a83bbea62c67..0131a7058778 100644 --- a/arch/alpha/include/asm/rwsem.h +++ b/arch/alpha/include/asm/rwsem.h @@ -63,7 +63,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem) return res >= 0 ? 1 : 0; } -static inline void __down_write(struct rw_semaphore *sem) +static inline long ___down_write(struct rw_semaphore *sem) { long oldcount; #ifndef CONFIG_SMP @@ -83,10 +83,24 @@ static inline void __down_write(struct rw_semaphore *sem) :"=&r" (oldcount), "=m" (sem->count), "=&r" (temp) :"Ir" (RWSEM_ACTIVE_WRITE_BIAS), "m" (sem->count) : "memory"); #endif - if (unlikely(oldcount)) + return oldcount; +} + +static inline void __down_write(struct rw_semaphore *sem) +{ + if (unlikely(___down_write(sem))) rwsem_down_write_failed(sem); } +static inline int __down_write_killable(struct rw_semaphore *sem) +{ + if (unlikely(___down_write(sem))) + if (IS_ERR(rwsem_down_write_failed_killable(sem))) + return -EINTR; + + return 0; +} + /* * trylock for writing -- returns 1 if successful, 0 if contention */ -- 2.7.0
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org> To: LKML <linux-kernel@vger.kernel.org> Cc: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, "David S. Miller" <davem@davemloft.net>, Tony Luck <tony.luck@intel.com>, Andrew Morton <akpm@linux-foundation.org>, Chris Zankel <chris@zankel.net>, Max Filippov <jcmvbkbc@gmail.com>, x86@kernel.org, linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-arch@vger.kernel.org, Michal Hocko <mhocko@suse.com> Subject: [RFC 04/12] alpha, rwsem: provide __down_write_killable Date: Tue, 2 Feb 2016 21:19:21 +0100 [thread overview] Message-ID: <1454444369-2146-5-git-send-email-mhocko@kernel.org> (raw) In-Reply-To: <1454444369-2146-1-git-send-email-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> Introduce ___down_write for the fast path and reuse it for __down_write resp. __down_write_killable each using the respective generic slow path (rwsem_down_write_failed resp. rwsem_down_write_failed_killable). Signed-off-by: Michal Hocko <mhocko@suse.com> --- arch/alpha/include/asm/rwsem.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/alpha/include/asm/rwsem.h b/arch/alpha/include/asm/rwsem.h index a83bbea62c67..0131a7058778 100644 --- a/arch/alpha/include/asm/rwsem.h +++ b/arch/alpha/include/asm/rwsem.h @@ -63,7 +63,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem) return res >= 0 ? 1 : 0; } -static inline void __down_write(struct rw_semaphore *sem) +static inline long ___down_write(struct rw_semaphore *sem) { long oldcount; #ifndef CONFIG_SMP @@ -83,10 +83,24 @@ static inline void __down_write(struct rw_semaphore *sem) :"=&r" (oldcount), "=m" (sem->count), "=&r" (temp) :"Ir" (RWSEM_ACTIVE_WRITE_BIAS), "m" (sem->count) : "memory"); #endif - if (unlikely(oldcount)) + return oldcount; +} + +static inline void __down_write(struct rw_semaphore *sem) +{ + if (unlikely(___down_write(sem))) rwsem_down_write_failed(sem); } +static inline int __down_write_killable(struct rw_semaphore *sem) +{ + if (unlikely(___down_write(sem))) + if (IS_ERR(rwsem_down_write_failed_killable(sem))) + return -EINTR; + + return 0; +} + /* * trylock for writing -- returns 1 if successful, 0 if contention */ -- 2.7.0
next prev parent reply other threads:[~2016-02-02 20:19 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-02 20:19 [RFC 0/12] introduce down_write_killable for rw_semaphore Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` [RFC 01/12] locking, rwsem: get rid of __down_write_nested Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` [RFC 02/12] locking, rwsem: drop explicit memory barriers Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` [RFC 03/12] locking, rwsem: introduce basis for down_write_killable Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` Michal Hocko [this message] 2016-02-02 20:19 ` [RFC 04/12] alpha, rwsem: provide __down_write_killable Michal Hocko 2016-02-02 20:19 ` [RFC 05/12] ia64, " Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` [RFC 06/12] s390, " Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` [RFC 07/12] sh, " Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-03 11:19 ` Sergei Shtylyov 2016-02-03 11:19 ` Sergei Shtylyov 2016-02-03 12:11 ` Michal Hocko 2016-02-03 12:11 ` Michal Hocko 2016-02-02 20:19 ` [RFC 08/12] sparc, " Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` [RFC 09/12] xtensa, " Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-02 20:19 ` [RFC 10/12] x86, rwsem: simplify __down_write Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-03 8:10 ` Ingo Molnar 2016-02-03 8:10 ` Ingo Molnar 2016-02-03 12:10 ` Michal Hocko 2016-02-03 12:10 ` Michal Hocko 2016-06-03 16:13 ` Peter Zijlstra 2016-06-03 16:13 ` Peter Zijlstra 2016-06-03 22:34 ` Peter Zijlstra 2016-06-03 22:34 ` Peter Zijlstra 2016-06-09 14:40 ` David Howells 2016-06-09 14:40 ` David Howells 2016-06-09 17:36 ` Peter Zijlstra 2016-06-09 17:36 ` Peter Zijlstra 2016-06-10 16:39 ` Paul E. McKenney 2016-06-10 16:39 ` Paul E. McKenney 2016-02-02 20:19 ` [RFC 11/12] x86, rwsem: provide __down_write_killable Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-17 16:41 ` [RFC 11/12 v1] " Michal Hocko 2016-02-17 16:41 ` Michal Hocko 2016-02-17 16:41 ` Michal Hocko 2016-02-17 16:41 ` Michal Hocko 2016-02-02 20:19 ` [RFC 12/12] locking, rwsem: provide down_write_killable Michal Hocko 2016-02-02 20:19 ` Michal Hocko 2016-02-19 12:15 ` [RFC 0/12] introduce down_write_killable for rw_semaphore Michal Hocko 2016-02-19 12:15 ` Michal Hocko 2016-03-09 12:18 ` Ingo Molnar 2016-03-09 12:18 ` Ingo Molnar 2016-03-09 12:56 ` Michal Hocko 2016-03-09 12:56 ` Michal Hocko 2016-03-09 13:17 ` Ingo Molnar 2016-03-09 13:17 ` Ingo Molnar 2016-03-09 13:28 ` Michal Hocko 2016-03-09 13:28 ` Michal Hocko 2016-03-09 13:43 ` Ingo Molnar 2016-03-09 13:43 ` Ingo Molnar 2016-03-09 14:41 ` Michal Hocko 2016-03-09 14:41 ` Michal Hocko 2016-03-10 10:24 ` Ingo Molnar 2016-03-10 10:24 ` Ingo Molnar
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=1454444369-2146-5-git-send-email-mhocko@kernel.org \ --to=mhocko@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=chris@zankel.net \ --cc=davem@davemloft.net \ --cc=hpa@zytor.com \ --cc=jcmvbkbc@gmail.com \ --cc=linux-alpha@vger.kernel.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-ia64@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=linux-xtensa@linux-xtensa.org \ --cc=mhocko@suse.com \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=sparclinux@vger.kernel.org \ --cc=tglx@linutronix.de \ --cc=tony.luck@intel.com \ --cc=x86@kernel.org \ /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.