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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB1BEC433EF for ; Thu, 7 Oct 2021 12:58:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 75995610E6 for ; Thu, 7 Oct 2021 12:58:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 75995610E6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eY2J35+IgYBW9mxSlRhY5FsW7z0KivPkJ0TH4AEj/FQ=; b=vYZ6gGFzyOmaaZ ku7nCnKCNXallnJOnRr9M5fICWkFfcCHJLrNsEkNCUxVw/mpZQqExof0vHdK+FGvFnLGsZG81yxYi 4X6grVl1zdyNbnVz9ww4udAL0RfWoxM5nsMlGwWMg59qtjvDnea/MqzeZWzjwziWkV/HQ7yistkOX 0yr9V+PWMJlm+Gb+HcmggriPugQ67VWtovSB/NHJYAkdGx5cK6BZ35fGoBg6sQ5/zswfHm8LbbdCx eBtouZmxwJVjZ5s9pzZFZhdZyNJe3SJQJzQd32l//Kmmp6zdkl1Zu8U5+9uFisT4eatoK7VOLdojt 0LN0C2jLmVdsl2/fhB5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYSxB-00HPgu-Jv; Thu, 07 Oct 2021 12:56:53 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYSx8-00HPfH-DQ for linux-arm-kernel@lists.infradead.org; Thu, 07 Oct 2021 12:56:52 +0000 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 9253F61053; Thu, 7 Oct 2021 12:56:49 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.misterjones.org) 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 1mYSx5-00FJgy-Jl; Thu, 07 Oct 2021 13:56:47 +0100 Date: Thu, 07 Oct 2021 13:56:47 +0100 Message-ID: <877depq9gw.wl-maz@kernel.org> From: Marc Zyngier To: Will Deacon Cc: linux-arm-kernel@lists.infradead.org, Quentin Perret , Catalin Marinas , Alexandru Elisei , Suzuki K Poulose , Mark Rutland , kvmarm@lists.cs.columbia.edu Subject: Re: [PATCH v2 5/5] KVM: arm64: Disable privileged hypercalls after pKVM finalisation In-Reply-To: <20211005113721.29441-6-will@kernel.org> References: <20211005113721.29441-1-will@kernel.org> <20211005113721.29441-6-will@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: will@kernel.org, linux-arm-kernel@lists.infradead.org, qperret@google.com, catalin.marinas@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, kvmarm@lists.cs.columbia.edu 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-20211007_055650_519090_AA6F60D5 X-CRM114-Status: GOOD ( 30.68 ) 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 On Tue, 05 Oct 2021 12:37:21 +0100, Will Deacon wrote: > > After pKVM has been 'finalised' using the __pkvm_prot_finalize hypercall, > the calling CPU will have a Stage-2 translation enabled to prevent access > to memory pages owned by EL2. > > Although this forms a significant part of the process to deprivilege the > host kernel, we also need to ensure that the hypercall interface is > reduced so that the EL2 code cannot, for example, be re-initialised using > a new set of vectors. > > Re-order the hypercalls so that only a suffix remains available after > finalisation of pKVM. > > Cc: Marc Zyngier > Cc: Quentin Perret > Signed-off-by: Will Deacon > --- > arch/arm64/include/asm/kvm_asm.h | 43 ++++++++++++++++-------------- > arch/arm64/kvm/hyp/nvhe/hyp-main.c | 37 +++++++++++++++++-------- > 2 files changed, 49 insertions(+), 31 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h > index e86045ac43ba..68630fd382c5 100644 > --- a/arch/arm64/include/asm/kvm_asm.h > +++ b/arch/arm64/include/asm/kvm_asm.h > @@ -43,27 +43,30 @@ > > #define KVM_HOST_SMCCC_FUNC(name) KVM_HOST_SMCCC_ID(__KVM_HOST_SMCCC_FUNC_##name) > > +/* Hypercalls available only prior to pKVM finalisation */ > #define __KVM_HOST_SMCCC_FUNC___kvm_hyp_init 0 > -#define __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run 1 > -#define __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context 2 > -#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa 3 > -#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid 4 > -#define __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context 5 > -#define __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff 6 > -#define __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs 7 > -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config 8 > -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr 9 > -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr 10 > -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs 11 > -#define __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2 12 > -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs 13 > -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs 14 > -#define __KVM_HOST_SMCCC_FUNC___pkvm_init 15 > -#define __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp 16 > -#define __KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping 17 > -#define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector 18 > -#define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize 19 > -#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc 20 > +#define __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2 1 > +#define __KVM_HOST_SMCCC_FUNC___pkvm_init 2 > +#define __KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping 3 > +#define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector 4 > +#define __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs 5 > +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs 6 > +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config 7 > +#define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize 8 > + > +/* Hypercalls available after pKVM finalisation */ > +#define __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp 9 > +#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc 10 > +#define __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run 11 > +#define __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context 12 > +#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa 13 > +#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid 14 > +#define __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context 15 > +#define __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff 16 > +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr 17 > +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr 18 > +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs 19 > +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs 20 This is no helping with the above, but can we *please* try to get rid of this #define insanity before moving things around? I came up with the following, which seems to build. Thoughts? M. >From 8a50c98489220d2ebaf02d4ffdbef3cf0d6634ee Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Thu, 7 Oct 2021 13:18:29 +0100 Subject: [PATCH] KVM: arm64: Turn __KVM_HOST_SMCCC_FUNC_* into an enum (mostly) __KVM_HOST_SMCCC_FUNC_* is a royal pain, as there is a fair amount of churn around these #defines, and we avoid making it an enum only for the sake of the early init, low level code that requires __KVM_HOST_SMCCC_FUNC___kvm_hyp_init to be usable from assembly. Let's be brave and turn everything but this symbol into an enum, using a bit of arithmetic to avoid any overlap. Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/kvm_asm.h | 44 +++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index e86045ac43ba..43b5e213ae43 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -44,31 +44,35 @@ #define KVM_HOST_SMCCC_FUNC(name) KVM_HOST_SMCCC_ID(__KVM_HOST_SMCCC_FUNC_##name) #define __KVM_HOST_SMCCC_FUNC___kvm_hyp_init 0 -#define __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run 1 -#define __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context 2 -#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa 3 -#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid 4 -#define __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context 5 -#define __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff 6 -#define __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs 7 -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config 8 -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr 9 -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr 10 -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs 11 -#define __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2 12 -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs 13 -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs 14 -#define __KVM_HOST_SMCCC_FUNC___pkvm_init 15 -#define __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp 16 -#define __KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping 17 -#define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector 18 -#define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize 19 -#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc 20 #ifndef __ASSEMBLY__ #include +enum __kvm_host_smccc_func { + /* __KVM_HOST_SMCCC_FUNC___kvm_hyp_init */ + __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run = __KVM_HOST_SMCCC_FUNC___kvm_hyp_init + 1, + __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context, + __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa, + __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid, + __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context, + __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff, + __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs, + __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config, + __KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr, + __KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr, + __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs, + __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2, + __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs, + __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs, + __KVM_HOST_SMCCC_FUNC___pkvm_init, + __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp, + __KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping, + __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector, + __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize, + __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc, +}; + #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] #define DECLARE_KVM_NVHE_SYM(sym) extern char kvm_nvhe_sym(sym)[] -- 2.30.2 -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel