From patchwork Thu Feb 23 12:26:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 60949 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp288358wrd; Thu, 23 Feb 2023 04:39:49 -0800 (PST) X-Google-Smtp-Source: AK7set9VRpnF4xd34ef2qPvTjr5INgMObmZwTK8aYZMzbPqfkzNfg+KWHFXPaP60TcoV6QGlPUU+ X-Received: by 2002:a17:906:51d8:b0:8ae:cd8e:3957 with SMTP id v24-20020a17090651d800b008aecd8e3957mr17321945ejk.4.1677155989338; Thu, 23 Feb 2023 04:39:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677155989; cv=none; d=google.com; s=arc-20160816; b=b78QIqYQuBnLFDtXWLOQNswAHY6iemaQeYyZ/NUSbh+6tE4Nd9Sag0J3aSUvlVcAcP uFDKzsKSwLHSTvU1Npb9ovjTx7zt6+dgfZMtMqn2ZhAZZ9nXaDTpH6bnXP3xWhpFxPkh cMZR28fvo6FKAYmliKq4gIEWERSfwO8irwOhpnpCgfbrJRTvHfe0EWteqIbyoY2BBu/f OdXcuob28zTetNT1U1WvfXGZdZEcn3CXpga1Pagq9g/qGYWxHUmjvF4Mbsn0Tw3pqYIo DVvpdCpNegvY7UJMdj/BIcM668ayDdOXbXrwxSxD3dyShMcpqtaJANpPDHoqlUwtUBdd ZWMA== 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=0TS8nXz+u1sbnPtO4cPWraWjlrBkSRepEXgG/CH9vjk=; b=rk81Med+JbiVITgPIBqN//dtyr88xSRVwNRZq3aB4o30GbVc0Y7IIFG0Tdq0lbAW5p DlxZF1bfr73WwiUo6GD6UspA0Q6Geuzh3cPJy2fwaqAfNO/449DloNSmiH39ZDeg1IEa lx4JhJDpTVJQzYTdhB7wJ9mV6XuQ0FD9PlrpCN3EzzgWbM8Inm62hJrdUwGrbChcHYVn WAJN5rl97jtTmRyrTJHcnmVaK+jjQafQbGBvJxaDe6wdkmhounqmCHykhViFB5wiYj2b RDP/mLC9jSW1QB1hbFgXvK3ULvKXhmXz/Mscbqy1HACrBPL5klQXlTXYlhAOYe326SHz IYLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=desiato.20200630 header.b=mN5vdRVp; 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 i22-20020aa7c716000000b004ad5219cd2asi4794973edq.355.2023.02.23.04.39.26; Thu, 23 Feb 2023 04:39:49 -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=desiato.20200630 header.b=mN5vdRVp; 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 S233956AbjBWMfB (ORCPT + 99 others); Thu, 23 Feb 2023 07:35:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233896AbjBWMes (ORCPT ); Thu, 23 Feb 2023 07:34:48 -0500 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77745532AC for ; Thu, 23 Feb 2023 04:34:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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=0TS8nXz+u1sbnPtO4cPWraWjlrBkSRepEXgG/CH9vjk=; b=mN5vdRVpmTtTwyuN2DIFDauxqj 1o3qoMLZfcsM6maEP16gO+DSlQfS5ptl7EPmIPsPda4yq4sG369icdDjiUuaUYF+QIocsyOzMyZ96 6dklfwYDxpDR8zBjS9UOctta8RTPWdySmOX3yEYMR95FsXskw1nMviCP+PMybek5DF/0X+IpyocRP EyJH3qRjjaqcU8T1POIFwSGm8JuQrGsS7bSkVdiEvvyFtlhgXi/QeKMLOwtL1fLj1sJkSj49eoVk7 Rq1JOT1cSqa/rkEd/K5MZ6L/4ug8N9I7xuy1skmNaJ7C5XLPffjET0T2Qhy5F0derdG4e41Uwu9TM wghnXc8w==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pVAo0-00CuV7-0x; Thu, 23 Feb 2023 12:34:36 +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 D174E30067B; Thu, 23 Feb 2023 13:34:35 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id B84AE2C86FE03; Thu, 23 Feb 2023 13:34:35 +0100 (CET) Message-ID: <20230223123319.428168721@infradead.org> User-Agent: quilt/0.66 Date: Thu, 23 Feb 2023 13:26:44 +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 2/6] locking/rwsem: Enforce queueing when HANDOFF 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?1758625518708970927?= X-GMAIL-MSGID: =?utf-8?q?1758625518708970927?= Ensure that HANDOFF disables all spinning and stealing. Signed-off-by: Peter Zijlstra (Intel) --- kernel/locking/rwsem.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -468,7 +468,12 @@ static void rwsem_mark_wake(struct rw_se adjustment -= RWSEM_FLAG_HANDOFF; lockevent_inc(rwsem_rlock_handoff); } + /* + * With HANDOFF set for reader, we must + * terminate all spinning. + */ waiter->handoff_set = true; + rwsem_set_nonspinnable(sem); } atomic_long_add(-adjustment, &sem->count); @@ -755,6 +760,10 @@ rwsem_spin_on_owner(struct rw_semaphore owner = rwsem_owner_flags(sem, &flags); state = rwsem_owner_state(owner, flags); + + if (owner == current) + return OWNER_NONSPINNABLE; /* Handoff granted */ + if (state != OWNER_WRITER) return state;