viridian: fix the HvFlushVirtualAddress/List hypercall implementation
PATCH 1/1 viridian: fix the HvFlushVirtualAddress/List hypercall implementation
The current code uses hvm_asid_flush_vcpu() but this is insufficient for a guest running in shadow mode, which results in guest crashes early in boot if the 'hcall_remote_tlb_flush' is enabled.
This patch, instead of open coding a new flush algorithm, adapts the one already used by the HVMOP_flush_tlbs Xen hypercall. The implementation is modified to allow TLB flushing a subset of a domain's vCPUs. A callback function determines whether or not a vCPU requires flushing. This mechanism was chosen because, while it is the case that the currently implemented viridian hypercalls specify a vCPU mask, there are newer variants which specify a sparse HV_VP_SET and thus use of a callback will avoid needing to expose details of this outside of the viridian subsystem if and when those newer variants are implemented.
NOTE: Use of the common flush function requires that the hypercalls are
restartable and so, with this patch applied, viridian_hypercall() can now return HVM_HCALL_preempted. This is safe as no modification to struct cpu_user_regs is done before the return.
---
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
--- xen/arch/x86/hvm/hvm.c | 55 +++++++++++++++++++++------- xen/arch/x86/hvm/viridian/viridian.c | 41 +++++---------------- xen/include/asm-x86/hvm/hvm.h | 2 + 3 files changed, 53 insertions(+), 45 deletions(-)
xen/arch/x86/hvm/hvm.c +41 -14
@@ -3964,45 +3964,72 @@ static void hvm_s3_resume(struct domain *d) } } -static int hvmop_flush_tlb_all (void ) +static DEFINE_PER_CPU(cpumask_t, flush_cpumask); + +bool hvm_flush_vcpu_tlb (bool (*flush_vcpu)(void *ctxt,struct vcpu *v), +void *ctxt) { +cpumask_t *mask = &this_cpu (flush_cpumask);struct domain *d = current->domain;struct vcpu *v; -if ( !is_hvm_domain (d) ) -return -EINVAL ; -/* Avoid deadlock if more than one vcpu tries this at the same time. */ if ( !spin_trylock (&d->hypercall_deadlock_mutex) ) -return -ERESTART ; +return false;/* Pause all other vcpus. */ for_each_vcpu ( d, v ) -if ( v != current ) +if ( v != current &&flush_vcpu (ctxt, v) )vcpu_pause_nosync (v); +cpumask_clear (mask); +/* Now that all VCPUs are signalled to deschedule, we wait... */ for_each_vcpu ( d, v ) -if ( v != current ) -while ( !vcpu_runnable (v) && v->is_running ) -cpu_relax (); + { +unsigned int cpu; + +if ( v == current || !flush_vcpu (ctxt, v) ) +continue ; + +while ( !vcpu_runnable (v) && v->is_running ) +cpu_relax (); + + cpu =read_atomic (&v->dirty_cpu); +if (is_vcpu_dirty_cpu (cpu) ) +__cpumask_set_cpu (cpu, mask); + }/* All other vcpus are paused, safe to unlock now. */ spin_unlock (&d->hypercall_deadlock_mutex);/* Flush paging-mode soft state (e.g., va->gfn cache; PAE PDPE cache). */ for_each_vcpu ( d, v ) -paging_update_cr3 (v, false); +if (flush_vcpu (ctxt, v) ) +paging_update_cr3 (v, false); -/* Flush all dirty TLBs. */ -flush_tlb_mask (d->dirty_cpumask); +/* Flush TLBs on all CPUs with dirty vcpu state. */ +flush_tlb_mask (mask);/* Done. */ for_each_vcpu ( d, v ) -if ( v != current ) +if ( v != current &&flush_vcpu (ctxt, v) )vcpu_unpause (v); -return 0 ; +return true; +} + +static bool always_flush (void *ctxt,struct vcpu *v) +{ +return true; +} + +static int hvmop_flush_tlb_all (void ) +{ +if ( !is_hvm_domain (current->domain) ) +return -EINVAL ; + +return hvm_flush_vcpu_tlb (always_flush,NULL ) ?0 : -ERESTART ; } static int hvmop_set_evtchn_upcall_vector(
xen/arch/x86/hvm/viridian/viridian.c +10 -31
61 lines not on this page · raw message
xen/include/asm-x86/hvm/hvm.h +2 -0
@@ -338,6 +338,8 @@ const char *hvm_efer_valid(const struct vcpu *v, uint64_t value, signed int cr0_pg);unsigned long hvm_cr4_guest_valid_bits (const struct domain *d,bool restore); +bool hvm_flush_vcpu_tlb (bool (*flush_vcpu)(void *ctxt,struct vcpu *v), +void *ctxt);#ifdef CONFIG_HVM
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel