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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 619D6C55178 for ; Mon, 26 Oct 2020 14:08:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 0FC5A2242A for ; Mon, 26 Oct 2020 14:08:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YvHqzQD1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FC5A2242A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gZxHjK/KzorNnNwO6mfomypADSmKhTHwrfh52WZBfJs=; b=YvHqzQD1ERHuc/4tlFO40Fyvj W0cZk5G/Pz+nocz67nCPIIu2klsR4CWa20LdouklvY+WuT1HeNDK9fiRQnIr0mET7a9Ijy2V+V1dM HQ6yXfecQv2/LV5JJELrT1Rv6V5M+iv42VGB2/QI88VCkRcfoLihFaSR0nhexH/BKvDYVkVOyh0td 5ApGKOPViD4OAOW1KpYtHwB4ypZxqyDABNGOb4c47bEizjyutg4NI6LBS3X9r05qJgdz334Zd+0FR +TcEakQo5wLSUJPSaf9HhetSwYWsgsGO52cfyE9wK3WhbW3iyGNjpxEq5EHgWuKBEiwSFIbwvwCFh Spp5X5AEg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX39q-0004HA-Mw; Mon, 26 Oct 2020 14:07:34 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX39l-0004Fg-GC for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 14:07:30 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5A97730E; Mon, 26 Oct 2020 07:07:26 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.56.187]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A86F03F68F; Mon, 26 Oct 2020 07:07:24 -0700 (PDT) Date: Mon, 26 Oct 2020 14:07:21 +0000 From: Mark Rutland To: Marc Zyngier Subject: Re: [PATCH 05/11] KVM: arm64: Move VHE direct sysreg accessors into kvm_host.h Message-ID: <20201026140721.GG12454@C02TD0UTHF1T.local> References: <20201026133450.73304-1-maz@kernel.org> <20201026133450.73304-6-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201026133450.73304-6-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_100729_701648_753B9955 X-CRM114-Status: GOOD ( 24.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Will Deacon , kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org 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 Mon, Oct 26, 2020 at 01:34:44PM +0000, Marc Zyngier wrote: > As we are about to need to access system registers from the HYP > code based on their internal encoding, move the direct sysreg > accessors to a common include file. > > No functionnal change. > > Signed-off-by: Marc Zyngier Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/kvm_host.h | 85 +++++++++++++++++++++++++++++++ > arch/arm64/kvm/sys_regs.c | 81 ----------------------------- > 2 files changed, 85 insertions(+), 81 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 9a75de3ad8da..0ae51093013d 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -438,6 +438,91 @@ struct kvm_vcpu_arch { > u64 vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, int reg); > void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg); > > +static inline bool __vcpu_read_sys_reg_from_cpu(int reg, u64 *val) > +{ > + /* > + * *** VHE ONLY *** > + * > + * System registers listed in the switch are not saved on every > + * exit from the guest but are only saved on vcpu_put. > + * > + * Note that MPIDR_EL1 for the guest is set by KVM via VMPIDR_EL2 but > + * should never be listed below, because the guest cannot modify its > + * own MPIDR_EL1 and MPIDR_EL1 is accessed for VCPU A from VCPU B's > + * thread when emulating cross-VCPU communication. > + */ > + switch (reg) { > + case CSSELR_EL1: *val = read_sysreg_s(SYS_CSSELR_EL1); break; > + case SCTLR_EL1: *val = read_sysreg_s(SYS_SCTLR_EL12); break; > + case CPACR_EL1: *val = read_sysreg_s(SYS_CPACR_EL12); break; > + case TTBR0_EL1: *val = read_sysreg_s(SYS_TTBR0_EL12); break; > + case TTBR1_EL1: *val = read_sysreg_s(SYS_TTBR1_EL12); break; > + case TCR_EL1: *val = read_sysreg_s(SYS_TCR_EL12); break; > + case ESR_EL1: *val = read_sysreg_s(SYS_ESR_EL12); break; > + case AFSR0_EL1: *val = read_sysreg_s(SYS_AFSR0_EL12); break; > + case AFSR1_EL1: *val = read_sysreg_s(SYS_AFSR1_EL12); break; > + case FAR_EL1: *val = read_sysreg_s(SYS_FAR_EL12); break; > + case MAIR_EL1: *val = read_sysreg_s(SYS_MAIR_EL12); break; > + case VBAR_EL1: *val = read_sysreg_s(SYS_VBAR_EL12); break; > + case CONTEXTIDR_EL1: *val = read_sysreg_s(SYS_CONTEXTIDR_EL12);break; > + case TPIDR_EL0: *val = read_sysreg_s(SYS_TPIDR_EL0); break; > + case TPIDRRO_EL0: *val = read_sysreg_s(SYS_TPIDRRO_EL0); break; > + case TPIDR_EL1: *val = read_sysreg_s(SYS_TPIDR_EL1); break; > + case AMAIR_EL1: *val = read_sysreg_s(SYS_AMAIR_EL12); break; > + case CNTKCTL_EL1: *val = read_sysreg_s(SYS_CNTKCTL_EL12); break; > + case ELR_EL1: *val = read_sysreg_s(SYS_ELR_EL12); break; > + case PAR_EL1: *val = read_sysreg_s(SYS_PAR_EL1); break; > + case DACR32_EL2: *val = read_sysreg_s(SYS_DACR32_EL2); break; > + case IFSR32_EL2: *val = read_sysreg_s(SYS_IFSR32_EL2); break; > + case DBGVCR32_EL2: *val = read_sysreg_s(SYS_DBGVCR32_EL2); break; > + default: return false; > + } > + > + return true; > +} > + > +static inline bool __vcpu_write_sys_reg_to_cpu(u64 val, int reg) > +{ > + /* > + * *** VHE ONLY *** > + * > + * System registers listed in the switch are not restored on every > + * entry to the guest but are only restored on vcpu_load. > + * > + * Note that MPIDR_EL1 for the guest is set by KVM via VMPIDR_EL2 but > + * should never be listed below, because the MPIDR should only be set > + * once, before running the VCPU, and never changed later. > + */ > + switch (reg) { > + case CSSELR_EL1: write_sysreg_s(val, SYS_CSSELR_EL1); break; > + case SCTLR_EL1: write_sysreg_s(val, SYS_SCTLR_EL12); break; > + case CPACR_EL1: write_sysreg_s(val, SYS_CPACR_EL12); break; > + case TTBR0_EL1: write_sysreg_s(val, SYS_TTBR0_EL12); break; > + case TTBR1_EL1: write_sysreg_s(val, SYS_TTBR1_EL12); break; > + case TCR_EL1: write_sysreg_s(val, SYS_TCR_EL12); break; > + case ESR_EL1: write_sysreg_s(val, SYS_ESR_EL12); break; > + case AFSR0_EL1: write_sysreg_s(val, SYS_AFSR0_EL12); break; > + case AFSR1_EL1: write_sysreg_s(val, SYS_AFSR1_EL12); break; > + case FAR_EL1: write_sysreg_s(val, SYS_FAR_EL12); break; > + case MAIR_EL1: write_sysreg_s(val, SYS_MAIR_EL12); break; > + case VBAR_EL1: write_sysreg_s(val, SYS_VBAR_EL12); break; > + case CONTEXTIDR_EL1: write_sysreg_s(val, SYS_CONTEXTIDR_EL12);break; > + case TPIDR_EL0: write_sysreg_s(val, SYS_TPIDR_EL0); break; > + case TPIDRRO_EL0: write_sysreg_s(val, SYS_TPIDRRO_EL0); break; > + case TPIDR_EL1: write_sysreg_s(val, SYS_TPIDR_EL1); break; > + case AMAIR_EL1: write_sysreg_s(val, SYS_AMAIR_EL12); break; > + case CNTKCTL_EL1: write_sysreg_s(val, SYS_CNTKCTL_EL12); break; > + case ELR_EL1: write_sysreg_s(val, SYS_ELR_EL12); break; > + case PAR_EL1: write_sysreg_s(val, SYS_PAR_EL1); break; > + case DACR32_EL2: write_sysreg_s(val, SYS_DACR32_EL2); break; > + case IFSR32_EL2: write_sysreg_s(val, SYS_IFSR32_EL2); break; > + case DBGVCR32_EL2: write_sysreg_s(val, SYS_DBGVCR32_EL2); break; > + default: return false; > + } > + > + return true; > +} > + > /* > * CP14 and CP15 live in the same array, as they are backed by the > * same system registers. > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 01f63027cf40..f7415c9dbcd9 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -64,87 +64,6 @@ static bool write_to_read_only(struct kvm_vcpu *vcpu, > return false; > } > > -static bool __vcpu_read_sys_reg_from_cpu(int reg, u64 *val) > -{ > - /* > - * System registers listed in the switch are not saved on every > - * exit from the guest but are only saved on vcpu_put. > - * > - * Note that MPIDR_EL1 for the guest is set by KVM via VMPIDR_EL2 but > - * should never be listed below, because the guest cannot modify its > - * own MPIDR_EL1 and MPIDR_EL1 is accessed for VCPU A from VCPU B's > - * thread when emulating cross-VCPU communication. > - */ > - switch (reg) { > - case CSSELR_EL1: *val = read_sysreg_s(SYS_CSSELR_EL1); break; > - case SCTLR_EL1: *val = read_sysreg_s(SYS_SCTLR_EL12); break; > - case CPACR_EL1: *val = read_sysreg_s(SYS_CPACR_EL12); break; > - case TTBR0_EL1: *val = read_sysreg_s(SYS_TTBR0_EL12); break; > - case TTBR1_EL1: *val = read_sysreg_s(SYS_TTBR1_EL12); break; > - case TCR_EL1: *val = read_sysreg_s(SYS_TCR_EL12); break; > - case ESR_EL1: *val = read_sysreg_s(SYS_ESR_EL12); break; > - case AFSR0_EL1: *val = read_sysreg_s(SYS_AFSR0_EL12); break; > - case AFSR1_EL1: *val = read_sysreg_s(SYS_AFSR1_EL12); break; > - case FAR_EL1: *val = read_sysreg_s(SYS_FAR_EL12); break; > - case MAIR_EL1: *val = read_sysreg_s(SYS_MAIR_EL12); break; > - case VBAR_EL1: *val = read_sysreg_s(SYS_VBAR_EL12); break; > - case CONTEXTIDR_EL1: *val = read_sysreg_s(SYS_CONTEXTIDR_EL12);break; > - case TPIDR_EL0: *val = read_sysreg_s(SYS_TPIDR_EL0); break; > - case TPIDRRO_EL0: *val = read_sysreg_s(SYS_TPIDRRO_EL0); break; > - case TPIDR_EL1: *val = read_sysreg_s(SYS_TPIDR_EL1); break; > - case AMAIR_EL1: *val = read_sysreg_s(SYS_AMAIR_EL12); break; > - case CNTKCTL_EL1: *val = read_sysreg_s(SYS_CNTKCTL_EL12); break; > - case ELR_EL1: *val = read_sysreg_s(SYS_ELR_EL12); break; > - case PAR_EL1: *val = read_sysreg_s(SYS_PAR_EL1); break; > - case DACR32_EL2: *val = read_sysreg_s(SYS_DACR32_EL2); break; > - case IFSR32_EL2: *val = read_sysreg_s(SYS_IFSR32_EL2); break; > - case DBGVCR32_EL2: *val = read_sysreg_s(SYS_DBGVCR32_EL2); break; > - default: return false; > - } > - > - return true; > -} > - > -static bool __vcpu_write_sys_reg_to_cpu(u64 val, int reg) > -{ > - /* > - * System registers listed in the switch are not restored on every > - * entry to the guest but are only restored on vcpu_load. > - * > - * Note that MPIDR_EL1 for the guest is set by KVM via VMPIDR_EL2 but > - * should never be listed below, because the MPIDR should only be set > - * once, before running the VCPU, and never changed later. > - */ > - switch (reg) { > - case CSSELR_EL1: write_sysreg_s(val, SYS_CSSELR_EL1); break; > - case SCTLR_EL1: write_sysreg_s(val, SYS_SCTLR_EL12); break; > - case CPACR_EL1: write_sysreg_s(val, SYS_CPACR_EL12); break; > - case TTBR0_EL1: write_sysreg_s(val, SYS_TTBR0_EL12); break; > - case TTBR1_EL1: write_sysreg_s(val, SYS_TTBR1_EL12); break; > - case TCR_EL1: write_sysreg_s(val, SYS_TCR_EL12); break; > - case ESR_EL1: write_sysreg_s(val, SYS_ESR_EL12); break; > - case AFSR0_EL1: write_sysreg_s(val, SYS_AFSR0_EL12); break; > - case AFSR1_EL1: write_sysreg_s(val, SYS_AFSR1_EL12); break; > - case FAR_EL1: write_sysreg_s(val, SYS_FAR_EL12); break; > - case MAIR_EL1: write_sysreg_s(val, SYS_MAIR_EL12); break; > - case VBAR_EL1: write_sysreg_s(val, SYS_VBAR_EL12); break; > - case CONTEXTIDR_EL1: write_sysreg_s(val, SYS_CONTEXTIDR_EL12);break; > - case TPIDR_EL0: write_sysreg_s(val, SYS_TPIDR_EL0); break; > - case TPIDRRO_EL0: write_sysreg_s(val, SYS_TPIDRRO_EL0); break; > - case TPIDR_EL1: write_sysreg_s(val, SYS_TPIDR_EL1); break; > - case AMAIR_EL1: write_sysreg_s(val, SYS_AMAIR_EL12); break; > - case CNTKCTL_EL1: write_sysreg_s(val, SYS_CNTKCTL_EL12); break; > - case ELR_EL1: write_sysreg_s(val, SYS_ELR_EL12); break; > - case PAR_EL1: write_sysreg_s(val, SYS_PAR_EL1); break; > - case DACR32_EL2: write_sysreg_s(val, SYS_DACR32_EL2); break; > - case IFSR32_EL2: write_sysreg_s(val, SYS_IFSR32_EL2); break; > - case DBGVCR32_EL2: write_sysreg_s(val, SYS_DBGVCR32_EL2); break; > - default: return false; > - } > - > - return true; > -} > - > u64 vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, int reg) > { > u64 val = 0x8badf00d8badf00d; > -- > 2.28.0 > > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel