From patchwork Fri Apr 1 11:04:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 604710 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qbz9K6Cs6z9t3n for ; Fri, 1 Apr 2016 22:07:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759188AbcDALHA (ORCPT ); Fri, 1 Apr 2016 07:07:00 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35161 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754584AbcDALFQ (ORCPT ); Fri, 1 Apr 2016 07:05:16 -0400 Received: by mail-wm0-f67.google.com with SMTP id 139so3699787wmn.2; Fri, 01 Apr 2016 04:05:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7QymAhlZ0TgbcSpc0rKZ4U8PMNA8DqvvA5mFGbhjlNY=; b=RTYNg3t2ah1TMZo9g43QH/vasc5aQ22YR5XtPulQoDBS32jIQJMDa8ZlICJnbVRUqT EYRDizrObAkQYpAaEq7h302tZLsNvsmKaRdj9BoNmVyEO9X7YU4UrylHPWTpHdrHygQO jkFw70HsIxPWXYxHUaKRMPdkesk/C9s9jFYmIdFXyVH9TPszjqkv1hVCa8Ni2yknUoAJ SOrfucRTjPtb2RJDdN8mDeXdgSOPoXIp/CqGLX0Ke4z8rZO4VK7RfZeDd/5DrkwCisk8 MWvb7Oxb3RDKr+/ni4HPjKQK+b2yM+eBg8RF8O/kJzGRvS4TvomWE39FFgMO6nAd93qH MDBA== X-Gm-Message-State: AD7BkJI6d/bl4fd3hVl+7bzaEEbxcLw6wByCix5F66AEz1MmRBux7Udc30Qkyy7vyx3KSg== X-Received: by 10.194.121.34 with SMTP id lh2mr4266929wjb.145.1459508714327; Fri, 01 Apr 2016 04:05:14 -0700 (PDT) Received: from tiehlicka.suse.cz (nat1.scz.suse.com. [213.151.88.250]) by smtp.gmail.com with ESMTPSA id ys9sm13434670wjc.35.2016.04.01.04.05.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 04:05:13 -0700 (PDT) From: Michal Hocko To: LKML Cc: Peter Zijlstra , Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , "David S. Miller" , Tony Luck , Andrew Morton , Chris Zankel , Max Filippov , 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 Subject: [PATCH 08/11] sparc, rwsem: provide __down_write_killable Date: Fri, 1 Apr 2016 13:04:52 +0200 Message-Id: <1459508695-14915-9-git-send-email-mhocko@kernel.org> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459508695-14915-1-git-send-email-mhocko@kernel.org> References: <1459508695-14915-1-git-send-email-mhocko@kernel.org> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Michal Hocko which uses the same fast path as __down_write except it falls back to rwsem_down_write_failed_killable slow path and return -EINTR if killed. Signed-off-by: Michal Hocko --- arch/sparc/include/asm/rwsem.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/sparc/include/asm/rwsem.h b/arch/sparc/include/asm/rwsem.h index e5a0d575bc7f..c1e9e32e8b63 100644 --- a/arch/sparc/include/asm/rwsem.h +++ b/arch/sparc/include/asm/rwsem.h @@ -55,6 +55,19 @@ static inline void __down_write(struct rw_semaphore *sem) rwsem_down_write_failed(sem); } +static inline int __down_write_killable(struct rw_semaphore *sem) +{ + long tmp; + + tmp = atomic64_add_return(RWSEM_ACTIVE_WRITE_BIAS, + (atomic64_t *)(&sem->count)); + if (unlikely(tmp != RWSEM_ACTIVE_WRITE_BIAS)) + if (IS_ERR(rwsem_down_write_failed_killable(sem))) + return -EINTR; + + return 0; +} + static inline int __down_write_trylock(struct rw_semaphore *sem) { long tmp;