Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9636c086 authored by Julien Grall's avatar Julien Grall Committed by Greg Kroah-Hartman
Browse files

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



commit 753c09b5652bb4fe53e2db648002ec64b32b8827 upstream.

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")
Reported-by: default avatarFeng Kan <fkan@apm.com>
Signed-off-by: default avatarJulien Grall <julien.grall@arm.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08229c11

drivers/xen/privcmd.c

+2 −2
Original line number Diff line number Diff line
@@ -335,8 +335,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;

}