From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Dmitry Safonov <dima@arista.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Borislav Petkov <bp@alien8.de>,
Catalin Marinas <catalin.marinas@arm.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Guo Ren <guoren@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
Ingo Molnar <mingo@redhat.com>, Oleg Nesterov <oleg@redhat.com>,
Russell King <linux@armlinux.org.uk>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Thomas Gleixner <tglx@linutronix.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Will Deacon <will@kernel.org>,
x86@kernel.org
Subject: [PATCH v2 11/19] mm/mmap: Make vm_special_mapping::mremap return void
Date: Tue, 24 Nov 2020 00:29:24 +0000 [thread overview]
Message-ID: <20201124002932.1220517-12-dima@arista.com> (raw)
In-Reply-To: <20201124002932.1220517-1-dima@arista.com>
Previously .mremap() callback needed (int) return to provide way to
restrict resizing of a special mapping. Now it's restricted by
providing .may_split = special_mapping_split.
Removing (int) return simplifies further changes to
special_mapping_mremap() as it won't need save ret code from the
callback. Also, it removes needless `return 0` from callbacks.
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
arch/arm/kernel/process.c | 3 +--
arch/arm64/kernel/vdso.c | 4 +---
arch/mips/vdso/genvdso.c | 3 +--
arch/x86/entry/vdso/vma.c | 4 +---
include/linux/mm_types.h | 2 +-
mm/mmap.c | 2 +-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 0e90cba8ac7a..5f4eced738f5 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -376,11 +376,10 @@ static unsigned long sigpage_addr(const struct mm_struct *mm,
static struct page *signal_page;
extern struct page *get_signal_page(void);
-static int sigpage_mremap(const struct vm_special_mapping *sm,
+static void sigpage_mremap(const struct vm_special_mapping *sm,
struct vm_area_struct *new_vma)
{
current->mm->context.sigpage = new_vma->vm_start;
- return 0;
}
static const struct vm_special_mapping sigpage_mapping = {
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 666338724a07..91c1b7c716b7 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -78,12 +78,10 @@ static union {
} vdso_data_store __page_aligned_data;
struct vdso_data *vdso_data = vdso_data_store.data;
-static int vdso_mremap(const struct vm_special_mapping *sm,
+static void vdso_mremap(const struct vm_special_mapping *sm,
struct vm_area_struct *new_vma)
{
current->mm->context.vdso = (void *)new_vma->vm_start;
-
- return 0;
}
static int __vdso_init(enum vdso_abi abi)
diff --git a/arch/mips/vdso/genvdso.c b/arch/mips/vdso/genvdso.c
index 09e30eb4be86..0303d30cde03 100644
--- a/arch/mips/vdso/genvdso.c
+++ b/arch/mips/vdso/genvdso.c
@@ -259,13 +259,12 @@ int main(int argc, char **argv)
fprintf(out_file, "#include <linux/linkage.h>\n");
fprintf(out_file, "#include <linux/mm.h>\n");
fprintf(out_file, "#include <asm/vdso.h>\n");
- fprintf(out_file, "static int vdso_mremap(\n");
+ fprintf(out_file, "static void vdso_mremap(\n");
fprintf(out_file, " const struct vm_special_mapping *sm,\n");
fprintf(out_file, " struct vm_area_struct *new_vma)\n");
fprintf(out_file, "{\n");
fprintf(out_file, " current->mm->context.vdso =\n");
fprintf(out_file, " (void *)(new_vma->vm_start);\n");
- fprintf(out_file, " return 0;\n");
fprintf(out_file, "}\n");
/* Write out the stripped VDSO data. */
diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
index 5b9020742e66..65780a0164e3 100644
--- a/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@ -86,15 +86,13 @@ static void vdso_fix_landing(const struct vdso_image *image,
#endif
}
-static int vdso_mremap(const struct vm_special_mapping *sm,
+static void vdso_mremap(const struct vm_special_mapping *sm,
struct vm_area_struct *new_vma)
{
const struct vdso_image *image = current->mm->context.vdso_image;
vdso_fix_landing(image, new_vma);
current->mm->context.vdso = (void __user *)new_vma->vm_start;
-
- return 0;
}
#ifdef CONFIG_TIME_NS
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 65df8abd90bd..95a257927dae 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -780,7 +780,7 @@ struct vm_special_mapping {
struct vm_area_struct *vma,
struct vm_fault *vmf);
- int (*mremap)(const struct vm_special_mapping *sm,
+ void (*mremap)(const struct vm_special_mapping *sm,
struct vm_area_struct *new_vma);
};
diff --git a/mm/mmap.c b/mm/mmap.c
index d0d458632c1b..17fe59a9780b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3433,7 +3433,7 @@ static int special_mapping_mremap(struct vm_area_struct *new_vma,
return -EFAULT;
if (sm->mremap)
- return sm->mremap(sm, new_vma);
+ sm->mremap(sm, new_vma);
return 0;
}
--
2.29.2
next prev parent reply other threads:[~2020-11-24 0:30 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 0:29 [PATCH v2 00/19] Add generic vdso_base tracking Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 01/19] x86/elf: Check in_x32_syscall() in compat_arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 02/19] elf: Move arch_setup_additional_pages() to generic elf.h Dmitry Safonov
2020-11-24 6:12 ` Christophe Leroy
2020-11-26 19:45 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 03/19] arm64: Use in_compat_task() in arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 04/19] x86: Remove compat_arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 05/19] elf: " Dmitry Safonov
2020-11-24 6:13 ` Christophe Leroy
2020-11-26 19:45 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 06/19] elf/vdso: Reuse arch_setup_additional_pages() parameters Dmitry Safonov
2020-11-24 6:18 ` Christophe Leroy
2020-11-26 19:46 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 07/19] elf: Use sysinfo_ehdr in ARCH_DLINFO() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 08/19] arm/vdso: Remove vdso pointer from mm->context Dmitry Safonov
2020-11-24 6:22 ` Christophe Leroy
2020-11-26 19:48 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 09/19] s390/vdso: Remove vdso_base " Dmitry Safonov
2020-11-24 6:22 ` Christophe Leroy
2020-11-24 0:29 ` [PATCH v2 10/19] sparc/vdso: Remove vdso " Dmitry Safonov
2020-11-24 0:29 ` Dmitry Safonov [this message]
2020-11-24 6:25 ` [PATCH v2 11/19] mm/mmap: Make vm_special_mapping::mremap return void Christophe Leroy
2020-11-24 0:29 ` [PATCH v2 12/19] x86/signal: Land on &frame->retcode when vdso isn't mapped Dmitry Safonov
2020-11-24 23:08 ` Andy Lutomirski
2020-11-24 0:29 ` [PATCH v2 13/19] x86/signal: Check if vdso_image_32 is mapped before trying to land on it Dmitry Safonov
2020-11-24 23:43 ` Andy Lutomirski
2020-11-26 20:00 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 14/19] mm: Add vdso_base in mm_struct Dmitry Safonov
2020-11-24 23:37 ` Andy Lutomirski
2020-11-24 0:29 ` [PATCH v2 15/19] x86/vdso: Migrate to generic vdso_base Dmitry Safonov
2020-11-24 2:51 ` kernel test robot
2020-11-24 0:29 ` [PATCH v2 16/19] arm/vdso: " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 17/19] arm64/vdso: Migrate compat signals " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 18/19] arm64/vdso: Migrate native " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 19/19] mips/vdso: Migrate " Dmitry Safonov
2020-11-24 6:53 ` [PATCH v2 00/19] Add generic vdso_base tracking Christophe Leroy
2020-11-26 20:41 ` Dmitry Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201124002932.1220517-12-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=guoren@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=vincenzo.frascino@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).