Message ID | 20200212160918.18470-4-liuwe@microsoft.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Xen on Hyper-V: Implement L0 assisted TLB flush | expand |
On Wed, Feb 12, 2020 at 04:09:17PM +0000, Wei Liu wrote: > Implement a basic hook for L0 assisted TLB flush. The hook needs to > check if prerequisites are met. If they are not met, it returns an error > number to fall back to native flushes. > > Introduce a new variable to indicate if hypercall page is ready. > > Signed-off-by: Wei Liu <liuwe@microsoft.com> > --- > xen/arch/x86/guest/hyperv/Makefile | 1 + > xen/arch/x86/guest/hyperv/hyperv.c | 17 ++++++++++++ > xen/arch/x86/guest/hyperv/private.h | 4 +++ > xen/arch/x86/guest/hyperv/tlb.c | 41 +++++++++++++++++++++++++++++ > 4 files changed, 63 insertions(+) > create mode 100644 xen/arch/x86/guest/hyperv/tlb.c > > diff --git a/xen/arch/x86/guest/hyperv/Makefile b/xen/arch/x86/guest/hyperv/Makefile > index 68170109a9..18902c33e9 100644 > --- a/xen/arch/x86/guest/hyperv/Makefile > +++ b/xen/arch/x86/guest/hyperv/Makefile > @@ -1 +1,2 @@ > obj-y += hyperv.o > +obj-y += tlb.o > diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c > index b7044f7193..1cdc88e27c 100644 > --- a/xen/arch/x86/guest/hyperv/hyperv.c > +++ b/xen/arch/x86/guest/hyperv/hyperv.c > @@ -33,6 +33,8 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); > DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); > DEFINE_PER_CPU_READ_MOSTLY(uint32_t, hv_vp_index); > > +static bool __read_mostly hv_hcall_page_ready; > + > static uint64_t generate_guest_id(void) > { > union hv_guest_os_id id = {}; > @@ -119,6 +121,8 @@ static void __init setup_hypercall_page(void) > BUG_ON(!hypercall_msr.enable); > > set_fixmap_x(FIX_X_HYPERV_HCALL, mfn << PAGE_SHIFT); > + > + hv_hcall_page_ready = true; I guess filling the hypercall page in the probe function like it's done for Xen is too early for HyperV, and hence you need this safeguard? TBH, maybe it would be best (and safer) to prevent using any hooks until setup has been called, and hence this check could be pulled into the generic hook? Thanks, Roger.
On Wed, Feb 12, 2020 at 06:09:24PM +0100, Roger Pau Monné wrote: > On Wed, Feb 12, 2020 at 04:09:17PM +0000, Wei Liu wrote: > > Implement a basic hook for L0 assisted TLB flush. The hook needs to > > check if prerequisites are met. If they are not met, it returns an error > > number to fall back to native flushes. > > > > Introduce a new variable to indicate if hypercall page is ready. > > > > Signed-off-by: Wei Liu <liuwe@microsoft.com> > > --- > > xen/arch/x86/guest/hyperv/Makefile | 1 + > > xen/arch/x86/guest/hyperv/hyperv.c | 17 ++++++++++++ > > xen/arch/x86/guest/hyperv/private.h | 4 +++ > > xen/arch/x86/guest/hyperv/tlb.c | 41 +++++++++++++++++++++++++++++ > > 4 files changed, 63 insertions(+) > > create mode 100644 xen/arch/x86/guest/hyperv/tlb.c > > > > diff --git a/xen/arch/x86/guest/hyperv/Makefile b/xen/arch/x86/guest/hyperv/Makefile > > index 68170109a9..18902c33e9 100644 > > --- a/xen/arch/x86/guest/hyperv/Makefile > > +++ b/xen/arch/x86/guest/hyperv/Makefile > > @@ -1 +1,2 @@ > > obj-y += hyperv.o > > +obj-y += tlb.o > > diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c > > index b7044f7193..1cdc88e27c 100644 > > --- a/xen/arch/x86/guest/hyperv/hyperv.c > > +++ b/xen/arch/x86/guest/hyperv/hyperv.c > > @@ -33,6 +33,8 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); > > DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); > > DEFINE_PER_CPU_READ_MOSTLY(uint32_t, hv_vp_index); > > > > +static bool __read_mostly hv_hcall_page_ready; > > + > > static uint64_t generate_guest_id(void) > > { > > union hv_guest_os_id id = {}; > > @@ -119,6 +121,8 @@ static void __init setup_hypercall_page(void) > > BUG_ON(!hypercall_msr.enable); > > > > set_fixmap_x(FIX_X_HYPERV_HCALL, mfn << PAGE_SHIFT); > > + > > + hv_hcall_page_ready = true; > > I guess filling the hypercall page in the probe function like it's > done for Xen is too early for HyperV, and hence you need this > safeguard? Yes that's too early. Keep in mind that Hyper-V's hypercall page is an overlay page which is not backed by real memory from Xen's PoV. Xen can't fill in a stub there. Xen needs to wait until other infrastructures to go live before setting up a hypercall page, while in the mean time, it will / may need to flush TLB. > > TBH, maybe it would be best (and safer) to prevent using any hooks > until setup has been called, and hence this check could be pulled into > the generic hook? "Prevent" is too vague a term here. We can't stop code from executing in parallel. In some situation there is no way to fail gracefully. There is only this hook at the moment that requires such special care afaict, and this is largely due to Hyper-V's idiosyncrasy. Others are called only in setup / teardown path which can easily be reasoned about. Wei. > > Thanks, Roger.
diff --git a/xen/arch/x86/guest/hyperv/Makefile b/xen/arch/x86/guest/hyperv/Makefile index 68170109a9..18902c33e9 100644 --- a/xen/arch/x86/guest/hyperv/Makefile +++ b/xen/arch/x86/guest/hyperv/Makefile @@ -1 +1,2 @@ obj-y += hyperv.o +obj-y += tlb.o diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index b7044f7193..1cdc88e27c 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -33,6 +33,8 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(uint32_t, hv_vp_index); +static bool __read_mostly hv_hcall_page_ready; + static uint64_t generate_guest_id(void) { union hv_guest_os_id id = {}; @@ -119,6 +121,8 @@ static void __init setup_hypercall_page(void) BUG_ON(!hypercall_msr.enable); set_fixmap_x(FIX_X_HYPERV_HCALL, mfn << PAGE_SHIFT); + + hv_hcall_page_ready = true; } static int setup_hypercall_pcpu_arg(void) @@ -199,11 +203,24 @@ static void __init e820_fixup(struct e820map *e820) panic("Unable to reserve Hyper-V hypercall range\n"); } +static int flush_tlb(const cpumask_t *mask, const void *va, + unsigned int flags) +{ + if ( !(ms_hyperv.hints & HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED) ) + return -EOPNOTSUPP; + + if ( !hv_hcall_page_ready || !this_cpu(hv_input_page) ) + return -ENXIO; + + return hyperv_flush_tlb(mask, va, flags); +} + static const struct hypervisor_ops __initdata ops = { .name = "Hyper-V", .setup = setup, .ap_setup = ap_setup, .e820_fixup = e820_fixup, + .flush_tlb = flush_tlb, }; /* diff --git a/xen/arch/x86/guest/hyperv/private.h b/xen/arch/x86/guest/hyperv/private.h index eb14ea43e5..78e52f74ce 100644 --- a/xen/arch/x86/guest/hyperv/private.h +++ b/xen/arch/x86/guest/hyperv/private.h @@ -22,10 +22,14 @@ #ifndef __XEN_HYPERV_PRIVIATE_H__ #define __XEN_HYPERV_PRIVIATE_H__ +#include <xen/cpumask.h> #include <xen/percpu.h> DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(uint32_t, hv_vp_index); +int hyperv_flush_tlb(const cpumask_t *mask, const void *va, + unsigned int flags); + #endif /* __XEN_HYPERV_PRIVIATE_H__ */ diff --git a/xen/arch/x86/guest/hyperv/tlb.c b/xen/arch/x86/guest/hyperv/tlb.c new file mode 100644 index 0000000000..48f527229e --- /dev/null +++ b/xen/arch/x86/guest/hyperv/tlb.c @@ -0,0 +1,41 @@ +/****************************************************************************** + * arch/x86/guest/hyperv/tlb.c + * + * Support for TLB management using hypercalls + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see <http://www.gnu.org/licenses/>. + * + * Copyright (c) 2020 Microsoft. + */ + +#include <xen/cpumask.h> +#include <xen/errno.h> + +#include "private.h" + +int hyperv_flush_tlb(const cpumask_t *mask, const void *va, + unsigned int flags) +{ + return -EOPNOTSUPP; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */
Implement a basic hook for L0 assisted TLB flush. The hook needs to check if prerequisites are met. If they are not met, it returns an error number to fall back to native flushes. Introduce a new variable to indicate if hypercall page is ready. Signed-off-by: Wei Liu <liuwe@microsoft.com> --- xen/arch/x86/guest/hyperv/Makefile | 1 + xen/arch/x86/guest/hyperv/hyperv.c | 17 ++++++++++++ xen/arch/x86/guest/hyperv/private.h | 4 +++ xen/arch/x86/guest/hyperv/tlb.c | 41 +++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 xen/arch/x86/guest/hyperv/tlb.c