From patchwork Tue Feb 11 17:48:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11376183 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 155D21395 for ; Tue, 11 Feb 2020 17:51:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E93DB20848 for ; Tue, 11 Feb 2020 17:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581443502; bh=YQuPy/0PNfjVnioz+da5ic/CAQ3RrhXg+mZ1QDYR2Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CAh1gVRhbhS8acKS2vLY3D3oslMPAHJBBbdyAOpmPST4ggzAC9gBTAdbAal28C47M Ra/VBXpwH9x5Nt0VOmO/LPXSkhdGmaeHq5I0RhJz5W3XdWaWKY5j2lAHtvymAivabW brsC6lJzrXU0JOKqAuYUK2rPKdcptsfL32Bd4pW8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730403AbgBKRvl (ORCPT ); Tue, 11 Feb 2020 12:51:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:54112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730389AbgBKRvk (ORCPT ); Tue, 11 Feb 2020 12:51:40 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 62399206CC; Tue, 11 Feb 2020 17:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581443499; bh=YQuPy/0PNfjVnioz+da5ic/CAQ3RrhXg+mZ1QDYR2Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b5d6t3QlcYeV+Fzu8I2hdTjJoEtF0B+Gb+oobNZIsE75nEBQdpLVFD4Ko4XWhI9gX W1B/onssv9CejPB+EGHxWA8qPMuUnydyshUWz276ZOEivneFkbdNiGiY3e00GXA4xr crwyxddfdwfjFlrlWUf1gLROjItj61EUWeuoSITY= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1j1Zfw-004O7k-GG; Tue, 11 Feb 2020 17:50:20 +0000 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Andre Przywara , Christoffer Dall , Dave Martin , Jintack Lim , Alexandru Elisei , James Morse , Julien Thierry , Suzuki K Poulose Subject: [PATCH v2 46/94] KVM: arm64: nv: Fold guest's HCR_EL2 configuration into the host's Date: Tue, 11 Feb 2020 17:48:50 +0000 Message-Id: <20200211174938.27809-47-maz@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211174938.27809-1-maz@kernel.org> References: <20200211174938.27809-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 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, Dave.Martin@arm.com, jintack@cs.columbia.edu, alexandru.elisei@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When entering a L2 guest (nested virt enabled, but not in hypervisor context), we need to honor the traps the L1 guest has asked enabled. For now, just OR the guest's HCR_EL2 into the host's. We may have to do some filtering in the future though. Signed-off-by: Marc Zyngier --- arch/arm64/kvm/hyp/switch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 57e6e848b7a7..43e3a60915b1 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -192,6 +192,8 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu) if (!vcpu_el2_tge_is_set(vcpu)) hcr |= HCR_AT | HCR_TTLB; } + } else if (nested_virt_in_use(vcpu)) { + hcr |= __vcpu_sys_reg(vcpu, HCR_EL2); } write_sysreg(hcr, hcr_el2);