From: andrey.konovalov@linux.dev To: Marco Elver <elver@google.com>, Alexander Potapenko <glider@google.com>, Andrew Morton <akpm@linux-foundation.org> Cc: 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>, Catalin Marinas <catalin.marinas@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: [PATCH mm v3 19/38] kasan: reorder vmalloc hooks Date: Mon, 13 Dec 2021 22:53:09 +0100 [thread overview] Message-ID: <15eeaed5bb807dba36e36d17a1d549df8e2b752e.1639432170.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1639432170.git.andreyknvl@google.com> From: Andrey Konovalov <andreyknvl@google.com> Group functions that [de]populate shadow memory for vmalloc. Group functions that [un]poison memory for vmalloc. This patch does no functional changes but prepares KASAN code for adding vmalloc support to HW_TAGS KASAN. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- include/linux/kasan.h | 20 +++++++++----------- mm/kasan/shadow.c | 43 ++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 55f1d4edf6b5..46a63374c86f 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -418,34 +418,32 @@ static inline void kasan_init_hw_tags(void) { } #ifdef CONFIG_KASAN_VMALLOC +void kasan_populate_early_vm_area_shadow(void *start, unsigned long size); int kasan_populate_vmalloc(unsigned long addr, unsigned long size); -void kasan_poison_vmalloc(const void *start, unsigned long size); -void kasan_unpoison_vmalloc(const void *start, unsigned long size); void kasan_release_vmalloc(unsigned long start, unsigned long end, unsigned long free_region_start, unsigned long free_region_end); -void kasan_populate_early_vm_area_shadow(void *start, unsigned long size); +void kasan_unpoison_vmalloc(const void *start, unsigned long size); +void kasan_poison_vmalloc(const void *start, unsigned long size); #else /* CONFIG_KASAN_VMALLOC */ +static inline void kasan_populate_early_vm_area_shadow(void *start, + unsigned long size) { } static inline int kasan_populate_vmalloc(unsigned long start, unsigned long size) { return 0; } - -static inline void kasan_poison_vmalloc(const void *start, unsigned long size) -{ } -static inline void kasan_unpoison_vmalloc(const void *start, unsigned long size) -{ } static inline void kasan_release_vmalloc(unsigned long start, unsigned long end, unsigned long free_region_start, - unsigned long free_region_end) {} + unsigned long free_region_end) { } -static inline void kasan_populate_early_vm_area_shadow(void *start, - unsigned long size) +static inline void kasan_unpoison_vmalloc(const void *start, unsigned long size) +{ } +static inline void kasan_poison_vmalloc(const void *start, unsigned long size) { } #endif /* CONFIG_KASAN_VMALLOC */ diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index e5c4393eb861..bf7ab62fbfb9 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -345,27 +345,6 @@ int kasan_populate_vmalloc(unsigned long addr, unsigned long size) return 0; } -/* - * Poison the shadow for a vmalloc region. Called as part of the - * freeing process at the time the region is freed. - */ -void kasan_poison_vmalloc(const void *start, unsigned long size) -{ - if (!is_vmalloc_or_module_addr(start)) - return; - - size = round_up(size, KASAN_GRANULE_SIZE); - kasan_poison(start, size, KASAN_VMALLOC_INVALID, false); -} - -void kasan_unpoison_vmalloc(const void *start, unsigned long size) -{ - if (!is_vmalloc_or_module_addr(start)) - return; - - kasan_unpoison(start, size, false); -} - static int kasan_depopulate_vmalloc_pte(pte_t *ptep, unsigned long addr, void *unused) { @@ -496,6 +475,28 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, } } + +void kasan_unpoison_vmalloc(const void *start, unsigned long size) +{ + if (!is_vmalloc_or_module_addr(start)) + return; + + kasan_unpoison(start, size, false); +} + +/* + * Poison the shadow for a vmalloc region. Called as part of the + * freeing process at the time the region is freed. + */ +void kasan_poison_vmalloc(const void *start, unsigned long size) +{ + if (!is_vmalloc_or_module_addr(start)) + return; + + size = round_up(size, KASAN_GRANULE_SIZE); + kasan_poison(start, size, KASAN_VMALLOC_INVALID, false); +} + #else /* CONFIG_KASAN_VMALLOC */ int kasan_alloc_module_shadow(void *addr, size_t size, gfp_t gfp_mask) -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: andrey.konovalov@linux.dev To: Marco Elver <elver@google.com>, Alexander Potapenko <glider@google.com>, Andrew Morton <akpm@linux-foundation.org> Cc: 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>, Catalin Marinas <catalin.marinas@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: [PATCH mm v3 19/38] kasan: reorder vmalloc hooks Date: Mon, 13 Dec 2021 22:53:09 +0100 [thread overview] Message-ID: <15eeaed5bb807dba36e36d17a1d549df8e2b752e.1639432170.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1639432170.git.andreyknvl@google.com> From: Andrey Konovalov <andreyknvl@google.com> Group functions that [de]populate shadow memory for vmalloc. Group functions that [un]poison memory for vmalloc. This patch does no functional changes but prepares KASAN code for adding vmalloc support to HW_TAGS KASAN. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- include/linux/kasan.h | 20 +++++++++----------- mm/kasan/shadow.c | 43 ++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 55f1d4edf6b5..46a63374c86f 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -418,34 +418,32 @@ static inline void kasan_init_hw_tags(void) { } #ifdef CONFIG_KASAN_VMALLOC +void kasan_populate_early_vm_area_shadow(void *start, unsigned long size); int kasan_populate_vmalloc(unsigned long addr, unsigned long size); -void kasan_poison_vmalloc(const void *start, unsigned long size); -void kasan_unpoison_vmalloc(const void *start, unsigned long size); void kasan_release_vmalloc(unsigned long start, unsigned long end, unsigned long free_region_start, unsigned long free_region_end); -void kasan_populate_early_vm_area_shadow(void *start, unsigned long size); +void kasan_unpoison_vmalloc(const void *start, unsigned long size); +void kasan_poison_vmalloc(const void *start, unsigned long size); #else /* CONFIG_KASAN_VMALLOC */ +static inline void kasan_populate_early_vm_area_shadow(void *start, + unsigned long size) { } static inline int kasan_populate_vmalloc(unsigned long start, unsigned long size) { return 0; } - -static inline void kasan_poison_vmalloc(const void *start, unsigned long size) -{ } -static inline void kasan_unpoison_vmalloc(const void *start, unsigned long size) -{ } static inline void kasan_release_vmalloc(unsigned long start, unsigned long end, unsigned long free_region_start, - unsigned long free_region_end) {} + unsigned long free_region_end) { } -static inline void kasan_populate_early_vm_area_shadow(void *start, - unsigned long size) +static inline void kasan_unpoison_vmalloc(const void *start, unsigned long size) +{ } +static inline void kasan_poison_vmalloc(const void *start, unsigned long size) { } #endif /* CONFIG_KASAN_VMALLOC */ diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index e5c4393eb861..bf7ab62fbfb9 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -345,27 +345,6 @@ int kasan_populate_vmalloc(unsigned long addr, unsigned long size) return 0; } -/* - * Poison the shadow for a vmalloc region. Called as part of the - * freeing process at the time the region is freed. - */ -void kasan_poison_vmalloc(const void *start, unsigned long size) -{ - if (!is_vmalloc_or_module_addr(start)) - return; - - size = round_up(size, KASAN_GRANULE_SIZE); - kasan_poison(start, size, KASAN_VMALLOC_INVALID, false); -} - -void kasan_unpoison_vmalloc(const void *start, unsigned long size) -{ - if (!is_vmalloc_or_module_addr(start)) - return; - - kasan_unpoison(start, size, false); -} - static int kasan_depopulate_vmalloc_pte(pte_t *ptep, unsigned long addr, void *unused) { @@ -496,6 +475,28 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, } } + +void kasan_unpoison_vmalloc(const void *start, unsigned long size) +{ + if (!is_vmalloc_or_module_addr(start)) + return; + + kasan_unpoison(start, size, false); +} + +/* + * Poison the shadow for a vmalloc region. Called as part of the + * freeing process at the time the region is freed. + */ +void kasan_poison_vmalloc(const void *start, unsigned long size) +{ + if (!is_vmalloc_or_module_addr(start)) + return; + + size = round_up(size, KASAN_GRANULE_SIZE); + kasan_poison(start, size, KASAN_VMALLOC_INVALID, false); +} + #else /* CONFIG_KASAN_VMALLOC */ int kasan_alloc_module_shadow(void *addr, size_t size, gfp_t gfp_mask) -- 2.25.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:[~2021-12-13 21:54 UTC|newest] Thread overview: 128+ 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 ` 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 ` 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 ` 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 ` 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-13 21:51 ` andrey.konovalov 2021-12-16 12:54 ` Alexander Potapenko 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 ` 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 ` andrey.konovalov 2021-12-13 21:51 ` [PATCH mm v3 07/38] mm: clarify __GFP_ZEROTAGS comment andrey.konovalov 2021-12-13 21:51 ` 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 ` 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-13 21:51 ` andrey.konovalov 2021-12-16 13:32 ` Alexander Potapenko 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:51 ` 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-13 21:53 ` andrey.konovalov 2021-12-16 13:04 ` Alexander Potapenko 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 ` andrey.konovalov 2021-12-13 21:53 ` [PATCH mm v3 13/38] kasan, page_alloc: move kernel_init_free_pages " andrey.konovalov 2021-12-13 21:53 ` andrey.konovalov 2021-12-16 11:00 ` Alexander Potapenko 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 ` andrey.konovalov 2021-12-13 21:53 ` [PATCH mm v3 15/38] kasan: clean up metadata byte definitions andrey.konovalov 2021-12-13 21:53 ` andrey.konovalov 2021-12-16 10:52 ` Alexander Potapenko 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 ` 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 ` andrey.konovalov 2021-12-13 21:53 ` [PATCH mm v3 18/38] kasan, vmalloc: drop outdated VM_KASAN comment andrey.konovalov 2021-12-13 21:53 ` andrey.konovalov 2021-12-16 10:53 ` Alexander Potapenko 2021-12-16 10:53 ` Alexander Potapenko 2021-12-13 21:53 ` andrey.konovalov [this message] 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-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 ` 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:53 ` 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 ` andrey.konovalov 2021-12-13 21:54 ` [PATCH mm v3 23/38] kasan, arm64: " andrey.konovalov 2021-12-13 21:54 ` andrey.konovalov 2021-12-13 21:59 ` Andrey Konovalov 2021-12-13 21:59 ` Andrey Konovalov 2021-12-14 13:25 ` Catalin Marinas 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 ` 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-13 21:54 ` andrey.konovalov 2021-12-14 17:11 ` Catalin Marinas 2021-12-14 17:11 ` Catalin Marinas 2021-12-14 18:27 ` Andrey Konovalov 2021-12-14 18:27 ` Andrey Konovalov 2021-12-14 19:27 ` Catalin Marinas 2021-12-14 19:27 ` Catalin Marinas 2021-12-20 21:38 ` Andrey Konovalov 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-13 21:54 ` andrey.konovalov 2021-12-16 19:07 ` Alexander Potapenko 2021-12-16 19:07 ` Alexander Potapenko 2021-12-20 21:35 ` Andrey Konovalov 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 ` andrey.konovalov 2021-12-13 21:54 ` [PATCH mm v3 28/38] kasan, page_alloc: allow skipping memory init " andrey.konovalov 2021-12-13 21:54 ` andrey.konovalov 2021-12-14 18:00 ` Marco Elver 2021-12-14 18:00 ` Marco Elver 2021-12-14 18:28 ` Andrey Konovalov 2021-12-14 18:28 ` Andrey Konovalov 2021-12-17 1:50 ` Kuan-Ying Lee 2021-12-17 1:50 ` Kuan-Ying Lee 2021-12-20 21:35 ` Andrey Konovalov 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-13 21:54 ` andrey.konovalov 2021-12-14 19:55 ` Marco Elver 2021-12-14 19:55 ` Marco Elver 2021-12-14 22:08 ` Andrey Konovalov 2021-12-14 22:08 ` Andrey Konovalov 2021-12-14 21:03 ` Marco Elver 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-13 21:54 ` andrey.konovalov 2021-12-14 19:42 ` 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:54 ` andrey.konovalov 2021-12-13 21:59 ` Andrey Konovalov 2021-12-13 21:59 ` Andrey Konovalov 2021-12-17 13:45 ` Catalin Marinas 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:54 ` 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 ` 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 ` 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 ` 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 ` andrey.konovalov 2021-12-13 21:55 ` [PATCH mm v3 37/38] kasan: documentation updates andrey.konovalov 2021-12-13 21:55 ` andrey.konovalov 2021-12-13 21:55 ` [PATCH mm v3 38/38] kasan: improve vmalloc tests andrey.konovalov 2021-12-13 21:55 ` 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=15eeaed5bb807dba36e36d17a1d549df8e2b752e.1639432170.git.andreyknvl@google.com \ --to=andrey.konovalov@linux.dev \ --cc=akpm@linux-foundation.org \ --cc=andreyknvl@gmail.com \ --cc=andreyknvl@google.com \ --cc=catalin.marinas@arm.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: 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.