From: Norbert Manthey Date: Thu, 14 Mar 2019 12:56:00 +0000 (+0100) Subject: is_hvm/pv_domain: block speculation X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0111f611a5997a20d087edbd7c05b141ff68ecec;p=people%2Fsstabellini%2Fxen-unstable.git%2F.git is_hvm/pv_domain: block speculation When checking for being an hvm domain, or PV domain, we have to make sure that speculation cannot bypass that check, and eventually access data that should not end up in cache for the current domain type. This is part of the speculative hardening effort. Signed-off-by: Norbert Manthey Acked-by: Jan Beulich --- diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0b8d6d492c..748bb0f2f9 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -920,7 +920,8 @@ void watchdog_domain_destroy(struct domain *d); static inline bool is_pv_domain(const struct domain *d) { - return IS_ENABLED(CONFIG_PV) ? d->guest_type == guest_type_pv : false; + return IS_ENABLED(CONFIG_PV) + ? evaluate_nospec(d->guest_type == guest_type_pv) : false; } static inline bool is_pv_vcpu(const struct vcpu *v) @@ -951,7 +952,8 @@ static inline bool is_pv_64bit_vcpu(const struct vcpu *v) #endif static inline bool is_hvm_domain(const struct domain *d) { - return IS_ENABLED(CONFIG_HVM) ? d->guest_type == guest_type_hvm : false; + return IS_ENABLED(CONFIG_HVM) + ? evaluate_nospec(d->guest_type == guest_type_hvm) : false; } static inline bool is_hvm_vcpu(const struct vcpu *v)