From: Vineeth Remanan Pillai <vpillai@digitalocean.com>
To: Nishanth Aravamudan <naravamudan@digitalocean.com>,
Julien Desfossez <jdesfossez@digitalocean.com>,
Peter Zijlstra <peterz@infradead.org>,
Tim Chen <tim.c.chen@linux.intel.com>,
mingo@kernel.org, tglx@linutronix.de, pjt@google.com,
torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, subhra.mazumdar@oracle.com,
fweisbec@gmail.com, keescook@chromium.org, kerrnel@google.com,
Phil Auld <pauld@redhat.com>, Aaron Lu <aaron.lwe@gmail.com>,
Aubrey Li <aubrey.intel@gmail.com>,
Valentin Schneider <valentin.schneider@arm.com>,
Mel Gorman <mgorman@techsingularity.net>,
Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Vineeth Remanan Pillai <vpillai@digitalocean.com>
Subject: [RFC PATCH v3 10/16] sched: Core-wide rq->lock
Date: Wed, 29 May 2019 20:36:46 +0000 [thread overview]
Message-ID: <a03795e66ed45469ac5b3c1b1d01c8ed33be299f.1559129225.git.vpillai@digitalocean.com> (raw)
In-Reply-To: <cover.1559129225.git.vpillai@digitalocean.com>
In-Reply-To: <cover.1559129225.git.vpillai@digitalocean.com>
From: Peter Zijlstra <peterz@infradead.org>
Introduce the basic infrastructure to have a core wide rq->lock.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Julien Desfossez <jdesfossez@digitalocean.com>
Signed-off-by: Vineeth Remanan Pillai <vpillai@digitalocean.com>
---
Changes in v3
-------------
- Fixes a crash during cpu offline/offline with coresched enabled
- Vineeth Pillai
kernel/Kconfig.preempt | 7 ++-
kernel/sched/core.c | 113 ++++++++++++++++++++++++++++++++++++++++-
kernel/sched/sched.h | 31 +++++++++++
3 files changed, 148 insertions(+), 3 deletions(-)
diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index 0fee5fe6c899..02fe0bf26676 100644
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -57,4 +57,9 @@ config PREEMPT
endchoice
config PREEMPT_COUNT
- bool
+ bool
+
+config SCHED_CORE
+ bool
+ default y
+ depends on SCHED_SMT
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b883c70674ba..b1ce33f9b106 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -60,6 +60,70 @@ __read_mostly int scheduler_running;
*/
int sysctl_sched_rt_runtime = 950000;
+#ifdef CONFIG_SCHED_CORE
+
+DEFINE_STATIC_KEY_FALSE(__sched_core_enabled);
+
+/*
+ * The static-key + stop-machine variable are needed such that:
+ *
+ * spin_lock(rq_lockp(rq));
+ * ...
+ * spin_unlock(rq_lockp(rq));
+ *
+ * ends up locking and unlocking the _same_ lock, and all CPUs
+ * always agree on what rq has what lock.
+ *
+ * XXX entirely possible to selectively enable cores, don't bother for now.
+ */
+static int __sched_core_stopper(void *data)
+{
+ bool enabled = !!(unsigned long)data;
+ int cpu;
+
+ for_each_online_cpu(cpu)
+ cpu_rq(cpu)->core_enabled = enabled;
+
+ return 0;
+}
+
+static DEFINE_MUTEX(sched_core_mutex);
+static int sched_core_count;
+
+static void __sched_core_enable(void)
+{
+ // XXX verify there are no cookie tasks (yet)
+
+ static_branch_enable(&__sched_core_enabled);
+ stop_machine(__sched_core_stopper, (void *)true, NULL);
+}
+
+static void __sched_core_disable(void)
+{
+ // XXX verify there are no cookie tasks (left)
+
+ stop_machine(__sched_core_stopper, (void *)false, NULL);
+ static_branch_disable(&__sched_core_enabled);
+}
+
+void sched_core_get(void)
+{
+ mutex_lock(&sched_core_mutex);
+ if (!sched_core_count++)
+ __sched_core_enable();
+ mutex_unlock(&sched_core_mutex);
+}
+
+void sched_core_put(void)
+{
+ mutex_lock(&sched_core_mutex);
+ if (!--sched_core_count)
+ __sched_core_disable();
+ mutex_unlock(&sched_core_mutex);
+}
+
+#endif /* CONFIG_SCHED_CORE */
+
/*
* __task_rq_lock - lock the rq @p resides on.
*/
@@ -5790,8 +5854,15 @@ int sched_cpu_activate(unsigned int cpu)
/*
* When going up, increment the number of cores with SMT present.
*/
- if (cpumask_weight(cpu_smt_mask(cpu)) == 2)
+ if (cpumask_weight(cpu_smt_mask(cpu)) == 2) {
static_branch_inc_cpuslocked(&sched_smt_present);
+#ifdef CONFIG_SCHED_CORE
+ if (static_branch_unlikely(&__sched_core_enabled)) {
+ rq->core_enabled = true;
+ }
+#endif
+ }
+
#endif
set_cpu_active(cpu, true);
@@ -5839,8 +5910,16 @@ int sched_cpu_deactivate(unsigned int cpu)
/*
* When going down, decrement the number of cores with SMT present.
*/
- if (cpumask_weight(cpu_smt_mask(cpu)) == 2)
+ if (cpumask_weight(cpu_smt_mask(cpu)) == 2) {
+#ifdef CONFIG_SCHED_CORE
+ struct rq *rq = cpu_rq(cpu);
+ if (static_branch_unlikely(&__sched_core_enabled)) {
+ rq->core_enabled = false;
+ }
+#endif
static_branch_dec_cpuslocked(&sched_smt_present);
+
+ }
#endif
if (!sched_smp_initialized)
@@ -5865,6 +5944,28 @@ static void sched_rq_cpu_starting(unsigned int cpu)
int sched_cpu_starting(unsigned int cpu)
{
+#ifdef CONFIG_SCHED_CORE
+ const struct cpumask *smt_mask = cpu_smt_mask(cpu);
+ struct rq *rq, *core_rq = NULL;
+ int i;
+
+ for_each_cpu(i, smt_mask) {
+ rq = cpu_rq(i);
+ if (rq->core && rq->core == rq)
+ core_rq = rq;
+ }
+
+ if (!core_rq)
+ core_rq = cpu_rq(cpu);
+
+ for_each_cpu(i, smt_mask) {
+ rq = cpu_rq(i);
+
+ WARN_ON_ONCE(rq->core && rq->core != core_rq);
+ rq->core = core_rq;
+ }
+#endif /* CONFIG_SCHED_CORE */
+
sched_rq_cpu_starting(cpu);
sched_tick_start(cpu);
return 0;
@@ -5893,6 +5994,9 @@ int sched_cpu_dying(unsigned int cpu)
update_max_interval();
nohz_balance_exit_idle(rq);
hrtick_clear(rq);
+#ifdef CONFIG_SCHED_CORE
+ rq->core = NULL;
+#endif
return 0;
}
#endif
@@ -6091,6 +6195,11 @@ void __init sched_init(void)
#endif /* CONFIG_SMP */
hrtick_rq_init(rq);
atomic_set(&rq->nr_iowait, 0);
+
+#ifdef CONFIG_SCHED_CORE
+ rq->core = NULL;
+ rq->core_enabled = 0;
+#endif
}
set_load_weight(&init_task, false);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index a024dd80eeb3..eb38063221d0 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -952,6 +952,12 @@ struct rq {
/* Must be inspected within a rcu lock section */
struct cpuidle_state *idle_state;
#endif
+
+#ifdef CONFIG_SCHED_CORE
+ /* per rq */
+ struct rq *core;
+ unsigned int core_enabled;
+#endif
};
#ifdef CONFIG_FAIR_GROUP_SCHED
@@ -979,11 +985,36 @@ static inline int cpu_of(struct rq *rq)
#endif
}
+#ifdef CONFIG_SCHED_CORE
+DECLARE_STATIC_KEY_FALSE(__sched_core_enabled);
+
+static inline bool sched_core_enabled(struct rq *rq)
+{
+ return static_branch_unlikely(&__sched_core_enabled) && rq->core_enabled;
+}
+
+static inline raw_spinlock_t *rq_lockp(struct rq *rq)
+{
+ if (sched_core_enabled(rq))
+ return &rq->core->__lock;
+
+ return &rq->__lock;
+}
+
+#else /* !CONFIG_SCHED_CORE */
+
+static inline bool sched_core_enabled(struct rq *rq)
+{
+ return false;
+}
+
static inline raw_spinlock_t *rq_lockp(struct rq *rq)
{
return &rq->__lock;
}
+#endif /* CONFIG_SCHED_CORE */
+
#ifdef CONFIG_SCHED_SMT
extern void __update_idle_core(struct rq *rq);
--
2.17.1
next prev parent reply other threads:[~2019-05-29 20:37 UTC|newest]
Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 20:36 [RFC PATCH v3 00/16] Core scheduling v3 Vineeth Remanan Pillai
2019-05-29 20:36 ` [RFC PATCH v3 01/16] stop_machine: Fix stop_cpus_in_progress ordering Vineeth Remanan Pillai
2019-08-08 10:54 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2019-08-26 16:19 ` [RFC PATCH v3 01/16] " mark gross
2019-08-26 16:59 ` Peter Zijlstra
2019-05-29 20:36 ` [RFC PATCH v3 02/16] sched: Fix kerneldoc comment for ia64_set_curr_task Vineeth Remanan Pillai
2019-08-08 10:55 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2019-08-26 16:20 ` [RFC PATCH v3 02/16] " mark gross
2019-05-29 20:36 ` [RFC PATCH v3 03/16] sched: Wrap rq::lock access Vineeth Remanan Pillai
2019-05-29 20:36 ` [RFC PATCH v3 04/16] sched/{rt,deadline}: Fix set_next_task vs pick_next_task Vineeth Remanan Pillai
2019-08-08 10:55 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2019-05-29 20:36 ` [RFC PATCH v3 05/16] sched: Add task_struct pointer to sched_class::set_curr_task Vineeth Remanan Pillai
2019-08-08 10:57 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2019-05-29 20:36 ` [RFC PATCH v3 06/16] sched/fair: Export newidle_balance() Vineeth Remanan Pillai
2019-08-08 10:58 ` [tip:sched/core] sched/fair: Expose newidle_balance() tip-bot for Peter Zijlstra
2019-05-29 20:36 ` [RFC PATCH v3 07/16] sched: Allow put_prev_task() to drop rq->lock Vineeth Remanan Pillai
2019-08-08 10:58 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2019-08-26 16:51 ` [RFC PATCH v3 07/16] " mark gross
2019-05-29 20:36 ` [RFC PATCH v3 08/16] sched: Rework pick_next_task() slow-path Vineeth Remanan Pillai
2019-08-08 10:59 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2019-08-26 17:01 ` [RFC PATCH v3 08/16] " mark gross
2019-05-29 20:36 ` [RFC PATCH v3 09/16] sched: Introduce sched_class::pick_task() Vineeth Remanan Pillai
2019-08-26 17:14 ` mark gross
2019-05-29 20:36 ` Vineeth Remanan Pillai [this message]
2019-05-31 11:08 ` [RFC PATCH v3 10/16] sched: Core-wide rq->lock Peter Zijlstra
2019-05-31 15:23 ` Vineeth Pillai
2019-05-29 20:36 ` [RFC PATCH v3 11/16] sched: Basic tracking of matching tasks Vineeth Remanan Pillai
2019-08-26 20:59 ` mark gross
2019-05-29 20:36 ` [RFC PATCH v3 12/16] sched: A quick and dirty cgroup tagging interface Vineeth Remanan Pillai
2019-05-29 20:36 ` [RFC PATCH v3 13/16] sched: Add core wide task selection and scheduling Vineeth Remanan Pillai
2019-06-07 23:36 ` Pawan Gupta
2019-05-29 20:36 ` [RFC PATCH v3 14/16] sched/fair: Add a few assertions Vineeth Remanan Pillai
2019-05-29 20:36 ` [RFC PATCH v3 15/16] sched: Trivial forced-newidle balancer Vineeth Remanan Pillai
2019-05-29 20:36 ` [RFC PATCH v3 16/16] sched: Debug bits Vineeth Remanan Pillai
2019-05-29 21:02 ` Peter Oskolkov
2019-05-30 14:04 ` [RFC PATCH v3 00/16] Core scheduling v3 Aubrey Li
2019-05-30 14:17 ` Julien Desfossez
2019-05-31 4:55 ` Aubrey Li
2019-05-31 3:01 ` Aaron Lu
2019-05-31 5:12 ` Aubrey Li
2019-05-31 6:09 ` Aaron Lu
2019-05-31 6:53 ` Aubrey Li
2019-05-31 7:44 ` Aaron Lu
2019-05-31 8:26 ` Aubrey Li
2019-05-31 21:08 ` Julien Desfossez
2019-06-06 15:26 ` Julien Desfossez
2019-06-12 1:52 ` Li, Aubrey
2019-06-12 16:06 ` Julien Desfossez
2019-06-12 16:33 ` Julien Desfossez
2019-06-13 0:03 ` Subhra Mazumdar
2019-06-13 3:22 ` Julien Desfossez
2019-06-17 2:51 ` Aubrey Li
2019-06-19 18:33 ` Julien Desfossez
2019-07-18 10:07 ` Aaron Lu
2019-07-18 23:27 ` Tim Chen
2019-07-19 5:52 ` Aaron Lu
2019-07-19 11:48 ` Aubrey Li
2019-07-19 18:33 ` Tim Chen
2019-07-22 10:26 ` Aubrey Li
2019-07-22 10:43 ` Aaron Lu
2019-07-23 2:52 ` Aubrey Li
2019-07-25 14:30 ` Aaron Lu
2019-07-25 14:31 ` [RFC PATCH 1/3] wrapper for cfs_rq->min_vruntime Aaron Lu
2019-07-25 14:32 ` [PATCH 2/3] core vruntime comparison Aaron Lu
2019-08-06 14:17 ` Peter Zijlstra
2019-07-25 14:33 ` [PATCH 3/3] temp hack to make tick based schedule happen Aaron Lu
2019-07-25 21:42 ` [RFC PATCH v3 00/16] Core scheduling v3 Li, Aubrey
2019-07-26 15:21 ` Julien Desfossez
2019-07-26 21:29 ` Tim Chen
2019-07-31 2:42 ` Li, Aubrey
2019-08-02 15:37 ` Julien Desfossez
2019-08-05 15:55 ` Tim Chen
2019-08-06 3:24 ` Aaron Lu
2019-08-06 6:56 ` Aubrey Li
2019-08-06 7:04 ` Aaron Lu
2019-08-06 12:24 ` Vineeth Remanan Pillai
2019-08-06 13:49 ` Aaron Lu
2019-08-06 16:14 ` Vineeth Remanan Pillai
2019-08-06 14:16 ` Peter Zijlstra
2019-08-06 15:53 ` Vineeth Remanan Pillai
2019-08-06 17:03 ` Tim Chen
2019-08-06 17:12 ` Peter Zijlstra
2019-08-06 21:19 ` Tim Chen
2019-08-08 6:47 ` Aaron Lu
2019-08-08 17:27 ` Tim Chen
2019-08-08 21:42 ` Tim Chen
2019-08-10 14:15 ` Aaron Lu
2019-08-12 15:38 ` Vineeth Remanan Pillai
2019-08-13 2:24 ` Aaron Lu
2019-08-08 12:55 ` Aaron Lu
2019-08-08 16:39 ` Tim Chen
2019-08-10 14:18 ` Aaron Lu
2019-08-05 20:09 ` Phil Auld
2019-08-06 13:54 ` Aaron Lu
2019-08-06 14:17 ` Phil Auld
2019-08-06 14:41 ` Aaron Lu
2019-08-06 14:55 ` Phil Auld
2019-08-07 8:58 ` Dario Faggioli
2019-08-07 17:10 ` Tim Chen
2019-08-15 16:09 ` Dario Faggioli
2019-08-16 2:33 ` Aaron Lu
2019-09-05 1:44 ` Julien Desfossez
2019-09-06 22:17 ` Tim Chen
2019-09-18 21:27 ` Tim Chen
2019-09-06 18:30 ` Tim Chen
2019-09-11 14:02 ` Aaron Lu
2019-09-11 16:19 ` Tim Chen
2019-09-11 16:47 ` Vineeth Remanan Pillai
2019-09-12 12:35 ` Aaron Lu
2019-09-12 17:29 ` Tim Chen
2019-09-13 14:15 ` Aaron Lu
2019-09-13 17:13 ` Tim Chen
2019-09-30 11:53 ` Vineeth Remanan Pillai
2019-10-02 20:48 ` Vineeth Remanan Pillai
2019-10-10 13:54 ` Aaron Lu
2019-10-10 14:29 ` Vineeth Remanan Pillai
2019-10-11 7:33 ` Aaron Lu
2019-10-11 11:32 ` Vineeth Remanan Pillai
2019-10-11 12:01 ` Aaron Lu
2019-10-11 12:10 ` Vineeth Remanan Pillai
2019-10-12 3:55 ` Aaron Lu
2019-10-13 12:44 ` Vineeth Remanan Pillai
2019-10-14 9:57 ` Aaron Lu
2019-10-21 12:30 ` Vineeth Remanan Pillai
2019-09-12 12:04 ` Aaron Lu
2019-09-12 17:05 ` Tim Chen
2019-09-13 13:57 ` Aaron Lu
2019-09-12 23:12 ` Aubrey Li
2019-09-15 14:14 ` Aaron Lu
2019-09-18 1:33 ` Aubrey Li
2019-09-18 20:40 ` Tim Chen
2019-09-18 22:16 ` Aubrey Li
2019-09-30 14:36 ` Vineeth Remanan Pillai
2019-10-29 20:40 ` Julien Desfossez
2019-11-01 21:42 ` Tim Chen
2019-10-29 9:11 ` Dario Faggioli
2019-10-29 9:15 ` Dario Faggioli
2019-10-29 9:16 ` Dario Faggioli
2019-10-29 9:17 ` Dario Faggioli
2019-10-29 9:18 ` Dario Faggioli
2019-10-29 9:18 ` Dario Faggioli
2019-10-29 9:19 ` Dario Faggioli
2019-10-29 9:20 ` Dario Faggioli
2019-10-29 20:34 ` Julien Desfossez
2019-11-15 16:30 ` Dario Faggioli
2019-09-25 2:40 ` Aubrey Li
2019-09-25 17:24 ` Tim Chen
2019-09-25 22:07 ` Aubrey Li
2019-09-30 15:22 ` Julien Desfossez
2019-08-27 21:14 ` Matthew Garrett
2019-08-27 21:50 ` Peter Zijlstra
2019-08-28 15:30 ` Phil Auld
2019-08-28 16:01 ` Peter Zijlstra
2019-08-28 16:37 ` Tim Chen
2019-08-29 14:30 ` Phil Auld
2019-08-29 14:38 ` Peter Zijlstra
2019-09-10 14:27 ` Julien Desfossez
2019-09-18 21:12 ` Tim Chen
2019-08-28 15:59 ` Tim Chen
2019-08-28 16:16 ` Peter Zijlstra
2019-08-27 23:24 ` Aubrey Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a03795e66ed45469ac5b3c1b1d01c8ed33be299f.1559129225.git.vpillai@digitalocean.com \
--to=vpillai@digitalocean.com \
--cc=aaron.lwe@gmail.com \
--cc=aubrey.intel@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jdesfossez@digitalocean.com \
--cc=keescook@chromium.org \
--cc=kerrnel@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@techsingularity.net \
--cc=mingo@kernel.org \
--cc=naravamudan@digitalocean.com \
--cc=pauld@redhat.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=subhra.mazumdar@oracle.com \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--cc=torvalds@linux-foundation.org \
--cc=valentin.schneider@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).