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 v4 12/14] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system
Date: Tue, 24 Nov 2020 15:50:37 +0000 [thread overview]
Message-ID: <20201124155039.13804-13-will@kernel.org> (raw)
In-Reply-To: <20201124155039.13804-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 29017cbb6c8e..fe470683b43e 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.454.gaff20da3a2-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-11-24 15:54 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 15:50 [PATCH v4 00/14] An alternative series for asymmetric AArch32 systems Will Deacon
2020-11-24 15:50 ` [PATCH v4 01/14] arm64: cpuinfo: Split AArch32 registers out into a separate struct Will Deacon
2020-11-24 15:50 ` [PATCH v4 02/14] arm64: Allow mismatched 32-bit EL0 support Will Deacon
2020-11-27 10:25 ` Marc Zyngier
2020-11-27 11:50 ` Will Deacon
2020-11-27 13:09 ` Qais Yousef
2020-12-01 16:56 ` Will Deacon
2020-12-02 13:16 ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 03/14] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched " Will Deacon
2020-11-27 10:26 ` Marc Zyngier
2020-11-27 11:53 ` Will Deacon
2020-11-27 17:14 ` Marc Zyngier
2020-11-27 17:24 ` Quentin Perret
2020-11-27 18:16 ` Marc Zyngier
2020-12-01 16:57 ` Will Deacon
2020-12-02 8:18 ` Marc Zyngier
2020-12-02 17:27 ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 04/14] arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs Will Deacon
2020-11-27 13:12 ` Qais Yousef
2020-12-01 16:56 ` Will Deacon
2020-12-02 13:52 ` Qais Yousef
2020-12-02 17:42 ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 05/14] arm64: Advertise CPUs capable of running 32-bit applications in sysfs Will Deacon
2020-11-24 15:50 ` [PATCH v4 06/14] arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0 Will Deacon
2020-11-27 13:17 ` Qais Yousef
2020-12-01 16:56 ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 07/14] sched: Introduce restrict_cpus_allowed_ptr() to limit task CPU affinity Will Deacon
2020-11-27 9:49 ` Quentin Perret
2020-11-27 13:19 ` Qais Yousef
2020-12-01 16:56 ` Will Deacon
2020-12-02 13:06 ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 08/14] arm64: exec: Adjust affinity for compat tasks with mismatched 32-bit EL0 Will Deacon
2020-11-27 10:01 ` Quentin Perret
2020-11-27 13:23 ` Qais Yousef
2020-12-01 16:55 ` Will Deacon
2020-12-02 14:07 ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 09/14] cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1 Will Deacon
2020-11-27 13:32 ` Qais Yousef
2020-11-30 17:05 ` Qais Yousef
2020-11-30 17:36 ` Quentin Perret
2020-12-01 11:58 ` Qais Yousef
2020-12-01 12:37 ` Quentin Perret
2020-12-01 14:11 ` Qais Yousef
2020-12-01 15:56 ` Quentin Perret
2020-12-01 22:30 ` Will Deacon
2020-12-02 11:34 ` Qais Yousef
2020-12-02 11:33 ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 10/14] sched: Introduce arch_task_cpu_possible_mask() to limit fallback rq selection Will Deacon
2020-11-24 15:50 ` [PATCH v4 11/14] sched: Reject CPU affinity changes based on arch_task_cpu_possible_mask() Will Deacon
2020-11-27 9:54 ` Quentin Perret
2020-11-24 15:50 ` Will Deacon [this message]
2020-11-27 13:41 ` [PATCH v4 12/14] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system Qais Yousef
2020-12-01 22:13 ` Will Deacon
2020-12-02 12:59 ` Qais Yousef
2020-12-02 17:42 ` Will Deacon
2020-12-02 18:08 ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 13/14] arm64: Implement arch_task_cpu_possible_mask() Will Deacon
2020-11-27 13:41 ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 14/14] arm64: Remove logic to kill 32-bit tasks on 64-bit-only cores Will Deacon
2020-11-27 13:58 ` [PATCH v4 00/14] An alternative series for asymmetric AArch32 systems Qais Yousef
2020-12-05 20:43 ` Pavel Machek
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=20201124155039.13804-13-will@kernel.org \
--to=will@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hannes@cmpxchg$(echo .)org \
--cc=juri.lelli@redhat$(echo .)com \
--cc=kernel-team@android$(echo .)com \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=lizefan@huawei$(echo .)com \
--cc=maz@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=morten.rasmussen@arm$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=qais.yousef@arm$(echo .)com \
--cc=qperret@google$(echo .)com \
--cc=surenb@google$(echo .)com \
--cc=tj@kernel$(echo .)org \
--cc=vincent.guittot@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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