From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH 04/10] x86/hvm: pkeys, add pkeys support when setting CR4 Date: Mon, 16 Nov 2015 14:02:17 +0000 Message-ID: <5649E1E9.1070305@citrix.com> References: <1447669917-17939-1-git-send-email-huaitong.han@intel.com> <1447669917-17939-5-git-send-email-huaitong.han@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1447669917-17939-5-git-send-email-huaitong.han@intel.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: Huaitong Han , jbeulich@suse.com, jun.nakajima@intel.com, eddie.dong@intel.com, kevin.tian@intel.com, george.dunlap@eu.citrix.com, ian.jackson@eu.citrix.com, stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, wei.liu2@citrix.com, keir@xen.org Cc: xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 16/11/15 10:31, Huaitong Han wrote: > This patch adds pkeys support when setting CR4 > > Signed-off-by: Huaitong Han Again, this patch is in need of a rebase (although it should be entirely mechanical). ~Andrew > > diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c > index 66917ff..953047f 100644 > --- a/xen/arch/x86/hvm/hvm.c > +++ b/xen/arch/x86/hvm/hvm.c > @@ -1911,6 +1911,7 @@ static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, > leaf1_edx = boot_cpu_data.x86_capability[X86_FEATURE_VME / 32]; > leaf1_ecx = boot_cpu_data.x86_capability[X86_FEATURE_PCID / 32]; > leaf7_0_ebx = boot_cpu_data.x86_capability[X86_FEATURE_FSGSBASE / 32]; > + leaf7_0_ecx = boot_cpu_data.x86_capability[X86_FEATURE_PKU / 32]; > } > > return ~(unsigned long) > @@ -1946,7 +1947,9 @@ static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, > (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMEP) ? > X86_CR4_SMEP : 0) | > (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMAP) ? > - X86_CR4_SMAP : 0)); > + X86_CR4_SMAP : 0) | > + (leaf7_0_ecx & cpufeat_mask(X86_FEATURE_PKU) ? > + X86_CR4_PKE : 0)); > } > > static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) > diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c > index c1f924e..8101a1b 100644 > --- a/xen/arch/x86/setup.c > +++ b/xen/arch/x86/setup.c > @@ -1310,6 +1310,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) > > if ( disable_pku ) > setup_clear_cpu_cap(X86_FEATURE_PKU); > + if ( cpu_has_pku ) > + set_in_cr4(X86_CR4_PKE); > > if ( cpu_has_fsgsbase ) > set_in_cr4(X86_CR4_FSGSBASE);