From: Andrey Konovalov <andreyknvl@google.com>
To: Dmitry Vyukov <dvyukov@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
kasan-dev@googlegroups.com
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>,
Evgenii Stepanov <eugenis@google.com>,
Elena Petrova <lenaptr@google.com>,
Branislav Rankov <Branislav.Rankov@arm.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Will Deacon <will.deacon@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v4 03/39] kasan: group vmalloc code
Date: Fri, 2 Oct 2020 01:10:04 +0200 [thread overview]
Message-ID: <cfdad0fc55c5a8b3a879627e2d20a0459a35af3f.1601593784.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1601593784.git.andreyknvl@google.com>
This is a preparatory commit for the upcoming addition of a new hardware
tag-based (MTE-based) KASAN mode.
Group all vmalloc-related function declarations in include/linux/kasan.h,
and their implementations in mm/kasan/common.c.
No functional changes.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Marco Elver <elver@google.com>
---
Change-Id: Ie20b6c689203cd6de4fd7f2c465ec081c00c5f15
---
include/linux/kasan.h | 41 +++++++++++++----------
mm/kasan/common.c | 78 ++++++++++++++++++++++---------------------
2 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index 087fba34b209..bd5b4965a269 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -69,19 +69,6 @@ struct kasan_cache {
int free_meta_offset;
};
-/*
- * 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.
- */
-#ifndef CONFIG_KASAN_VMALLOC
-int kasan_module_alloc(void *addr, size_t size);
-void kasan_free_shadow(const struct vm_struct *vm);
-#else
-static inline int kasan_module_alloc(void *addr, size_t size) { return 0; }
-static inline void kasan_free_shadow(const struct vm_struct *vm) {}
-#endif
-
int kasan_add_zero_shadow(void *start, unsigned long size);
void kasan_remove_zero_shadow(void *start, unsigned long size);
@@ -150,9 +137,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object,
return false;
}
-static inline int kasan_module_alloc(void *addr, size_t size) { return 0; }
-static inline void kasan_free_shadow(const struct vm_struct *vm) {}
-
static inline int kasan_add_zero_shadow(void *start, unsigned long size)
{
return 0;
@@ -205,13 +189,16 @@ static inline void *kasan_reset_tag(const void *addr)
#endif /* CONFIG_KASAN_SW_TAGS */
#ifdef CONFIG_KASAN_VMALLOC
+
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);
-#else
+
+#else /* CONFIG_KASAN_VMALLOC */
+
static inline int kasan_populate_vmalloc(unsigned long start,
unsigned long size)
{
@@ -226,7 +213,25 @@ static inline void kasan_release_vmalloc(unsigned long start,
unsigned long end,
unsigned long free_region_start,
unsigned long free_region_end) {}
-#endif
+
+#endif /* CONFIG_KASAN_VMALLOC */
+
+#if defined(CONFIG_KASAN) && !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.
+ */
+int kasan_module_alloc(void *addr, size_t size);
+void kasan_free_shadow(const struct vm_struct *vm);
+
+#else /* CONFIG_KASAN && !CONFIG_KASAN_VMALLOC */
+
+static inline int kasan_module_alloc(void *addr, size_t size) { return 0; }
+static inline void kasan_free_shadow(const struct vm_struct *vm) {}
+
+#endif /* CONFIG_KASAN && !CONFIG_KASAN_VMALLOC */
#ifdef CONFIG_KASAN_INLINE
void kasan_non_canonical_hook(unsigned long addr);
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 33d863f55db1..89e5ef9417a7 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -536,44 +536,6 @@ void kasan_kfree_large(void *ptr, unsigned long ip)
/* The object will be poisoned by page_alloc. */
}
-#ifndef CONFIG_KASAN_VMALLOC
-int kasan_module_alloc(void *addr, size_t size)
-{
- void *ret;
- size_t scaled_size;
- size_t shadow_size;
- unsigned long shadow_start;
-
- shadow_start = (unsigned long)kasan_mem_to_shadow(addr);
- scaled_size = (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_SHIFT;
- shadow_size = round_up(scaled_size, PAGE_SIZE);
-
- if (WARN_ON(!PAGE_ALIGNED(shadow_start)))
- return -EINVAL;
-
- ret = __vmalloc_node_range(shadow_size, 1, shadow_start,
- shadow_start + shadow_size,
- GFP_KERNEL,
- PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE,
- __builtin_return_address(0));
-
- if (ret) {
- __memset(ret, KASAN_SHADOW_INIT, shadow_size);
- find_vm_area(addr)->flags |= VM_KASAN;
- kmemleak_ignore(ret);
- return 0;
- }
-
- return -ENOMEM;
-}
-
-void kasan_free_shadow(const struct vm_struct *vm)
-{
- if (vm->flags & VM_KASAN)
- vfree(kasan_mem_to_shadow(vm->addr));
-}
-#endif
-
#ifdef CONFIG_MEMORY_HOTPLUG
static bool shadow_mapped(unsigned long addr)
{
@@ -685,6 +647,7 @@ core_initcall(kasan_memhotplug_init);
#endif
#ifdef CONFIG_KASAN_VMALLOC
+
static int kasan_populate_vmalloc_pte(pte_t *ptep, unsigned long addr,
void *unused)
{
@@ -923,4 +886,43 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end,
(unsigned long)shadow_end);
}
}
+
+#else /* CONFIG_KASAN_VMALLOC */
+
+int kasan_module_alloc(void *addr, size_t size)
+{
+ void *ret;
+ size_t scaled_size;
+ size_t shadow_size;
+ unsigned long shadow_start;
+
+ shadow_start = (unsigned long)kasan_mem_to_shadow(addr);
+ scaled_size = (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_SHIFT;
+ shadow_size = round_up(scaled_size, PAGE_SIZE);
+
+ if (WARN_ON(!PAGE_ALIGNED(shadow_start)))
+ return -EINVAL;
+
+ ret = __vmalloc_node_range(shadow_size, 1, shadow_start,
+ shadow_start + shadow_size,
+ GFP_KERNEL,
+ PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE,
+ __builtin_return_address(0));
+
+ if (ret) {
+ __memset(ret, KASAN_SHADOW_INIT, shadow_size);
+ find_vm_area(addr)->flags |= VM_KASAN;
+ kmemleak_ignore(ret);
+ return 0;
+ }
+
+ return -ENOMEM;
+}
+
+void kasan_free_shadow(const struct vm_struct *vm)
+{
+ if (vm->flags & VM_KASAN)
+ vfree(kasan_mem_to_shadow(vm->addr));
+}
+
#endif
--
2.28.0.709.gb0816b6eb0-goog
next prev parent reply other threads:[~2020-10-01 23:10 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 23:10 [PATCH v4 00/39] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 01/39] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 02/39] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-10-01 23:10 ` Andrey Konovalov [this message]
2020-10-01 23:10 ` [PATCH v4 04/39] kasan: shadow declarations only for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 05/39] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 06/39] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 07/39] kasan: only build init.c for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 08/39] kasan: split out shadow.c from common.c Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 09/39] kasan: define KASAN_GRANULE_PAGE Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 10/39] kasan: rename report and tags files Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 11/39] kasan: don't duplicate config dependencies Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 12/39] kasan: hide invalid free check implementation Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 13/39] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 14/39] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 15/39] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 16/39] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 17/39] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 18/39] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 19/39] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 20/39] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 21/39] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 22/39] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 23/39] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 24/39] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-10-02 13:51 ` Catalin Marinas
2020-10-01 23:10 ` [PATCH v4 25/39] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 26/39] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 27/39] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-10-02 14:00 ` Catalin Marinas
2020-10-01 23:10 ` [PATCH v4 28/39] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 29/39] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-10-02 14:06 ` Catalin Marinas
2020-10-08 18:24 ` Vincenzo Frascino
2020-10-09 8:11 ` Catalin Marinas
2020-10-09 9:56 ` Vincenzo Frascino
2020-10-09 10:16 ` Catalin Marinas
2020-10-09 10:21 ` Vincenzo Frascino
2020-10-01 23:10 ` [PATCH v4 30/39] arm64: kasan: Enable TBI EL1 Andrey Konovalov
2020-10-02 14:10 ` Catalin Marinas
2020-10-01 23:10 ` [PATCH v4 31/39] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 32/39] kasan: define KASAN_GRANULE_SIZE " Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 33/39] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 34/39] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 35/39] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 36/39] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 37/39] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 38/39] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 39/39] kasan: add documentation for hardware tag-based mode 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=cfdad0fc55c5a8b3a879627e2d20a0459a35af3f.1601593784.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Branislav.Rankov@arm.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.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=kevin.brodsky@arm.com \
--cc=lenaptr@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=vincenzo.frascino@arm.com \
--cc=will.deacon@arm.com \
/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).