From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753522AbcDVJo3 (ORCPT ); Fri, 22 Apr 2016 05:44:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36388 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845AbcDVJoL (ORCPT ); Fri, 22 Apr 2016 05:44:11 -0400 Date: Fri, 22 Apr 2016 02:43:29 -0700 From: tip-bot for Michal Hocko Message-ID: Cc: paulmck@linux.vnet.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, chris@zankel.net, akpm@linux-foundation.org, jason.low2@hp.com, dbueso@suse.de, jcmvbkbc@gmail.com, davem@davemloft.net, tony.luck@intel.com, mhocko@suse.com, torvalds@linux-foundation.org, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, chris@zankel.net, paulmck@linux.vnet.ibm.com, davem@davemloft.net, dbueso@suse.de, jason.low2@hp.com, akpm@linux-foundation.org, jcmvbkbc@gmail.com, torvalds@linux-foundation.org, mhocko@suse.com, tony.luck@intel.com, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org In-Reply-To: <1460041951-22347-10-git-send-email-mhocko@kernel.org> References: <1460041951-22347-10-git-send-email-mhocko@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/rwsem] locking/rwsem, s390: Provide __down_write_killable() Git-Commit-ID: 4edab14ec66fae5b3c7c4969295facf70365f39d 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: 4edab14ec66fae5b3c7c4969295facf70365f39d Gitweb: http://git.kernel.org/tip/4edab14ec66fae5b3c7c4969295facf70365f39d Author: Michal Hocko AuthorDate: Thu, 7 Apr 2016 17:12:29 +0200 Committer: Ingo Molnar CommitDate: Wed, 13 Apr 2016 10:42:22 +0200 locking/rwsem, s390: 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-10-git-send-email-mhocko@kernel.org Signed-off-by: Ingo Molnar --- arch/s390/include/asm/rwsem.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/s390/include/asm/rwsem.h b/arch/s390/include/asm/rwsem.h index 555d23b..c75e447 100644 --- a/arch/s390/include/asm/rwsem.h +++ b/arch/s390/include/asm/rwsem.h @@ -90,7 +90,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem) /* * lock for writing */ -static inline void __down_write(struct rw_semaphore *sem) +static inline long ___down_write(struct rw_semaphore *sem) { signed long old, new, tmp; @@ -104,10 +104,25 @@ static inline void __down_write(struct rw_semaphore *sem) : "=&d" (old), "=&d" (new), "=Q" (sem->count) : "Q" (sem->count), "m" (tmp) : "cc", "memory"); - if (old != 0) + + return old; +} + +static inline void __down_write(struct rw_semaphore *sem) +{ + if (___down_write(sem)) rwsem_down_write_failed(sem); } +static inline int __down_write_killable(struct rw_semaphore *sem) +{ + if (___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 */