From patchwork Mon Nov 9 21:30:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 11892615 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 DA852C2D0A3 for ; Mon, 9 Nov 2020 21:32:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 6D724206CB for ; Mon, 9 Nov 2020 21:32:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lgOM717E"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ow/6Me/4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D724206CB 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7voRtGs8jAq/1WdPBLgSyL3SG3zfla0RNhm1amhH10E=; b=lgOM717EvjKln32OQrxLB0i0/ 3gvD5Hxj8SImcy66mRhh9wkPQQj3+F/RSqZELH6wHkqoLZl8cMkzf39RN4++sQ+I5fmoWWWiwHY9k nuppIuXw+vazG4ZA6F5q6n3u9b5X5LioW0FIYI0NvKvIj8OO0Z+CF79k7SuxFxDhUArGaG/jwKPmC mP4/5+0rZM3Wo1yChjL81IzyOiquTDa5z64yXaCOavAG014gT86dK01Uqy61vheWl5f5HS72w53PE hF1eShmib40Nex1E6PBB+Y7I3zyeA/G6v/4O18AxnBzpg9wRM8riOO6vd1D9pSaPjFCq4BuKb2oqq 7DH8f9T5g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcEkV-0000zM-DZ; Mon, 09 Nov 2020 21:30:51 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcEkN-0000wY-8e for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2020 21:30:44 +0000 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E72F206ED; Mon, 9 Nov 2020 21:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604957442; bh=+2vEm2wQnwG7BQ7CHmbryb5A53vahnMslWkiKMUiDUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ow/6Me/4IKdRiS+9ELR3/w0KzhlSfFQaQdsbYLb/I9Ftri+TJwchBDtk0g8+SMG1L dvmKZj9sbY2GkOuhpqdDrRdFl0kshGJMHyLPB2frRnm1aTwM18XytXcz6gqoTK/blX NSrEO7OfBMR5KeID6Gz+aRZDb8EAl7p9Rl2DhDDk= From: Will Deacon To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/6] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched EL0 support Date: Mon, 9 Nov 2020 21:30:19 +0000 Message-Id: <20201109213023.15092-4-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201109213023.15092-1-will@kernel.org> References: <20201109213023.15092-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_163043_434340_63FA5909 X-CRM114-Status: GOOD ( 17.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Marc Zyngier , kernel-team@android.com, Quentin Perret , Peter Zijlstra , Catalin Marinas , Qais Yousef , Suren Baghdasaryan , Greg Kroah-Hartman , Will Deacon , Morten Rasmussen Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If a vCPU tries to run 32-bit code on a system with mismatched support at EL0, then we should kill it. Signed-off-by: Will Deacon Acked-by: Marc Zyngier --- arch/arm64/kvm/arm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 5750ec34960e..d322ac0f4a8e 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -633,6 +633,15 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu) } } +static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu) +{ + if (likely(!vcpu_mode_is_32bit(vcpu))) + return false; + + return !system_supports_32bit_el0() || + static_branch_unlikely(&arm64_mismatched_32bit_el0); +} + /** * kvm_arch_vcpu_ioctl_run - the main VCPU run function to execute guest code * @vcpu: The VCPU pointer @@ -816,7 +825,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) * with the asymmetric AArch32 case), return to userspace with * a fatal error. */ - if (!system_supports_32bit_el0() && vcpu_mode_is_32bit(vcpu)) { + if (vcpu_mode_is_bad_32bit(vcpu)) { /* * As we have caught the guest red-handed, decide that * it isn't fit for purpose anymore by making the vcpu