Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Christoffer Dall Newsgroups: linux.kernel Subject: Re: [RFC 06/55] KVM: arm64: Add EL2 execution context for nesting Date: Wed, 22 Feb 2017 12:20:01 +0100 Message-ID: References: X-Original-To: Jintack Lim Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=z5oEokqA7o0VlLA91qQnwvdityfNwLpYGOwbv0AXjKY=; b=kXGfTw6/RmNbQAffO1NFAskkKscnj5zSreZH6GzS7KkWnPe+tdKF31yVFou1tzCFVR 4y1ZG7mzyHnWQ7Jz26HGA+6iBG4ytuyLUjOdJ0LPoqKPA29REpcQ5xs4TrEaNivB+BM3 PGC7weGMVI+HARIP0fZMwiedKGjhp++RSLhTU= X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=z5oEokqA7o0VlLA91qQnwvdityfNwLpYGOwbv0AXjKY=; b=nEynmaj0Sn+ivxnX2bS7afx2H5AY4J2u3Mgmu7ab3sbeTDIyVnlPBZ7RNzQT018gYy AsAVhP24XR5JLC6T2wic7rPPhqIbzkdZRa517tbpAeMZC/sL7VvgTBS1TU6hd4XeZs0u q/8KPp6fUVtIINC0E6xALOOLXcDPGz7K27t0/VK9cRnbAmnuScFplrscZLW9j0j/9Pg1 /n1XJxWU059ZhUNRSVMD4u7uDeHWug7zpaSySjd8+vmdhZPwTCG0zXUBamWihoIDLrz8 k6msTGooP3xWwGexxkHM63UcVQko6jq5PmlRisf/YZ3B1maZsKZFCpeFF15NvayLVw4b KBQw== X-Gm-Message-State: AMke39mDkbLv8n+PsTfs3eF9wCqn1FCNHzkGvBwUuV+LnSGRJDd7z1QnW2qamEUZbn7vL/D6 X-Received: by 10.28.69.28 with SMTP id s28mr1805193wma.40.1487761830332; Wed, 22 Feb 2017 03:10:30 -0800 (PST) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 109 Organization: linux.* mail to news gateway X-Original-Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com, pbonzini@redhat.com, rkrcmar@redhat.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, vladimir.murzin@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, james.morse@arm.com, lorenzo.pieralisi@arm.com, kevin.brodsky@arm.com, wcohen@redhat.com, shankerd@codeaurora.org, geoff@infradead.org, andre.przywara@arm.com, eric.auger@redhat.com, anna-maria@linutronix.de, shihwei@cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org X-Original-Date: Wed, 22 Feb 2017 12:10:17 +0100 X-Original-Message-ID: <20170222111017.GB26976@cbox> X-Original-References: <1483943091-1364-1-git-send-email-jintack@cs.columbia.edu> <1483943091-1364-7-git-send-email-jintack@cs.columbia.edu> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1586068 On Mon, Jan 09, 2017 at 01:24:02AM -0500, Jintack Lim wrote: > With the nested virtualization support, the context of the guest > includes EL2 register states. The host manages a set of virtual EL2 > registers. In addition to that, the guest hypervisor supposed to run in > EL2 is now deprivilaged and runs in EL1. So, the host also manages a set > of shadow system registers to be able to run the guest hypervisor in > EL1. > > Signed-off-by: Jintack Lim > Signed-off-by: Christoffer Dall > --- > arch/arm64/include/asm/kvm_host.h | 54 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 54 insertions(+) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index c0c8b02..ed78d73 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -146,6 +146,42 @@ enum vcpu_sysreg { > NR_SYS_REGS /* Nothing after this line! */ > }; > > +enum el2_regs { > + ELR_EL2, > + SPSR_EL2, > + SP_EL2, > + AMAIR_EL2, > + MAIR_EL2, > + TCR_EL2, > + TTBR0_EL2, > + VTCR_EL2, > + VTTBR_EL2, > + VMPIDR_EL2, > + VPIDR_EL2, /* 10 */ > + MDCR_EL2, > + CNTHCTL_EL2, > + CNTHP_CTL_EL2, > + CNTHP_CVAL_EL2, > + CNTHP_TVAL_EL2, > + CNTVOFF_EL2, > + ACTLR_EL2, > + AFSR0_EL2, > + AFSR1_EL2, > + CPTR_EL2, /* 20 */ > + ESR_EL2, > + FAR_EL2, > + HACR_EL2, > + HCR_EL2, > + HPFAR_EL2, > + HSTR_EL2, > + RMR_EL2, > + RVBAR_EL2, > + SCTLR_EL2, > + TPIDR_EL2, /* 30 */ > + VBAR_EL2, > + NR_EL2_REGS /* Nothing after this line! */ > +}; Why do we have a separate enum and array for the EL2 regs and not simply expand vcpu_sysreg ? > + > /* 32bit mapping */ > #define c0_MPIDR (MPIDR_EL1 * 2) /* MultiProcessor ID Register */ > #define c0_CSSELR (CSSELR_EL1 * 2)/* Cache Size Selection Register */ > @@ -193,6 +229,23 @@ struct kvm_cpu_context { > u64 sys_regs[NR_SYS_REGS]; > u32 copro[NR_COPRO_REGS]; > }; > + > + u64 el2_regs[NR_EL2_REGS]; /* only used for nesting */ > + u64 shadow_sys_regs[NR_SYS_REGS]; /* only used for virtual EL2 */ > + > + /* > + * hw_* will be used when switching to a VM. They point to either > + * the virtual EL2 or EL1/EL0 context depending on vcpu mode. don't they either point to the shadow sys regs or the the normal EL1 sysregs? > + */ > + > + /* pointing shadow_sys_regs or sys_regs */ that's what this comment seems to indicate, so there's some duplicity here. > + u64 *hw_sys_regs; > + > + /* copy of either gp_regs.sp_el1 or el2_regs[SP_EL2] */ > + u64 hw_sp_el1; > + > + /* pstate written to SPSR_EL2 */ > + u64 hw_pstate; > }; > > typedef struct kvm_cpu_context kvm_cpu_context_t; > @@ -277,6 +330,7 @@ struct kvm_vcpu_arch { > > #define vcpu_gp_regs(v) (&(v)->arch.ctxt.gp_regs) > #define vcpu_sys_reg(v,r) ((v)->arch.ctxt.sys_regs[(r)]) > +#define vcpu_el2_reg(v, r) ((v)->arch.ctxt.el2_regs[(r)]) > /* > * CP14 and CP15 live in the same array, as they are backed by the > * same system registers. > -- > 1.9.1 > >