From mboxrd@z Thu Jan 1 00:00:00 1970 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 61526C433ED for ; Tue, 18 May 2021 09:53:17 +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 1EFD460BD3 for ; Tue, 18 May 2021 09:53:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EFD460BD3 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=ccqB1JYRdvdsO1e+9XA27cX+ZVZIKcKyJ+nKdUtQfLA=; b=Xr5+1pjw7gFtf0cjZY491A7/P cz0iLz1H8fUSiKFZ2glv5OcFKc1D1hg3yiyan2Q+k65yh16SS+gRopIrmnKCXWsSteiPiyIoVMMnt eR0bdV7Ejko4VRAA3qtqyiyjxnJs4pPnnlceyK57KXgxpSb2FYVNI+jCHyu6/6VAfJQwef6pU3aBY ptUC/j70Cd2FAnlh5mJXNpc3OQML1lLn/6kmhT07cYpteGC6RTjfxFP2zyEBygs1UPoV9HPf1KePJ oyZ6R3icYB844qFxmBuA6q3NVU4TFeM/MbhXIpNvSF5mIHoawMU588/8q1B2ABj5/OB7LMMAbyuYZ nx77CZ3bQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liwO5-000Ej3-2N; Tue, 18 May 2021 09:51:41 +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 1liwKO-000DoH-Bn for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:47:52 +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=is8gJR47maHbQv14/EL+XcM6Kns0E/nUDmBQUn7eGDs=; b=DTs2+NZecK2Za/c9PxhMLfnXQB DeUEfbSt7T9nwfgb4FOPHZwbpsCKRCslzWt3tHwwNioXdf4/PI0qVlO3c6jWQwbq4w2Mtz17RVbt5 9m1HEoOLU7IgsyUqJAbSt/ybJ6bRcRlK/KS8erqYwi9EyDArrMJbpdvtRi4OSe1DyouBFbRPNCjN+ XQ6VvSeoFxHFJJgSm/N/7l7qBWQTMwFlQMaMOL4i+TflqDycqyj2pP5T90RbWiyfZqjC5HuZ3+T2p mkDOGjFE95aQrmG3V8sqZ21bTfL3PePEPu5uoIImMUSd7cYNadXELDjeovFxYM6OUIzXQvlsmDpVo lDn8wZBg==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liwKK-00EWb3-Nm for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:47:51 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 53BD8613B9; Tue, 18 May 2021 09:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621331268; bh=NS4QEgIKSv/TTYjJalSTuvXiLJYF+wZzDqr0D/nk7gg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A+Hero/Z/jjMxzs9M4fBC2NACqp7Ij5irKXXGRtGUOXUYFIRki+CVYeQbVZaLKVPc yOEKw+nrm5ZqFTHkA1qeR4XD2WX0C3ZAqtt9j5gBazPzls9Di6lKR6zY6FTZIQXdM2 +ubc1/vbB16Jvy956HahOqZzZ8+H/yOck3ft7bqfCrTA4Gs4KSnYYknMWFm8DdOuXN QvG0HZufgLu51uqSRFHk9bBKoybZWGM1+Er0yIXExGS15jD38M4MobmDWGjrhl95Bv qfjhKibJ1tQ8ALu0N07p0mt4sZdac9VptqK5O9zu5lfNdaGYB62jVJxc+NZbbdgLlD WYu+m9QNRJLMw== 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 03/21] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched EL0 support Date: Tue, 18 May 2021 10:47:07 +0100 Message-Id: <20210518094725.7701-4-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_024748_830077_877E2A19 X-CRM114-Status: GOOD ( 12.91 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If a vCPU is caught running 32-bit code on a system with mismatched support at EL0, then we should kill it. Acked-by: Marc Zyngier Signed-off-by: Will Deacon --- 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 1cb39c0803a4..5bdba97a7654 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -692,6 +692,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 @@ -875,7 +884,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 -- 2.31.1.751.gd2f1c929bd-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel