From nobody Thu Apr 9 09:02:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 181F1C4332F for ; Thu, 3 Nov 2022 18:31:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231834AbiKCSbr (ORCPT ); Thu, 3 Nov 2022 14:31:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229672AbiKCSbk (ORCPT ); Thu, 3 Nov 2022 14:31:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF55095A3 for ; Thu, 3 Nov 2022 11:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667500191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rq8XGM/za3SECEC5EhKMn++1K/i+OiHH929IAZiyu1Q=; b=P2qGaU9A9nr5mUiXQj3b2UWo5i9omcAOwW+i1ZQ/eAuuMA5ccH4CaDIZPLYtPDtj2jShWa jOzyg5+StEBzJ46F80benlzFnbqCm/BourbVa3j1w0IqoMlSilpg+mQRTL91iuWUzZaGm5 cktCOPSsqhC6oAYcH5COzeWCB1+udmc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-pGWcr2k4OL-41WqZfZJuLQ-1; Thu, 03 Nov 2022 14:29:46 -0400 X-MC-Unique: pGWcr2k4OL-41WqZfZJuLQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 392C43C11EA4; Thu, 3 Nov 2022 18:29:45 +0000 (UTC) Received: from llong.com (unknown [10.22.33.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id D13EE1121325; Thu, 3 Nov 2022 18:29:44 +0000 (UTC) From: Waiman Long To: Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng Cc: linux-kernel@vger.kernel.org, john.p.donnelly@oracle.com, Hillf Danton , Mukesh Ojha , =?UTF-8?q?Ting11=20Wang=20=E7=8E=8B=E5=A9=B7?= , Waiman Long Subject: [PATCH v5 4/6] locking/rwsem: Change waiter->hanodff_set to a handoff_state enum Date: Thu, 3 Nov 2022 14:29:34 -0400 Message-Id: <20221103182936.217120-5-longman@redhat.com> In-Reply-To: <20221103182936.217120-1-longman@redhat.com> References: <20221103182936.217120-1-longman@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Change the boolean waiter->handoff_set to an enum type so that we can have more states in some later patches. Also use READ_ONCE() outside wait_lock critical sections for read and WRITE_ONCE() inside wait_lock critical sections for write for proper synchronization. There is no functional change. Signed-off-by: Waiman Long --- kernel/locking/rwsem.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 2953fa4dd790..d80f22f7ecb6 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -335,12 +335,17 @@ enum rwsem_waiter_type { RWSEM_WAITING_FOR_READ }; =20 +enum rwsem_handoff_state { + HANDOFF_NONE =3D 0, + HANDOFF_REQUESTED, +}; + struct rwsem_waiter { struct list_head list; struct task_struct *task; enum rwsem_waiter_type type; + enum rwsem_handoff_state handoff_state; unsigned long timeout; - bool handoff_set; }; #define rwsem_first_waiter(sem) \ list_first_entry(&sem->wait_list, struct rwsem_waiter, list) @@ -467,7 +472,7 @@ static void rwsem_mark_wake(struct rw_semaphore *sem, adjustment -=3D RWSEM_FLAG_HANDOFF; lockevent_inc(rwsem_rlock_handoff); } - waiter->handoff_set =3D true; + WRITE_ONCE(waiter->handoff_state, HANDOFF_REQUESTED); } =20 atomic_long_add(-adjustment, &sem->count); @@ -619,7 +624,7 @@ static inline bool rwsem_try_write_lock(struct rw_semap= hore *sem, * waiter is the one that set it. Otherwisee, we * still try to acquire the rwsem. */ - if (first->handoff_set && (waiter !=3D first)) + if (first->handoff_state && (waiter !=3D first)) return false; } =20 @@ -647,11 +652,11 @@ static inline bool rwsem_try_write_lock(struct rw_sem= aphore *sem, =20 /* * We have either acquired the lock with handoff bit cleared or set - * the handoff bit. Only the first waiter can have its handoff_set + * the handoff bit. Only the first waiter can have its handoff_state * set here to enable optimistic spinning in slowpath loop. */ if (new & RWSEM_FLAG_HANDOFF) { - first->handoff_set =3D true; + WRITE_ONCE(first->handoff_state, HANDOFF_REQUESTED); lockevent_inc(rwsem_wlock_handoff); return false; } @@ -1035,7 +1040,7 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, lo= ng count, unsigned int stat waiter.task =3D current; waiter.type =3D RWSEM_WAITING_FOR_READ; waiter.timeout =3D jiffies + RWSEM_WAIT_TIMEOUT; - waiter.handoff_set =3D false; + waiter.handoff_state =3D HANDOFF_NONE; =20 raw_spin_lock_irq(&sem->wait_lock); if (list_empty(&sem->wait_list)) { @@ -1122,7 +1127,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, i= nt state) waiter.task =3D current; waiter.type =3D RWSEM_WAITING_FOR_WRITE; waiter.timeout =3D jiffies + RWSEM_WAIT_TIMEOUT; - waiter.handoff_set =3D false; + waiter.handoff_state =3D HANDOFF_NONE; =20 raw_spin_lock_irq(&sem->wait_lock); rwsem_add_waiter(sem, &waiter); @@ -1167,7 +1172,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, i= nt state) * In this case, we attempt to acquire the lock again * without sleeping. */ - if (waiter.handoff_set) { + if (READ_ONCE(waiter.handoff_state)) { enum owner_state owner_state; =20 owner_state =3D rwsem_spin_on_owner(sem); --=20 2.31.1