From patchwork Tue May 18 09:47:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 12264467 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28E3CC433ED for ; Tue, 18 May 2021 10:10:04 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A63D0611BD for ; Tue, 18 May 2021 10:10:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A63D0611BD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Sr5N+HvZKKFgaeewiecIB9ZWnDtXQjGBP/wjYwC5qmA=; b=iN/QvszvldDOgND5+xjeVLl3D +IeLlxkuFbH/UQpQqobRfoVc4QvMTsZ3QpwKaoHFH56MKZqXmPTqzxIZY4W9LwaAaEZ29I4fX0eJ4 VCYqdkNinKFiD91C0DWakmS0cIYFOmWYKk2Eo4fHYxCRV9wHHGm+9rB8xOOiYnlj4KaXjI4e328uf vyuxLardekG1OLi4zistJ01cRxDWilcpLfzpEsmL3zNLiyRydNFXPebeHlrZ1TIl9/2k9vSzTHZE8 Kp3NZfAjn0pZwCBp1+fTpSoXKc25DnxOhYiWtGoy+X7nKXDTQcwGeRfPyIfZGrSLrJIu7Rlmx0oOY mOHOAsFyQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liwdq-000HcR-6k; Tue, 18 May 2021 10:07:58 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liwLF-000E33-Nj for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:48:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=mJrRcI1ieCOpDitI8/IIj8QtBN6jl43+OSHaWCO6GBc=; b=OpW6rf/+RRxc3bLoP/jqNzJhyI Ze6RDPqJcy3a6gk25dcchnhZNHGzuZ+mE9PAYgbV2DRRRBIc5NVBNEuT2CtiHwOrTs7UcFrwm2sOF t4spezRbfyBchuYhm/J3NbEnTrOqZDTtyzLs8Y41ZXpHVog4cHM+4g+67vuW8XrIraBzkwRZSKH0n m+n7APxtn4tvpt4a9+QiLuhEbZvvPJ2hCeLojgAgD7hrWHRd7mOXuGYOgdkItE7SDiBxYvzrHCfaX 9fRxwmKWxtZcdivTgDUFsjqPEHZ5ppXn3kMLVvVQLh5+pht3lwefOiNLnYScEH7cJ4DxLC2JTyUf4 X9MuCoig==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liwLC-00EWnG-73 for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:48:44 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id C1FDA61401; Tue, 18 May 2021 09:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621331321; bh=6g9NVbkObRxGunwkaQ5JxyE6uDt34ueHBKqyl0oVxYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kbkOc+WKgFFl0HV+uacnOtz0MtG+VG7IhssMjNOO3i3md9AUXwFLFbGvOlpJpP2UK f2exwaDNgrJDxMFDR5OlCqmVex9lfkqHocqc6c3LInUzFdAFzLPcI9gCtH4YNVksco f+lMksvAgtytTY+DC1MbXoWtJDcR2JormPvecHdqDcBPcLYqp0pzb2jYqu/Wn1RQNT zJ+Y73ZOzrAKdEYP/S3kDgZqofiXT0z6KJlaprpYRMtofQNdN0g7rm9ysamPRUDA7D bDugtVJzZ5+Nx0fCM7DDgQvkYtTx8Zn3xOlpnl7S9DmXA/SsDgYKH3N9wC7BOyL6Lt SMBvCK4BI4tJQ== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , Catalin Marinas , Marc Zyngier , Greg Kroah-Hartman , Peter Zijlstra , Morten Rasmussen , Qais Yousef , Suren Baghdasaryan , Quentin Perret , Tejun Heo , Li Zefan , Johannes Weiner , Ingo Molnar , Juri Lelli , Vincent Guittot , "Rafael J. Wysocki" , kernel-team@android.com Subject: [PATCH v6 18/21] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system Date: Tue, 18 May 2021 10:47:22 +0100 Message-Id: <20210518094725.7701-19-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210518094725.7701-1-will@kernel.org> References: <20210518094725.7701-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_024842_297220_B3227E54 X-CRM114-Status: GOOD ( 15.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Reviewed-by: Catalin Marinas --- arch/arm64/kernel/cpufeature.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 959442f76ed7..72efdc611b14 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2896,15 +2896,33 @@ void __init setup_cpu_features(void) 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); if (cpu_32bit) { cpumask_set_cpu(cpu, cpu_32bit_el0_mask); static_branch_enable_cpuslocked(&arm64_mismatched_32bit_el0); - setup_elf_hwcaps(compat_elf_hwcaps); } + 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; + setup_elf_hwcaps(compat_elf_hwcaps); + pr_info("Asymmetric 32-bit EL0 support detected on CPU %u; CPU hot-unplug disabled on CPU %u\n", + cpu, lucky_winner); return 0; }