Patch "xen/privcmd: Support correctly 64KB page granularity when mapping memory" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xen-privcmd-support-correctly-64kb-page-granularity-when-mapping-memory.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Julien Grall <[email protected]>
Date: Wed, 31 May 2017 14:03:57 +0100
Subject: xen/privcmd: Support correctly 64KB page granularity when mapping memory

From: Julien Grall <[email protected]>

commit 753c09b5652bb4fe53e2db648002ec64b32b8827 upstream.

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.

---
 drivers/xen/privcmd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -335,8 +335,8 @@ static int mmap_batch_fn(void *data, int
 				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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/xen-privcmd-support-correctly-64kb-page-granularity-when-mapping-memory.patch