All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Deacon <will@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
	Will Deacon <will@kernel.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Marc Zyngier <maz@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Morten Rasmussen <morten.rasmussen@arm.com>,
	Qais Yousef <qais.yousef@arm.com>,
	Suren Baghdasaryan <surenb@google.com>,
	Quentin Perret <qperret@google.com>, Tejun Heo <tj@kernel.org>,
	Li Zefan <lizefan@huawei.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Ingo Molnar <mingo@redhat.com>,
	Juri Lelli <juri.lelli@redhat.com>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	kernel-team@android.com
Subject: [PATCH v3 12/14] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system
Date: Fri, 13 Nov 2020 09:37:17 +0000	[thread overview]
Message-ID: <20201113093720.21106-13-will@kernel.org> (raw)
In-Reply-To: <20201113093720.21106-1-will@kernel.org>

If we want to support 32-bit applications, then when we identify a CPU
with mismatched 32-bit EL0 support we must ensure that we will always
have an active 32-bit CPU available to us from then on. This is important
for the scheduler, because is_cpu_allowed() will be constrained to 32-bit
CPUs for compat tasks and forced migration due to a hotplug event will
hang if no 32-bit CPUs are available.

On detecting a mismatch, prevent offlining of either the mismatching CPU
if it is 32-bit capable, or find the first active 32-bit capable CPU
otherwise.

Signed-off-by: Will Deacon <will@kernel.org>
---
 arch/arm64/kernel/cpufeature.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index dfded018af44..853f3ac876a3 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -1237,6 +1237,8 @@ has_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
 
 static int enable_mismatched_32bit_el0(unsigned int cpu)
 {
+	static int lucky_winner = -1;
+
 	struct cpuinfo_arm64 *info = &per_cpu(cpu_data, cpu);
 	bool cpu_32bit = id_aa64pfr0_32bit_el0(info->reg_id_aa64pfr0);
 
@@ -1245,6 +1247,22 @@ static int enable_mismatched_32bit_el0(unsigned int cpu)
 		static_branch_enable_cpuslocked(&arm64_mismatched_32bit_el0);
 	}
 
+	if (cpumask_test_cpu(0, cpu_32bit_el0_mask) == cpu_32bit)
+		return 0;
+
+	if (lucky_winner >= 0)
+		return 0;
+
+	/*
+	 * We've detected a mismatch. We need to keep one of our CPUs with
+	 * 32-bit EL0 online so that is_cpu_allowed() doesn't end up rejecting
+	 * every CPU in the system for a 32-bit task.
+	 */
+	lucky_winner = cpu_32bit ? cpu : cpumask_any_and(cpu_32bit_el0_mask,
+							 cpu_active_mask);
+	get_cpu_device(lucky_winner)->offline_disabled = true;
+	pr_info("Asymmetric 32-bit EL0 support detected on CPU %u; CPU hot-unplug disabled on CPU %u\n",
+		cpu, lucky_winner);
 	return 0;
 }
 
-- 
2.29.2.299.gdc1121823c-goog


WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-arch@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
	kernel-team@android.com,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Juri Lelli <juri.lelli@redhat.com>,
	Quentin Perret <qperret@google.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	linux-kernel@vger.kernel.org, Qais Yousef <qais.yousef@arm.com>,
	Suren Baghdasaryan <surenb@google.com>,
	Ingo Molnar <mingo@redhat.com>, Li Zefan <lizefan@huawei.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Tejun Heo <tj@kernel.org>, Will Deacon <will@kernel.org>,
	Morten Rasmussen <morten.rasmussen@arm.com>
Subject: [PATCH v3 12/14] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system
Date: Fri, 13 Nov 2020 09:37:17 +0000	[thread overview]
Message-ID: <20201113093720.21106-13-will@kernel.org> (raw)
In-Reply-To: <20201113093720.21106-1-will@kernel.org>

If we want to support 32-bit applications, then when we identify a CPU
with mismatched 32-bit EL0 support we must ensure that we will always
have an active 32-bit CPU available to us from then on. This is important
for the scheduler, because is_cpu_allowed() will be constrained to 32-bit
CPUs for compat tasks and forced migration due to a hotplug event will
hang if no 32-bit CPUs are available.

On detecting a mismatch, prevent offlining of either the mismatching CPU
if it is 32-bit capable, or find the first active 32-bit capable CPU
otherwise.

Signed-off-by: Will Deacon <will@kernel.org>
---
 arch/arm64/kernel/cpufeature.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index dfded018af44..853f3ac876a3 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -1237,6 +1237,8 @@ has_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
 
 static int enable_mismatched_32bit_el0(unsigned int cpu)
 {
+	static int lucky_winner = -1;
+
 	struct cpuinfo_arm64 *info = &per_cpu(cpu_data, cpu);
 	bool cpu_32bit = id_aa64pfr0_32bit_el0(info->reg_id_aa64pfr0);
 
@@ -1245,6 +1247,22 @@ static int enable_mismatched_32bit_el0(unsigned int cpu)
 		static_branch_enable_cpuslocked(&arm64_mismatched_32bit_el0);
 	}
 
+	if (cpumask_test_cpu(0, cpu_32bit_el0_mask) == cpu_32bit)
+		return 0;
+
+	if (lucky_winner >= 0)
+		return 0;
+
+	/*
+	 * We've detected a mismatch. We need to keep one of our CPUs with
+	 * 32-bit EL0 online so that is_cpu_allowed() doesn't end up rejecting
+	 * every CPU in the system for a 32-bit task.
+	 */
+	lucky_winner = cpu_32bit ? cpu : cpumask_any_and(cpu_32bit_el0_mask,
+							 cpu_active_mask);
+	get_cpu_device(lucky_winner)->offline_disabled = true;
+	pr_info("Asymmetric 32-bit EL0 support detected on CPU %u; CPU hot-unplug disabled on CPU %u\n",
+		cpu, lucky_winner);
 	return 0;
 }
 
-- 
2.29.2.299.gdc1121823c-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-11-13  9:38 UTC|newest]

Thread overview: 104+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-13  9:37 [PATCH v3 00/14] An alternative series for asymmetric AArch32 systems Will Deacon
2020-11-13  9:37 ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 01/14] arm64: cpuinfo: Split AArch32 registers out into a separate struct Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 02/14] arm64: Allow mismatched 32-bit EL0 support Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-19 11:27   ` Valentin Schneider
2020-11-19 11:27     ` Valentin Schneider
2020-11-19 13:12     ` Will Deacon
2020-11-19 13:12       ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 03/14] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched " Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 04/14] arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 05/14] arm64: Advertise CPUs capable of running 32-bit applications in sysfs Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 06/14] arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0 Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 07/14] sched: Introduce restrict_cpus_allowed_ptr() to limit task CPU affinity Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-19  9:18   ` Quentin Perret
2020-11-19  9:18     ` Quentin Perret
2020-11-19 11:03     ` Quentin Perret
2020-11-19 11:03       ` Quentin Perret
2020-11-19 11:05     ` Will Deacon
2020-11-19 11:05       ` Will Deacon
2020-11-19 11:27       ` Valentin Schneider
2020-11-19 11:27         ` Valentin Schneider
2020-11-19 13:13         ` Will Deacon
2020-11-19 13:13           ` Will Deacon
2020-11-19 14:54           ` Valentin Schneider
2020-11-19 14:54             ` Valentin Schneider
2020-11-19 16:41             ` Will Deacon
2020-11-19 16:41               ` Will Deacon
2020-11-19 12:47   ` Valentin Schneider
2020-11-19 12:47     ` Valentin Schneider
2020-11-19 13:13     ` Will Deacon
2020-11-19 13:13       ` Will Deacon
2020-11-19 14:54       ` Valentin Schneider
2020-11-19 14:54         ` Valentin Schneider
2020-11-19 16:09       ` Peter Zijlstra
2020-11-19 16:09         ` Peter Zijlstra
2020-11-19 16:57         ` Valentin Schneider
2020-11-19 16:57           ` Valentin Schneider
2020-11-19 19:25           ` Will Deacon
2020-11-19 19:25             ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 08/14] arm64: exec: Adjust affinity for compat tasks with mismatched 32-bit EL0 Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-19  9:24   ` Quentin Perret
2020-11-19  9:24     ` Quentin Perret
2020-11-19 11:06     ` Will Deacon
2020-11-19 11:06       ` Will Deacon
2020-11-19 16:19       ` Peter Zijlstra
2020-11-19 16:19         ` Peter Zijlstra
2020-11-19 16:30         ` Will Deacon
2020-11-19 16:30           ` Will Deacon
2020-11-19 16:44           ` Peter Zijlstra
2020-11-19 16:44             ` Peter Zijlstra
2020-11-19 16:51             ` Will Deacon
2020-11-19 16:51               ` Will Deacon
2020-11-19 16:14   ` Peter Zijlstra
2020-11-19 16:14     ` Peter Zijlstra
2020-11-19 16:28     ` Will Deacon
2020-11-19 16:28       ` Will Deacon
2020-11-19 16:42       ` Peter Zijlstra
2020-11-19 16:42         ` Peter Zijlstra
2020-11-19 16:48         ` Will Deacon
2020-11-19 16:48           ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 09/14] cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1 Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-19  9:29   ` Quentin Perret
2020-11-19  9:29     ` Quentin Perret
2020-11-19 11:06     ` Will Deacon
2020-11-19 11:06       ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 10/14] sched: Introduce arch_cpu_allowed_mask() to limit fallback rq selection Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-19  9:38   ` Quentin Perret
2020-11-19  9:38     ` Quentin Perret
2020-11-19 11:07     ` Will Deacon
2020-11-19 11:07       ` Will Deacon
2020-11-19 20:39       ` Will Deacon
2020-11-19 20:39         ` Will Deacon
2020-11-23 14:48         ` Quentin Perret
2020-11-23 14:48           ` Quentin Perret
2020-11-13  9:37 ` [PATCH v3 11/14] sched: Reject CPU affinity changes based on arch_cpu_allowed_mask() Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-19  9:47   ` Quentin Perret
2020-11-19  9:47     ` Quentin Perret
2020-11-19 11:07     ` Will Deacon
2020-11-19 11:07       ` Will Deacon
2020-11-19 14:30       ` Quentin Perret
2020-11-19 14:30         ` Quentin Perret
2020-11-19 16:44         ` Will Deacon
2020-11-19 16:44           ` Will Deacon
2020-11-13  9:37 ` Will Deacon [this message]
2020-11-13  9:37   ` [PATCH v3 12/14] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system Will Deacon
2020-11-13  9:37 ` [PATCH v3 13/14] arm64: Implement arch_cpu_allowed_mask() Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-13  9:37 ` [PATCH v3 14/14] arm64: Remove logic to kill 32-bit tasks on 64-bit-only cores Will Deacon
2020-11-13  9:37   ` Will Deacon
2020-11-19 16:11 ` [PATCH v3 00/14] An alternative series for asymmetric AArch32 systems Peter Zijlstra
2020-11-19 16:11   ` Peter Zijlstra
2020-11-19 16:39   ` Will Deacon
2020-11-19 16:39     ` Will Deacon

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=20201113093720.21106-13-will@kernel.org \
    --to=will@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hannes@cmpxchg.org \
    --cc=juri.lelli@redhat.com \
    --cc=kernel-team@android.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=maz@kernel.org \
    --cc=mingo@redhat.com \
    --cc=morten.rasmussen@arm.com \
    --cc=peterz@infradead.org \
    --cc=qais.yousef@arm.com \
    --cc=qperret@google.com \
    --cc=surenb@google.com \
    --cc=tj@kernel.org \
    --cc=vincent.guittot@linaro.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.