The purpose of MAP_FIXED_HUGETLB_LEN is to check whether the parameter
length is valid or not according to the target file's huge page size.
When it is used, if length is not aligned to underlying huge page size,
mmap() is failed with errno set to EINVAL. When it is not used, the
current semantic is maintained, i.e., length is round up to underlying
huge page size.
In current code, the vma related call, except mmap, are all consider
not correctly aligned length as invalid parameter, including mprotect,
munmap, mlock, etc., by checking through hugetlb_vm_op_split. So, user
will see failure, after successfully call mmap, although using same
length parameter to other mapping syscall.
With MAP_FIXED_HUGETLB_LEN, user can choose to check if length is
correctly aligned at first place when call mmap, instead of failure after
mapping has been created.
Signed-off-by: Li Xinhai <lixinhai.lxh@xxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/uapi/asm-generic/mman-common.h | 1 +
mm/mmap.c | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/include/uapi/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h
index f94f65d..1c9ba97 100644
--- a/include/uapi/asm-generic/mman-common.h
+++ b/include/uapi/asm-generic/mman-common.h
@@ -21,6 +21,7 @@
#define MAP_TYPE 0x0f /* Mask for type of mapping */
#define MAP_FIXED 0x10 /* Interpret addr exactly */
#define MAP_ANONYMOUS 0x20 /* don't use a file */
+#define MAP_FIXED_HUGETLB_LEN 0x40 /* check alignment of addr, length, offset */
/* 0x0100 - 0x4000 flags are defined in asm-generic/mman.h */
#define MAP_POPULATE 0x008000 /* populate (prefault) pagetables */
diff --git a/mm/mmap.c b/mm/mmap.c
index d681a20..50a12e0 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1560,9 +1560,18 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
file = fget(fd);
if (!file)
return -EBADF;
- if (is_file_hugepages(file))
- len = ALIGN(len, huge_page_size(hstate_file(file)));
+
retval = -EINVAL;
+ if (is_file_hugepages(file)) {
+ struct hstate *hs = hstate_file(file);
+
+ if (flags & MAP_FIXED_HUGETLB_LEN &&
+ len & ~(huge_page_mask(hs)))
+ goto out_fput;
+
+ len = ALIGN(len, huge_page_size(hs));
+ }
+
if (unlikely(flags & MAP_HUGETLB && !is_file_hugepages(file)))
goto out_fput;
} else if (flags & MAP_HUGETLB) {
@@ -1573,6 +1582,10 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
if (!hs)
return -EINVAL;
+ if (flags & MAP_FIXED_HUGETLB_LEN &&
+ len & ~(huge_page_mask(hs)))
+ return -EINVAL;
+
len = ALIGN(len, huge_page_size(hs));
/*
* VM_NORESERVE is used because the reservations will be
--
1.8.3.1
