| Message ID | 20190328103731.27264-3-andrew.murray@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: Support perf event modifiers :G and :H | expand |
On 03/28/2019 10:37 AM, Andrew Murray wrote: > The virt/arm core allocates a kvm_cpu_context_t percpu, at present this is > a typedef to kvm_cpu_context and is used to store host cpu context. The > kvm_cpu_context structure is also used elsewhere to hold vcpu context. > In order to use the percpu to hold additional future host information we > encapsulate kvm_cpu_context in a new structure and rename the typedef and > percpu to match. > > Signed-off-by: Andrew Murray <andrew.murray@arm.com> > --- > arch/arm/include/asm/kvm_host.h | 8 ++++++-- > arch/arm64/include/asm/kvm_asm.h | 3 ++- > arch/arm64/include/asm/kvm_host.h | 16 ++++++++++------ > arch/arm64/kernel/asm-offsets.c | 1 + > virt/kvm/arm/arm.c | 14 ++++++++------ > 5 files changed, 27 insertions(+), 15 deletions(-) > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > index 770d73257ad9..427c28be6452 100644 > --- a/arch/arm/include/asm/kvm_host.h > +++ b/arch/arm/include/asm/kvm_host.h > @@ -150,7 +150,11 @@ struct kvm_cpu_context { > u32 cp15[NR_CP15_REGS]; > }; > > -typedef struct kvm_cpu_context kvm_cpu_context_t; > +struct kvm_host_data { > + struct kvm_cpu_context host_ctxt; > +}; > + > +typedef struct kvm_host_data kvm_host_data_t; > > static inline void kvm_init_host_cpu_context(kvm_cpu_context_t *cpu_ctxt, > int cpu) We need to fix this function prototype to accept struct kvm_cpu_context, instead of the now removed kvm_cpu_context_t, to prevent a build break on arm32 ? With that : Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
On Thu, Mar 28, 2019 at 10:37:25AM +0000, Andrew Murray wrote: > The virt/arm core allocates a kvm_cpu_context_t percpu, at present this is > a typedef to kvm_cpu_context and is used to store host cpu context. The > kvm_cpu_context structure is also used elsewhere to hold vcpu context. > In order to use the percpu to hold additional future host information we > encapsulate kvm_cpu_context in a new structure and rename the typedef and > percpu to match. > > Signed-off-by: Andrew Murray <andrew.murray@arm.com> > --- > arch/arm/include/asm/kvm_host.h | 8 ++++++-- > arch/arm64/include/asm/kvm_asm.h | 3 ++- > arch/arm64/include/asm/kvm_host.h | 16 ++++++++++------ > arch/arm64/kernel/asm-offsets.c | 1 + > virt/kvm/arm/arm.c | 14 ++++++++------ > 5 files changed, 27 insertions(+), 15 deletions(-) As per usual, I'll need an Ack from Christoffer and/or Marc on this one :) Will
On Thu, Apr 04, 2019 at 05:09:58PM +0100, Will Deacon wrote: > On Thu, Mar 28, 2019 at 10:37:25AM +0000, Andrew Murray wrote: > > The virt/arm core allocates a kvm_cpu_context_t percpu, at present this is > > a typedef to kvm_cpu_context and is used to store host cpu context. The > > kvm_cpu_context structure is also used elsewhere to hold vcpu context. > > In order to use the percpu to hold additional future host information we > > encapsulate kvm_cpu_context in a new structure and rename the typedef and > > percpu to match. > > > > Signed-off-by: Andrew Murray <andrew.murray@arm.com> > > --- > > arch/arm/include/asm/kvm_host.h | 8 ++++++-- > > arch/arm64/include/asm/kvm_asm.h | 3 ++- > > arch/arm64/include/asm/kvm_host.h | 16 ++++++++++------ > > arch/arm64/kernel/asm-offsets.c | 1 + > > virt/kvm/arm/arm.c | 14 ++++++++------ > > 5 files changed, 27 insertions(+), 15 deletions(-) > > As per usual, I'll need an Ack from Christoffer and/or Marc on this one :) Actually... given that most of this series is now firmly in KVM territory, it probably makes more sense for the kvm/arm tree to take this on a separate branch, which I can also pull into the arm64 perf tree if I run into conflicts on the non-kvm parts. Will
On Thu, Apr 04, 2019 at 05:14:16PM +0100, Will Deacon wrote: > On Thu, Apr 04, 2019 at 05:09:58PM +0100, Will Deacon wrote: > > On Thu, Mar 28, 2019 at 10:37:25AM +0000, Andrew Murray wrote: > > > The virt/arm core allocates a kvm_cpu_context_t percpu, at present this is > > > a typedef to kvm_cpu_context and is used to store host cpu context. The > > > kvm_cpu_context structure is also used elsewhere to hold vcpu context. > > > In order to use the percpu to hold additional future host information we > > > encapsulate kvm_cpu_context in a new structure and rename the typedef and > > > percpu to match. > > > > > > Signed-off-by: Andrew Murray <andrew.murray@arm.com> > > > --- > > > arch/arm/include/asm/kvm_host.h | 8 ++++++-- > > > arch/arm64/include/asm/kvm_asm.h | 3 ++- > > > arch/arm64/include/asm/kvm_host.h | 16 ++++++++++------ > > > arch/arm64/kernel/asm-offsets.c | 1 + > > > virt/kvm/arm/arm.c | 14 ++++++++------ > > > 5 files changed, 27 insertions(+), 15 deletions(-) > > > > As per usual, I'll need an Ack from Christoffer and/or Marc on this one :) > > Actually... given that most of this series is now firmly in KVM territory, > it probably makes more sense for the kvm/arm tree to take this on a separate > branch, which I can also pull into the arm64 perf tree if I run into > conflicts on the non-kvm parts. No problem. Thanks, Andrew Murray > > Will
On Thu, Mar 28, 2019 at 03:28:37PM +0000, Suzuki K Poulose wrote: > On 03/28/2019 10:37 AM, Andrew Murray wrote: > > The virt/arm core allocates a kvm_cpu_context_t percpu, at present this is > > a typedef to kvm_cpu_context and is used to store host cpu context. The > > kvm_cpu_context structure is also used elsewhere to hold vcpu context. > > In order to use the percpu to hold additional future host information we > > encapsulate kvm_cpu_context in a new structure and rename the typedef and > > percpu to match. > > > > Signed-off-by: Andrew Murray <andrew.murray@arm.com> > > --- > > arch/arm/include/asm/kvm_host.h | 8 ++++++-- > > arch/arm64/include/asm/kvm_asm.h | 3 ++- > > arch/arm64/include/asm/kvm_host.h | 16 ++++++++++------ > > arch/arm64/kernel/asm-offsets.c | 1 + > > virt/kvm/arm/arm.c | 14 ++++++++------ > > 5 files changed, 27 insertions(+), 15 deletions(-) > > > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > > index 770d73257ad9..427c28be6452 100644 > > --- a/arch/arm/include/asm/kvm_host.h > > +++ b/arch/arm/include/asm/kvm_host.h > > @@ -150,7 +150,11 @@ struct kvm_cpu_context { > > u32 cp15[NR_CP15_REGS]; > > }; > > -typedef struct kvm_cpu_context kvm_cpu_context_t; > > +struct kvm_host_data { > > + struct kvm_cpu_context host_ctxt; > > +}; > > + > > +typedef struct kvm_host_data kvm_host_data_t; > > static inline void kvm_init_host_cpu_context(kvm_cpu_context_t *cpu_ctxt, > > int cpu) > > We need to fix this function prototype to accept struct kvm_cpu_context, > instead of the now removed kvm_cpu_context_t, to prevent a build break > on arm32 ? Yes this was a breakage, thanks for pointing this out. Thanks, Andrew Murray > > With that : > > Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 770d73257ad9..427c28be6452 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -150,7 +150,11 @@ struct kvm_cpu_context { u32 cp15[NR_CP15_REGS]; }; -typedef struct kvm_cpu_context kvm_cpu_context_t; +struct kvm_host_data { + struct kvm_cpu_context host_ctxt; +}; + +typedef struct kvm_host_data kvm_host_data_t; static inline void kvm_init_host_cpu_context(kvm_cpu_context_t *cpu_ctxt, int cpu) @@ -182,7 +186,7 @@ struct kvm_vcpu_arch { struct kvm_vcpu_fault_info fault; /* Host FP context */ - kvm_cpu_context_t *host_cpu_context; + struct kvm_cpu_context *host_cpu_context; /* VGIC state */ struct vgic_cpu vgic_cpu; diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index f5b79e995f40..ff73f5462aca 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -108,7 +108,8 @@ extern u32 __kvm_get_mdcr_el2(void); .endm .macro get_host_ctxt reg, tmp - hyp_adr_this_cpu \reg, kvm_host_cpu_state, \tmp + hyp_adr_this_cpu \reg, kvm_host_data, \tmp + add \reg, \reg, #HOST_DATA_CONTEXT .endm .macro get_vcpu_ptr vcpu, ctxt diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index a01fe087e022..6530ad522a16 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -212,7 +212,11 @@ struct kvm_cpu_context { struct kvm_vcpu *__hyp_running_vcpu; }; -typedef struct kvm_cpu_context kvm_cpu_context_t; +struct kvm_host_data { + struct kvm_cpu_context host_ctxt; +}; + +typedef struct kvm_host_data kvm_host_data_t; struct vcpu_reset_state { unsigned long pc; @@ -255,7 +259,7 @@ struct kvm_vcpu_arch { struct kvm_guest_debug_arch external_debug_state; /* Pointer to host CPU context */ - kvm_cpu_context_t *host_cpu_context; + struct kvm_cpu_context *host_cpu_context; struct thread_info *host_thread_info; /* hyp VA */ struct user_fpsimd_state *host_fpsimd_state; /* hyp VA */ @@ -432,9 +436,9 @@ void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome); struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr); -DECLARE_PER_CPU(kvm_cpu_context_t, kvm_host_cpu_state); +DECLARE_PER_CPU(kvm_host_data_t, kvm_host_data); -static inline void kvm_init_host_cpu_context(kvm_cpu_context_t *cpu_ctxt, +static inline void kvm_init_host_cpu_context(struct kvm_cpu_context *cpu_ctxt, int cpu) { /* The host's MPIDR is immutable, so let's set it up at boot time */ @@ -452,8 +456,8 @@ static inline void __cpu_init_hyp_mode(phys_addr_t pgd_ptr, * kernel's mapping to the linear mapping, and store it in tpidr_el2 * so that we can use adr_l to access per-cpu variables in EL2. */ - u64 tpidr_el2 = ((u64)this_cpu_ptr(&kvm_host_cpu_state) - - (u64)kvm_ksym_ref(kvm_host_cpu_state)); + u64 tpidr_el2 = ((u64)this_cpu_ptr(&kvm_host_data) - + (u64)kvm_ksym_ref(kvm_host_data)); /* * Call initialization code, and switch to the full blown HYP code. diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 7f40dcbdd51d..fbf0409cc2be 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -128,6 +128,7 @@ int main(void) DEFINE(CPU_GP_REGS, offsetof(struct kvm_cpu_context, gp_regs)); DEFINE(CPU_USER_PT_REGS, offsetof(struct kvm_regs, regs)); DEFINE(HOST_CONTEXT_VCPU, offsetof(struct kvm_cpu_context, __hyp_running_vcpu)); + DEFINE(HOST_DATA_CONTEXT, offsetof(struct kvm_host_data, host_ctxt)); #endif #ifdef CONFIG_CPU_PM DEFINE(CPU_CTX_SP, offsetof(struct cpu_suspend_ctx, sp)); diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 99c37384ba7b..6bcda52c0ea6 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -56,7 +56,7 @@ __asm__(".arch_extension virt"); #endif -DEFINE_PER_CPU(kvm_cpu_context_t, kvm_host_cpu_state); +DEFINE_PER_CPU(kvm_host_data_t, kvm_host_data); static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page); /* Per-CPU variable containing the currently running vcpu. */ @@ -360,8 +360,10 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) { int *last_ran; + kvm_host_data_t *cpu_data; last_ran = this_cpu_ptr(vcpu->kvm->arch.last_vcpu_ran); + cpu_data = this_cpu_ptr(&kvm_host_data); /* * We might get preempted before the vCPU actually runs, but @@ -373,7 +375,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) } vcpu->cpu = cpu; - vcpu->arch.host_cpu_context = this_cpu_ptr(&kvm_host_cpu_state); + vcpu->arch.host_cpu_context = &cpu_data->host_ctxt; kvm_arm_set_running_vcpu(vcpu); kvm_vgic_load(vcpu); @@ -1549,11 +1551,11 @@ static int init_hyp_mode(void) } for_each_possible_cpu(cpu) { - kvm_cpu_context_t *cpu_ctxt; + kvm_host_data_t *cpu_data; - cpu_ctxt = per_cpu_ptr(&kvm_host_cpu_state, cpu); - kvm_init_host_cpu_context(cpu_ctxt, cpu); - err = create_hyp_mappings(cpu_ctxt, cpu_ctxt + 1, PAGE_HYP); + cpu_data = per_cpu_ptr(&kvm_host_data, cpu); + kvm_init_host_cpu_context(&cpu_data->host_ctxt, cpu); + err = create_hyp_mappings(cpu_data, cpu_data + 1, PAGE_HYP); if (err) { kvm_err("Cannot map host CPU state: %d\n", err);
The virt/arm core allocates a kvm_cpu_context_t percpu, at present this is a typedef to kvm_cpu_context and is used to store host cpu context. The kvm_cpu_context structure is also used elsewhere to hold vcpu context. In order to use the percpu to hold additional future host information we encapsulate kvm_cpu_context in a new structure and rename the typedef and percpu to match. Signed-off-by: Andrew Murray <andrew.murray@arm.com> --- arch/arm/include/asm/kvm_host.h | 8 ++++++-- arch/arm64/include/asm/kvm_asm.h | 3 ++- arch/arm64/include/asm/kvm_host.h | 16 ++++++++++------ arch/arm64/kernel/asm-offsets.c | 1 + virt/kvm/arm/arm.c | 14 ++++++++------ 5 files changed, 27 insertions(+), 15 deletions(-)