diff options
| author | Julien Grall <julien.grall@arm.com> | 2017-05-31 14:03:57 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-06-07 11:23:14 +0200 |
| commit | 753c09b5652bb4fe53e2db648002ec64b32b8827 (patch) | |
| tree | 9a4e906571c2f9075302d2421a54d76b9ad32282 /drivers | |
| parent | c71e6d804c88168ecf02aaf14e1fd5773d683b5f (diff) | |
| download | linux-753c09b5652bb4fe53e2db648002ec64b32b8827.tar.gz | |
xen/privcmd: Support correctly 64KB page granularity when mapping memory
Commit 5995a68 "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: 5995a68 ("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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/privcmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 7a92a5e1d40c..feca75b07fdd 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -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; } |