From patchwork Tue Feb 2 20:19:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 577582 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 E3FC3140144 for ; Wed, 3 Feb 2016 07:21:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965767AbcBBUUm (ORCPT ); Tue, 2 Feb 2016 15:20:42 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35759 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933496AbcBBUTp (ORCPT ); Tue, 2 Feb 2016 15:19:45 -0500 Received: by mail-wm0-f67.google.com with SMTP id l66so4052970wml.2; Tue, 02 Feb 2016 12:19:44 -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=4Ckalw6tuYKR3wvu2fZnGogCvOoBrCGOL018Z2ypS8g=; b=d8KbQ4/G6HriH2ku0VQauTo5iJscfwdxEzttbtqYizzfJxRuawZtYYjAAlMeWvqUDB l6L4WHVv6zBHPCdGI1vnQEIRM1TUE/yJm/LSo+tZunrWyb529QrfH1jB0gDwCzuAxZUr /VBi48OhhFroMBZEF8IWkRNrdy8HpJXwJxzZTtl8/W8IIFBiGR+zjbrG0Gs7gCo5VaCe jKxKR5UpfuFuKnqlTc6/6iFozU9inlRWvd9mKPnyaugmbRQnFiUeMH50vIQl1ICCY63d S4U1kdOnVduRdLYkkDm6CE6PECZ/APfIxuzvSb2AHay8smiicM0aytihkPkYMEsDzTkQ Rigw== X-Gm-Message-State: AG10YORZCLy8YxxHrnNi0Y6KQI594HEjpdseezfN812sTgitXHFE2YWSQIe9Afu6fna9UA== X-Received: by 10.194.20.105 with SMTP id m9mr30000377wje.161.1454444383899; Tue, 02 Feb 2016 12:19:43 -0800 (PST) Received: from tiehlicka.suse.cz (ip-86-49-65-8.net.upcbroadband.cz. [86.49.65.8]) by smtp.gmail.com with ESMTPSA id l7sm3099511wjx.14.2016.02.02.12.19.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Feb 2016 12:19:43 -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: [RFC 05/12] ia64, rwsem: provide __down_write_killable Date: Tue, 2 Feb 2016 21:19:22 +0100 Message-Id: <1454444369-2146-6-git-send-email-mhocko@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454444369-2146-1-git-send-email-mhocko@kernel.org> References: <1454444369-2146-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 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 */