Message ID | 20220128121912.509006-11-maz@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B8301C433F5 for <linux-arm-kernel@archiver.kernel.org>; Fri, 28 Jan 2022 12:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=jX/PYsVewphXVgJyLjPSJ1IgQ/B4QVa9+ZgrHjJwjnk=; b=Lxmj3QanfotUJ4 i478nQns89wjYJOcIXcKBKjUwdbagJ+qiJ8Vb993jpBGUD1rgnv9oxOBOuxnAYm24g8g39xsQweRe 1u2z3GnWR7VLzPjKPRg1TJFsZEEepwBTQhH1GJxotmBjM4A3mgU5OWAa2yc/BuvvcYVEks/hiWHHt 9Uy6/RPk18tmTIcFeE0Dm6+kttiQBmRf4s6X22i6STsNkFnm8ORRFChXaGIjGgAcTyWkhVjHE7HDm XfbIFCfXRh9tSbHy9OjNxXM9FuZaYhtBoEHARDds2/m4l341iASDw0hlsFkhuNTH4ztCHJsFU5RSU NOHOGmcqGYkbWbIMyxbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDQKw-001wG6-74; Fri, 28 Jan 2022 12:26:42 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDQEK-001tWk-Fx for linux-arm-kernel@lists.infradead.org; Fri, 28 Jan 2022 12:19:54 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 32129B824CA; Fri, 28 Jan 2022 12:19:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5935C340E0; Fri, 28 Jan 2022 12:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643372389; bh=pIjod5yjcsTAd74TzbrckBOJcTf6ITKrXfCtyQ/Qu3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HB5Ke7NZCzzVSY+t98iET8lbg6RDcI4BcVe0Ow41deAcq+GdcuVN50HNyJUgiTlDx aF6Cj9ZrzB3mmIVTwU+qZP+5cDJbkO6zo3xprkMxpCbyXqZPr6kuIend1t5UXMAKGi vlklUhqHnSNCLR+SFYfaJBNoDKYwMg455jJZ01GtG07fE/WQeiWYy9uGRjEEBH71bh GMxWZIuXRlQjNiO14LCdNLjLNPWSF+ugzNvWD/N1iYMBE3fQAn7j76r7d8ZAyhSZAq +tDZMa5mZdWhvyIS8cjHEa6ZYlbGUCwzUqKkSwLSyh99eWq4tXFJtKnoV2b4LWfybi 3uXcR57tNT6lg== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from <maz@kernel.org>) id 1nDQDv-003njR-O8; Fri, 28 Jan 2022 12:19:27 +0000 From: Marc Zyngier <maz@kernel.org> To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Andre Przywara <andre.przywara@arm.com>, Christoffer Dall <christoffer.dall@arm.com>, Jintack Lim <jintack@cs.columbia.edu>, Haibo Xu <haibo.xu@linaro.org>, Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>, Chase Conklin <chase.conklin@arm.com>, "Russell King (Oracle)" <linux@armlinux.org.uk>, James Morse <james.morse@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Alexandru Elisei <alexandru.elisei@arm.com>, karl.heubaum@oracle.com, mihai.carabas@oracle.com, miguel.luis@oracle.com, kernel-team@android.com Subject: [PATCH v6 10/64] KVM: arm64: nv: Inject HVC exceptions to the virtual EL2 Date: Fri, 28 Jan 2022 12:18:18 +0000 Message-Id: <20220128121912.509006-11-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220128121912.509006-1-maz@kernel.org> References: <20220128121912.509006-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, andre.przywara@arm.com, christoffer.dall@arm.com, jintack@cs.columbia.edu, haibo.xu@linaro.org, gankulkarni@os.amperecomputing.com, chase.conklin@arm.com, linux@armlinux.org.uk, james.morse@arm.com, suzuki.poulose@arm.com, alexandru.elisei@arm.com, karl.heubaum@oracle.com, mihai.carabas@oracle.com, miguel.luis@oracle.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220128_041952_844553_CCA66530 X-CRM114-Status: GOOD ( 15.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
KVM: arm64: ARMv8.3/8.4 Nested Virtualization support
|
expand
|
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index fd2dd26caf91..6bfb5c31cad1 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -16,6 +16,7 @@ #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> #include <asm/kvm_mmu.h> +#include <asm/kvm_nested.h> #include <asm/debug-monitors.h> #include <asm/traps.h> @@ -40,6 +41,16 @@ static int handle_hvc(struct kvm_vcpu *vcpu) kvm_vcpu_hvc_get_imm(vcpu)); vcpu->stat.hvc_exit_stat++; + /* Forward hvc instructions to the virtual EL2 if the guest has EL2. */ + if (vcpu_has_nv(vcpu)) { + if (vcpu_read_sys_reg(vcpu, HCR_EL2) & HCR_HCD) + kvm_inject_undefined(vcpu); + else + kvm_inject_nested_sync(vcpu, kvm_vcpu_get_esr(vcpu)); + + return 1; + } + ret = kvm_hvc_call_handler(vcpu); if (ret < 0) { vcpu_set_reg(vcpu, 0, ~0UL);