From patchwork Tue Feb 2 20:19:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 8195401 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 80A13BEEE5 for ; Tue, 2 Feb 2016 20:21:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3031202F0 for ; Tue, 2 Feb 2016 20:21:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3B7E202C8 for ; Tue, 2 Feb 2016 20:21:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965774AbcBBUUn (ORCPT ); Tue, 2 Feb 2016 15:20:43 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36850 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933528AbcBBUTs (ORCPT ); Tue, 2 Feb 2016 15:19:48 -0500 Received: by mail-wm0-f68.google.com with SMTP id 128so4050064wmz.3; Tue, 02 Feb 2016 12:19:46 -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=YCVrF7t9ioV8gOKdiFlRmJA39oe737n8g+8cpEPghHg=; b=Pxa8ps34QH/IJwLmMNaro11VledYgm1kGAWUbQyutvVUOw5oNeY6QhqbxdD0ZuFn8h +Ftaushmx5/eZoyMesPiHDg6HgJCedeYfkekEx7hpQWMmhDzLNlpylzF4+vil3u+xLPE c0yHkU0LKunSq+TRLltaU27xXYSXxHR9V35PXfrAvNoRVw9N5rEdknubfp7mW4EjISea Up6xloW/qMlKOfAIGwAOfiANTQEHhx7/6GL9OEWv/7BCMquxfUuL1vqD61i6b7gUEF2n dJ9jfV03OUmiPXppb4s155nWgQJK55L/hMJyPNalKEQ2elsQE/wXoC6za6SaIj/PncbF Poow== X-Gm-Message-State: AG10YORwPFieLULLQ67R3dgrtcBUlt0aKPKNlKgmw3GsbRzgg9kB6EYKbmWSeVymY2pWDQ== X-Received: by 10.194.9.42 with SMTP id w10mr29776081wja.159.1454444386185; Tue, 02 Feb 2016 12:19:46 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Feb 2016 12:19:45 -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 07/12] sh, rwsem: provide __down_write_killable Date: Tue, 2 Feb 2016 21:19:24 +0100 Message-Id: <1454444369-2146-8-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: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 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 which is 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/sh/include/asm/rwsem.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/sh/include/asm/rwsem.h b/arch/sh/include/asm/rwsem.h index f6c951c7a875..8a457b83d2a5 100644 --- a/arch/sh/include/asm/rwsem.h +++ b/arch/sh/include/asm/rwsem.h @@ -54,6 +54,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) +{ + int tmp; + + tmp = atomic_add_return(RWSEM_ACTIVE_WRITE_BIAS, + (atomic_t *)(&sem->count)); + if (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) { int tmp;