Applied.

On 2020/12/31 18:15, Hanjun Guo wrote:

On 2020/12/31 11:22, Bixuan Cui wrote:

...

From: Zhengyuan Liu liuzhengyuan@tj.kylinos.cn

hulk inclusion category: bugfix bugzilla: NA CVE: NA

MAP_PA32BIT was defined in uapi/asm-generic/mman.h, that was not automatically included by mm/mmap.c when building on platforms such as mips, and result in following compiling error:

mm/mmap.c: In function ‘do_mmap’:     mm/mmap.c:1450:14: error: ‘MAP_PA32BIT’ undeclared (first use in this function); did you mean ‘MAP_32BIT’?       if (flags & MAP_PA32BIT)                   ^~~~~~~~~~~                   MAP_32BIT     mm/mmap.c:1450:14: note: each undeclared identifier is reported only once for each function it appears in     make[1]: *** [scripts/Makefile.build:303: mm/mmap.o] Error 1

Fixes: e138253f2b82 ("svm: add support for allocing memory which is within 4G physical address in svm_mmap")

Signed-off-by: Zhengyuan Liu liuzhengyuan@tj.kylinos.cn Signed-off-by: Bixuan Cui cuibixuan@huawei.com

---

arch/alpha/include/uapi/asm/mman.h   | 1 +   arch/mips/include/uapi/asm/mman.h    | 1 +   arch/parisc/include/uapi/asm/mman.h  | 1 +   arch/powerpc/include/uapi/asm/mman.h | 1 +   arch/sparc/include/uapi/asm/mman.h   | 1 +   arch/xtensa/include/uapi/asm/mman.h  | 1 +   6 files changed, 6 insertions(+)

diff --git a/arch/alpha/include/uapi/asm/mman.h b/arch/alpha/include/uapi/asm/mman.h index f9d4e6b6d4bd..b3acfc00c8ec 100644 --- a/arch/alpha/include/uapi/asm/mman.h +++ b/arch/alpha/include/uapi/asm/mman.h @@ -33,6 +33,7 @@   #define MAP_STACK    0x80000        /* give out an address that is best suited for process/thread stacks */   #define MAP_HUGETLB    0x100000    /* create a huge page mapping */   #define MAP_FIXED_NOREPLACE    0x200000/* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT    0x400000    /* physical address is within 4G */     #define MS_ASYNC    1        /* sync memory asynchronously */   #define MS_SYNC        2        /* synchronous memory sync */ diff --git a/arch/mips/include/uapi/asm/mman.h b/arch/mips/include/uapi/asm/mman.h index 3035ca499cd8..72a00c746e78 100644 --- a/arch/mips/include/uapi/asm/mman.h +++ b/arch/mips/include/uapi/asm/mman.h @@ -51,6 +51,7 @@   #define MAP_STACK    0x40000        /* give out an address that is best suited for process/thread stacks */   #define MAP_HUGETLB    0x80000        /* create a huge page mapping */   #define MAP_FIXED_NOREPLACE 0x100000    /* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT    0x400000    /* physical address is within 4G */     /*    * Flags for msync diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index 870fbf8c7088..9e989d649e85 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h @@ -27,6 +27,7 @@   #define MAP_STACK    0x40000        /* give out an address that is best suited for process/thread stacks */   #define MAP_HUGETLB    0x80000        /* create a huge page mapping */   #define MAP_FIXED_NOREPLACE 0x100000    /* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT    0x400000    /* physical address is within 4G */     #define MS_SYNC        1        /* synchronous memory sync */   #define MS_ASYNC    2        /* sync memory asynchronously */ diff --git a/arch/powerpc/include/uapi/asm/mman.h b/arch/powerpc/include/uapi/asm/mman.h index 65065ce32814..95f884ada96f 100644 --- a/arch/powerpc/include/uapi/asm/mman.h +++ b/arch/powerpc/include/uapi/asm/mman.h @@ -29,6 +29,7 @@   #define MAP_NONBLOCK    0x10000        /* do not block on IO */   #define MAP_STACK    0x20000        /* give out an address that is best suited for process/thread stacks */   #define MAP_HUGETLB    0x40000        /* create a huge page mapping */ +#define MAP_PA32BIT    0x400000    /* physical address is within 4G */     /* Override any generic PKEY permission defines */   #define PKEY_DISABLE_EXECUTE   0x4 diff --git a/arch/sparc/include/uapi/asm/mman.h b/arch/sparc/include/uapi/asm/mman.h index f6f99ec65bb3..0d1881b8f30d 100644 --- a/arch/sparc/include/uapi/asm/mman.h +++ b/arch/sparc/include/uapi/asm/mman.h @@ -26,6 +26,7 @@   #define MAP_NONBLOCK    0x10000        /* do not block on IO */   #define MAP_STACK    0x20000        /* give out an address that is best suited for process/thread stacks */   #define MAP_HUGETLB    0x40000        /* create a huge page mapping */ +#define MAP_PA32BIT    0x400000    /* physical address is within 4G */       #endif /* _UAPI__SPARC_MMAN_H__ */ diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h index 58f29a9d895d..f584a590bb00 100644 --- a/arch/xtensa/include/uapi/asm/mman.h +++ b/arch/xtensa/include/uapi/asm/mman.h @@ -58,6 +58,7 @@   #define MAP_STACK    0x40000        /* give out an address that is best suited for process/thread stacks */   #define MAP_HUGETLB    0x80000        /* create a huge page mapping */   #define MAP_FIXED_NOREPLACE 0x100000    /* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT    0x400000    /* physical address is within 4G */   #ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED   # define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could be                        * uninitialized */

Reviewed-by: Hanjun Guo guohanjun@huawei.com .