xen: support priv-mapping in an HVM tools domain
Subsystems (3)
PATCH v3 1/1 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.
This patch also moves xen_remap_domain_gfn_range() into the PV-only MMU code and #ifdefs the (only) calling code in privcmd accordingly.
---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
v3:
- As v1 but with additional stubs in xen/xen-ops.h to handle configurations without CONFIG_XEN_AUTO_XLATE.
--- arch/x86/xen/mmu.c | 14 ++++++++++++-- include/xen/xen-ops.h | 24 ++++++++++++++++++++++++ 2 files changed, 36 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 ;
include/xen/xen-ops.h +24 -0
@@ -103,6 +103,8 @@ int xen_remap_domain_gfn_range(struct vm_area_struct *vma, struct page **pages);int xen_unmap_domain_gfn_range (struct vm_area_struct *vma,int numpgs,struct page **pages); + +#ifdef CONFIG_XEN_AUTO_XLATE int xen_xlate_remap_gfn_array(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *gfn, int nr,
@@ -111,6 +113,28 @@ int xen_xlate_remap_gfn_array(struct vm_area_struct *vma, struct page **pages);int xen_xlate_unmap_gfn_range (struct vm_area_struct *vma,int nr,struct page **pages); +#else +/* +* These two functions are called from arch/x86/xen/mmu.c and so stubs +* are needed for a configuration not specifying CONFIG_XEN_AUTO_XLATE. +*/ +static inline int xen_xlate_remap_gfn_array (struct vm_area_struct *vma, +unsigned long addr, +xen_pfn_t *gfn,int nr, +int *err_ptr,pgprot_t prot, +unsigned int domid, +struct page **pages) +{ +return -EOPNOTSUPP ; +} + +static inline int xen_xlate_unmap_gfn_range (struct vm_area_struct *vma, +int nr,struct page **pages) +{ +return -EOPNOTSUPP ; +} +#endif +int xen_xlate_map_ballooned_pages (xen_pfn_t **pfns,void **vaddr,unsigned long nr_grant_frames);
Signature · 1 line
2.11.0
Quoted 14 lines
-----Original Message-----
From: Paul Durrant [mailto:[email protected]]
Sent: 03 November 2017 16:58
To: [email protected]; [email protected]; linux- [email protected]
Cc: 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]>
Subject: [PATCH v3] 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.
Quoted 7 lines
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.This patch also moves
xen_remap_domain_gfn_range()into the PV-only MMU
code and #ifdefs the (only) calling code in privcmd accordingly.
<sigh> I realise now that this paragraph refers to the code in the v2 patch. I'll send v4.
Paul
Quoted 110 lines
Signed-off-by Paul Durrant <[email protected]>---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>v3:
- As v1 but with additional stubs inxen/xen-ops.hto handle configurations withoutCONFIG_XEN_AUTO_XLATE.--- arch/x86/xen/mmu.c | 14 ++++++++++++-- include/xen/xen-ops.h | 24 ++++++++++++++++++++++++ 2 files changed, 36 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 ;arch/x86/xen/mmu.c +0
-0return -EINVAL ;include/xen/xen-ops.h +2
-0@@ -103,6 +103,8 @@ int xen_remap_domain_gfn_range(structvm_area_struct *vma, struct page **pages);int xen_unmap_domain_gfn_range (struct vm_area_struct *vma,int numpgs,struct page **pages); + +#ifdef CONFIG_XEN_AUTO_XLATE int xen_xlate_remap_gfn_array(struct vm_area_struct *vma, unsigned long addr,include/xen/xen-ops.h +4
-0xen_pfn_t *gfn, int nr,@@ -111,6 +113,28 @@ int xen_xlate_remap_gfn_array(structvm_area_struct *vma, struct page **pages);int xen_xlate_unmap_gfn_range (struct vm_area_struct *vma,int nr,struct page **pages); +#else +/* +* These two functions are called from arch/x86/xen/mmu.c and so stubs +* are needed for a configuration not specifying
CONFIG_XEN_AUTO_XLATE.
+ */include/xen/xen-ops.h +17
-1+static inline int xen_xlate_remap_gfn_array (struct vm_area_struct *vma, +unsigned long addr, +xen_pfn_t *gfn,int nr, +int *err_ptr,pgprot_t prot, +unsigned int domid, +struct page **pages) +{ +return -EOPNOTSUPP ; +} + +static inline int xen_xlate_unmap_gfn_range (struct vm_area_struct *vma, +int nr,struct page **pages) +{ +return -EOPNOTSUPP ; +} +#endif +int xen_xlate_map_ballooned_pages (xen_pfn_t **pfns,void **vaddr,unsigned long nr_grant_frames); --2.11.0
Quoted 14 lines
-----Original Message-----
From: Paul Durrant [mailto:[email protected]]
Sent: 03 November 2017 16:58
To: [email protected]; [email protected]; linux- [email protected]
Cc: 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]>
Subject: [PATCH v3] 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.
Quoted 7 lines
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.This patch also moves
xen_remap_domain_gfn_range()into the PV-only MMU
code and #ifdefs the (only) calling code in privcmd accordingly.
<sigh> I realise now that this paragraph refers to the code in the v2 patch. I'll send v4.
Paul
Quoted 109 lines
Signed-off-by Paul Durrant <[email protected]>---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>v3:
- As v1 but with additional stubs inxen/xen-ops.hto handle configurations withoutCONFIG_XEN_AUTO_XLATE.--- arch/x86/xen/mmu.c | 14 ++++++++++++-- include/xen/xen-ops.h | 24 ++++++++++++++++++++++++ 2 files changed, 36 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 ;arch/x86/xen/mmu.c +0
-0return -EINVAL ;include/xen/xen-ops.h +2
-0@@ -103,6 +103,8 @@ int xen_remap_domain_gfn_range(structvm_area_struct *vma, struct page **pages);int xen_unmap_domain_gfn_range (struct vm_area_struct *vma,int numpgs,struct page **pages); + +#ifdef CONFIG_XEN_AUTO_XLATE int xen_xlate_remap_gfn_array(struct vm_area_struct *vma, unsigned long addr,include/xen/xen-ops.h +4
-0xen_pfn_t *gfn, int nr,@@ -111,6 +113,28 @@ int xen_xlate_remap_gfn_array(structvm_area_struct *vma, struct page **pages);int xen_xlate_unmap_gfn_range (struct vm_area_struct *vma,int nr,struct page **pages); +#else +/* +* These two functions are called from arch/x86/xen/mmu.c and so stubs +* are needed for a configuration not specifying
CONFIG_XEN_AUTO_XLATE.
+ */include/xen/xen-ops.h +17
-1+static inline int xen_xlate_remap_gfn_array (struct vm_area_struct *vma, +unsigned long addr, +xen_pfn_t *gfn,int nr, +int *err_ptr,pgprot_t prot, +unsigned int domid, +struct page **pages) +{ +return -EOPNOTSUPP ; +} + +static inline int xen_xlate_unmap_gfn_range (struct vm_area_struct *vma, +int nr,struct page **pages) +{ +return -EOPNOTSUPP ; +} +#endif +int xen_xlate_map_ballooned_pages (xen_pfn_t **pfns,void **vaddr,unsigned long nr_grant_frames); --
Quoted 1 line
2.11.0
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel