x86/xen: support priv-mapping in an HVM tools domain
Subsystems (2)
PATCH 1/1 x86/xen: support priv-mapping in an HVM tools domain
If the domain has XENFEAT_auto_translated_physmap then use of the PV- specific HYPERVISOR_mmu_update hypercall is clearly incorrect.
This patch adds checks in xen_remap_domain_gfn_array() and xen_unmap_domain_gfn_array() which call through to the approprate xlate_mmu function if the feature is present. A check is also added to xen_remap_domain_gfn_range() to fail with -EOPNOTSUPP since this should not be used in an HVM tools domain.
---
Boris Ostrovsky <[email protected]>
Juergen Gross <[email protected]>
Thomas Gleixner <[email protected]>
Ingo Molnar <[email protected]>
"H. Peter Anvin" <[email protected]>
--- arch/x86/xen/mmu.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
arch/x86/xen/mmu.c +12 -2
@@ -172,6 +172,9 @@ int xen_remap_domain_gfn_range(struct vm_area_struct *vma, pgprot_t prot, unsigned domid, struct page **pages) { + if (xen_feature(XENFEAT_auto_translated_physmap)) + return -EOPNOTSUPP; +return do_remap_gfn (vma, addr, &gfn, nr,NULL , prot, domid, pages); }EXPORT_SYMBOL_GPL (xen_remap_domain_gfn_range);
@@ -182,6 +185,10 @@ int xen_remap_domain_gfn_array(struct vm_area_struct *vma, int *err_ptr, pgprot_t prot, unsigned domid, struct page **pages) { + if (xen_feature(XENFEAT_auto_translated_physmap)) + return xen_xlate_remap_gfn_array(vma, addr, gfn, nr, err_ptr, + prot, domid, pages); +/* We BUG_ON because it's a programmer error to pass a NULL err_ptr, * and the consequences later is quite hard to detect what the actual * cause of "wrong memory was mapped in".
@@ -193,9 +200,12 @@ EXPORT_SYMBOL_GPL(xen_remap_domain_gfn_array);/* Returns: 0 success */ int xen_unmap_domain_gfn_range (struct vm_area_struct *vma, -int numpgs,struct page **pages) +int nr,struct page **pages) { -if (!pages || !xen_feature (XENFEAT_auto_translated_physmap)) +if (xen_feature (XENFEAT_auto_translated_physmap)) +return xen_xlate_unmap_gfn_range (vma, nr, pages); + +if (!pages)return 0 ;return -EINVAL ;
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Apologies... I misformatted this. I will re-send.
Paul
Quoted 73 lines
-----Original Message-----
From: Paul Durrant [mailto:[email protected]]
Sent: 19 October 2017 16:24
To: [email protected]; [email protected]; linux- [email protected]
Cc: Paul Durrant <[email protected]>
Subject: [PATCH] x86/xen: support priv-mapping in an HVM tools domainIf the domain has
XENFEAT_auto_translated_physmapthen use of the PV- specificHYPERVISOR_mmu_updatehypercall is clearly incorrect.This patch adds checks in
xen_remap_domain_gfn_array()andxen_unmap_domain_gfn_array()which call through to the appropratexlate_mmufunction if the feature is present. A check is also added toxen_remap_domain_gfn_range()to fail with-EOPNOTSUPPsince this should not be used in an HVM tools domain.Signed-off-by Paul Durrant <[email protected]>---
Boris Ostrovsky <[email protected]>
Juergen Gross <[email protected]>
Thomas Gleixner <[email protected]>
Ingo Molnar <[email protected]>
"H. Peter Anvin" <[email protected]>--- arch/x86/xen/mmu.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)arch/x86/xen/mmu.c +3
-0@@ -172,6 +172,9 @@ int xen_remap_domain_gfn_range(structvm_area_struct *vma, pgprot_t prot, unsigned domid, struct page **pages) { + if (xen_feature(XENFEAT_auto_translated_physmap)) + return -EOPNOTSUPP; +return do_remap_gfn (vma, addr, &gfn, nr,NULL , prot, domid, pages);}
EXPORT_SYMBOL_GPL(xen_remap_domain_gfn_range);arch/x86/xen/mmu.c +4
-0@@ -182,6 +185,10 @@ int xen_remap_domain_gfn_array(struct vm_area_struct *vma, int *err_ptr, pgprot_t prot, unsigned domid, struct page **pages) { +if (xen_feature (XENFEAT_auto_translated_physmap)) +return xen_xlate_remap_gfn_array (vma, addr, gfn, nr, err_ptr, + prot, domid, pages); +/* We BUG_ON because it's a programmer error to pass a NULL
err_ptr,arch/x86/xen/mmu.c +5
-2* and the consequences later is quite hard to detect what the actual * cause of "wrong memory was mapped in". @@ -193,9 +200,12 @@EXPORT_SYMBOL_GPL (xen_remap_domain_gfn_array);/* Returns: 0 success */ int xen_unmap_domain_gfn_range (struct vm_area_struct *vma, -int numpgs,struct page **pages) +int nr,struct page **pages) { -if (!pages || !xen_feature (XENFEAT_auto_translated_physmap)) +if (xen_feature (XENFEAT_auto_translated_physmap)) +return xen_xlate_unmap_gfn_range (vma, nr, pages); + +if (!pages)return 0 ;
Quoted 3 lines
return
-EINVAL;
--
2.11.0
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel