Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752000AbbFOWYU (ORCPT ); Mon, 15 Jun 2015 18:24:20 -0400 Received: from g2t2352.austin.hp.com ([15.217.128.51]:37796 "EHLO g2t2352.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbbFOWYM (ORCPT ); Mon, 15 Jun 2015 18:24:12 -0400 From: Waiman Long To: Peter Zijlstra , Ingo Molnar , Arnd Bergmann Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , Scott J Norton , Douglas Hatch , Waiman Long Subject: [PATCH v3 1/2] locking/qrwlock: Better optimization for interrupt context readers Date: Mon, 15 Jun 2015 18:24:02 -0400 Message-Id: <1434407043-18741-2-git-send-email-Waiman.Long@hp.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1434407043-18741-1-git-send-email-Waiman.Long@hp.com> References: <1434407043-18741-1-git-send-email-Waiman.Long@hp.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3242 Lines: 88 The qrwlock is fair in the process context, but becoming unfair when in the interrupt context to support use cases like the tasklist_lock. The current code isn't that well-documented on what happens when in the interrupt context. The rspin_until_writer_unlock() will only spin if the writer has gotten the lock. If the writer is still in the waiting state, the increment in the reader count will cause the writer to remain in the waiting state and the new interrupt context reader will get the lock and return immediately. The current code, however, do an additional read of the lock value which is not necessary as the information have already been there in the fast path. This may sometime cause an additional cacheline load when the lock is highly contended. This patch passes the lock value information gotten in the fast path to the slow path to eliminate the additional read. It also clarify the action for the interrupt context readers more explicitly. Signed-off-by: Waiman Long --- include/asm-generic/qrwlock.h | 4 ++-- kernel/locking/qrwlock.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/asm-generic/qrwlock.h b/include/asm-generic/qrwlock.h index 6383d54..865d021 100644 --- a/include/asm-generic/qrwlock.h +++ b/include/asm-generic/qrwlock.h @@ -36,7 +36,7 @@ /* * External function declarations */ -extern void queue_read_lock_slowpath(struct qrwlock *lock); +extern void queue_read_lock_slowpath(struct qrwlock *lock, u32 cnts); extern void queue_write_lock_slowpath(struct qrwlock *lock); /** @@ -105,7 +105,7 @@ static inline void queue_read_lock(struct qrwlock *lock) return; /* The slowpath will decrement the reader count, if necessary. */ - queue_read_lock_slowpath(lock); + queue_read_lock_slowpath(lock, cnts); } /** diff --git a/kernel/locking/qrwlock.c b/kernel/locking/qrwlock.c index 00c12bb..d7d7557 100644 --- a/kernel/locking/qrwlock.c +++ b/kernel/locking/qrwlock.c @@ -43,22 +43,24 @@ rspin_until_writer_unlock(struct qrwlock *lock, u32 cnts) * queue_read_lock_slowpath - acquire read lock of a queue rwlock * @lock: Pointer to queue rwlock structure */ -void queue_read_lock_slowpath(struct qrwlock *lock) +void queue_read_lock_slowpath(struct qrwlock *lock, u32 cnts) { - u32 cnts; - /* * Readers come here when they cannot get the lock without waiting */ if (unlikely(in_interrupt())) { /* - * Readers in interrupt context will spin until the lock is - * available without waiting in the queue. + * Readers in interrupt context will get the lock immediately + * if the writer is just waiting (not holding the lock yet) + * or they will spin until the lock is available without + * waiting in the queue. */ - cnts = smp_load_acquire((u32 *)&lock->cnts); + if ((cnts & _QW_WMASK) != _QW_LOCKED) + return; rspin_until_writer_unlock(lock, cnts); return; } + atomic_sub(_QR_BIAS, &lock->cnts); /* -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/