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 4CD5EC76188 for ; Wed, 5 Apr 2023 15:42:09 +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=2WK+3Bu1AhCF7MyAVBQx8w0XNRE4lKgsT9osYd3zVyE=; b=YypqvgOIETVGBl 94VJnvd8CYMFu1xahE+DgPvqm+bLPhjnEs06WXwAQZ1HotIbrF67eh9szGCG+3tc0pKKpbqsEgcC9 uFT9JHFGx6anwKjQyZinr2D0SJhcX537QU/uwgke4GjkGwUIYHnxHbRSnaUgOevx8ulzrf7WScFAR lrTpUHBCJKhxdgXA2x/MAKtYbPDwgrs9nu4uYpHr1G6hQd9SuJS5jNWncLSX0g2yZHic9JdLcEs/s eNu+AlJSsXKe6WCMlmQ4ix2UGnhekgh1UVPVvUwTa8iaSN1zKW5aZegn6xIEuwdqGreehCBL7Xg25 CjAuBOTWoMvKAxaUpnPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pk5Fi-004ssR-21; Wed, 05 Apr 2023 15:40:50 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pk5Fe-004spH-1k for linux-arm-kernel@lists.infradead.org; Wed, 05 Apr 2023 15:40:47 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 0EE3063ED4; Wed, 5 Apr 2023 15:40:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72E32C433A0; Wed, 5 Apr 2023 15:40:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680709245; bh=BqWGGG6P0Q1EZNUaobu4OneFEfRFSI4gFWADamGwyEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OsId5NIhMgEELAQTVXaett/UwYU0WZDM+4Bc6KforaGi2jmIm8UpjkKfuzGkczQoo szsoDH6dFPh9tefbnv4fs0+17eiT7E+azoG0diQunCWU1T4SAYluqlYNKSGP4U1Vd+ aMgcfOH8zNpAC1TY6JSZM72D2XNqfGPylPV7T5ObH8lehSH4US6FpUaUPfZp1nkEX/ ML1gd5DTEe3i4UcdGjCHq4538Lb5B/9+TzWkmmfGLMw3Cam/+Z8duKccTkuTV0tBN9 k1Ppw0SUOUg5VLwezV9y8RFiXZP9te44ID9sy6uj+4RzatGXLE3gpPKJESiVBpfPIE 13kltom17ImSw== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pk5FR-0062PV-FK; Wed, 05 Apr 2023 16:40:33 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Alexandru Elisei , Andre Przywara , Chase Conklin , Christoffer Dall , Ganapatrao Kulkarni , Darren Hart , Jintack Lim , Russell King , Miguel Luis , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu Subject: [PATCH v9 23/50] KVM: arm64: nv: Fold guest's HCR_EL2 configuration into the host's Date: Wed, 5 Apr 2023 16:39:41 +0100 Message-Id: <20230405154008.3552854-24-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230405154008.3552854-1-maz@kernel.org> References: <20230405154008.3552854-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, alexandru.elisei@arm.com, andre.przywara@arm.com, chase.conklin@arm.com, christoffer.dall@arm.com, gankulkarni@os.amperecomputing.com, darren@os.amperecomputing.com, jintack@cs.columbia.edu, rmk+kernel@armlinux.org.uk, miguel.luis@oracle.com, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.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-20230405_084046_624111_E1DCBDF9 X-CRM114-Status: GOOD ( 13.59 ) 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 a17bf261d501..ff77b37b6f45 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -81,6 +81,11 @@ static void __activate_traps(struct kvm_vcpu *vcpu) if (!vcpu_el2_tge_is_set(vcpu)) hcr |= HCR_AT | HCR_TTLB; } + } else if (vcpu_has_nv(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.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel