From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3CF9FC1C for ; Mon, 15 May 2023 17:48:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8A3AC4339E; Mon, 15 May 2023 17:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684172907; bh=F+9WesFTXCCuJ+1TkWYjP7j2xz7RrQW71dVOswKi8Ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AtdebCxDo3XN7j5GhwI3QRNuGVcxrKZtpYaCf0/tu6FYxp0nJ9qeDvK2k1FCJSvW9 OrVu4uRgSFkMTEIKL4xbr6T9XU/WPerXeI+WfWJOgOdONec5suTRcojhT/prb6HcRa nLMP5LoPDZOxE9FzuSmdPRFqrUgpvHZZ7HryFSot8Uy0IyFcjH/cpjhRK9NLxvu0GN OG2izmlTF0QzhqhJYNX/5NsEPpa8nc/QmWn3JMMcdpmstfFNN8zNvAVAmdiydV2gao orRGcGpVOBhHskKEZSRntnMLTWNhxBfFEJU0+vh8anGnw05EAk7YmidI0ku3hD1GlP LWlBtXXbgQtDA== 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 1pyc2m-00FJAF-5n; Mon, 15 May 2023 18:31:32 +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 v10 33/59] KVM: arm64: nv: Fold guest's HCR_EL2 configuration into the host's Date: Mon, 15 May 2023 18:30:37 +0100 Message-Id: <20230515173103.1017669-34-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515173103.1017669-1-maz@kernel.org> References: <20230515173103.1017669-1-maz@kernel.org> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 c7d083407fae..154d994c1015 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 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 4DBA5C7EE2A for ; Mon, 15 May 2023 17:49:58 +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=Sdk7R/mVG4Ci0lW8DQ5rIDvV4U2m5CXQ7ZGVB6jgMzc=; b=Ay4owgRLADdPDR VlzSaPkeRYFxhRa8FTYir9iGKxnAqhRgDUHzBNLWEsrbKrIhDZm+gQNpr1zdTG5qGm6RKPF0i7toF 0BYzV5FRjIuG6eVT23jt9SXzNTXiwZ3VunbpBnAahRi3vT1Kqme60no1H7FzSmEYWoIx1UkmWLKzj f64fWdNRiZJSsS1xOQzefDWrD1twUIPPqhO2M4g5jMkQc07cjX/YIkKGu/rppHlOTxd33DuqZQ81u 3QdF3FQhcsJdlYFjZYcnKMiiE4CX+FzVVrn1jgVi7ZK7oCrMHxz8NZRpkKsg9gZn4Nn/Pj+2G3OhV MnAcWimBrgr0QMfX6iag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pycKA-0031o1-03; Mon, 15 May 2023 17:49:30 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pycJI-00314g-39 for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 17:48:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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=F+SrjCSOkzCW5sAEdpNIPnIXMNxpdwlE9K/zotjhyQw=; b=KpjXGmj4w386Sq3cAD5XEqBKFG h4DUNHNi2vs/k68SFTu7yQmOpuZcNhA/oyKv1GBeJ+odaCk/MRpxD++8xkpc7L7pN7czeyCSIPf+U 2mlHkbU56/aE5g9gu2qiyfmLicBFziKXRuqJgCMipXhmI4K/la+UOf5MpN8YBzA44dDa0ZSx9Uys9 MILlfT0cjnSb36idojhhY8BqbYqUVXYAWQFgmfrcrRdViR4aUefX6CRhHfhV9MFMRC/57Y02mTQ6F 4GPMkTybBygU38vj8lcUnHNpPPaI+VoODszB3aYTGetWu1hksxuk3NA0MVCoO0SGrCAGtvZOZBGNg To0/3zDA==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pycJF-00BXlI-0r for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 17:48:35 +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 5061C62EF8; Mon, 15 May 2023 17:48:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8A3AC4339E; Mon, 15 May 2023 17:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684172907; bh=F+9WesFTXCCuJ+1TkWYjP7j2xz7RrQW71dVOswKi8Ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AtdebCxDo3XN7j5GhwI3QRNuGVcxrKZtpYaCf0/tu6FYxp0nJ9qeDvK2k1FCJSvW9 OrVu4uRgSFkMTEIKL4xbr6T9XU/WPerXeI+WfWJOgOdONec5suTRcojhT/prb6HcRa nLMP5LoPDZOxE9FzuSmdPRFqrUgpvHZZ7HryFSot8Uy0IyFcjH/cpjhRK9NLxvu0GN OG2izmlTF0QzhqhJYNX/5NsEPpa8nc/QmWn3JMMcdpmstfFNN8zNvAVAmdiydV2gao orRGcGpVOBhHskKEZSRntnMLTWNhxBfFEJU0+vh8anGnw05EAk7YmidI0ku3hD1GlP LWlBtXXbgQtDA== 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 1pyc2m-00FJAF-5n; Mon, 15 May 2023 18:31:32 +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 v10 33/59] KVM: arm64: nv: Fold guest's HCR_EL2 configuration into the host's Date: Mon, 15 May 2023 18:30:37 +0100 Message-Id: <20230515173103.1017669-34-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515173103.1017669-1-maz@kernel.org> References: <20230515173103.1017669-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-20230515_184833_635724_8237F203 X-CRM114-Status: GOOD ( 13.54 ) 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 c7d083407fae..154d994c1015 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