From patchwork Wed Nov 30 08:22:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 13059545 X-Patchwork-Delegate: bpf@iogearbox.net 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 69413C4321E for ; Wed, 30 Nov 2022 08:25:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234794AbiK3IY6 (ORCPT ); Wed, 30 Nov 2022 03:24:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234939AbiK3IYY (ORCPT ); Wed, 30 Nov 2022 03:24:24 -0500 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41E6D6B3A4; Wed, 30 Nov 2022 00:23:59 -0800 (PST) Received: by mail-pf1-x430.google.com with SMTP id o1so11607049pfp.12; Wed, 30 Nov 2022 00:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Gxv++NBnFpdmWnlSJbtHUBmuUdRGOnW9DgpB9Iflias=; b=PUfmJVBIHHYPYEhAS6R2x9XGUCDE+Carvu4xp0kRrUUWyPtZhoudJ+UNr44LBXF2oZ /3uLF+zPKD3Tzwo5cqM6mOxsrTxC1Ln/8UALs9GvigOvKHwZFV3aP8kTZQAPdFk9gB41 Io4OSqlNQVrl3hJ5op9KpGnkk+70pBtHajl+DKn9S74EeBMk1+ngPJKEIHxtIXgfmPW0 HkBwVlgQrlPs/3acXQO3UtaoJ+0EvFDM7sIZDD74dVevV2wl6gTmesCPeOl5+e6q3mFj 3ImKlSYxpoIYgmmvMeyC7ZWpjE/VBGgCKp1FtHBm/3gJb/OOT3r++gNu8HvruNUKWiFM fedw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Gxv++NBnFpdmWnlSJbtHUBmuUdRGOnW9DgpB9Iflias=; b=Yz8cA+SoBATZnM23r++pKdSiucUfdXug/oVkZbiHiziBwnkbyL9OVMBittXZYrZw3V xRvKZ9tX5vbQIWdCV7HiO7CFkokK/F1E0Z9gzfBl6bVc3h7+MMvZh1sIDzAWU9qGN/XG jPNA/M3qLMEDIVihEPAAOL53WrGjhGrTNuEi9A875nsgHjH0FNLSBigm+cZ6AyanOb5o sSuhZ733F7I0JJSdlP4a0EVzotmt4WeIqNwlqEMdBKFkx+VkBpFCKpFsw36QhBVhFH28 ikg1FulYcFyiOvKH87z9EbRQ83fc2RQmFxlk3asZUAAae+40UGb8+I5Wm5v1d9iRUecn YT9Q== X-Gm-Message-State: ANoB5pkJ0tR3Kj9m0xyq9UDDc0EX/XHuOnuQZZHoI7vCrEineUPqaWjI ZSn/HN3Rzck/BFffaZl55LA= X-Google-Smtp-Source: AA0mqf63XMQjNSEmX6yr63Qw7tRmJcXsN1K9X4Efcne2YjnQusUApnFeyHjLfZ9GCL1LF3xSRpu+tQ== X-Received: by 2002:a65:458e:0:b0:477:e813:1795 with SMTP id o14-20020a65458e000000b00477e8131795mr21863122pgq.54.1669796638582; Wed, 30 Nov 2022 00:23:58 -0800 (PST) Received: from localhost ([2600:380:4a00:1415:d028:b547:7d35:7b0b]) by smtp.gmail.com with ESMTPSA id d6-20020a170902654600b00172b87d9770sm761887pln.81.2022.11.30.00.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Nov 2022 00:23:58 -0800 (PST) Sender: Tejun Heo From: Tejun Heo To: torvalds@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, joshdon@google.com, brho@google.com, pjt@google.com, derkling@google.com, haoluo@google.com, dvernet@meta.com, dschatzberg@meta.com, dskarlat@cs.cmu.edu, riel@surriel.com Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, kernel-team@meta.com, Tejun Heo Subject: [PATCH 10/31] sched: Add @reason to sched_class->rq_{on|off}line() Date: Tue, 29 Nov 2022 22:22:52 -1000 Message-Id: <20221130082313.3241517-11-tj@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221130082313.3241517-1-tj@kernel.org> References: <20221130082313.3241517-1-tj@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org ->rq_{on|off}line are called either during CPU hotplug or cpuset partition updates. Let's add an argument to distinguish the two cases. The argument will be used by a new sched_class to track CPU hotplug events. Signed-off-by: Tejun Heo Reviewed-by: David Vernet Acked-by: Josh Don Acked-by: Hao Luo Acked-by: Barret Rhoden --- kernel/sched/core.c | 12 ++++++------ kernel/sched/deadline.c | 4 ++-- kernel/sched/fair.c | 4 ++-- kernel/sched/rt.c | 4 ++-- kernel/sched/sched.h | 13 +++++++++---- kernel/sched/topology.c | 4 ++-- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 735e94bc7dbb..0699b49b1a21 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9286,7 +9286,7 @@ static inline void balance_hotplug_wait(void) #endif /* CONFIG_HOTPLUG_CPU */ -void set_rq_online(struct rq *rq) +void set_rq_online(struct rq *rq, enum rq_onoff_reason reason) { if (!rq->online) { const struct sched_class *class; @@ -9296,19 +9296,19 @@ void set_rq_online(struct rq *rq) for_each_class(class) { if (class->rq_online) - class->rq_online(rq); + class->rq_online(rq, reason); } } } -void set_rq_offline(struct rq *rq) +void set_rq_offline(struct rq *rq, enum rq_onoff_reason reason) { if (rq->online) { const struct sched_class *class; for_each_class(class) { if (class->rq_offline) - class->rq_offline(rq); + class->rq_offline(rq, reason); } cpumask_clear_cpu(rq->cpu, rq->rd->online); @@ -9404,7 +9404,7 @@ int sched_cpu_activate(unsigned int cpu) rq_lock_irqsave(rq, &rf); if (rq->rd) { BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span)); - set_rq_online(rq); + set_rq_online(rq, RQ_ONOFF_HOTPLUG); } rq_unlock_irqrestore(rq, &rf); @@ -9449,7 +9449,7 @@ int sched_cpu_deactivate(unsigned int cpu) if (rq->rd) { update_rq_clock(rq); BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span)); - set_rq_offline(rq); + set_rq_offline(rq, RQ_ONOFF_HOTPLUG); } rq_unlock_irqrestore(rq, &rf); diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 9ae8f41e3372..f63e5d0c5fb1 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -2519,7 +2519,7 @@ static void set_cpus_allowed_dl(struct task_struct *p, } /* Assumes rq->lock is held */ -static void rq_online_dl(struct rq *rq) +static void rq_online_dl(struct rq *rq, enum rq_onoff_reason reason) { if (rq->dl.overloaded) dl_set_overload(rq); @@ -2530,7 +2530,7 @@ static void rq_online_dl(struct rq *rq) } /* Assumes rq->lock is held */ -static void rq_offline_dl(struct rq *rq) +static void rq_offline_dl(struct rq *rq, enum rq_onoff_reason reason) { if (rq->dl.overloaded) dl_clear_overload(rq); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 78263cef1ea8..6cad7d07186b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -11436,14 +11436,14 @@ void trigger_load_balance(struct rq *rq) nohz_balancer_kick(rq); } -static void rq_online_fair(struct rq *rq) +static void rq_online_fair(struct rq *rq, enum rq_onoff_reason reason) { update_sysctl(); update_runtime_enabled(rq); } -static void rq_offline_fair(struct rq *rq) +static void rq_offline_fair(struct rq *rq, enum rq_onoff_reason reason) { update_sysctl(); diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index ed2a47e4ddae..0fb7ee087669 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -2470,7 +2470,7 @@ static void task_woken_rt(struct rq *rq, struct task_struct *p) } /* Assumes rq->lock is held */ -static void rq_online_rt(struct rq *rq) +static void rq_online_rt(struct rq *rq, enum rq_onoff_reason reason) { if (rq->rt.overloaded) rt_set_overload(rq); @@ -2481,7 +2481,7 @@ static void rq_online_rt(struct rq *rq) } /* Assumes rq->lock is held */ -static void rq_offline_rt(struct rq *rq) +static void rq_offline_rt(struct rq *rq, enum rq_onoff_reason reason) { if (rq->rt.overloaded) rt_clear_overload(rq); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 157eeabca5db..3c6ea8296ae4 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2169,6 +2169,11 @@ extern const u32 sched_prio_to_wmult[40]; #define RETRY_TASK ((void *)-1UL) +enum rq_onoff_reason { + RQ_ONOFF_HOTPLUG, /* CPU is going on/offline */ + RQ_ONOFF_TOPOLOGY, /* sched domain topology update */ +}; + struct sched_class { #ifdef CONFIG_UCLAMP_TASK @@ -2201,8 +2206,8 @@ struct sched_class { const struct cpumask *newmask, u32 flags); - void (*rq_online)(struct rq *rq); - void (*rq_offline)(struct rq *rq); + void (*rq_online)(struct rq *rq, enum rq_onoff_reason reason); + void (*rq_offline)(struct rq *rq, enum rq_onoff_reason reason); struct rq *(*find_lock_rq)(struct task_struct *p, struct rq *rq); #endif @@ -2726,8 +2731,8 @@ static inline void double_rq_unlock(struct rq *rq1, struct rq *rq2) raw_spin_rq_unlock(rq1); } -extern void set_rq_online (struct rq *rq); -extern void set_rq_offline(struct rq *rq); +extern void set_rq_online (struct rq *rq, enum rq_onoff_reason reason); +extern void set_rq_offline(struct rq *rq, enum rq_onoff_reason reason); extern bool sched_smp_initialized; #else /* CONFIG_SMP */ diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 8739c2a5a54e..0e859bea1cb6 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -493,7 +493,7 @@ void rq_attach_root(struct rq *rq, struct root_domain *rd) old_rd = rq->rd; if (cpumask_test_cpu(rq->cpu, old_rd->online)) - set_rq_offline(rq); + set_rq_offline(rq, RQ_ONOFF_TOPOLOGY); cpumask_clear_cpu(rq->cpu, old_rd->span); @@ -511,7 +511,7 @@ void rq_attach_root(struct rq *rq, struct root_domain *rd) cpumask_set_cpu(rq->cpu, rd->span); if (cpumask_test_cpu(rq->cpu, cpu_active_mask)) - set_rq_online(rq); + set_rq_online(rq, RQ_ONOFF_TOPOLOGY); raw_spin_rq_unlock_irqrestore(rq, flags);