From: Andrei Vagin <avagin@gmail.com> To: linux-arm-kernel@lists.infradead.org, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org> Cc: linux-kernel@vger.kernel.org, Vincenzo Frascino <vincenzo.frascino@arm.com>, Mark Rutland <mark.rutland@arm.com>, Thomas Gleixner <tglx@linutronix.de>, Dmitry Safonov <dima@arista.com>, Andrei Vagin <avagin@gmail.com> Subject: [PATCH 5/6] arm64/vdso: Restrict splitting VVAR VMA Date: Tue, 2 Jun 2020 11:02:58 -0700 [thread overview] Message-ID: <20200602180259.76361-6-avagin@gmail.com> (raw) In-Reply-To: <20200602180259.76361-1-avagin@gmail.com> Forbid splitting VVAR VMA resulting in a stricter ABI and reducing the amount of corner-cases to consider while working further on VDSO time namespace support. As the offset from timens to VVAR page is computed compile-time, the pages in VVAR should stay together and not being partically mremap()'ed. Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Signed-off-by: Andrei Vagin <avagin@gmail.com> --- arch/arm64/kernel/vdso.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index f3baecd8edfb..8b17d7d10729 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -235,6 +235,17 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm, return vmf_insert_pfn(vma, vmf->address, pfn); } +static int vvar_mremap(const struct vm_special_mapping *sm, + struct vm_area_struct *new_vma) +{ + unsigned long new_size = new_vma->vm_end - new_vma->vm_start; + + if (new_size != VVAR_NR_PAGES * PAGE_SIZE) + return -EINVAL; + + return 0; +} + static int __setup_additional_pages(enum arch_vdso_type arch_index, struct mm_struct *mm, struct linux_binprm *bprm, @@ -317,6 +328,7 @@ static struct vm_special_mapping aarch32_vdso_spec[C_PAGES] = { { .name = "[vvar]", .fault = vvar_fault, + .mremap = vvar_mremap, }, { .name = "[vdso]", @@ -488,6 +500,7 @@ static struct vm_special_mapping vdso_spec[A_PAGES] __ro_after_init = { { .name = "[vvar]", .fault = vvar_fault, + .mremap = vvar_mremap, }, { .name = "[vdso]", -- 2.24.1
WARNING: multiple messages have this Message-ID (diff)
From: Andrei Vagin <avagin@gmail.com> To: linux-arm-kernel@lists.infradead.org, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com>, Dmitry Safonov <dima@arista.com>, linux-kernel@vger.kernel.org, Andrei Vagin <avagin@gmail.com>, Thomas Gleixner <tglx@linutronix.de>, Vincenzo Frascino <vincenzo.frascino@arm.com> Subject: [PATCH 5/6] arm64/vdso: Restrict splitting VVAR VMA Date: Tue, 2 Jun 2020 11:02:58 -0700 [thread overview] Message-ID: <20200602180259.76361-6-avagin@gmail.com> (raw) In-Reply-To: <20200602180259.76361-1-avagin@gmail.com> Forbid splitting VVAR VMA resulting in a stricter ABI and reducing the amount of corner-cases to consider while working further on VDSO time namespace support. As the offset from timens to VVAR page is computed compile-time, the pages in VVAR should stay together and not being partically mremap()'ed. Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Signed-off-by: Andrei Vagin <avagin@gmail.com> --- arch/arm64/kernel/vdso.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index f3baecd8edfb..8b17d7d10729 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -235,6 +235,17 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm, return vmf_insert_pfn(vma, vmf->address, pfn); } +static int vvar_mremap(const struct vm_special_mapping *sm, + struct vm_area_struct *new_vma) +{ + unsigned long new_size = new_vma->vm_end - new_vma->vm_start; + + if (new_size != VVAR_NR_PAGES * PAGE_SIZE) + return -EINVAL; + + return 0; +} + static int __setup_additional_pages(enum arch_vdso_type arch_index, struct mm_struct *mm, struct linux_binprm *bprm, @@ -317,6 +328,7 @@ static struct vm_special_mapping aarch32_vdso_spec[C_PAGES] = { { .name = "[vvar]", .fault = vvar_fault, + .mremap = vvar_mremap, }, { .name = "[vdso]", @@ -488,6 +500,7 @@ static struct vm_special_mapping vdso_spec[A_PAGES] __ro_after_init = { { .name = "[vvar]", .fault = vvar_fault, + .mremap = vvar_mremap, }, { .name = "[vdso]", -- 2.24.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-06-02 18:03 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-02 18:02 [PATCH RESEND v3 0/6] arm64: add the time namespace support Andrei Vagin 2020-06-02 18:02 ` Andrei Vagin 2020-06-02 18:02 ` [PATCH 1/6] arm64/vdso: use the fault callback to map vvar pages Andrei Vagin 2020-06-02 18:02 ` Andrei Vagin 2020-06-02 18:02 ` [PATCH 2/6] arm64/vdso: Zap vvar pages when switching to a time namespace Andrei Vagin 2020-06-02 18:02 ` Andrei Vagin 2020-06-02 18:02 ` [PATCH 3/6] arm64/vdso: Add time namespace page Andrei Vagin 2020-06-02 18:02 ` Andrei Vagin 2020-06-02 19:29 ` Dmitry Safonov 2020-06-02 19:29 ` Dmitry Safonov 2020-06-02 22:04 ` kbuild test robot 2020-06-02 22:04 ` kbuild test robot 2020-06-02 22:04 ` kbuild test robot 2020-06-03 6:42 ` kbuild test robot 2020-06-03 6:42 ` kbuild test robot 2020-06-03 6:42 ` kbuild test robot 2020-06-05 7:45 ` [PATCH 3/6 v4] " Andrei Vagin 2020-06-05 7:45 ` Andrei Vagin 2020-06-02 18:02 ` [PATCH 4/6] arm64/vdso: Handle faults on timens page Andrei Vagin 2020-06-02 18:02 ` Andrei Vagin 2020-06-02 18:02 ` Andrei Vagin [this message] 2020-06-02 18:02 ` [PATCH 5/6] arm64/vdso: Restrict splitting VVAR VMA Andrei Vagin 2020-06-02 18:02 ` [PATCH 6/6] arm64: enable time namespace support Andrei Vagin 2020-06-02 18:02 ` Andrei Vagin 2020-06-02 19:31 ` [PATCH RESEND v3 0/6] arm64: add the " Dmitry Safonov 2020-06-02 19:31 ` Dmitry Safonov 2020-06-05 10:49 ` Mark Rutland 2020-06-05 10:49 ` Mark Rutland 2020-06-06 8:58 ` Andrei Vagin 2020-06-06 8:58 ` Andrei Vagin -- strict thread matches above, loose matches on Subject: below -- 2020-06-24 8:33 [PATCH v5 " Andrei Vagin 2020-06-24 8:33 ` [PATCH 5/6] arm64/vdso: Restrict splitting VVAR VMA Andrei Vagin 2020-06-24 8:33 ` Andrei Vagin 2020-06-16 7:55 [PATCH v4 0/6] arm64: add the time namespace support Andrei Vagin 2020-06-16 7:55 ` [PATCH 5/6] arm64/vdso: Restrict splitting VVAR VMA Andrei Vagin 2020-06-16 7:55 ` Andrei Vagin 2020-04-16 5:26 [PATCH v3 0/6] arm64: add the time namespace support Andrei Vagin 2020-04-16 5:26 ` [PATCH 5/6] arm64/vdso: Restrict splitting VVAR VMA Andrei Vagin 2020-04-16 5:26 ` Andrei Vagin
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=20200602180259.76361-6-avagin@gmail.com \ --to=avagin@gmail.com \ --cc=catalin.marinas@arm.com \ --cc=dima@arista.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=tglx@linutronix.de \ --cc=vincenzo.frascino@arm.com \ --cc=will@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.