From 469c1b030426d6b92a71faf1fc5127201b0d1d82 Mon Sep 17 00:00:00 2001 From: ChenJie Date: Thu, 26 May 2022 23:56:28 +0800 Subject: [PATCH 1/9] mmap debug Signed-off-by: ChenJie --- mm/mmap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/mmap.c b/mm/mmap.c index a5e0958acd05..e2c36409852b 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1592,6 +1592,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, ((vm_flags & VM_LOCKED) || (flags & (MAP_POPULATE | MAP_NONBLOCK)) == MAP_POPULATE)) *populate = len; + pr_err("pid=%d, addr=%lx\n", current->pid, addr); return addr; } -- Gitee From 62de058ecb7a553484292bf77005ecfc705924c0 Mon Sep 17 00:00:00 2001 From: ChenJie Date: Fri, 27 May 2022 17:58:19 +0800 Subject: [PATCH 2/9] update Signed-off-by: ChenJie --- arch/arm64/kernel/sys.c | 5 ++++- arch/arm64/kernel/sys32.c | 6 +++++- mm/mmap.c | 3 ++- mm/util.c | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index d5ffaaab31a7..45eb5e0c67e4 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -22,10 +22,13 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, unsigned long, off) { + unsigned long ret; if (offset_in_page(off) != 0) return -EINVAL; - return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); + ret = ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); + return ret; } SYSCALL_DEFINE1(arm64_personality, unsigned int, personality) diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c index fc40386afb1b..535df6d47b4b 100644 --- a/arch/arm64/kernel/sys32.c +++ b/arch/arm64/kernel/sys32.c @@ -56,12 +56,16 @@ COMPAT_SYSCALL_DEFINE6(aarch32_mmap2, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, unsigned long, off_4k) { + unsigned long ret; if (off_4k & (~PAGE_MASK >> 12)) return -EINVAL; off_4k >>= (PAGE_SHIFT - 12); - return ksys_mmap_pgoff(addr, len, prot, flags, fd, off_4k); + ret = ksys_mmap_pgoff(addr, len, prot, flags, fd, off_4k); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); + return ret; +} } #ifdef CONFIG_CPU_BIG_ENDIAN diff --git a/mm/mmap.c b/mm/mmap.c index e2c36409852b..ed1d06ed90e2 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1592,7 +1592,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, ((vm_flags & VM_LOCKED) || (flags & (MAP_POPULATE | MAP_NONBLOCK)) == MAP_POPULATE)) *populate = len; - pr_err("pid=%d, addr=%lx\n", current->pid, addr); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); return addr; } @@ -1640,6 +1640,7 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len, flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); out_fput: if (file) fput(file); diff --git a/mm/util.c b/mm/util.c index 90792e4eaa25..afddc41cd74e 100644 --- a/mm/util.c +++ b/mm/util.c @@ -511,6 +511,7 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr, if (populate) mm_populate(ret, populate); } + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); return ret; } -- Gitee From e0c93d1a861c5cbcc25c7cbd647645b2b78cf948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Fri, 27 May 2022 11:52:11 +0000 Subject: [PATCH 3/9] update arch/arm64/kernel/sys.c. Signed-off-by: ChenJie --- arch/arm64/kernel/sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index 45eb5e0c67e4..a30c02320564 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -27,7 +27,7 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, return -EINVAL; ret = ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); - pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, ret); return ret; } -- Gitee From c956e8430abd5b7c29ab3ef5e016c0894259ca48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Fri, 27 May 2022 11:52:46 +0000 Subject: [PATCH 4/9] update arch/arm64/kernel/sys32.c. Signed-off-by: ChenJie --- arch/arm64/kernel/sys32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c index 535df6d47b4b..8c69ea117c87 100644 --- a/arch/arm64/kernel/sys32.c +++ b/arch/arm64/kernel/sys32.c @@ -63,7 +63,7 @@ COMPAT_SYSCALL_DEFINE6(aarch32_mmap2, unsigned long, addr, unsigned long, len, off_4k >>= (PAGE_SHIFT - 12); ret = ksys_mmap_pgoff(addr, len, prot, flags, fd, off_4k); - pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, ret); return ret; } } -- Gitee From 11cfcc1bb87f1e1c1b8dfa0d9d1d43fa36196d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Fri, 27 May 2022 11:55:46 +0000 Subject: [PATCH 5/9] update mm/mmap.c. Signed-off-by: ChenJie --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index ed1d06ed90e2..7ee18c0d993a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1592,7 +1592,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, ((vm_flags & VM_LOCKED) || (flags & (MAP_POPULATE | MAP_NONBLOCK)) == MAP_POPULATE)) *populate = len; - pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, addr); return addr; } -- Gitee From b230e3e9a85281528e8261c14f05c3382d0dc882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Fri, 27 May 2022 11:56:37 +0000 Subject: [PATCH 6/9] update mm/util.c. Signed-off-by: ChenJie --- mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/util.c b/mm/util.c index afddc41cd74e..a48fbfb8baee 100644 --- a/mm/util.c +++ b/mm/util.c @@ -511,7 +511,7 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr, if (populate) mm_populate(ret, populate); } - pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, retval); + pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, ret); return ret; } -- Gitee From f8c36b038d0a1caa3436b6aa2153b3c7952fdebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Fri, 27 May 2022 12:09:54 +0000 Subject: [PATCH 7/9] update arch/arm64/kernel/sys.c. --- arch/arm64/kernel/sys.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index a30c02320564..0c303a04bd03 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -22,13 +22,9 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, unsigned long, off) { - unsigned long ret; if (offset_in_page(off) != 0) return -EINVAL; - - ret = ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); - pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, ret); - return ret; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); } SYSCALL_DEFINE1(arm64_personality, unsigned int, personality) -- Gitee From 2cc58fa8db4457c903577b65c9abd5ec0283c310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Fri, 27 May 2022 12:10:25 +0000 Subject: [PATCH 8/9] update arch/arm64/kernel/sys.c. --- arch/arm64/kernel/sys.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index 0c303a04bd03..d5ffaaab31a7 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -24,6 +24,7 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, { if (offset_in_page(off) != 0) return -EINVAL; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); } -- Gitee From 40eacd4bd6dd5d505d19f5ad0fc1993c3d54da4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Fri, 27 May 2022 12:11:03 +0000 Subject: [PATCH 9/9] update arch/arm64/kernel/sys32.c. --- arch/arm64/kernel/sys32.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c index 8c69ea117c87..7d2152a7fb6b 100644 --- a/arch/arm64/kernel/sys32.c +++ b/arch/arm64/kernel/sys32.c @@ -56,15 +56,12 @@ COMPAT_SYSCALL_DEFINE6(aarch32_mmap2, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, unsigned long, off_4k) { - unsigned long ret; if (off_4k & (~PAGE_MASK >> 12)) return -EINVAL; off_4k >>= (PAGE_SHIFT - 12); - ret = ksys_mmap_pgoff(addr, len, prot, flags, fd, off_4k); - pr_err("%s, pid=%d, addr=%lx\n", __FUNC__ ,current->pid, ret); - return ret; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, off_4k); } } -- Gitee