From patchwork Mon Feb 29 12:58:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 8453681 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7F213C0553 for ; Mon, 29 Feb 2016 13:03:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A758C2015E for ; Mon, 29 Feb 2016 13:03:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC5EC20131 for ; Mon, 29 Feb 2016 13:03:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754291AbcB2NCl (ORCPT ); Mon, 29 Feb 2016 08:02:41 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36221 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752753AbcB2M6k (ORCPT ); Mon, 29 Feb 2016 07:58:40 -0500 Received: by mail-wm0-f68.google.com with SMTP id l68so8090376wml.3; Mon, 29 Feb 2016 04:58:39 -0800 (PST) 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=G77HllpQMpK1AvGuHhgpz2taAocOJRu434TzJbi7cio=; b=eM/MtcnPc61cowITuGCvgH9YZSVC/SZIaL/d++tpokBgnQJEhJ/B0XkUeOKXDEjJvx 1PD1ZIywJoPqEC+syJTCk988J7x6b3oxGTMdBYhr9fHBhcIFu64wCK0mSs1TB7PGtw8P A9e/1Zj6HzTvdQJf/8AUmpr5tFwZvF9HANF3v+kDHHROJz8gZB0TX/wN7Wi3jMLP+97a PuKgNs6Sg+6H1UAv+MQLDzx193GIwYDcuMldWrJzC8dEzUdrBD+QoWBA1lhiEFN/OalJ TU5lOKLxsobDbV1VrwADaCqE4Q8Bl8s/BYCmQ91sVZz0Ehxz2VLEr8rrcQZAdROi4MNB f24A== X-Gm-Message-State: AD7BkJL1EK1irMvNnCbn6reRgwPnmzkdsMTbbgCTaFU5IT2KGyr/boZPd8vMUcfWryu6iw== X-Received: by 10.28.216.141 with SMTP id p135mr11998495wmg.22.1456750718355; Mon, 29 Feb 2016 04:58:38 -0800 (PST) Received: from tiehlicka.suse.cz (bband-dyn69.95-103-50.t-com.sk. [95.103.50.69]) by smtp.gmail.com with ESMTPSA id lh1sm25728400wjb.20.2016.02.29.04.58.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 04:58:37 -0800 (PST) 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 04/11] alpha, rwsem: provide __down_write_killable Date: Mon, 29 Feb 2016 13:58:18 +0100 Message-Id: <1456750705-7141-5-git-send-email-mhocko@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456750705-7141-1-git-send-email-mhocko@kernel.org> References: <1456750705-7141-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=-6.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/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 */