From mboxrd@z Thu Jan 1 00:00:00 1970 From: Huaitong Han Subject: [V3 PATCH 8/9] x86/hvm: pkeys, add pkeys support for gva2gfn funcitons Date: Mon, 7 Dec 2015 17:16:19 +0800 Message-ID: <1449479780-19146-9-git-send-email-huaitong.han@intel.com> References: <1449479780-19146-1-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: <1449479780-19146-1-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: jbeulich@suse.com, andrew.cooper3@citrix.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: Huaitong Han , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org This patch adds pkeys support for gva2gfn funcitons. Signed-off-by: Huaitong Han --- xen/arch/x86/hvm/hvm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 59916ed..b88f381 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4319,7 +4319,8 @@ static enum hvm_copy_result __hvm_clear(paddr_t addr, int size) p2m_type_t p2mt; char *p; int count, todo = size; - uint32_t pfec = PFEC_page_present | PFEC_write_access; + uint32_t pfec = PFEC_page_present | PFEC_write_access | + (hvm_pku_enabled(curr) ? PFEC_prot_key : 0); /* * XXX Disable for 4.1.0: PV-on-HVM drivers will do grant-table ops @@ -4420,7 +4421,8 @@ enum hvm_copy_result hvm_copy_to_guest_virt( { return __hvm_copy(buf, vaddr, size, HVMCOPY_to_guest | HVMCOPY_fault | HVMCOPY_virt, - PFEC_page_present | PFEC_write_access | pfec); + PFEC_page_present | PFEC_write_access | pfec | + (hvm_pku_enabled(current) ? PFEC_prot_key : 0)); } enum hvm_copy_result hvm_copy_from_guest_virt( @@ -4428,7 +4430,8 @@ enum hvm_copy_result hvm_copy_from_guest_virt( { return __hvm_copy(buf, vaddr, size, HVMCOPY_from_guest | HVMCOPY_fault | HVMCOPY_virt, - PFEC_page_present | pfec); + PFEC_page_present | pfec | + (hvm_pku_enabled(current) ? PFEC_prot_key : 0)); } enum hvm_copy_result hvm_fetch_from_guest_virt( @@ -4446,7 +4449,8 @@ enum hvm_copy_result hvm_copy_to_guest_virt_nofault( { return __hvm_copy(buf, vaddr, size, HVMCOPY_to_guest | HVMCOPY_no_fault | HVMCOPY_virt, - PFEC_page_present | PFEC_write_access | pfec); + PFEC_page_present | PFEC_write_access | pfec | + (hvm_pku_enabled(current) ? PFEC_prot_key : 0)); } enum hvm_copy_result hvm_copy_from_guest_virt_nofault( @@ -4454,7 +4458,8 @@ enum hvm_copy_result hvm_copy_from_guest_virt_nofault( { return __hvm_copy(buf, vaddr, size, HVMCOPY_from_guest | HVMCOPY_no_fault | HVMCOPY_virt, - PFEC_page_present | pfec); + PFEC_page_present | pfec | + (hvm_pku_enabled(current) ? PFEC_prot_key : 0)); } enum hvm_copy_result hvm_fetch_from_guest_virt_nofault( -- 2.4.3