[PATCH] sparc64: Fix mapping of 64k pages with MAP_FIXED

From	Nitin Gupta <nitin.m.gupta@oracle.com>
Newsgroups	linux.kernel
Subject	[PATCH] sparc64: Fix mapping of 64k pages with MAP_FIXED
Date	2017-05-16 01:30 +0200
Message-ID	<tHxB8-6e6-11@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Signed-off-by: Nitin Gupta <nitin.m.gupta@oracle.com>
---
 arch/sparc/include/asm/hugetlb.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
index dcbf985..d1f837d 100644
--- 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(struct mm_struct *mm,
 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;
 }
-- 
2.9.2

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] sparc64: Fix mapping of 64k pages with MAP_FIXED Nitin Gupta <nitin.m.gupta@oracle.com> - 2017-05-16 01:30 +0200
  Re: [PATCH] sparc64: Fix mapping of 64k pages with MAP_FIXED David Miller <davem@davemloft.net> - 2017-05-17 21:10 +0200

csiph-web