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 v4 17/39] kasan, x86, arm64, s390: rename functions for modules shadow
Date: Mon, 20 Dec 2021 22:59:32 +0100 [thread overview]
Message-ID: <84de4863847a3aa21e2b6e9f64683d05a4f0c773.1640036051.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1640036051.git.andreyknvl@google.com>
From: Andrey Konovalov <andreyknvl@google.com>
Rename kasan_free_shadow to kasan_free_module_shadow and
kasan_module_alloc to kasan_alloc_module_shadow.
These functions are used to allocate/free shadow memory for kernel
modules when KASAN_VMALLOC is not enabled. The new names better
reflect their purpose.
Also reword the comment next to their declaration to improve clarity.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/kernel/module.c | 2 +-
arch/s390/kernel/module.c | 2 +-
arch/x86/kernel/module.c | 2 +-
include/linux/kasan.h | 14 +++++++-------
mm/kasan/shadow.c | 4 ++--
mm/vmalloc.c | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c
index 309a27553c87..d3a1fa818348 100644
--- a/arch/arm64/kernel/module.c
+++ b/arch/arm64/kernel/module.c
@@ -58,7 +58,7 @@ void *module_alloc(unsigned long size)
PAGE_KERNEL, 0, NUMA_NO_NODE,
__builtin_return_address(0));
- if (p && (kasan_module_alloc(p, size, gfp_mask) < 0)) {
+ if (p && (kasan_alloc_module_shadow(p, size, gfp_mask) < 0)) {
vfree(p);
return NULL;
}
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index d52d85367bf7..b16bebd9a8b9 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -45,7 +45,7 @@ void *module_alloc(unsigned long size)
p = __vmalloc_node_range(size, MODULE_ALIGN, MODULES_VADDR, MODULES_END,
gfp_mask, PAGE_KERNEL_EXEC, VM_DEFER_KMEMLEAK, NUMA_NO_NODE,
__builtin_return_address(0));
- if (p && (kasan_module_alloc(p, size, gfp_mask) < 0)) {
+ if (p && (kasan_alloc_module_shadow(p, size, gfp_mask) < 0)) {
vfree(p);
return NULL;
}
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index 95fa745e310a..c9eb8aa3b7b8 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -78,7 +78,7 @@ void *module_alloc(unsigned long size)
MODULES_END, gfp_mask,
PAGE_KERNEL, VM_DEFER_KMEMLEAK, NUMA_NO_NODE,
__builtin_return_address(0));
- if (p && (kasan_module_alloc(p, size, gfp_mask) < 0)) {
+ if (p && (kasan_alloc_module_shadow(p, size, gfp_mask) < 0)) {
vfree(p);
return NULL;
}
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index b88ca6b97ba3..55f1d4edf6b5 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -454,17 +454,17 @@ static inline void kasan_populate_early_vm_area_shadow(void *start,
!defined(CONFIG_KASAN_VMALLOC)
/*
- * These functions provide a special case to support backing module
- * allocations with real shadow memory. With KASAN vmalloc, the special
- * case is unnecessary, as the work is handled in the generic case.
+ * These functions allocate and free shadow memory for kernel modules.
+ * They are only required when KASAN_VMALLOC is not supported, as otherwise
+ * shadow memory is allocated by the generic vmalloc handlers.
*/
-int kasan_module_alloc(void *addr, size_t size, gfp_t gfp_mask);
-void kasan_free_shadow(const struct vm_struct *vm);
+int kasan_alloc_module_shadow(void *addr, size_t size, gfp_t gfp_mask);
+void kasan_free_module_shadow(const struct vm_struct *vm);
#else /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */
-static inline int kasan_module_alloc(void *addr, size_t size, gfp_t gfp_mask) { return 0; }
-static inline void kasan_free_shadow(const struct vm_struct *vm) {}
+static inline int kasan_alloc_module_shadow(void *addr, size_t size, gfp_t gfp_mask) { return 0; }
+static inline void kasan_free_module_shadow(const struct vm_struct *vm) {}
#endif /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */
diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c
index 94136f84b449..e5c4393eb861 100644
--- a/mm/kasan/shadow.c
+++ b/mm/kasan/shadow.c
@@ -498,7 +498,7 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end,
#else /* CONFIG_KASAN_VMALLOC */
-int kasan_module_alloc(void *addr, size_t size, gfp_t gfp_mask)
+int kasan_alloc_module_shadow(void *addr, size_t size, gfp_t gfp_mask)
{
void *ret;
size_t scaled_size;
@@ -534,7 +534,7 @@ int kasan_module_alloc(void *addr, size_t size, gfp_t gfp_mask)
return -ENOMEM;
}
-void kasan_free_shadow(const struct vm_struct *vm)
+void kasan_free_module_shadow(const struct vm_struct *vm)
{
if (vm->flags & VM_KASAN)
vfree(kasan_mem_to_shadow(vm->addr));
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index eb6e527a6b77..10011a07231d 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2525,7 +2525,7 @@ struct vm_struct *remove_vm_area(const void *addr)
va->vm = NULL;
spin_unlock(&vmap_area_lock);
- kasan_free_shadow(vm);
+ kasan_free_module_shadow(vm);
free_unmap_vmap_area(va);
return vm;
--
2.25.1
next prev parent reply other threads:[~2021-12-20 22:00 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-20 21:58 [PATCH mm v4 00/39] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 01/39] kasan, page_alloc: deduplicate should_skip_kasan_poison andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 02/39] kasan, page_alloc: move tag_clear_highpage out of kernel_init_free_pages andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 03/39] kasan, page_alloc: merge kasan_free_pages into free_pages_prepare andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 04/39] kasan, page_alloc: simplify kasan_poison_pages call site andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 05/39] kasan, page_alloc: init memory of skipped pages on free andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 06/39] kasan: drop skip_kasan_poison variable in free_pages_prepare andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 07/39] mm: clarify __GFP_ZEROTAGS comment andrey.konovalov
2021-12-21 9:16 ` Alexander Potapenko
2021-12-30 19:11 ` Andrey Konovalov
2021-12-20 21:58 ` [PATCH mm v4 08/39] kasan: only apply __GFP_ZEROTAGS when memory is zeroed andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 09/39] kasan, page_alloc: refactor init checks in post_alloc_hook andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 10/39] kasan, page_alloc: merge kasan_alloc_pages into post_alloc_hook andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 11/39] kasan, page_alloc: combine tag_clear_highpage calls in post_alloc_hook andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 12/39] kasan, page_alloc: move SetPageSkipKASanPoison " andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 13/39] kasan, page_alloc: move kernel_init_free_pages " andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 14/39] kasan, page_alloc: rework kasan_unpoison_pages call site andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 15/39] kasan: clean up metadata byte definitions andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 16/39] kasan: define KASAN_VMALLOC_INVALID for SW_TAGS andrey.konovalov
2021-12-21 9:23 ` Alexander Potapenko
2021-12-20 21:59 ` andrey.konovalov [this message]
2021-12-20 21:59 ` [PATCH mm v4 18/39] kasan, vmalloc: drop outdated VM_KASAN comment andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 19/39] kasan: reorder vmalloc hooks andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 20/39] kasan: add wrappers for " andrey.konovalov
2021-12-21 14:21 ` Alexander Potapenko
2021-12-20 21:59 ` [PATCH mm v4 21/39] kasan, vmalloc: reset tags in vmalloc functions andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 22/39] kasan, fork: reset pointer tags of vmapped stacks andrey.konovalov
2021-12-21 15:11 ` Alexander Potapenko
2021-12-20 22:01 ` [PATCH mm v4 23/39] kasan, arm64: " andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 24/39] kasan, vmalloc: add vmalloc tagging for SW_TAGS andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 25/39] kasan, vmalloc, arm64: mark vmalloc mappings as pgprot_tagged andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 26/39] kasan, vmalloc: unpoison VM_ALLOC pages after mapping andrey.konovalov
2021-12-21 11:50 ` Alexander Potapenko
2021-12-20 22:01 ` [PATCH mm v4 27/39] kasan, mm: only define ___GFP_SKIP_KASAN_POISON with HW_TAGS andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 28/39] kasan, page_alloc: allow skipping unpoisoning for HW_TAGS andrey.konovalov
2021-12-21 12:04 ` Marco Elver
2021-12-30 19:11 ` Andrey Konovalov
2021-12-21 12:14 ` Marco Elver
2021-12-21 12:19 ` Marco Elver
2021-12-20 22:02 ` [PATCH mm v4 29/39] kasan, page_alloc: allow skipping memory init " andrey.konovalov
2021-12-21 12:11 ` Marco Elver
2021-12-30 19:11 ` Andrey Konovalov
2021-12-21 12:30 ` Marco Elver
2021-12-30 19:11 ` Andrey Konovalov
2021-12-20 22:02 ` [PATCH mm v4 30/39] kasan, vmalloc: add vmalloc tagging " andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 31/39] kasan, vmalloc: only tag normal vmalloc allocations andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 32/39] kasan, arm64: don't tag executable " andrey.konovalov
2021-12-20 22:05 ` Andrey Konovalov
2021-12-22 11:11 ` Catalin Marinas
2021-12-20 22:02 ` [PATCH mm v4 33/39] kasan: mark kasan_arg_stacktrace as __initdata andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 34/39] kasan: simplify kasan_init_hw_tags andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 35/39] kasan: add kasan.vmalloc command line flag andrey.konovalov
2021-12-21 14:43 ` Alexander Potapenko
2021-12-30 19:11 ` Andrey Konovalov
2021-12-20 22:03 ` [PATCH mm v4 36/39] kasan: allow enabling KASAN_VMALLOC and SW/HW_TAGS andrey.konovalov
2021-12-20 22:03 ` [PATCH mm v4 37/39] arm64: select KASAN_VMALLOC for SW/HW_TAGS modes andrey.konovalov
2021-12-20 22:03 ` [PATCH mm v4 38/39] kasan: documentation updates andrey.konovalov
2021-12-20 22:03 ` [PATCH mm v4 39/39] kasan: improve vmalloc tests andrey.konovalov
2021-12-22 7:00 ` [PATCH mm v4 00/39] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS Marco Elver
2021-12-30 19:11 ` 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=84de4863847a3aa21e2b6e9f64683d05a4f0c773.1640036051.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: 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