From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754493Ab3JBWis (ORCPT ); Wed, 2 Oct 2013 18:38:48 -0400 Received: from mga02.intel.com ([134.134.136.20]:47427 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754404Ab3JBWip (ORCPT ); Wed, 2 Oct 2013 18:38:45 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,1022,1371106800"; d="scan'208";a="413212359" Subject: [PATCH v8 3/9] rwsem: remove try_reader_grant label do_wake From: Tim Chen To: Ingo Molnar , Andrew Morton Cc: Linus Torvalds , Andrea Arcangeli , Alex Shi , Andi Kleen , Michel Lespinasse , Davidlohr Bueso , Matthew R Wilcox , Dave Hansen , Peter Zijlstra , Rik van Riel , Peter Hurley , "Paul E.McKenney" , Tim Chen , Jason Low , Waiman Long , linux-kernel@vger.kernel.org, linux-mm In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Date: Wed, 02 Oct 2013 15:38:25 -0700 Message-ID: <1380753505.11046.85.camel@schen9-DESK> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 (2.32.3-1.fc14) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org That make code simple and more readable Signed-off-by: Alex Shi --- lib/rwsem.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/rwsem.c b/lib/rwsem.c index 42f1b1a..a8055cf 100644 --- a/lib/rwsem.c +++ b/lib/rwsem.c @@ -85,15 +85,17 @@ __rwsem_do_wake(struct rw_semaphore *sem, enum rwsem_wake_type wake_type) adjustment = 0; if (wake_type != RWSEM_WAKE_READ_OWNED) { adjustment = RWSEM_ACTIVE_READ_BIAS; - try_reader_grant: - oldcount = rwsem_atomic_update(adjustment, sem) - adjustment; - if (unlikely(oldcount < RWSEM_WAITING_BIAS)) { - /* A writer stole the lock. Undo our reader grant. */ + while (1) { + oldcount = rwsem_atomic_update(adjustment, sem) + - adjustment; + if (likely(oldcount >= RWSEM_WAITING_BIAS)) + break; + + /* A writer stole the lock. Undo our reader grant. */ if (rwsem_atomic_update(-adjustment, sem) & RWSEM_ACTIVE_MASK) return sem; /* Last active locker left. Retry waking readers. */ - goto try_reader_grant; } } -- 1.7.4.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pb0-f43.google.com (mail-pb0-f43.google.com [209.85.160.43]) by kanga.kvack.org (Postfix) with ESMTP id 0A2E36B003C for ; Wed, 2 Oct 2013 18:38:48 -0400 (EDT) Received: by mail-pb0-f43.google.com with SMTP id md4so1546337pbc.2 for ; Wed, 02 Oct 2013 15:38:48 -0700 (PDT) Subject: [PATCH v8 3/9] rwsem: remove try_reader_grant label do_wake From: Tim Chen In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Date: Wed, 02 Oct 2013 15:38:25 -0700 Message-ID: <1380753505.11046.85.camel@schen9-DESK> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Ingo Molnar , Andrew Morton Cc: Linus Torvalds , Andrea Arcangeli , Alex Shi , Andi Kleen , Michel Lespinasse , Davidlohr Bueso , Matthew R Wilcox , Dave Hansen , Peter Zijlstra , Rik van Riel , Peter Hurley , "Paul E.McKenney" , Tim Chen , Jason Low , Waiman Long , linux-kernel@vger.kernel.org, linux-mm That make code simple and more readable Signed-off-by: Alex Shi --- lib/rwsem.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/rwsem.c b/lib/rwsem.c index 42f1b1a..a8055cf 100644 --- a/lib/rwsem.c +++ b/lib/rwsem.c @@ -85,15 +85,17 @@ __rwsem_do_wake(struct rw_semaphore *sem, enum rwsem_wake_type wake_type) adjustment = 0; if (wake_type != RWSEM_WAKE_READ_OWNED) { adjustment = RWSEM_ACTIVE_READ_BIAS; - try_reader_grant: - oldcount = rwsem_atomic_update(adjustment, sem) - adjustment; - if (unlikely(oldcount < RWSEM_WAITING_BIAS)) { - /* A writer stole the lock. Undo our reader grant. */ + while (1) { + oldcount = rwsem_atomic_update(adjustment, sem) + - adjustment; + if (likely(oldcount >= RWSEM_WAITING_BIAS)) + break; + + /* A writer stole the lock. Undo our reader grant. */ if (rwsem_atomic_update(-adjustment, sem) & RWSEM_ACTIVE_MASK) return sem; /* Last active locker left. Retry waking readers. */ - goto try_reader_grant; } } -- 1.7.4.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org