From: Catalin Marinas <catalin.marinas@arm.com>
To: andrey.konovalov@linux.dev
Cc: Marco Elver <elver@google.com>,
Alexander Potapenko <glider@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Andrey Konovalov <andreyknvl@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Andrey Ryabinin <ryabinin.a.a@gmail.com>,
kasan-dev@googlegroups.com, linux-mm@kvack.org,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
linux-arm-kernel@lists.infradead.org,
Peter Collingbourne <pcc@google.com>,
Evgenii Stepanov <eugenis@google.com>,
linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: Re: [PATCH mm v3 25/38] kasan, vmalloc, arm64: mark vmalloc mappings as pgprot_tagged
Date: Tue, 14 Dec 2021 17:11:17 +0000 [thread overview]
Message-ID: <YbjQNdst07JqbG0j@arm.com> (raw)
In-Reply-To: <d91e501aef74c5bb924cae90b469ff0dc1d56488.1639432170.git.andreyknvl@google.com>
On Mon, Dec 13, 2021 at 10:54:21PM +0100, andrey.konovalov@linux.dev wrote:
> diff --git a/arch/arm64/include/asm/vmalloc.h b/arch/arm64/include/asm/vmalloc.h
> index b9185503feae..3d35adf365bf 100644
> --- a/arch/arm64/include/asm/vmalloc.h
> +++ b/arch/arm64/include/asm/vmalloc.h
> @@ -25,4 +25,14 @@ static inline bool arch_vmap_pmd_supported(pgprot_t prot)
>
> #endif
>
> +#define arch_vmalloc_pgprot_modify arch_vmalloc_pgprot_modify
> +static inline pgprot_t arch_vmalloc_pgprot_modify(pgprot_t prot)
> +{
> + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS) &&
> + (pgprot_val(prot) == pgprot_val(PAGE_KERNEL)))
> + prot = pgprot_tagged(prot);
> +
> + return prot;
> +}
> +
> #endif /* _ASM_ARM64_VMALLOC_H */
> diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
> index 28becb10d013..760caeedd749 100644
> --- a/include/linux/vmalloc.h
> +++ b/include/linux/vmalloc.h
> @@ -115,6 +115,13 @@ static inline int arch_vmap_pte_supported_shift(unsigned long size)
> }
> #endif
>
> +#ifndef arch_vmalloc_pgprot_modify
> +static inline pgprot_t arch_vmalloc_pgprot_modify(pgprot_t prot)
> +{
> + return prot;
> +}
> +#endif
> +
> /*
> * Highlevel APIs for driver use
> */
> diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> index 837ed355bfc6..58bd2f7f86d7 100644
> --- a/mm/vmalloc.c
> +++ b/mm/vmalloc.c
> @@ -3060,6 +3060,8 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
> return NULL;
> }
>
> + prot = arch_vmalloc_pgprot_modify(prot);
> +
> if (vmap_allow_huge && !(vm_flags & VM_NO_HUGE_VMAP)) {
> unsigned long size_per_node;
I wonder whether we could fix the prot bits in the caller instead and we
won't need to worry about the exec or the module_alloc() case. Something
like:
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index d2a00ad4e1dd..4e8c61255b92 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -3112,7 +3112,7 @@ void *__vmalloc_node(unsigned long size, unsigned long align,
gfp_t gfp_mask, int node, const void *caller)
{
return __vmalloc_node_range(size, align, VMALLOC_START, VMALLOC_END,
- gfp_mask, PAGE_KERNEL, 0, node, caller);
+ gfp_mask, pgprot_hwasan(PAGE_KERNEL), 0, node, caller);
}
/*
* This is only for performance analysis of vmalloc and stress purpose.
@@ -3161,7 +3161,7 @@ EXPORT_SYMBOL(vmalloc);
void *vmalloc_no_huge(unsigned long size)
{
return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
- GFP_KERNEL, PAGE_KERNEL, VM_NO_HUGE_VMAP,
+ GFP_KERNEL, pgprot_hwasan(PAGE_KERNEL), VM_NO_HUGE_VMAP,
NUMA_NO_NODE, __builtin_return_address(0));
}
EXPORT_SYMBOL(vmalloc_no_huge);
with pgprot_hwasan() defined to pgprot_tagged() only if KASAN_HW_TAGS is
enabled.
--
Catalin
next prev parent reply other threads:[~2021-12-14 17:11 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 21:51 [PATCH mm v3 00/38] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 01/38] kasan, page_alloc: deduplicate should_skip_kasan_poison andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 02/38] kasan, page_alloc: move tag_clear_highpage out of kernel_init_free_pages andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 03/38] kasan, page_alloc: merge kasan_free_pages into free_pages_prepare andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 04/38] kasan, page_alloc: simplify kasan_poison_pages call site andrey.konovalov
2021-12-16 12:54 ` Alexander Potapenko
2021-12-13 21:51 ` [PATCH mm v3 05/38] kasan, page_alloc: init memory of skipped pages on free andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 06/38] kasan: drop skip_kasan_poison variable in free_pages_prepare andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 07/38] mm: clarify __GFP_ZEROTAGS comment andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 08/38] kasan: only apply __GFP_ZEROTAGS when memory is zeroed andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 09/38] kasan, page_alloc: refactor init checks in post_alloc_hook andrey.konovalov
2021-12-16 13:32 ` Alexander Potapenko
2021-12-13 21:51 ` [PATCH mm v3 10/38] kasan, page_alloc: merge kasan_alloc_pages into post_alloc_hook andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 11/38] kasan, page_alloc: combine tag_clear_highpage calls in post_alloc_hook andrey.konovalov
2021-12-16 13:04 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 12/38] kasan, page_alloc: move SetPageSkipKASanPoison " andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 13/38] kasan, page_alloc: move kernel_init_free_pages " andrey.konovalov
2021-12-16 11:00 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 14/38] kasan, page_alloc: simplify kasan_unpoison_pages call site andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 15/38] kasan: clean up metadata byte definitions andrey.konovalov
2021-12-16 10:52 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 16/38] kasan: define KASAN_VMALLOC_INVALID for SW_TAGS andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 17/38] kasan, x86, arm64, s390: rename functions for modules shadow andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 18/38] kasan, vmalloc: drop outdated VM_KASAN comment andrey.konovalov
2021-12-16 10:53 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 19/38] kasan: reorder vmalloc hooks andrey.konovalov
2021-12-16 10:55 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 20/38] kasan: add wrappers for " andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 21/38] kasan, vmalloc: reset tags in vmalloc functions andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 22/38] kasan, fork: reset pointer tags of vmapped stacks andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 23/38] kasan, arm64: " andrey.konovalov
2021-12-13 21:59 ` Andrey Konovalov
2021-12-14 13:25 ` Catalin Marinas
2021-12-13 21:54 ` [PATCH mm v3 24/38] kasan, vmalloc: add vmalloc tagging for SW_TAGS andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 25/38] kasan, vmalloc, arm64: mark vmalloc mappings as pgprot_tagged andrey.konovalov
2021-12-14 17:11 ` Catalin Marinas [this message]
2021-12-14 18:27 ` Andrey Konovalov
2021-12-14 19:27 ` Catalin Marinas
2021-12-20 21:38 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 26/38] kasan, vmalloc: don't unpoison VM_ALLOC pages before mapping andrey.konovalov
2021-12-16 19:07 ` Alexander Potapenko
2021-12-20 21:35 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 27/38] kasan, page_alloc: allow skipping unpoisoning for HW_TAGS andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 28/38] kasan, page_alloc: allow skipping memory init " andrey.konovalov
2021-12-14 18:00 ` Marco Elver
2021-12-14 18:28 ` Andrey Konovalov
2021-12-17 1:50 ` Kuan-Ying Lee
2021-12-20 21:35 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 29/38] kasan, vmalloc: add vmalloc tagging " andrey.konovalov
2021-12-14 19:55 ` Marco Elver
2021-12-14 22:08 ` Andrey Konovalov
2021-12-14 21:03 ` Marco Elver
2021-12-13 21:54 ` [PATCH mm v3 30/38] kasan, vmalloc: don't tag executable vmalloc allocations andrey.konovalov
2021-12-14 19:42 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 31/38] kasan, arm64: " andrey.konovalov
2021-12-13 21:59 ` Andrey Konovalov
2021-12-17 13:45 ` Catalin Marinas
2021-12-13 21:54 ` [PATCH mm v3 32/38] kasan: mark kasan_arg_stacktrace as __initdata andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 33/38] kasan: simplify kasan_init_hw_tags andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 34/38] kasan: add kasan.vmalloc command line flag andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 35/38] kasan: allow enabling KASAN_VMALLOC and SW/HW_TAGS andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 36/38] arm64: select KASAN_VMALLOC for SW/HW_TAGS modes andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 37/38] kasan: documentation updates andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 38/38] kasan: improve vmalloc tests andrey.konovalov
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=YbjQNdst07JqbG0j@arm.com \
--to=catalin.marinas@arm.com \
--cc=akpm@linux-foundation.org \
--cc=andrey.konovalov@linux.dev \
--cc=andreyknvl@gmail.com \
--cc=andreyknvl@google.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mark.rutland@arm.com \
--cc=pcc@google.com \
--cc=ryabinin.a.a@gmail.com \
--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: 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).