From patchwork Mon Jun 19 11:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 109931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2938025vqr; Mon, 19 Jun 2023 04:29:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zSWOw1vWbdSh4Kt2wIfKzzMTCBtbPNF4ZVJJK2aBbgl72/0AOyyRLvmHuLfgCngAIf8GW X-Received: by 2002:a17:903:25d1:b0:1b0:3ab6:5140 with SMTP id jc17-20020a17090325d100b001b03ab65140mr9499484plb.4.1687174181356; Mon, 19 Jun 2023 04:29:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687174181; cv=none; d=google.com; s=arc-20160816; b=wlQAupHaZdTr5W3Ay1eE6TWXuyWbj8cQCdR/co4zjlUDekb6QspmP6b1AZBKqvPNSz 0T0cno4l8zJ9/iWHPdezQCwc+KzB6Lien6AdbX4dE9+H/w7kA7eKhfVWGIcC6xFBFoZo ZvuQpR8cysjGbojEBUBgfdOja3Ku9JrcegiHWPppdd5ZSjxgpZO2KCt18dJJJJ1zFtbV jDLrJYOyImmiXR0f9IQu3s1S6oRbzlnMK0RhxxXB3kmjcH1KgpN8Wl7oSQPYFLEUpUuX 5fQLV7XXvdE2VdRlr7DfVXkHYQG93NrRoD+k9x+HZU0aao3FB/BtMg2fMcTDKdWzrt8/ h1og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=J97AV1wbvGzM84xSecIv75HNLCdjTpNilZUb/XHuEvw=; b=bosgr6wqMySi8Kcop1KSlDHSGjheakVlCtiDTWxlCZ9sS1CKndRBCeDJgIfmObfHWj w0QMS5X1bMwpTElhHeIuqt5G7/veqWeUhb5hblvbwKKoafRE2A4cUqFpYXOnP2IlKEfO W8wU1fK+4z44/+7xVK4Q1XiQmg6SLH5bl3DYggyM3WcIqZjwe1sb78f23TCdVimsXxWn Lt5TQesOUFt1Wp6LB8OGujSArqt7lZ0io+h48C8hwNHeqx2BLZ6fLgT36BG8BwA/DCBo 3Q38JRl4iLLTx8r0RjWXEEhokpT9OcxZWn5Gk6qKuTkePYnYJv9+Qa71kHSSmw1FrwHN fjYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=QqOqFoJ+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Jqmvjs6q; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q11-20020a170902dacb00b001b0113e102dsi7261720plx.365.2023.06.19.04.29.26; Mon, 19 Jun 2023 04:29:41 -0700 (PDT) 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=@linutronix.de header.s=2020 header.b=QqOqFoJ+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Jqmvjs6q; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232597AbjFSLGG (ORCPT + 99 others); Mon, 19 Jun 2023 07:06:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232660AbjFSLFn (ORCPT ); Mon, 19 Jun 2023 07:05:43 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4BFD19B6; Mon, 19 Jun 2023 04:04:53 -0700 (PDT) Date: Mon, 19 Jun 2023 11:04:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1687172692; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J97AV1wbvGzM84xSecIv75HNLCdjTpNilZUb/XHuEvw=; b=QqOqFoJ+f1IVCZkhDbXydMy8yHrAFn9sBrzw6jE05H/dn7wihkQ9u5KWZTqZ8u7E/xDGU1 mXti7X4JXEJxQZ5SNiQLcLJIWCokigBkNgZl0U2JSpWADD1AtjwDc6WO8knvn7nHAStomF WMrxPy1lHX9bFqFhmKfug/V5LZXinIM4N9QayNX83CShLHEjDgWD2bfY3WWZ0EGr6jLcr8 QfYVQYieR/s9mSVlkMsN2Y48Ezaz2cfbrIEZem/YkSWqHCQwMR+bMORt9S0Yx1K4C0Ng8e mogtTxZLCwnFTbjnB+kSENqZV5E++xNgn7Uusf2Dw7gf88mFEru1jzS3vp/bIA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1687172692; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J97AV1wbvGzM84xSecIv75HNLCdjTpNilZUb/XHuEvw=; b=Jqmvjs6qkWzSLcXJr40+UfI821V/Nb0EfnphKp/Ij9hP1NzOSxEnQdSrbIMr0lPDBXg+gG Y4R009F8AHshr9AQ== From: "tip-bot2 for Hao Jia" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/core: Fixed missing rq clock update before calling set_rq_offline() Cc: Ben Segall , Hao Jia , "Peter Zijlstra (Intel)" , Vincent Guittot , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230613082012.49615-2-jiahao.os@bytedance.com> References: <20230613082012.49615-2-jiahao.os@bytedance.com> MIME-Version: 1.0 Message-ID: <168717269157.404.12414969911873741834.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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_PASS,T_SCC_BODY_TEXT_LINE 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?1768576960416105116?= X-GMAIL-MSGID: =?utf-8?q?1769130354312736056?= The following commit has been merged into the sched/core branch of tip: Commit-ID: cab3ecaed5cdcc9c36a96874b4c45056a46ece45 Gitweb: https://git.kernel.org/tip/cab3ecaed5cdcc9c36a96874b4c45056a46ece45 Author: Hao Jia AuthorDate: Tue, 13 Jun 2023 16:20:09 +08:00 Committer: Peter Zijlstra CommitterDate: Fri, 16 Jun 2023 22:08:12 +02:00 sched/core: Fixed missing rq clock update before calling set_rq_offline() When using a cpufreq governor that uses cpufreq_add_update_util_hook(), it is possible to trigger a missing update_rq_clock() warning for the CPU hotplug path: rq_attach_root() set_rq_offline() rq_offline_rt() __disable_runtime() sched_rt_rq_enqueue() enqueue_top_rt_rq() cpufreq_update_util() data->func(data, rq_clock(rq), flags) Move update_rq_clock() from sched_cpu_deactivate() (one of it's callers) into set_rq_offline() such that it covers all set_rq_offline() usage. Additionally change rq_attach_root() to use rq_lock_irqsave() so that it will properly manage the runqueue clock flags. Suggested-by: Ben Segall Signed-off-by: Hao Jia Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Vincent Guittot Link: https://lkml.kernel.org/r/20230613082012.49615-2-jiahao.os@bytedance.com --- kernel/sched/core.c | 2 +- kernel/sched/topology.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ac38225..442efe5 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9585,6 +9585,7 @@ void set_rq_offline(struct rq *rq) if (rq->online) { const struct sched_class *class; + update_rq_clock(rq); for_each_class(class) { if (class->rq_offline) class->rq_offline(rq); @@ -9726,7 +9727,6 @@ int sched_cpu_deactivate(unsigned int cpu) rq_lock_irqsave(rq, &rf); if (rq->rd) { - update_rq_clock(rq); BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span)); set_rq_offline(rq); } diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index cb92dc5..d3a3b26 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -487,9 +487,9 @@ static void free_rootdomain(struct rcu_head *rcu) void rq_attach_root(struct rq *rq, struct root_domain *rd) { struct root_domain *old_rd = NULL; - unsigned long flags; + struct rq_flags rf; - raw_spin_rq_lock_irqsave(rq, flags); + rq_lock_irqsave(rq, &rf); if (rq->rd) { old_rd = rq->rd; @@ -515,7 +515,7 @@ void rq_attach_root(struct rq *rq, struct root_domain *rd) if (cpumask_test_cpu(rq->cpu, cpu_active_mask)) set_rq_online(rq); - raw_spin_rq_unlock_irqrestore(rq, flags); + rq_unlock_irqrestore(rq, &rf); if (old_rd) call_rcu(&old_rd->rcu, free_rootdomain);