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 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 E7599C433EF for ; Mon, 29 Nov 2021 20:17:54 +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=bmA3oLpDd5k1ffU2oeXn3GThfaLwb8XyT4E1oy25Ch8=; b=fBwp2W+P/5uwzh 2yi2fiOttr+NMq6gJsNBYEDP3Y6sbGp7P5ED5PDVeCiJkcx65EgYB2tR+XYPu43LNZKSb6KCPF7FC 1p3x3nMfyUPp+r7q9rDobSKhQlauiV9JPZ+0RWNQLRA0e7UX8ORP8PVnUqDOAh+i3wr1Nd6cHLLey fZq/0o4KpizdK7erGoy9zhyp8G9yYZQSCvilBBFedpOoZd87EY8mhSswwHhLoBSNx4t7rrVaN5hW/ 6otwV+M9yg/t1+3dlVoizM6lcXpdsoWPi7j9lYh6GZHWqrCVw8GFT1cdT2kgZOPgFXjQdNgj3+sdd 4hxQIBvf8q0qmjB1BuHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrn4N-002ITP-QI; Mon, 29 Nov 2021 20:16:12 +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 1mrmuK-002EbX-Ps for linux-arm-kernel@lists.infradead.org; Mon, 29 Nov 2021 20:05:50 +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 794D9B815E6; Mon, 29 Nov 2021 20:05:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DC68C53FC7; Mon, 29 Nov 2021 20:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638216347; bh=THxfTratzuqnEYOjcyY3aQOXMptJwOp65u+vqN5et1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g9s2zOs6sQmgspPbLkSCbYEv4Bw+wREmA1o4IPHSDOSEbi318fK9wOhWBMsdCkMjz sWHM4mKPgn0kGGf9/aRL+ONrMvLL6rEshGFxNuarekB2oEg46XBNXomJrWDTH+tOzs p/TjjuMUKw2IQTJ/4gj3AU2yOw0Q3IWfl8Mtveg9IaJ2DBdGMluVfFTsh8D4oALUYv To9W1c4S9JFfelUokt+0AJdKdeckP0PdduG5FnA7X8OXKuhZWYnEQRK7tmhpPjs66c klfkbPDbebpMq0SoyfpSUY11bxzzRRKZe4589jRNolIXurrxwkuOwqGPRrg+4CYA53 ZkJJsTXZEDTuQ== 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 ) id 1mrmr4-008gvR-BT; Mon, 29 Nov 2021 20:02:27 +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 , Jintack Lim , Haibo Xu , Ganapatrao Kulkarni , James Morse , Suzuki K Poulose , Alexandru Elisei , kernel-team@android.com Subject: [PATCH v5 47/69] KVM: arm64: nv: Fold guest's HCR_EL2 configuration into the host's Date: Mon, 29 Nov 2021 20:01:28 +0000 Message-Id: <20211129200150.351436-48-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211129200150.351436-1-maz@kernel.org> References: <20211129200150.351436-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, james.morse@arm.com, suzuki.poulose@arm.com, alexandru.elisei@arm.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-20211129_120549_027107_C80F139E X-CRM114-Status: GOOD ( 13.15 ) 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 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/vhe/switch.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c index 71a4914761d0..ef4488db6dc1 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -79,6 +79,11 @@ static void __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)) { + u64 vhcr_el2 = __vcpu_sys_reg(vcpu, HCR_EL2); + + vhcr_el2 &= ~HCR_GUEST_NV_FILTER_FLAGS; + hcr |= vhcr_el2; } ___activate_traps(vcpu, hcr); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel