| Message ID | 20170626162842.482-7-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 26/06/17 17:28, Wei Liu wrote: > There is only one caller for that function. Simplify the function, > move it close to the caller and rename it. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> Good improvement. In principle, Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>, although... > --- > xen/arch/x86/cpu/mcheck/vmce.c | 11 ++++++++++- > xen/arch/x86/traps.c | 18 ------------------ > xen/include/asm-x86/traps.h | 8 -------- > 3 files changed, 10 insertions(+), 27 deletions(-) > > diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c > index d591d31600..368285810a 100644 > --- a/xen/arch/x86/cpu/mcheck/vmce.c > +++ b/xen/arch/x86/cpu/mcheck/vmce.c > @@ -359,6 +359,15 @@ static int vmce_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) > HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt, > vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); > > +static inline bool pv_callback_registered(const struct vcpu *v, uint8_t vector) > +{ > +#ifdef CONFIG_PV > + return v->arch.pv_vcpu.trap_ctxt[vector].address; > +#else > + return false; > +#endif > +} > + Isn't there a header file this would be better living in? Its certainly not vmce-specific. ~Andrew
>>> Andrew Cooper <andrew.cooper3@citrix.com> 06/26/17 6:58 PM >>> >On 26/06/17 17:28, Wei Liu wrote: >> --- a/xen/arch/x86/cpu/mcheck/vmce.c >> +++ b/xen/arch/x86/cpu/mcheck/vmce.c >> @@ -359,6 +359,15 @@ static int vmce_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) >> HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt, >> vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); >> >> +static inline bool pv_callback_registered(const struct vcpu *v, uint8_t vector) >> +{ >> +#ifdef CONFIG_PV >> + return v->arch.pv_vcpu.trap_ctxt[vector].address; >> +#else >> + return false; >> +#endif >> +} >> + > >Isn't there a header file this would be better living in? Its certainly >not vmce-specific. We certainly have the equivalent of this check in assembly code (which iirc we mean to convert to C eventually), so pv/traps.h would seem to be the right place. The function name would need to change a little though, as we're talking about exception callbacks here, not the things we call callbacks in the public interface. pv_trap_callback_registered() perhaps? Jan
diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index d591d31600..368285810a 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -359,6 +359,15 @@ static int vmce_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt, vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); +static inline bool pv_callback_registered(const struct vcpu *v, uint8_t vector) +{ +#ifdef CONFIG_PV + return v->arch.pv_vcpu.trap_ctxt[vector].address; +#else + return false; +#endif +} + /* * for Intel MCE, broadcast vMCE to all vcpus * for AMD MCE, only inject vMCE to vcpu0 @@ -383,7 +392,7 @@ int inject_vmce(struct domain *d, int vcpu) continue; if ( (is_hvm_domain(d) || - guest_has_trap_callback(d, v->vcpu_id, TRAP_machine_check)) && + pv_callback_registered(v, TRAP_machine_check)) && !test_and_set_bool(v->mce_pending) ) { mce_printk(MCE_VERBOSE, "MCE: inject vMCE to %pv\n", v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c43f3f1095..f3c5de6f2c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2008,24 +2008,6 @@ long unregister_guest_nmi_callback(void) return 0; } -int guest_has_trap_callback(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) -{ - struct vcpu *v; - struct trap_info *t; - - BUG_ON(d == NULL); - BUG_ON(vcpuid >= d->max_vcpus); - - /* Sanity check - XXX should be more fine grained. */ - BUG_ON(trap_nr >= NR_VECTORS); - - v = d->vcpu[vcpuid]; - t = &v->arch.pv_vcpu.trap_ctxt[trap_nr]; - - return (t->address != 0); -} - - int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) { struct vcpu *v; diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h index 893b4dbe77..cc1d7d01d9 100644 --- a/xen/include/asm-x86/traps.h +++ b/xen/include/asm-x86/traps.h @@ -29,14 +29,6 @@ struct cpu_user_regs; void async_exception_cleanup(struct vcpu *); -/** - * guest_has_trap_callback - * - * returns true (non-zero) if guest registered a trap handler - */ -extern int guest_has_trap_callback(struct domain *d, uint16_t vcpuid, - unsigned int trap_nr); - /** * send_guest_trap *
There is only one caller for that function. Simplify the function, move it close to the caller and rename it. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- xen/arch/x86/cpu/mcheck/vmce.c | 11 ++++++++++- xen/arch/x86/traps.c | 18 ------------------ xen/include/asm-x86/traps.h | 8 -------- 3 files changed, 10 insertions(+), 27 deletions(-)