From: Andrey Konovalov <andreyknvl@google.com> To: Dmitry Vyukov <dvyukov@google.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com> Cc: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Evgenii Stepanov <eugenis@google.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Branislav Rankov <Branislav.Rankov@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Andrew Morton <akpm@linux-foundation.org>, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v2 09/20] kasan: inline kasan_poison_memory and check_invalid_free Date: Tue, 10 Nov 2020 23:20:13 +0100 [thread overview] Message-ID: <e14ac53d7c43b4381ad94665c63a154dffc04b6b.1605046662.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1605046662.git.andreyknvl@google.com> Using kasan_poison_memory() or check_invalid_free() currently results in function calls. Move their definitions to mm/kasan/kasan.h and turn them into static inline functions for hardware tag-based mode to avoid unneeded function calls. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Reviewed-by: Dmitry Vyukov <dvyukov@google.com> Link: https://linux-review.googlesource.com/id/Ia9d8191024a12d1374675b3d27197f10193f50bb --- mm/kasan/hw_tags.c | 15 --------------- mm/kasan/kasan.h | 28 ++++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 1476ac07666e..0303e49904b4 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -30,27 +30,12 @@ void kasan_init_hw_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void kasan_poison_memory(const void *address, size_t size, u8 value) -{ - hw_set_mem_tag_range(kasan_reset_tag(address), - round_up(size, KASAN_GRANULE_SIZE), value); -} - void kasan_unpoison_memory(const void *address, size_t size) { hw_set_mem_tag_range(kasan_reset_tag(address), round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -bool check_invalid_free(void *addr) -{ - u8 ptr_tag = get_tag(addr); - u8 mem_tag = hw_get_mem_tag(addr); - - return (mem_tag == KASAN_TAG_INVALID) || - (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); -} - void kasan_set_free_info(struct kmem_cache *cache, void *object, u8 tag) { diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 7498839a15d3..ab7314418604 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -153,8 +153,6 @@ struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, const void *object); -void kasan_poison_memory(const void *address, size_t size, u8 value); - #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) static inline const void *kasan_shadow_to_mem(const void *shadow_addr) @@ -194,8 +192,6 @@ void print_tags(u8 addr_tag, const void *addr); static inline void print_tags(u8 addr_tag, const void *addr) { } #endif -bool check_invalid_free(void *addr); - void *find_first_bad_addr(void *addr, size_t size); const char *get_bug_type(struct kasan_access_info *info); void metadata_fetch_row(char *buffer, void *row); @@ -279,6 +275,30 @@ static inline u8 random_tag(void) } #endif +#ifdef CONFIG_KASAN_HW_TAGS + +static inline void kasan_poison_memory(const void *address, size_t size, u8 value) +{ + hw_set_mem_tag_range(kasan_reset_tag(address), + round_up(size, KASAN_GRANULE_SIZE), value); +} + +static inline bool check_invalid_free(void *addr) +{ + u8 ptr_tag = get_tag(addr); + u8 mem_tag = hw_get_mem_tag(addr); + + return (mem_tag == KASAN_TAG_INVALID) || + (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); +} + +#else /* CONFIG_KASAN_HW_TAGS */ + +void kasan_poison_memory(const void *address, size_t size, u8 value); +bool check_invalid_free(void *addr); + +#endif /* CONFIG_KASAN_HW_TAGS */ + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations. -- 2.29.2.222.g5d2a92d10f8-goog
WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com> To: Dmitry Vyukov <dvyukov@google.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com> Cc: Branislav Rankov <Branislav.Rankov@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Will Deacon <will.deacon@arm.com>, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Andrey Konovalov <andreyknvl@google.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Andrew Morton <akpm@linux-foundation.org>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Evgenii Stepanov <eugenis@google.com> Subject: [PATCH v2 09/20] kasan: inline kasan_poison_memory and check_invalid_free Date: Tue, 10 Nov 2020 23:20:13 +0100 [thread overview] Message-ID: <e14ac53d7c43b4381ad94665c63a154dffc04b6b.1605046662.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1605046662.git.andreyknvl@google.com> Using kasan_poison_memory() or check_invalid_free() currently results in function calls. Move their definitions to mm/kasan/kasan.h and turn them into static inline functions for hardware tag-based mode to avoid unneeded function calls. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Reviewed-by: Dmitry Vyukov <dvyukov@google.com> Link: https://linux-review.googlesource.com/id/Ia9d8191024a12d1374675b3d27197f10193f50bb --- mm/kasan/hw_tags.c | 15 --------------- mm/kasan/kasan.h | 28 ++++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 1476ac07666e..0303e49904b4 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -30,27 +30,12 @@ void kasan_init_hw_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void kasan_poison_memory(const void *address, size_t size, u8 value) -{ - hw_set_mem_tag_range(kasan_reset_tag(address), - round_up(size, KASAN_GRANULE_SIZE), value); -} - void kasan_unpoison_memory(const void *address, size_t size) { hw_set_mem_tag_range(kasan_reset_tag(address), round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -bool check_invalid_free(void *addr) -{ - u8 ptr_tag = get_tag(addr); - u8 mem_tag = hw_get_mem_tag(addr); - - return (mem_tag == KASAN_TAG_INVALID) || - (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); -} - void kasan_set_free_info(struct kmem_cache *cache, void *object, u8 tag) { diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 7498839a15d3..ab7314418604 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -153,8 +153,6 @@ struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, const void *object); -void kasan_poison_memory(const void *address, size_t size, u8 value); - #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) static inline const void *kasan_shadow_to_mem(const void *shadow_addr) @@ -194,8 +192,6 @@ void print_tags(u8 addr_tag, const void *addr); static inline void print_tags(u8 addr_tag, const void *addr) { } #endif -bool check_invalid_free(void *addr); - void *find_first_bad_addr(void *addr, size_t size); const char *get_bug_type(struct kasan_access_info *info); void metadata_fetch_row(char *buffer, void *row); @@ -279,6 +275,30 @@ static inline u8 random_tag(void) } #endif +#ifdef CONFIG_KASAN_HW_TAGS + +static inline void kasan_poison_memory(const void *address, size_t size, u8 value) +{ + hw_set_mem_tag_range(kasan_reset_tag(address), + round_up(size, KASAN_GRANULE_SIZE), value); +} + +static inline bool check_invalid_free(void *addr) +{ + u8 ptr_tag = get_tag(addr); + u8 mem_tag = hw_get_mem_tag(addr); + + return (mem_tag == KASAN_TAG_INVALID) || + (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); +} + +#else /* CONFIG_KASAN_HW_TAGS */ + +void kasan_poison_memory(const void *address, size_t size, u8 value); +bool check_invalid_free(void *addr); + +#endif /* CONFIG_KASAN_HW_TAGS */ + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations. -- 2.29.2.222.g5d2a92d10f8-goog _______________________________________________ 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-11-10 22:20 UTC|newest] Thread overview: 166+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-10 22:20 [PATCH v2 00/20] kasan: boot parameters for hardware tag-based mode Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` [PATCH v2 01/20] kasan: simplify quarantine_put call site Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:08 ` Marco Elver 2020-11-11 16:08 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 02/20] kasan: rename get_alloc/free_info Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:09 ` Marco Elver 2020-11-11 16:09 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 03/20] kasan: introduce set_alloc_info Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:10 ` Marco Elver 2020-11-11 16:10 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 04/20] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:13 ` Marco Elver 2020-11-11 16:13 ` Marco Elver 2020-11-12 9:51 ` Catalin Marinas 2020-11-12 9:51 ` Catalin Marinas 2020-11-12 19:38 ` Andrey Konovalov 2020-11-12 19:38 ` Andrey Konovalov 2020-11-12 19:38 ` Andrey Konovalov 2020-11-10 22:20 ` [PATCH v2 05/20] kasan: allow VMAP_STACK for HW_TAGS mode Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:20 ` Marco Elver 2020-11-11 16:20 ` Marco Elver 2020-11-12 0:24 ` Andrey Konovalov 2020-11-12 0:24 ` Andrey Konovalov 2020-11-12 0:24 ` Andrey Konovalov 2020-11-12 10:31 ` Catalin Marinas 2020-11-12 10:31 ` Catalin Marinas 2020-11-10 22:20 ` [PATCH v2 06/20] kasan: remove __kasan_unpoison_stack Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:42 ` Marco Elver 2020-11-11 16:42 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 07/20] kasan: inline kasan_reset_tag for tag-based modes Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:54 ` Marco Elver 2020-11-11 16:54 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 08/20] kasan: inline random_tag for HW_TAGS Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 17:02 ` Marco Elver 2020-11-11 17:02 ` Marco Elver 2020-11-12 0:21 ` Andrey Konovalov 2020-11-12 0:21 ` Andrey Konovalov 2020-11-12 0:21 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov [this message] 2020-11-10 22:20 ` [PATCH v2 09/20] kasan: inline kasan_poison_memory and check_invalid_free Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 17:50 ` Marco Elver 2020-11-11 17:50 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 10/20] kasan: inline and rename kasan_unpoison_memory Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 17:49 ` Marco Elver 2020-11-11 17:49 ` Marco Elver 2020-11-12 19:45 ` Andrey Konovalov 2020-11-12 19:45 ` Andrey Konovalov 2020-11-12 19:45 ` Andrey Konovalov 2020-11-12 19:52 ` Marco Elver 2020-11-12 19:52 ` Marco Elver 2020-11-12 19:52 ` Marco Elver 2020-11-12 20:54 ` Andrey Konovalov 2020-11-12 20:54 ` Andrey Konovalov 2020-11-12 20:54 ` Andrey Konovalov 2020-11-12 22:20 ` Marco Elver 2020-11-12 22:20 ` Marco Elver 2020-11-12 22:20 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 11/20] kasan: add and integrate kasan boot parameters Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 18:29 ` Marco Elver 2020-11-11 18:29 ` Marco Elver 2020-11-12 19:51 ` Andrey Konovalov 2020-11-12 19:51 ` Andrey Konovalov 2020-11-12 19:51 ` Andrey Konovalov 2020-11-12 11:35 ` Catalin Marinas 2020-11-12 11:35 ` Catalin Marinas 2020-11-12 11:53 ` Marco Elver 2020-11-12 11:53 ` Marco Elver 2020-11-12 11:53 ` Marco Elver 2020-11-12 12:54 ` Catalin Marinas 2020-11-12 12:54 ` Catalin Marinas 2020-11-12 19:52 ` Andrey Konovalov 2020-11-12 19:52 ` Andrey Konovalov 2020-11-12 19:52 ` Andrey Konovalov 2020-11-13 17:52 ` Marco Elver 2020-11-13 17:52 ` Marco Elver 2020-11-13 17:55 ` Marco Elver 2020-11-13 17:55 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 12/20] kasan, mm: check kasan_enabled in annotations Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 14:48 ` Marco Elver 2020-11-11 14:48 ` Marco Elver 2020-11-11 14:48 ` Marco Elver 2020-11-12 0:36 ` Andrey Konovalov 2020-11-12 0:36 ` Andrey Konovalov 2020-11-12 0:36 ` Andrey Konovalov 2020-11-10 22:20 ` [PATCH v2 13/20] kasan: simplify kasan_poison_kfree Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 18:42 ` Marco Elver 2020-11-11 18:42 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 14/20] kasan, mm: rename kasan_poison_kfree Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 18:53 ` Marco Elver 2020-11-11 18:53 ` Marco Elver 2020-11-12 1:05 ` Andrey Konovalov 2020-11-12 1:05 ` Andrey Konovalov 2020-11-12 1:05 ` Andrey Konovalov 2020-11-10 22:20 ` [PATCH v2 15/20] kasan: don't round_up too much Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 19:08 ` Marco Elver 2020-11-11 19:08 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 16/20] kasan: simplify assign_tag and set_tag calls Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 19:17 ` Marco Elver 2020-11-11 19:17 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 17/20] kasan: clarify comment in __kasan_kfree_large Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 19:18 ` Marco Elver 2020-11-11 19:18 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 18/20] kasan: clean up metadata allocation and usage Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 23:06 ` Marco Elver 2020-11-11 23:06 ` Marco Elver 2020-11-12 20:11 ` Andrey Konovalov 2020-11-12 20:11 ` Andrey Konovalov 2020-11-12 20:11 ` Andrey Konovalov 2020-11-10 22:20 ` [PATCH v2 19/20] kasan, mm: allow cache merging with no metadata Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 15:13 ` Marco Elver 2020-11-11 15:13 ` Marco Elver 2020-11-12 23:00 ` Andrey Konovalov 2020-11-12 23:00 ` Andrey Konovalov 2020-11-12 23:00 ` Andrey Konovalov 2020-11-11 23:27 ` Marco Elver 2020-11-11 23:27 ` Marco Elver 2020-11-10 22:20 ` [PATCH v2 20/20] kasan: update documentation Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-10 22:20 ` Andrey Konovalov 2020-11-11 16:03 ` Marco Elver 2020-11-11 16:03 ` Marco Elver 2020-11-12 0:51 ` Andrey Konovalov 2020-11-12 0:51 ` Andrey Konovalov 2020-11-12 0:51 ` Andrey Konovalov 2020-11-10 22:24 ` [PATCH v2 00/20] kasan: boot parameters for hardware tag-based mode Andrey Konovalov 2020-11-10 22:24 ` Andrey Konovalov 2020-11-10 22:24 ` 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=e14ac53d7c43b4381ad94665c63a154dffc04b6b.1605046662.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=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: 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.