Re: [Xen-devel] [PATCH for-next v3 7/9] x86: switch xen implementation to use hypervisor framework
On 21.10.2019 17:57, Wei Liu wrote: > @@ -31,9 +31,39 @@ bool hypervisor_probe(void) > if ( hops ) > return true; > > +/* Too early to use cpu_has_hypervisor */ > +if ( !(cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_HYPERVISOR)) ) > +return false; > + > +#ifdef CONFIG_XEN_GUEST > +if ( xen_probe() ) > +{ > +hops = &xen_ops; > +return true; > +} > +#endif > + > return false; > } > > +void hypervisor_setup(void) __init? > @@ -330,6 +325,13 @@ void hypervisor_resume(void) > pv_console_init(); > } > > +struct hypervisor_ops xen_ops = { const (will require a corresponding adjustment in the earlier patch then too)? With these taken care of and the naming possibly adjusted according to whatever the decision on the earlier patch s going to be Acked-by: Jan Beulich Jan ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-next v3 7/9] x86: switch xen implementation to use hypervisor framework
On Mon, 21 Oct 2019 at 17:00, Wei Liu wrote: > > Take the chance to change probe_hypervisor to hypervisor_probe. > > Signed-off-by: Wei Liu Reviewed-by: Paul Durrant > --- > V3: > 1. Address Roger's comments > 2. Change xen_hypervisor_ops to xen_ops > --- > xen/arch/x86/guest/hypervisor.c | 32 ++- > xen/arch/x86/guest/xen/pvh-boot.c | 2 +- > xen/arch/x86/guest/xen/xen.c | 26 + > xen/arch/x86/setup.c | 2 +- > xen/include/asm-x86/guest/xen.h | 6 -- > 5 files changed, 51 insertions(+), 17 deletions(-) > > diff --git a/xen/arch/x86/guest/hypervisor.c b/xen/arch/x86/guest/hypervisor.c > index 89b9ae4de0..33bf1a769d 100644 > --- a/xen/arch/x86/guest/hypervisor.c > +++ b/xen/arch/x86/guest/hypervisor.c > @@ -22,7 +22,7 @@ > #include > > #include > -#include > +#include > > static struct hypervisor_ops *hops __read_mostly; > > @@ -31,9 +31,39 @@ bool hypervisor_probe(void) > if ( hops ) > return true; > > +/* Too early to use cpu_has_hypervisor */ > +if ( !(cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_HYPERVISOR)) ) > +return false; > + > +#ifdef CONFIG_XEN_GUEST > +if ( xen_probe() ) > +{ > +hops = &xen_ops; > +return true; > +} > +#endif > + > return false; > } > > +void hypervisor_setup(void) > +{ > +if ( hops && hops->setup ) > +hops->setup(); > +} > + > +void hypervisor_ap_setup(void) > +{ > +if ( hops && hops->ap_setup ) > +hops->ap_setup(); > +} > + > +void hypervisor_resume(void) > +{ > +if ( hops && hops->resume ) > +hops->resume(); > +} > + > /* > * Local variables: > * mode: C > diff --git a/xen/arch/x86/guest/xen/pvh-boot.c > b/xen/arch/x86/guest/xen/pvh-boot.c > index ca8e156f7d..498625eae0 100644 > --- a/xen/arch/x86/guest/xen/pvh-boot.c > +++ b/xen/arch/x86/guest/xen/pvh-boot.c > @@ -103,7 +103,7 @@ void __init pvh_init(multiboot_info_t **mbi, module_t > **mod) > { > convert_pvh_info(mbi, mod); > > -probe_hypervisor(); > +hypervisor_probe(); > ASSERT(xen_guest); > > get_memory_map(); > diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c > index 9895025d02..655435c1f7 100644 > --- a/xen/arch/x86/guest/xen/xen.c > +++ b/xen/arch/x86/guest/xen/xen.c > @@ -67,24 +67,19 @@ static void __init find_xen_leaves(void) > } > } > > -void __init probe_hypervisor(void) > +bool __init xen_probe(void) > { > -if ( xen_guest ) > -return; > - > -/* Too early to use cpu_has_hypervisor */ > -if ( !(cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_HYPERVISOR)) ) > -return; > - > find_xen_leaves(); > > if ( !xen_cpuid_base ) > -return; > +return false; > > /* Fill the hypercall page. */ > wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); > > xen_guest = true; > + > +return true; > } > > static void map_shared_info(void) > @@ -249,7 +244,7 @@ static void init_evtchn(void) > } > } > > -void __init hypervisor_setup(void) > +static void __init xen_setup(void) > { > init_memmap(); > > @@ -277,7 +272,7 @@ void __init hypervisor_setup(void) > init_evtchn(); > } > > -void hypervisor_ap_setup(void) > +static void xen_ap_setup(void) > { > set_vcpu_id(); > map_vcpuinfo(); > @@ -307,7 +302,7 @@ static void ap_resume(void *unused) > init_evtchn(); > } > > -void hypervisor_resume(void) > +static void xen_resume(void) > { > /* Reset shared info page. */ > map_shared_info(); > @@ -330,6 +325,13 @@ void hypervisor_resume(void) > pv_console_init(); > } > > +struct hypervisor_ops xen_ops = { > +.name = "Xen", > +.setup = xen_setup, > +.ap_setup = xen_ap_setup, > +.resume = xen_resume, > +}; > + > /* > * Local variables: > * mode: C > diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c > index dec60d0301..0ee11b15a6 100644 > --- a/xen/arch/x86/setup.c > +++ b/xen/arch/x86/setup.c > @@ -763,7 +763,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) > * allocing any xenheap structures wanted in lower memory. */ > kexec_early_calculations(); > > -probe_hypervisor(); > +hypervisor_probe(); > > parse_video_info(); > > diff --git a/xen/include/asm-x86/guest/xen.h b/xen/include/asm-x86/guest/xen.h > index 8221fc1325..c3c6bea24f 100644 > --- a/xen/include/asm-x86/guest/xen.h > +++ b/xen/include/asm-x86/guest/xen.h > @@ -23,6 +23,7 @@ > > #include > #include > +#include > > #define XEN_shared_info ((struct shared_info > *)fix_to_virt(FIX_XEN_SHARED_INFO)) > > @@ -31,8 +32,9 @@ > extern bool xen_guest; > extern bool pv_console; > extern uint32_t xen_cpuid_base; > +extern struct hypervisor_ops xen_ops; > > -void probe_hypervisor(void); > +bool xen_probe(void); > int xen_alloc_unused_page(mfn_t *mfn); > int xen_free_unused_page(mfn_t mfn); > > @@ -44,7 +46,7 @@ DECLARE_PER_CPU(struct vcpu_info *, vcpu_info)
[Xen-devel] [PATCH for-next v3 7/9] x86: switch xen implementation to use hypervisor framework
Take the chance to change probe_hypervisor to hypervisor_probe. Signed-off-by: Wei Liu --- V3: 1. Address Roger's comments 2. Change xen_hypervisor_ops to xen_ops --- xen/arch/x86/guest/hypervisor.c | 32 ++- xen/arch/x86/guest/xen/pvh-boot.c | 2 +- xen/arch/x86/guest/xen/xen.c | 26 + xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/guest/xen.h | 6 -- 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/guest/hypervisor.c b/xen/arch/x86/guest/hypervisor.c index 89b9ae4de0..33bf1a769d 100644 --- a/xen/arch/x86/guest/hypervisor.c +++ b/xen/arch/x86/guest/hypervisor.c @@ -22,7 +22,7 @@ #include #include -#include +#include static struct hypervisor_ops *hops __read_mostly; @@ -31,9 +31,39 @@ bool hypervisor_probe(void) if ( hops ) return true; +/* Too early to use cpu_has_hypervisor */ +if ( !(cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_HYPERVISOR)) ) +return false; + +#ifdef CONFIG_XEN_GUEST +if ( xen_probe() ) +{ +hops = &xen_ops; +return true; +} +#endif + return false; } +void hypervisor_setup(void) +{ +if ( hops && hops->setup ) +hops->setup(); +} + +void hypervisor_ap_setup(void) +{ +if ( hops && hops->ap_setup ) +hops->ap_setup(); +} + +void hypervisor_resume(void) +{ +if ( hops && hops->resume ) +hops->resume(); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/guest/xen/pvh-boot.c b/xen/arch/x86/guest/xen/pvh-boot.c index ca8e156f7d..498625eae0 100644 --- a/xen/arch/x86/guest/xen/pvh-boot.c +++ b/xen/arch/x86/guest/xen/pvh-boot.c @@ -103,7 +103,7 @@ void __init pvh_init(multiboot_info_t **mbi, module_t **mod) { convert_pvh_info(mbi, mod); -probe_hypervisor(); +hypervisor_probe(); ASSERT(xen_guest); get_memory_map(); diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 9895025d02..655435c1f7 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -67,24 +67,19 @@ static void __init find_xen_leaves(void) } } -void __init probe_hypervisor(void) +bool __init xen_probe(void) { -if ( xen_guest ) -return; - -/* Too early to use cpu_has_hypervisor */ -if ( !(cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_HYPERVISOR)) ) -return; - find_xen_leaves(); if ( !xen_cpuid_base ) -return; +return false; /* Fill the hypercall page. */ wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); xen_guest = true; + +return true; } static void map_shared_info(void) @@ -249,7 +244,7 @@ static void init_evtchn(void) } } -void __init hypervisor_setup(void) +static void __init xen_setup(void) { init_memmap(); @@ -277,7 +272,7 @@ void __init hypervisor_setup(void) init_evtchn(); } -void hypervisor_ap_setup(void) +static void xen_ap_setup(void) { set_vcpu_id(); map_vcpuinfo(); @@ -307,7 +302,7 @@ static void ap_resume(void *unused) init_evtchn(); } -void hypervisor_resume(void) +static void xen_resume(void) { /* Reset shared info page. */ map_shared_info(); @@ -330,6 +325,13 @@ void hypervisor_resume(void) pv_console_init(); } +struct hypervisor_ops xen_ops = { +.name = "Xen", +.setup = xen_setup, +.ap_setup = xen_ap_setup, +.resume = xen_resume, +}; + /* * Local variables: * mode: C diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index dec60d0301..0ee11b15a6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -763,7 +763,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) * allocing any xenheap structures wanted in lower memory. */ kexec_early_calculations(); -probe_hypervisor(); +hypervisor_probe(); parse_video_info(); diff --git a/xen/include/asm-x86/guest/xen.h b/xen/include/asm-x86/guest/xen.h index 8221fc1325..c3c6bea24f 100644 --- a/xen/include/asm-x86/guest/xen.h +++ b/xen/include/asm-x86/guest/xen.h @@ -23,6 +23,7 @@ #include #include +#include #define XEN_shared_info ((struct shared_info *)fix_to_virt(FIX_XEN_SHARED_INFO)) @@ -31,8 +32,9 @@ extern bool xen_guest; extern bool pv_console; extern uint32_t xen_cpuid_base; +extern struct hypervisor_ops xen_ops; -void probe_hypervisor(void); +bool xen_probe(void); int xen_alloc_unused_page(mfn_t *mfn); int xen_free_unused_page(mfn_t mfn); @@ -44,7 +46,7 @@ DECLARE_PER_CPU(struct vcpu_info *, vcpu_info); #define xen_guest 0 #define pv_console 0 -static inline void probe_hypervisor(void) {} +static inline bool xen_probe(void) { return false; } #endif /* CONFIG_XEN_GUEST */ #endif /* __X86_GUEST_XEN_H__ */ -- 2.20.1 ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel