Commit d742db70 authored Aug 25, 2020 by Simon Leiner Committed by Juergen Gross Aug 27, 2020

xen/xenbus: Fix granting of vmalloc'd memory



On some architectures (like ARM), virt_to_gfn cannot be used for
vmalloc'd memory because of its reliance on virt_to_phys. This patch
introduces a check for vmalloc'd addresses and obtains the PFN using
vmalloc_to_pfn in that case.

Signed-off-by: Simon Leiner <simon@leiner.me>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Link: https://lore.kernel.org/r/20200825093153.35500-1-simon@leiner.me


Signed-off-by: Juergen Gross <jgross@suse.com>

parent c330fb1d

drivers/xen/xenbus/xenbus_client.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -379,8 +379,14 @@ int xenbus_grant_ring(struct xenbus_device dev, void vaddr,
		int i, j;

		for (i = 0; i < nr_pages; i++) {
		err = gnttab_grant_foreign_access(dev->otherend_id,
		virt_to_gfn(vaddr), 0);
		unsigned long gfn;

		if (is_vmalloc_addr(vaddr))
		gfn = pfn_to_gfn(vmalloc_to_pfn(vaddr));
		else
		gfn = virt_to_gfn(vaddr);

		err = gnttab_grant_foreign_access(dev->otherend_id, gfn, 0);
		if (err < 0) {
		xenbus_dev_fatal(dev, err,
		"granting access to ring page");

Admin message