Commit 753c09b5 authored May 31, 2017 by Julien Grall Committed by Juergen Gross Jun 07, 2017

xen/privcmd: Support correctly 64KB page granularity when mapping memory



Commit 5995a68a "xen/privcmd: Add support for Linux 64KB page granularity" did
not go far enough to support 64KB in mmap_batch_fn.

The variable 'nr' is the number of 4KB chunk to map. However, when Linux
is using 64KB page granularity the array of pages (vma->vm_private_data)
contain one page per 64KB. Fix it by incrementing st->index correctly.

Furthermore, st->va is not correctly incremented as PAGE_SIZE !=
XEN_PAGE_SIZE.

Fixes: 5995a68a ("xen/privcmd: Add support for Linux 64KB page granularity")
CC: stable@vger.kernel.org
Reported-by: Feng Kan <fkan@apm.com>
Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

parent c71e6d80

drivers/xen/privcmd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -362,8 +362,8 @@ static int mmap_batch_fn(void data, int nr, void state)
		st->global_error = 1;
		}
		}
		st->va += PAGE_SIZE * nr;
		st->index += nr;
		st->va += XEN_PAGE_SIZE * nr;
		st->index += nr / XEN_PFN_PER_PAGE;

		return 0;
		}

Admin message