xen: avoid link error on ARM
PATCH v2 1/1 xen: avoid link error on ARM
Building the privcmd code as a loadable module on ARM, we get a link error due to the private cache management functions:
ERROR: "__sync_icache_dcache" [drivers/xen/xen-privcmd.ko] undefined!
Move the code into a new file that is always built in when Xen is enabled, as suggested by Juergen Gross. Additional code will be moved into this file later.
---
v2: rename mm.o to xen-builtin.o, make it unconditional
--- drivers/xen/Makefile | 1 + drivers/xen/privcmd.c | 30 +--------------------------- drivers/xen/xen-builtin.c | 41 +++++++++++++++++++++++++++++++++++++++ include/xen/xen-ops.h | 3 +++ 4 files changed, 46 insertions(+), 29 deletions(-) create mode 100644 drivers/xen/xen-builtin.c
drivers/xen/Makefile +1 -0
@@ -2,6 +2,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-y += grant-table.o features.o balloon.o manage.o preempt.o time.o obj-y += mem-reservation.o +obj-y += xen-builtin.o obj-y += events/ obj-y += xenbus/
drivers/xen/privcmd.c +1 -29
@@ -723,26 +723,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)return 0 ; } -struct remap_pfn { -struct mm_struct *mm; -struct page **pages; -pgprot_t prot; -unsigned long i; -}; - -static int remap_pfn_fn (pte_t *ptep,pgtable_t token,unsigned long addr, -void *data) -{ -struct remap_pfn *r = data; -struct page *page = r->pages[r->i]; -pte_t pte =pte_mkspecial (pfn_pte (page_to_pfn (page), r->prot)); - -set_pte_at (r->mm, addr, ptep, pte); - r->i++; - -return 0 ; -} -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;
@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT ); }else {unsigned int domid = (xdata.flags & XENMEM_rsrc_acq_caller_owned) ?
drivers/xen/xen-builtin.c new file +41 -0
41 lines not on this page · raw message
include/xen/xen-ops.h +3 -0
@@ -109,6 +109,9 @@ static inline int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma, }#endif +int xen_remap_vma_range (struct vm_area_struct *vma,unsigned long addr, +unsigned long len); +/* * xen_remap_domain_gfn_array() - map an array of foreign frames by gfn * @vma: VMA to map the pages into
Signature · 1 line
2.20.0
Juergen Gross
maintainerQuoted 86 lines · Arnd Bergmann
Building the privcmd code as a loadable module on ARM, we get a link error due to the private cache management functions:
ERROR: "
__sync_icache_dcache" [drivers/xen/xen-privcmd.ko] undefined!Move the code into a new file that is always built in when Xen is enabled, as suggested by Juergen Gross. Additional code will be moved into this file later.
Signed-off-by Arnd Bergmann <[email protected]>---
v2: rename mm.o to xen-builtin.o, make it unconditional--- drivers/xen/Makefile | 1 + drivers/xen/privcmd.c | 30 +--------------------------- drivers/xen/xen-builtin.c | 41 +++++++++++++++++++++++++++++++++++++++ include/xen/xen-ops.h | 3 +++ 4 files changed, 46 insertions(+), 29 deletions(-) create mode 100644 drivers/xen/xen-builtin.cdrivers/xen/Makefile +1
-0@@ -2,6 +2,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-y += grant-table.o features.o balloon.o manage.o preempt.o time.o obj-y += mem-reservation.o +obj-y += xen-builtin.o obj-y += events/ obj-y += xenbus/drivers/xen/privcmd.c +1
-29@@ -723,26 +723,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)return 0 ; } -struct remap_pfn { -struct mm_struct *mm; -struct page **pages; -pgprot_t prot; -unsigned long i; -}; - -static int remap_pfn_fn (pte_t *ptep,pgtable_t token,unsigned long addr, -void *data) -{ -struct remap_pfn *r = data; -struct page *page = r->pages[r->i]; -pte_t pte =pte_mkspecial (pfn_pte (page_to_pfn (page), r->prot)); - -set_pte_at (r->mm, addr, ptep, pte); - r->i++; - -return 0 ; -} -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT ); }else {unsigned int domid = (xdata.flags & XENMEM_rsrc_acq_caller_owned) ?drivers/xen/xen-builtin.c new file +0
-0
drivers/xen/xen-builtin.c line 8
Quoted 8 lines
drivers/xen/xen-builtin.c new file +8
-0@@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Architecture independent helper functions for memory management +* +* Written by Paul Durrant <[email protected]> +*/ +#include <linux/mm.h> +#include <linux/export.h>
Shouldn't you #include xen/xen-ops.h here as well?
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerQuoted 86 lines · Arnd Bergmann
Building the privcmd code as a loadable module on ARM, we get a link error due to the private cache management functions:
ERROR: "
__sync_icache_dcache" [drivers/xen/xen-privcmd.ko] undefined!Move the code into a new file that is always built in when Xen is enabled, as suggested by Juergen Gross. Additional code will be moved into this file later.
Signed-off-by Arnd Bergmann <[email protected]>---
v2: rename mm.o to xen-builtin.o, make it unconditional--- drivers/xen/Makefile | 1 + drivers/xen/privcmd.c | 30 +--------------------------- drivers/xen/xen-builtin.c | 41 +++++++++++++++++++++++++++++++++++++++ include/xen/xen-ops.h | 3 +++ 4 files changed, 46 insertions(+), 29 deletions(-) create mode 100644 drivers/xen/xen-builtin.cdrivers/xen/Makefile +1
-0@@ -2,6 +2,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-y += grant-table.o features.o balloon.o manage.o preempt.o time.o obj-y += mem-reservation.o +obj-y += xen-builtin.o obj-y += events/ obj-y += xenbus/drivers/xen/privcmd.c +1
-29@@ -723,26 +723,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)return 0 ; } -struct remap_pfn { -struct mm_struct *mm; -struct page **pages; -pgprot_t prot; -unsigned long i; -}; - -static int remap_pfn_fn (pte_t *ptep,pgtable_t token,unsigned long addr, -void *data) -{ -struct remap_pfn *r = data; -struct page *page = r->pages[r->i]; -pte_t pte =pte_mkspecial (pfn_pte (page_to_pfn (page), r->prot)); - -set_pte_at (r->mm, addr, ptep, pte); - r->i++; - -return 0 ; -} -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT ); }else {unsigned int domid = (xdata.flags & XENMEM_rsrc_acq_caller_owned) ?drivers/xen/xen-builtin.c new file +0
-0
drivers/xen/xen-builtin.c line 8
Quoted 8 lines
drivers/xen/xen-builtin.c new file +8
-0@@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Architecture independent helper functions for memory management +* +* Written by Paul Durrant <[email protected]> +*/ +#include <linux/mm.h> +#include <linux/export.h>
Shouldn't you #include xen/xen-ops.h here as well?
Juergen
Quoted 36 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-20@@ -723,26 +723,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)return 0 ; } -struct remap_pfn { -struct mm_struct *mm; -struct page **pages; -pgprot_t prot; -unsigned long i; -}; - -static int remap_pfn_fn (pte_t *ptep,pgtable_t token,unsigned long addr, -void *data) -{ -struct remap_pfn *r = data; -struct page *page = r->pages[r->i]; -pte_t pte =pte_mkspecial (pfn_pte (page_to_pfn (page), r->prot)); - -set_pte_at (r->mm, addr, ptep, pte); - r->i++; - -return 0 ; -} -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;if (xen_feature (XENFEAT_auto_translated_physmap)) {
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 10 lines
drivers/xen/privcmd.c +1
-9-struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );
I wonder whether drivers/xen/xlate_mmu.c might be a good place for these routines.
-boris
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 36 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-20@@ -723,26 +723,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)return 0 ; } -struct remap_pfn { -struct mm_struct *mm; -struct page **pages; -pgprot_t prot; -unsigned long i; -}; - -static int remap_pfn_fn (pte_t *ptep,pgtable_t token,unsigned long addr, -void *data) -{ -struct remap_pfn *r = data; -struct page *page = r->pages[r->i]; -pte_t pte =pte_mkspecial (pfn_pte (page_to_pfn (page), r->prot)); - -set_pte_at (r->mm, addr, ptep, pte); - r->i++; - -return 0 ; -} -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;if (xen_feature (XENFEAT_auto_translated_physmap)) {
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 10 lines
drivers/xen/privcmd.c +1
-9-struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );
I wonder whether drivers/xen/xlate_mmu.c might be a good place for these routines.
-boris
Juergen Gross
maintainerQuoted 36 lines · Boris Ostrovsky
Quoted 35 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-20@@ -723,26 +723,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)return 0 ; } -struct remap_pfn { -struct mm_struct *mm; -struct page **pages; -pgprot_t prot; -unsigned long i; -}; - -static int remap_pfn_fn (pte_t *ptep,pgtable_t token,unsigned long addr, -void *data) -{ -struct remap_pfn *r = data; -struct page *page = r->pages[r->i]; -pte_t pte =pte_mkspecial (pfn_pte (page_to_pfn (page), r->prot)); - -set_pte_at (r->mm, addr, ptep, pte); - r->i++; - -return 0 ; -} -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;
Quoted 14 lines
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 11 lines
drivers/xen/privcmd.c +1
-9if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );I wonder whether
drivers/xen/xlate_mmu.cmight be a good place for these routines.
Hmm, probably. This would require a stub in the header to avoid problems in case of CONFIG_XEN_AUTO_XLATE not defined, though (the #ifdef is already there).
I think this is the cleanest solution.
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerQuoted 36 lines · Boris Ostrovsky
Quoted 35 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-20@@ -723,26 +723,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)return 0 ; } -struct remap_pfn { -struct mm_struct *mm; -struct page **pages; -pgprot_t prot; -unsigned long i; -}; - -static int remap_pfn_fn (pte_t *ptep,pgtable_t token,unsigned long addr, -void *data) -{ -struct remap_pfn *r = data; -struct page *page = r->pages[r->i]; -pte_t pte =pte_mkspecial (pfn_pte (page_to_pfn (page), r->prot)); - -set_pte_at (r->mm, addr, ptep, pte); - r->i++; - -return 0 ; -} -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;
Quoted 14 lines
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 11 lines
drivers/xen/privcmd.c +1
-9if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );I wonder whether
drivers/xen/xlate_mmu.cmight be a good place for these routines.
Hmm, probably. This would require a stub in the header to avoid problems in case of CONFIG_XEN_AUTO_XLATE not defined, though (the #ifdef is already there).
I think this is the cleanest solution.
Juergen
Quoted 21 lines · Juergen Gross
Quoted 5 lines · Boris Ostrovsky
Quoted 3 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-0@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;Quoted 14 lines
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 11 lines
drivers/xen/privcmd.c +1
-9if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );I wonder whether
drivers/xen/xlate_mmu.cmight be a good place for these routines.
Quoted 5 lines
Hmm, probably. This would require a stub in the header to avoid problems in case of
CONFIG_XEN_AUTO_XLATEnot defined, though (the #ifdef is already there).I think this is the cleanest solution.
Putting it into xlate_mmu.c was my first attempt, but I was not sure how to solve the dependency on CONFIG_XEN_AUTO_XLATE. So xen_feature(XENFEAT_auto_translated_physmap)) would be guaranteed to return false if CONFIG_XEN_AUTO_XLATE is disabled?
Arnd
Juergen Gross
maintainerQuoted 26 lines · Arnd Bergmann
Quoted 25 lines · Juergen Gross
Quoted 5 lines · Boris Ostrovsky
Quoted 3 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-0@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;Quoted 14 lines
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 11 lines
drivers/xen/privcmd.c +1
-9if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );I wonder whether
drivers/xen/xlate_mmu.cmight be a good place for these routines.Hmm, probably. This would require a stub in the header to avoid problems in case of
CONFIG_XEN_AUTO_XLATEnot defined, though (the #ifdef is already there).
Quoted 6 lines
Quoted 1 line
I think this is the cleanest solution.
Putting it into
xlate_mmu.cwas my first attempt, but I was not sure how to solve the dependency onCONFIG_XEN_AUTO_XLATE. Soxen_feature(XENFEAT_auto_translated_physmap)) would be guaranteed to return false ifCONFIG_XEN_AUTO_XLATEis disabled?
Yes.
Juergen
Juergen Gross
maintainerQuoted 26 lines · Arnd Bergmann
Quoted 25 lines · Juergen Gross
Quoted 5 lines · Boris Ostrovsky
Quoted 3 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-0@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;Quoted 14 lines
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 11 lines
drivers/xen/privcmd.c +1
-9if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );I wonder whether
drivers/xen/xlate_mmu.cmight be a good place for these routines.Hmm, probably. This would require a stub in the header to avoid problems in case of
CONFIG_XEN_AUTO_XLATEnot defined, though (the #ifdef is already there).
Quoted 6 lines
Quoted 1 line
I think this is the cleanest solution.
Putting it into
xlate_mmu.cwas my first attempt, but I was not sure how to solve the dependency onCONFIG_XEN_AUTO_XLATE. Soxen_feature(XENFEAT_auto_translated_physmap)) would be guaranteed to return false ifCONFIG_XEN_AUTO_XLATEis disabled?
Yes.
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 21 lines · Juergen Gross
Quoted 5 lines · Boris Ostrovsky
Quoted 3 lines · Arnd Bergmann
drivers/xen/privcmd.c +0
-0@@ -809,15 +789,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) goto out;Quoted 14 lines
drivers/xen/privcmd.c static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) · line 792
Quoted 11 lines
drivers/xen/privcmd.c +1
-9if (xen_feature (XENFEAT_auto_translated_physmap)) { -struct remap_pfn r = { - .mm = vma->vm_mm, - .pages = vma->vm_private_data, - .prot = vma->vm_page_prot, - }; - - rc =apply_to_page_range (r.mm, kdata.addr, - kdata.num <<PAGE_SHIFT , - remap_pfn_fn, &r); + rc =xen_remap_vma_range (vma, kdata.addr, kdata.num <<PAGE_SHIFT );I wonder whether
drivers/xen/xlate_mmu.cmight be a good place for these routines.
Quoted 5 lines
Hmm, probably. This would require a stub in the header to avoid problems in case of
CONFIG_XEN_AUTO_XLATEnot defined, though (the #ifdef is already there).I think this is the cleanest solution.
Putting it into xlate_mmu.c was my first attempt, but I was not sure how to solve the dependency on CONFIG_XEN_AUTO_XLATE. So xen_feature(XENFEAT_auto_translated_physmap)) would be guaranteed to return false if CONFIG_XEN_AUTO_XLATE is disabled?
Arnd
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel