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 18/19] arm64/vdso: Migrate native signals to generic vdso_base
Date: Tue, 24 Nov 2020 00:29:31 +0000 [thread overview]
Message-ID: <20201124002932.1220517-19-dima@arista.com> (raw)
In-Reply-To: <20201124002932.1220517-1-dima@arista.com>
Generic way to track the land vma area.
As a bonus, after unmapping vdso, kernel won't try to land on its
previous position (due to UNMAPPED_VDSO_BASE check instead of
context.vdso ?= 0 check).
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
arch/arm64/kernel/signal.c | 10 +++++++---
arch/arm64/kernel/vdso.c | 16 ++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index bec6ef69704f..96e8988f033d 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -723,9 +723,10 @@ static int get_sigframe(struct rt_sigframe_user_layout *user,
return 0;
}
-static void setup_return(struct pt_regs *regs, struct k_sigaction *ka,
+static int setup_return(struct pt_regs *regs, struct k_sigaction *ka,
struct rt_sigframe_user_layout *user, int usig)
{
+ unsigned long land = (unsigned long)current->mm->vdso_base;
__sigrestore_t sigtramp;
regs->regs[0] = usig;
@@ -754,10 +755,13 @@ static void setup_return(struct pt_regs *regs, struct k_sigaction *ka,
if (ka->sa.sa_flags & SA_RESTORER)
sigtramp = ka->sa.sa_restorer;
+ else if (land != UNMAPPED_VDSO_BASE)
+ sigtramp = VDSO_SYMBOL(land, sigtramp);
else
- sigtramp = VDSO_SYMBOL(current->mm->context.vdso, sigtramp);
+ return 1;
regs->regs[30] = (unsigned long)sigtramp;
+ return 0;
}
static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
@@ -780,7 +784,7 @@ static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
err |= __save_altstack(&frame->uc.uc_stack, regs->sp);
err |= setup_sigframe(&user, regs, set);
if (err == 0) {
- setup_return(regs, &ksig->ka, &user, usig);
+ err = setup_return(regs, &ksig->ka, &user, usig);
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
regs->regs[1] = (unsigned long)&frame->info;
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 03a6519d50cd..5b44463b739a 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -78,12 +78,6 @@ static union {
} vdso_data_store __page_aligned_data;
struct vdso_data *vdso_data = vdso_data_store.data;
-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;
-}
-
static int __vdso_init(enum vdso_abi abi)
{
int i;
@@ -239,7 +233,6 @@ static int __setup_additional_pages(enum vdso_abi abi,
gp_flags = VM_ARM64_BTI;
vdso_base += VVAR_NR_PAGES * PAGE_SIZE;
- mm->context.vdso = (void *)vdso_base;
ret = _install_special_mapping(mm, vdso_base, vdso_text_len,
VM_READ|VM_EXEC|gp_flags|
VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
@@ -247,12 +240,17 @@ static int __setup_additional_pages(enum vdso_abi abi,
if (IS_ERR(ret))
goto up_fail;
+ /*
+ * 32-bit ABI is to land on sigpage (see aarch32_sigreturn_setup()),
+ * 64-bit on vDSO.
+ */
+ if (abi == VDSO_ABI_AA64)
+ mm->vdso_base = (void __user *)vdso_base;
*sysinfo_ehdr = vdso_base;
return 0;
up_fail:
- mm->context.vdso = NULL;
return PTR_ERR(ret);
}
@@ -285,7 +283,6 @@ static struct vm_special_mapping aarch32_vdso_maps[] = {
},
[AA32_MAP_VDSO] = {
.name = "[vdso]",
- .mremap = vdso_mremap,
},
};
@@ -431,7 +428,6 @@ static struct vm_special_mapping aarch64_vdso_maps[] __ro_after_init = {
},
[AA64_MAP_VDSO] = {
.name = "[vdso]",
- .mremap = vdso_mremap,
},
};
--
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 ` [PATCH v2 11/19] mm/mmap: Make vm_special_mapping::mremap return void Dmitry Safonov
2020-11-24 6:25 ` 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 ` Dmitry Safonov [this message]
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-19-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).