From patchwork Thu Feb 23 12:26:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 60948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp288212wrd; Thu, 23 Feb 2023 04:39:29 -0800 (PST) X-Google-Smtp-Source: AK7set/t+LzWwoqvv83qhKusEAkdjuhIoGzxssUXzAe/hL3XOT+RCMtvEKzznUu8En9kAk2fnws2 X-Received: by 2002:a17:906:51ca:b0:8eb:fb1a:6970 with SMTP id v10-20020a17090651ca00b008ebfb1a6970mr3354011ejk.1.1677155968949; Thu, 23 Feb 2023 04:39:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677155968; cv=none; d=google.com; s=arc-20160816; b=fO5Uwm4ZVcpzQDGf+urV4uP3XbfGfIn85T87IxXusaxHtFG0FSmC0MY8KUZOB2xOO1 6F6wL7QtetH3i+pjVV6cAYhhEhCMpFHI/t8PIdDI43l72N3GHcRUhzax/8EG/RZqBlgB WNN69BnTQ6M873S/Ty7/2lyiDHxD1QM7E5aqqUMYANTcVAOrXXGo8HUj+Ufsff0aXkmC coZ6aCsUXdCwZFjKXHp2kff3NASbZP/H8WC0oVfijLPzrnFp2rJBMzkbWgYVTNjrWCu6 n6oy4/7IQtgBS+SE3v/xJNvajxJcMmArdJlIROoQlLRsEMuYe9LKpnm/tQYLlfofNHUv 6tYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature; bh=TEsGyLB0CNcBpX90uP9C3/IuHqwgLDCS4pkbIzi7bTs=; b=uEaXmvHe3wVkaNXNmJWoej8HWvTopIJvxayqROoqYVocUU+I/4//srvB6qU+DE1mVy QQIgQQKW194SWzPzsy6gangUmBz/Qb4doCMObFVmYwRBP1PNcLo2jnU/CC7FodzGlzFc W6XOKPu1h2iODYFAvEaESAnbCRzCnG1jr6Jo/S0Q5340ZHxvZTw9vFLPNxW0EQlOLvOE LykTUbvDzt83RYuoZ8B+UZQx0PyQZDd/8rS5gCyrdzDMQQobDvUIcJW9pqutjHX+8drj vTt4++QX0WuWTHMLOGn0Xy9wok1klZzVDxGNvyBiNIy9L5Ko4fXA5KRyO/CEUCGLuggC rX3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=W+Yg1h01; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t26-20020a170906c39a00b008beb8136584si16513118ejz.491.2023.02.23.04.39.05; Thu, 23 Feb 2023 04:39:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=W+Yg1h01; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233776AbjBWMe6 (ORCPT + 99 others); Thu, 23 Feb 2023 07:34:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233824AbjBWMeq (ORCPT ); Thu, 23 Feb 2023 07:34:46 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D551F53291 for ; Thu, 23 Feb 2023 04:34:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=TEsGyLB0CNcBpX90uP9C3/IuHqwgLDCS4pkbIzi7bTs=; b=W+Yg1h01pDhHfxnGAyRcsmwgae TUshyVt3m63K6ldCz0ndwzLsb7y7tLV14Pywr392gBpULlSTcJVFhW540Y3SiHgeMmp1msaNSxNxL 23lUZfij3DeAxFGUX7WK0ceMqp5pkC+1ohtQE5GcrPATG1ZXU0a1We/Lmy/EhrRElzcnzM3jBMRCw UWWAB3pHtfdbwzU2ZRpWM+a50z2mkn48eAsvf3NXy7awZLRfV5NVj+tTBpTokPy5VHbm7uwNESw3u MV6tqDmGvzvM3onImHKxLJYIlk8ISJqq9No4CkqP3hHxlpLYImk+3NH+4GGL47TviJPiPV2avyFid h/0oSBmQ==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pVAo1-00EMIv-2D; Thu, 23 Feb 2023 12:34:37 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id DE32130082F; Thu, 23 Feb 2023 13:34:35 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id C88112C86FE08; Thu, 23 Feb 2023 13:34:35 +0100 (CET) Message-ID: <20230223123319.667433408@infradead.org> User-Agent: quilt/0.66 Date: Thu, 23 Feb 2023 13:26:48 +0100 From: Peter Zijlstra To: longman@redhat.com, mingo@redhat.com, will@kernel.org Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, boqun.feng@gmail.com Subject: [PATCH 6/6] locking/rwsem: Use the force References: <20230223122642.491637862@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758625497240358637?= X-GMAIL-MSGID: =?utf-8?q?1758625497240358637?= Now that the writer adjustment is done from the wakeup side and HANDOFF guarantees spinning/stealing is disabled, use the combined guarantee it ignore spurious READER_BIAS and directly claim the lock. Signed-off-by: Peter Zijlstra (Intel) --- kernel/locking/lock_events_list.h | 1 + kernel/locking/rwsem.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) --- a/kernel/locking/lock_events_list.h +++ b/kernel/locking/lock_events_list.h @@ -67,3 +67,4 @@ LOCK_EVENT(rwsem_rlock_handoff) /* # of LOCK_EVENT(rwsem_wlock) /* # of write locks acquired */ LOCK_EVENT(rwsem_wlock_fail) /* # of failed write lock acquisitions */ LOCK_EVENT(rwsem_wlock_handoff) /* # of write lock handoffs */ +LOCK_EVENT(rwsem_wlock_ehandoff) /* # of write lock early handoffs */ --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -433,6 +433,26 @@ static void rwsem_writer_wake(struct rw_ lockdep_assert_held(&sem->wait_lock); count = atomic_long_read(&sem->count); + + /* + * Since rwsem_mark_wake() is only called (with WAKE_ANY) when + * the lock is unlocked, and the HANDOFF bit guarantees that + * all spinning / stealing is disabled, it is posssible to + * unconditionally claim the lock -- any READER_BIAS will be + * temporary. + */ + if (count & RWSEM_FLAG_HANDOFF) { + unsigned long adjustment = RWSEM_WRITER_LOCKED - RWSEM_FLAG_HANDOFF; + + if (list_is_singular(&sem->wait_list)) + adjustment -= RWSEM_FLAG_WAITERS; + + atomic_long_set(&sem->owner, (long)waiter->task); + atomic_long_add(adjustment, &sem->count); + lockevent_inc(rwsem_wlock_ehandoff); + goto success; + } + do { bool has_handoff = !!(count & RWSEM_FLAG_HANDOFF); @@ -479,6 +499,7 @@ static void rwsem_writer_wake(struct rw_ return; } +success: /* * Have rwsem_writer_wake() fully imply rwsem_del_waiter() on * success.