Xen on Hyper-V: Implement L0 assisted TLB flush
v5 cover Xen on Hyper-V: Implement L0 assisted TLB flush
Hi all
This seris is based on Roger's L0 assisted flush series v9. In patch 1 I dropped FLUSH_TLB_FLAGS_MASK per Jan's request. Other than that, nothing is changed.
Wei.
Wei Liu (3):
x86/hypervisor: pass flags to hypervisor_flush_tlb x86/hyperv: skeleton for L0 assisted TLB flush x86/hyperv: L0 assisted TLB flush
xen/arch/x86/guest/hyperv/Makefile | 2 + xen/arch/x86/guest/hyperv/hyperv.c | 17 ++ xen/arch/x86/guest/hyperv/private.h | 12 ++ xen/arch/x86/guest/hyperv/tlb.c | 214 +++++++++++++++++++++++++ xen/arch/x86/guest/hyperv/util.c | 75 +++++++++ xen/arch/x86/guest/hypervisor.c | 4 +- xen/arch/x86/guest/xen/xen.c | 2 +- xen/arch/x86/smp.c | 2 +- xen/include/asm-x86/guest/hypervisor.h | 10 +- 9 files changed, 329 insertions(+), 9 deletions(-) create mode 100644 xen/arch/x86/guest/hyperv/tlb.c create mode 100644 xen/arch/x86/guest/hyperv/util.c
Signature · 1 line
2.20.1
PATCH v5 1/3 x86/hypervisor: pass flags to hypervisor_flush_tlb
Hyper-V's L0 assisted flush has fine-grained control over what gets flushed. We need all the flags available to make the best decisions possible.
No functional change because Xen's implementation doesn't care about what is passed to it.
---
v5:
1. Drop FLUSH_TLB_FLAGS_MASK
v2:
1. Introduce FLUSH_TLB_FLAGS_MASK
--- xen/arch/x86/guest/hypervisor.c | 4 ++-- xen/arch/x86/guest/xen/xen.c | 2 +- xen/arch/x86/smp.c | 2 +- xen/include/asm-x86/guest/hypervisor.h | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-)
xen/arch/x86/guest/hypervisor.c +2 -2
@@ -79,10 +79,10 @@ void __init hypervisor_e820_fixup(struct e820map *e820) }int hypervisor_flush_tlb (const cpumask_t *mask,const void *va, -unsigned int order) +unsigned int flags) {if ( ops.flush_tlb ) -return alternative_call (ops.flush_tlb, mask, va, order); +return alternative_call (ops.flush_tlb, mask, va, flags);return -EOPNOTSUPP ; }
xen/arch/x86/guest/xen/xen.c +1 -1
@@ -324,7 +324,7 @@ static void __init e820_fixup(struct e820map *e820)pv_shim_fixup_e820 (e820); } -static int flush_tlb (const cpumask_t *mask,const void *va,unsigned int order) +static int flush_tlb (const cpumask_t *mask,const void *va,unsigned int flags) {return xen_hypercall_hvm_op (HVMOP_flush_tlbs,NULL ); }
xen/arch/x86/smp.c +1 -1
@@ -272,7 +272,7 @@ void flush_area_mask(const cpumask_t *mask, const void *va, unsigned int flags)if ( cpu_has_hypervisor && !(flags & ~(FLUSH_TLB |FLUSH_TLB_GLOBAL |FLUSH_VA_VALID |FLUSH_ORDER_MASK )) && - !hypervisor_flush_tlb (mask, va, (flags -1 ) &FLUSH_ORDER_MASK ) ) + !hypervisor_flush_tlb (mask, va, flags) )return ;spin_lock (&flush_lock);
xen/include/asm-x86/guest/hypervisor.h +5 -5
@@ -35,7 +35,7 @@ struct hypervisor_ops {/* Fix up e820 map */ void (*e820_fixup)(struct e820map *e820);/* L0 assisted TLB flush */ -int (*flush_tlb)(const cpumask_t *mask,const void *va,unsigned int order); +int (*flush_tlb)(const cpumask_t *mask,const void *va,unsigned int flags); };#ifdef CONFIG_GUEST
@@ -48,11 +48,11 @@ void hypervisor_e820_fixup(struct e820map *e820);/* * L0 assisted TLB flush. * mask: cpumask of the dirty vCPUs that should be flushed. -* va: linear address to flush, or NULL for global flushes. -* order: order of the linear address pointed by va. +* va: linear address to flush, or NULL for entire address space. +* flags: flags for flushing, including the order of va. */ int hypervisor_flush_tlb (const cpumask_t *mask,const void *va, -unsigned int order); +unsigned int flags);#else
@@ -65,7 +65,7 @@ static inline int hypervisor_ap_setup(void) { return 0; }static inline void hypervisor_resume (void ) {ASSERT_UNREACHABLE (); }static inline void hypervisor_e820_fixup (struct e820map *e820) {}static inline int hypervisor_flush_tlb (const cpumask_t *mask,const void *va, -unsigned int order) +unsigned int flags) {return -EOPNOTSUPP ; }
Signature · 1 line
2.20.1
PATCH v5 2/3 x86/hyperv: skeleton for L0 assisted TLB flush
In reply to Wei LiuImplement 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.
---
v3:
1. Change hv_hcall_page_ready to hcall_page_ready
--- 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
xen/arch/x86/guest/hyperv/Makefile +1 -0
@@ -1 +1,2 @@ obj-y += hyperv.o +obj-y += tlb.o
xen/arch/x86/guest/hyperv/hyperv.c +17 -0
@@ -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(unsigned int, hv_vp_index); +static bool __read_mostly 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 ); + + 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 ( !hcall_page_ready || !this_cpu (hv_input_page) ) +return -ENXIO ; + +return hyperv_flush_tlb (mask, va, flags); +} + static const struct hypervisor_ops __initconstrel ops = { .name ="Hyper-V" , .setup = setup, .ap_setup = ap_setup, .e820_fixup = e820_fixup, + .flush_tlb = flush_tlb, };/*
xen/arch/x86/guest/hyperv/private.h +4 -0
@@ -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(unsigned int, hv_vp_index); +int hyperv_flush_tlb (const cpumask_t *mask,const void *va, +unsigned int flags); +#endif /* __XEN_HYPERV_PRIVIATE_H__ */
xen/arch/x86/guest/hyperv/tlb.c new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v5 3/3 x86/hyperv: L0 assisted TLB flush
In reply to Wei LiuImplement L0 assisted TLB flush for Xen on Hyper-V. It takes advantage of several hypercalls:
* HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST
* HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST_EX
* HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE
* HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE_EX
Pick the most efficient hypercalls available.
---
v4:
1. Fix bank mask generation.
2. Fix page order calculation.
3. Remove types.h from private.h.
4. Add a note about nmi and mc handling.
v3:
1. Address more comments.
2. Fix usage of max_vp_index.
3. Use the fill_gva_list algorithm from Linux.
v2:
1. Address Roger and Jan's comments re types etc.
2. Fix pointer arithmetic.
3. Misc improvement to code.
--- xen/arch/x86/guest/hyperv/Makefile | 1 + xen/arch/x86/guest/hyperv/private.h | 8 ++ xen/arch/x86/guest/hyperv/tlb.c | 175 +++++++++++++++++++++++++++- xen/arch/x86/guest/hyperv/util.c | 75 ++++++++++++ 4 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 xen/arch/x86/guest/hyperv/util.c
xen/arch/x86/guest/hyperv/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-y += hyperv.o obj-y += tlb.o +obj-y += util.o
xen/arch/x86/guest/hyperv/private.h +8 -0
@@ -29,7 +29,15 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +static inline unsigned int hv_vp_index (unsigned int cpu) +{ +return per_cpu (hv_vp_index, cpu); +} +int hyperv_flush_tlb (const cpumask_t *mask,const void *va,unsigned int flags); +/* Returns number of banks, -ev if error */ +int cpumask_to_vpset (struct hv_vpset *vpset,const cpumask_t *mask); +#endif /* __XEN_HYPERV_PRIVIATE_H__ */
xen/arch/x86/guest/hyperv/tlb.c +174 -1
191 lines not on this page · raw message
xen/arch/x86/guest/hyperv/util.c new file +75 -0
75 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v5 1/3] x86/hypervisor: pass flags to hypervisor_flush_tlb
In reply to Wei LiuQuoted 10 lines · Wei Liu
Hyper-V's L0 assisted flush has fine-grained control over what gets flushed. We need all the flags available to make the best decisions possible.
No functional change because Xen's implementation doesn't care about what is passed to it.
Signed-off-by Wei Liu <[email protected]>Reviewed-by Roger Pau Monné <[email protected]>Reviewed-by Paul Durrant <[email protected]>