From patchwork Fri Jun 6 15:55:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 4312461 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 574E3BEEAA for ; Fri, 6 Jun 2014 15:56:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 87B1020274 for ; Fri, 6 Jun 2014 15:56:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A626220222 for ; Fri, 6 Jun 2014 15:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752734AbaFFP4F (ORCPT ); Fri, 6 Jun 2014 11:56:05 -0400 Received: from g4t3426.houston.hp.com ([15.201.208.54]:59329 "EHLO g4t3426.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751986AbaFFP4D (ORCPT ); Fri, 6 Jun 2014 11:56:03 -0400 Received: from g4t3433.houston.hp.com (g4t3433.houston.hp.com [16.210.25.219]) by g4t3426.houston.hp.com (Postfix) with ESMTP id E98C0291; Fri, 6 Jun 2014 15:56:01 +0000 (UTC) Received: from buesod1.americas.hpqcorp.net (unknown [16.212.160.243]) by g4t3433.houston.hp.com (Postfix) with ESMTP id 32C1B5B; Fri, 6 Jun 2014 15:55:59 +0000 (UTC) From: Davidlohr Bueso To: peterz@infradead.org, mingo@kernel.org Cc: mpatocka@redhat.com, torvalds@linux-foundation.org, jason.low2@hp.com, waiman.long@hp.com, jejb@parisc-linux.org, paulmck@linux.vnet.ibm.com, dave.anglin@bell.net, aswin@hp.com, davidlohr@hp.com, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH 1/2] locking/rwsem: Add CONFIG_RWSEM_SPIN_ON_OWNER Date: Fri, 6 Jun 2014 08:55:39 -0700 Message-Id: <1402070140-15090-2-git-send-email-davidlohr@hp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1402070140-15090-1-git-send-email-davidlohr@hp.com> References: <1402070140-15090-1-git-send-email-davidlohr@hp.com> Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Just like with mutexes (CONFIG_MUTEX_SPIN_ON_OWNER), encapsulate the dependencies for rwsem optimistic spinning. No logical changes here as it continues to depend on both SMP and the XADD algorithm variant. Signed-off-by: Davidlohr Bueso Acked-by: Jason Low --- include/linux/rwsem.h | 4 ++-- kernel/Kconfig.locks | 4 ++++ kernel/locking/rwsem.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 8d79708..accdef7 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -27,7 +27,7 @@ struct rw_semaphore { long count; raw_spinlock_t wait_lock; struct list_head wait_list; -#ifdef CONFIG_SMP +#ifdef CONFIG_RWSEM_SPIN_ON_OWNER /* * Write owner. Used as a speculative check to see * if the owner is running on the cpu. @@ -64,7 +64,7 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) # define __RWSEM_DEP_MAP_INIT(lockname) #endif -#if defined(CONFIG_SMP) && !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) +#ifdef CONFIG_RWSEM_SPIN_ON_OWNER #define __RWSEM_INITIALIZER(name) \ { RWSEM_UNLOCKED_VALUE, \ __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock), \ diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks index 35536d9..e4c3162 100644 --- a/kernel/Kconfig.locks +++ b/kernel/Kconfig.locks @@ -224,6 +224,10 @@ config MUTEX_SPIN_ON_OWNER def_bool y depends on SMP && !DEBUG_MUTEXES +config RWSEM_SPIN_ON_OWNER + def_bool y + depends on SMP && RWSEM_XCHGADD_ALGORITHM + config ARCH_USE_QUEUE_RWLOCK bool diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 42f806d..e2d3bc7 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -12,7 +12,7 @@ #include -#if defined(CONFIG_SMP) && defined(CONFIG_RWSEM_XCHGADD_ALGORITHM) +#ifdef CONFIG_RWSEM_SPIN_ON_OWNER static inline void rwsem_set_owner(struct rw_semaphore *sem) { sem->owner = current;