From patchwork Fri Apr 1 11:04:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 8722771 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 67B819F39A for ; Fri, 1 Apr 2016 11:07:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F6E7202C8 for ; Fri, 1 Apr 2016 11:07:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C061201FA for ; Fri, 1 Apr 2016 11:07:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbcDALFP (ORCPT ); Fri, 1 Apr 2016 07:05:15 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36747 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758724AbcDALFN (ORCPT ); Fri, 1 Apr 2016 07:05:13 -0400 Received: by mail-wm0-f67.google.com with SMTP id 20so3685890wmh.3; Fri, 01 Apr 2016 04:05:11 -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=NY7IXGvaU5qftTknQBtsgk3EIZ7m2smVGG7Ogx79Y1Y=; b=BCSM7xF4zUl/4EoAcyl+zUCBu6h87Z2mTuESq8QfLAyRgVNayrOWzfxpc3ThBiG/KL FwVus/MM1hiuroIhl0IqBu8ZLVk+1p0cSGY0E95759YdRC9BLTs2gBJ8ytgM5KxdxWcU BKuJEKySizwbUrXCc4l+iDHTALfuydyJIH3FVXC5wRGRmTwz0hv0pEcyaHGUb6wZGVq+ G06NvoZL4sML/As9CRtyT8TLGBnLmtwMxmTbbQJQfQUHQkdF8IMwsXNXSutBFJ2v0FfZ iLt0FCLwdBNROXNgmtawuGul4HTBN/qESsZ/N73rhGn3uglmjyRFcsPrq1vKfadgUkoR l2Jg== X-Gm-Message-State: AD7BkJKAlcjDtxN+e+Xg5YLYZQNwZZXAjVWD9qSmz0UGmN61oRU81qip1maXr9q6r15Jmg== X-Received: by 10.28.24.130 with SMTP id 124mr3273315wmy.50.1459508710928; Fri, 01 Apr 2016 04:05:10 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 04:05:10 -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 05/11] ia64, rwsem: provide __down_write_killable Date: Fri, 1 Apr 2016 13:04:49 +0200 Message-Id: <1459508695-14915-6-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: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Michal Hocko 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 --- arch/ia64/include/asm/rwsem.h | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h index 3027e7516d85..5e78cb40d9df 100644 --- a/arch/ia64/include/asm/rwsem.h +++ b/arch/ia64/include/asm/rwsem.h @@ -49,8 +49,8 @@ __down_read (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) { long old, new; @@ -59,10 +59,26 @@ __down_write (struct rw_semaphore *sem) new = old + RWSEM_ACTIVE_WRITE_BIAS; } while (cmpxchg_acq(&sem->count, old, new) != old); - 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; +} + /* * unlock after reading */