From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753441AbcDVJno (ORCPT ); Fri, 22 Apr 2016 05:43:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36324 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752544AbcDVJnl (ORCPT ); Fri, 22 Apr 2016 05:43:41 -0400 Date: Fri, 22 Apr 2016 02:42:42 -0700 From: tip-bot for Michal Hocko Message-ID: Cc: davem@davemloft.net, tony.luck@intel.com, chris@zankel.net, jcmvbkbc@gmail.com, torvalds@linux-foundation.org, peterz@infradead.org, dbueso@suse.de, tglx@linutronix.de, akpm@linux-foundation.org, paulmck@linux.vnet.ibm.com, mhocko@suse.com, hpa@zytor.com, linux-kernel@vger.kernel.org, jason.low2@hp.com, mingo@kernel.org Reply-To: paulmck@linux.vnet.ibm.com, mhocko@suse.com, mingo@kernel.org, jason.low2@hp.com, linux-kernel@vger.kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, peterz@infradead.org, jcmvbkbc@gmail.com, chris@zankel.net, tony.luck@intel.com, davem@davemloft.net, akpm@linux-foundation.org, tglx@linutronix.de, dbueso@suse.de In-Reply-To: <1460041951-22347-8-git-send-email-mhocko@kernel.org> References: <1460041951-22347-8-git-send-email-mhocko@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/rwsem] locking/rwsem, alpha: Provide __down_write_killable() Git-Commit-ID: 7deb5eebc1e61b15c5c7f1ef19f216b20d7f7d00 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7deb5eebc1e61b15c5c7f1ef19f216b20d7f7d00 Gitweb: http://git.kernel.org/tip/7deb5eebc1e61b15c5c7f1ef19f216b20d7f7d00 Author: Michal Hocko AuthorDate: Thu, 7 Apr 2016 17:12:27 +0200 Committer: Ingo Molnar CommitDate: Wed, 13 Apr 2016 10:42:21 +0200 locking/rwsem, alpha: Provide __down_write_killable() 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 Cc: Andrew Morton Cc: Chris Zankel Cc: David S. Miller Cc: Linus Torvalds Cc: Max Filippov Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Signed-off-by: Davidlohr Bueso Cc: Signed-off-by: Jason Low Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-alpha@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-ia64@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: linux-sh@vger.kernel.org Cc: linux-xtensa@linux-xtensa.org Cc: sparclinux@vger.kernel.org Link: http://lkml.kernel.org/r/1460041951-22347-8-git-send-email-mhocko@kernel.org Signed-off-by: Ingo Molnar --- 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 a83bbea..0131a70 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 */