| Message ID | 20200706125425.1671020-11-maz@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5b78077a00f8109f7a4717b19309ef0a76d73372 |
| Headers | show |
| Series | KVM: arm64: Preliminary NV patches | expand |
Hi Marc, On 7/6/20 1:54 PM, Marc Zyngier wrote: > As part of the ongoing spring cleanup, remove the now useless > vcpu parameter that is passed around (host and guest contexts > give us everything we need). > > Signed-off-by: Marc Zyngier <maz@kernel.org> > --- > arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h > index 5499d6c1fd9f..0297dc63988c 100644 > --- a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h > +++ b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h > @@ -88,9 +88,8 @@ > default: write_debug(ptr[0], reg, 0); \ > } > > -static inline void __debug_save_state(struct kvm_vcpu *vcpu, > - struct kvm_guest_debug_arch *dbg, > - struct kvm_cpu_context *ctxt) > +static void __debug_save_state(struct kvm_guest_debug_arch *dbg, > + struct kvm_cpu_context *ctxt) > { > u64 aa64dfr0; > int brps, wrps; > @@ -107,9 +106,8 @@ static inline void __debug_save_state(struct kvm_vcpu *vcpu, > ctxt_sys_reg(ctxt, MDCCINT_EL1) = read_sysreg(mdccint_el1); > } > > -static inline void __debug_restore_state(struct kvm_vcpu *vcpu, > - struct kvm_guest_debug_arch *dbg, > - struct kvm_cpu_context *ctxt) > +static void __debug_restore_state(struct kvm_guest_debug_arch *dbg, > + struct kvm_cpu_context *ctxt) > { > u64 aa64dfr0; > int brps, wrps; > @@ -142,8 +140,8 @@ static inline void __debug_switch_to_guest_common(struct kvm_vcpu *vcpu) > host_dbg = &vcpu->arch.host_debug_state.regs; > guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); > > - __debug_save_state(vcpu, host_dbg, host_ctxt); > - __debug_restore_state(vcpu, guest_dbg, guest_ctxt); > + __debug_save_state(host_dbg, host_ctxt); > + __debug_restore_state(guest_dbg, guest_ctxt); > } > > static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) > @@ -161,8 +159,8 @@ static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) > host_dbg = &vcpu->arch.host_debug_state.regs; > guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); > > - __debug_save_state(vcpu, guest_dbg, guest_ctxt); > - __debug_restore_state(vcpu, host_dbg, host_ctxt); > + __debug_save_state(guest_dbg, guest_ctxt); > + __debug_restore_state(host_dbg, host_ctxt); > > vcpu->arch.flags &= ~KVM_ARM64_DEBUG_DIRTY; > } Looks fine to me. I also had a look at the other files where we started using the __vcpu_sys_reg/ctxt_sys_reg accessors, and I didn't find any functions where we could eliminate the vcpu parameter, like we did here: Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> Thanks, Alex
diff --git a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h index 5499d6c1fd9f..0297dc63988c 100644 --- a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h +++ b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h @@ -88,9 +88,8 @@ default: write_debug(ptr[0], reg, 0); \ } -static inline void __debug_save_state(struct kvm_vcpu *vcpu, - struct kvm_guest_debug_arch *dbg, - struct kvm_cpu_context *ctxt) +static void __debug_save_state(struct kvm_guest_debug_arch *dbg, + struct kvm_cpu_context *ctxt) { u64 aa64dfr0; int brps, wrps; @@ -107,9 +106,8 @@ static inline void __debug_save_state(struct kvm_vcpu *vcpu, ctxt_sys_reg(ctxt, MDCCINT_EL1) = read_sysreg(mdccint_el1); } -static inline void __debug_restore_state(struct kvm_vcpu *vcpu, - struct kvm_guest_debug_arch *dbg, - struct kvm_cpu_context *ctxt) +static void __debug_restore_state(struct kvm_guest_debug_arch *dbg, + struct kvm_cpu_context *ctxt) { u64 aa64dfr0; int brps, wrps; @@ -142,8 +140,8 @@ static inline void __debug_switch_to_guest_common(struct kvm_vcpu *vcpu) host_dbg = &vcpu->arch.host_debug_state.regs; guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); - __debug_save_state(vcpu, host_dbg, host_ctxt); - __debug_restore_state(vcpu, guest_dbg, guest_ctxt); + __debug_save_state(host_dbg, host_ctxt); + __debug_restore_state(guest_dbg, guest_ctxt); } static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) @@ -161,8 +159,8 @@ static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) host_dbg = &vcpu->arch.host_debug_state.regs; guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); - __debug_save_state(vcpu, guest_dbg, guest_ctxt); - __debug_restore_state(vcpu, host_dbg, host_ctxt); + __debug_save_state(guest_dbg, guest_ctxt); + __debug_restore_state(host_dbg, host_ctxt); vcpu->arch.flags &= ~KVM_ARM64_DEBUG_DIRTY; }
As part of the ongoing spring cleanup, remove the now useless vcpu parameter that is passed around (host and guest contexts give us everything we need). Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)