This is a note to let you know that I've just added the patch titled
sparc64: Fix mapping of 64k pages with MAP_FIXED
to the 4.11-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:
sparc64-fix-mapping-of-64k-pages-with-map_fixed.patch
and it can be found in the queue-4.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Wed May 31 16:49:09 JST 2017
From: Nitin Gupta <nitin.m.gupta@xxxxxxxxxx>
Date: Mon, 15 May 2017 16:28:17 -0700
Subject: sparc64: Fix mapping of 64k pages with MAP_FIXED
From: Nitin Gupta <nitin.m.gupta@xxxxxxxxxx>
[ Upstream commit b6c41cb050d5debc7e4eaa0a81cbdbad72588891 ]
An incorrect huge page alignment check caused
mmap failure for 64K pages when MAP_FIXED is used
with address not aligned to HPAGE_SIZE.
Orabug: 25885991
Fixes: dcd1912d21a0 ("sparc64: Add 64K page size support")
Signed-off-by: Nitin Gupta <nitin.m.gupta@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/sparc/include/asm/hugetlb.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/arch/sparc/include/asm/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
@@ -24,9 +24,11 @@ static inline int is_hugepage_only_range
static inline int prepare_hugepage_range(struct file *file,
unsigned long addr, unsigned long len)
{
- if (len & ~HPAGE_MASK)
+ struct hstate *h = hstate_file(file);
+
+ if (len & ~huge_page_mask(h))
return -EINVAL;
- if (addr & ~HPAGE_MASK)
+ if (addr & ~huge_page_mask(h))
return -EINVAL;
return 0;
}
Patches currently in stable-queue which might be from nitin.m.gupta@xxxxxxxxxx are
queue-4.11/sparc64-fix-mapping-of-64k-pages-with-map_fixed.patch