linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Andrey Konovalov <andreyknvl@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	 Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Dmitry Vyukov <dvyukov@google.com>,
	 Andrey Ryabinin <aryabinin@virtuozzo.com>,
	Alexander Potapenko <glider@google.com>,
	 Marco Elver <elver@google.com>,
	Evgenii Stepanov <eugenis@google.com>,
	 Branislav Rankov <Branislav.Rankov@arm.com>,
	Kevin Brodsky <kevin.brodsky@arm.com>,
	 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 mm v4 08/19] kasan: inline random_tag for HW_TAGS
Date: Mon, 23 Nov 2020 21:14:38 +0100	[thread overview]
Message-ID: <be438471690e351e1d792e6bb432e8c03ccb15d3.1606162397.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1606162397.git.andreyknvl@google.com>

Using random_tag() currently results in a function call. Move its
definition to mm/kasan/kasan.h and turn it into a static inline function
for hardware tag-based mode to avoid uneeded function calls.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Link: https://linux-review.googlesource.com/id/Iac5b2faf9a912900e16cca6834d621f5d4abf427
---
 mm/kasan/hw_tags.c |  5 -----
 mm/kasan/kasan.h   | 31 ++++++++++++++-----------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index a34476764f1d..3cdd87d189f6 100644
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -51,11 +51,6 @@ void unpoison_range(const void *address, size_t size)
 			round_up(size, KASAN_GRANULE_SIZE), get_tag(address));
 }
 
-u8 random_tag(void)
-{
-	return hw_get_random_tag();
-}
-
 bool check_invalid_free(void *addr)
 {
 	u8 ptr_tag = get_tag(addr);
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 5e8cd2080369..7876a2547b7d 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -190,6 +190,12 @@ static inline bool addr_has_metadata(const void *addr)
 
 #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
 
+#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS)
+void print_tags(u8 addr_tag, const void *addr);
+#else
+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);
@@ -225,23 +231,6 @@ static inline void quarantine_reduce(void) { }
 static inline void quarantine_remove_cache(struct kmem_cache *cache) { }
 #endif
 
-#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS)
-
-void print_tags(u8 addr_tag, const void *addr);
-
-u8 random_tag(void);
-
-#else
-
-static inline void print_tags(u8 addr_tag, const void *addr) { }
-
-static inline u8 random_tag(void)
-{
-	return 0;
-}
-
-#endif
-
 #ifndef arch_kasan_set_tag
 static inline const void *arch_kasan_set_tag(const void *addr, u8 tag)
 {
@@ -281,6 +270,14 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag)
 
 #endif /* CONFIG_KASAN_HW_TAGS */
 
+#ifdef CONFIG_KASAN_SW_TAGS
+u8 random_tag(void);
+#elif defined(CONFIG_KASAN_HW_TAGS)
+static inline u8 random_tag(void) { return hw_get_random_tag(); }
+#else
+static inline u8 random_tag(void) { return 0; }
+#endif
+
 /*
  * Exported functions for interfaces called from assembly or from generated
  * code. Declarations here to avoid warning about missing declarations.
-- 
2.29.2.454.gaff20da3a2-goog



  parent reply	other threads:[~2020-11-23 20:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-23 20:14 [PATCH mm v4 00/19] kasan: boot parameters for hardware tag-based mode Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 01/19] kasan: simplify quarantine_put call site Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 02/19] kasan: rename get_alloc/free_info Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 03/19] kasan: introduce set_alloc_info Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 04/19] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 05/19] kasan: allow VMAP_STACK for HW_TAGS mode Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 06/19] kasan: remove __kasan_unpoison_stack Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 07/19] kasan: inline kasan_reset_tag for tag-based modes Andrey Konovalov
2020-11-23 20:14 ` Andrey Konovalov [this message]
2020-11-23 20:14 ` [PATCH mm v4 09/19] kasan: open-code kasan_unpoison_slab Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 10/19] kasan: inline (un)poison_range and check_invalid_free Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 11/19] kasan: add and integrate kasan boot parameters Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 12/19] kasan, mm: check kasan_enabled in annotations Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 13/19] kasan, mm: rename kasan_poison_kfree Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 14/19] kasan: don't round_up too much Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 15/19] kasan: simplify assign_tag and set_tag calls Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 16/19] kasan: clarify comment in __kasan_kfree_large Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 17/19] kasan: sanitize objects when metadata doesn't fit Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 18/19] kasan, mm: allow cache merging with no metadata Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 19/19] kasan: update documentation 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=be438471690e351e1d792e6bb432e8c03ccb15d3.1606162397.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: 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).