From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: [PATCH v3 2/4] x86/compat: Test both PV and PVH guests for compat mode Date: Fri, 10 Jul 2015 18:20:51 -0400 Message-ID: <1436566853-8444-3-git-send-email-boris.ostrovsky@oracle.com> References: <1436566853-8444-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1436566853-8444-1-git-send-email-boris.ostrovsky@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: elena.ufimtseva@oracle.com, wei.liu2@citrix.com, ian.campbell@citrix.com, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, boris.ostrovsky@oracle.com, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org Add is_pvh_32bit_domain() macro and use it alongside is_pv_32bit_domain() where necessary. Since PVH guests cannot change execution mode, has_32bit_shinfo is a good indicator of whether the guest is PVH and 32-bit. Signed-off-by: Boris Ostrovsky --- Changes in v3: * Defined is_pvh_32bit_domain() * Dropped unnecessary changes in hypercall_create_continuation() and do_domctl() (XEN_DOMCTL_set/getvcpucontext) xen/arch/x86/domain.c | 6 +++--- xen/arch/x86/domctl.c | 5 +++-- xen/include/asm-x86/domain.h | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 9c29ef2..c743362 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -358,7 +358,7 @@ int switch_native(struct domain *d) if ( !may_switch_mode(d) ) return -EACCES; - if ( !is_pv_32bit_domain(d) ) + if ( !is_pv_32bit_domain(d) && !is_pvh_32bit_domain(d) ) return 0; d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; @@ -383,7 +383,7 @@ int switch_compat(struct domain *d) if ( !may_switch_mode(d) ) return -EACCES; - if ( is_pv_32bit_domain(d) ) + if ( is_pv_32bit_domain(d) || is_pvh_32bit_domain(d) ) return 0; d->arch.has_32bit_shinfo = 1; @@ -771,7 +771,7 @@ int arch_set_info_guest( /* The context is a compat-mode one if the target domain is compat-mode; * we expect the tools to DTRT even in compat-mode callers. */ - compat = is_pv_32bit_domain(d); + compat = is_pv_32bit_domain(d) || is_pvh_32bit_domain(d); #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld)) flags = c(flags); diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index b5047db..63cca52 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -349,7 +349,8 @@ long arch_do_domctl( case XEN_DOMCTL_get_address_size: domctl->u.address_size.size = - is_pv_32bit_domain(d) ? 32 : BITS_PER_LONG; + (is_pv_32bit_domain(d) || is_pvh_32bit_domain(d)) ? + 32 : BITS_PER_LONG; copyback = 1; break; @@ -1203,7 +1204,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) { unsigned int i; const struct domain *d = v->domain; - bool_t compat = is_pv_32bit_domain(d); + bool_t compat = is_pv_32bit_domain(d) || is_pvh_32bit_domain(d); #define c(fld) (!compat ? (c.nat->fld) : (c.cmp->fld)) if ( !is_pv_domain(d) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 201436d..263c022 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -14,6 +14,7 @@ #define has_32bit_shinfo(d) ((d)->arch.has_32bit_shinfo) #define is_pv_32bit_domain(d) ((d)->arch.is_32bit_pv) #define is_pv_32bit_vcpu(v) (is_pv_32bit_domain((v)->domain)) +#define is_pvh_32bit_domain(d) (is_pvh_domain(d) && has_32bit_shinfo(d)) #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) -- 1.8.1.4