From patchwork Fri Apr 1 11:04:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 8722831 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 56360C0555 for ; Fri, 1 Apr 2016 11:08:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FED8203C4 for ; Fri, 1 Apr 2016 11:08:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77CC6203B6 for ; Fri, 1 Apr 2016 11:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752899AbcDALHa (ORCPT ); Fri, 1 Apr 2016 07:07:30 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33856 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758849AbcDALFP (ORCPT ); Fri, 1 Apr 2016 07:05:15 -0400 Received: by mail-wm0-f67.google.com with SMTP id p65so3712654wmp.1; Fri, 01 Apr 2016 04:05:14 -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=azMISwPqub+VxvH4Od3RaTVgdd+bAxC+E6izk3k6lp4=; b=S20BYbsscpnVmgWd/2jGmk7Mas+hbOi+2bZC99gz5SeTCZq66LmbrrO/jhx9YWzPrU FaOYvVjcftv+ImoAEqbjz8gHQvoHwMNUdy79JkrUYX1I6D7+ce60aUEd1YC2Es3abbEJ tYfuzl47j86NcrhPDBGum5oIAy5Y7aqKeabLeHrmqQ4vhLLMqD+GEh0Hoh0sjg6CUeRF TsRbCzmjhBGJi8GzZHQNTL4ZG07oSwXAt8oi77OlJnvecqBy6b74rIVhqNi3nvRxVeSZ lU7h6RkdwIekIPArAmtlEAQRoJ98/f6gWUISKdhf2OE9U7457HNLVZqMT+CJnBtVmhYo V3nA== X-Gm-Message-State: AD7BkJI2QnBIbMImlAJ5MJOuNV+y3q15D56LAhlz9GnvAOzH2na4u365Ofe9J4jq4U5WYw== X-Received: by 10.28.176.200 with SMTP id z191mr3264358wme.91.1459508713328; Fri, 01 Apr 2016 04:05:13 -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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 04:05:12 -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 07/11] sh, rwsem: provide __down_write_killable Date: Fri, 1 Apr 2016 13:04:51 +0200 Message-Id: <1459508695-14915-8-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 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/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;