linux-kernel - [PATCH] Revert "sched/deadline: Remove cpu_active_mask from cpudl

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 24 Jun 2020 23:13:15 -0700
From:   Sai Harshini Nimmala <snimmala@...eaurora.org>
To:     mingo@...hat.com, peterz@...radead.org, juri.lelli@...hat.com,
        vincent.guittot@...aro.org, dietmar.eggemann@....com,
        rostedt@...dmis.org, bsegall@...gle.com, mgorman@...e.de,
        linux-kernel@...r.kernel.org, linux-arm-msm@...r.kernel.org,
        linux-arm-msm-owner@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org
Cc:     Sai Harshini Nimmala <snimmala@...eaurora.org>,
        adharmap@...eaurora.org, shalagra@...eaurora.org,
        dickey@...eaurora.org, satyap@...eaurora.org,
        pkondeti@...eaurora.org, clingutla@...eaurora.org,
        aiquny@...eaurora.org, rgottimu@...eaurora.org,
        Puja Gupta <pujag@...eaurora.org>
Subject: [PATCH] Revert "sched/deadline: Remove cpu_active_mask from cpudl_find()"

The original commit 9659e1ee removes checking the cpu_active_mask
while finding the best cpu to place a deadline task, citing the reason that
this mask rarely changes and removing the check will give performance
gains.
However, on hotplugging, the cpu dying path has a brief duration between
the CPUHP_TEARDOWN_CPU and CPUHP_AP_SCHED_STARTING hotplug states where
the DL task can be scheduled on this cpu because the corresponding cpu
bit in cpu->free_cpus has not been cleared yet. Without the
cpu_active_mask check we could end up putting a DL task on such cpus
leading to a BUG.
The cpu_active_mask will be updated promptly before either of these
states and will provide a more accurate check for the use case above.

Signed-off-by: Puja Gupta <pujag@...eaurora.org>
Signed-off-by: Sai Harshini Nimmala <snimmala@...eaurora.org>
---
 kernel/sched/cpudeadline.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c
index 5cc4012..0346837 100644
--- a/kernel/sched/cpudeadline.c
+++ b/kernel/sched/cpudeadline.c
@@ -120,7 +120,8 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,
 	const struct sched_dl_entity *dl_se = &p->dl;
 
 	if (later_mask &&
-	    cpumask_and(later_mask, cp->free_cpus, p->cpus_ptr)) {
+	    cpumask_and(later_mask, cp->free_cpus, p->cpus_ptr) &&
+	    cpumask_and(later_mask, later_mask, cpu_active_mask)) {
 		return 1;
 	} else {
 		int best_cpu = cpudl_maximum(cp);
@@ -128,6 +129,7 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,
 		WARN_ON(best_cpu != -1 && !cpu_present(best_cpu));
 
 		if (cpumask_test_cpu(best_cpu, p->cpus_ptr) &&
+		    cpumask_test_cpu(best_cpu, cpu_active_mask) &&
 		    dl_time_before(dl_se->deadline, cp->elements[0].dl)) {
 			if (later_mask)
 				cpumask_set_cpu(best_cpu, later_mask);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project