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 v10 18/42] kasan: rename addr_has_shadow to addr_has_metadata
Date: Fri, 13 Nov 2020 23:15:46 +0100 [thread overview]
Message-ID: <ec80ee52d741da81e4e2c08a09c3dff5feab5260.1605305705.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1605305705.git.andreyknvl@google.com>
This is a preparatory commit for the upcoming addition of a new hardware
tag-based (MTE-based) KASAN mode.
Hardware tag-based KASAN won't be using shadow memory, but will reuse
this function. Rename "shadow" to implementation-neutral "metadata".
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>
Reviewed-by: Alexander Potapenko <glider@google.com>
---
Change-Id: I03706fe34b38da7860c39aa0968e00001a7d1873
---
mm/kasan/kasan.h | 2 +-
mm/kasan/report.c | 6 +++---
mm/kasan/report_generic.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 488ca1ff5979..c79d30c6fcdb 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -147,7 +147,7 @@ static inline const void *kasan_shadow_to_mem(const void *shadow_addr)
<< KASAN_SHADOW_SCALE_SHIFT);
}
-static inline bool addr_has_shadow(const void *addr)
+static inline bool addr_has_metadata(const void *addr)
{
return (addr >= kasan_shadow_to_mem((void *)KASAN_SHADOW_START));
}
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index af9138ea54ad..2990ca34abaf 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -361,7 +361,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write,
untagged_addr = reset_tag(tagged_addr);
info.access_addr = tagged_addr;
- if (addr_has_shadow(untagged_addr))
+ if (addr_has_metadata(untagged_addr))
info.first_bad_addr = find_first_bad_addr(tagged_addr, size);
else
info.first_bad_addr = untagged_addr;
@@ -372,11 +372,11 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write,
start_report(&flags);
print_error_description(&info);
- if (addr_has_shadow(untagged_addr))
+ if (addr_has_metadata(untagged_addr))
print_tags(get_tag(tagged_addr), info.first_bad_addr);
pr_err("\n");
- if (addr_has_shadow(untagged_addr)) {
+ if (addr_has_metadata(untagged_addr)) {
print_address_description(untagged_addr, get_tag(tagged_addr));
pr_err("\n");
print_shadow_for_address(info.first_bad_addr);
diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c
index b543a1ed6078..16ed550850e9 100644
--- a/mm/kasan/report_generic.c
+++ b/mm/kasan/report_generic.c
@@ -118,7 +118,7 @@ const char *get_bug_type(struct kasan_access_info *info)
if (info->access_addr + info->access_size < info->access_addr)
return "out-of-bounds";
- if (addr_has_shadow(info->access_addr))
+ if (addr_has_metadata(info->access_addr))
return get_shadow_bug_type(info);
return get_wild_bug_type(info);
}
--
2.29.2.299.gdc1121823c-goog
next prev parent reply other threads:[~2020-11-13 22:17 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 22:15 [PATCH mm v10 00/42] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 01/42] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 02/42] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 03/42] kasan: group vmalloc code Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 04/42] kasan: shadow declarations only for software modes Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 05/42] kasan: rename (un)poison_shadow to (un)poison_range Andrey Konovalov
2020-11-18 15:30 ` Alexander Potapenko
2020-11-13 22:15 ` [PATCH mm v10 06/42] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 07/42] kasan: only build init.c for software modes Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 08/42] kasan: split out shadow.c from common.c Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 09/42] kasan: define KASAN_MEMORY_PER_SHADOW_PAGE Andrey Konovalov
2020-11-18 15:36 ` Alexander Potapenko
2020-11-13 22:15 ` [PATCH mm v10 10/42] kasan: rename report and tags files Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 11/42] kasan: don't duplicate config dependencies Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 12/42] kasan: hide invalid free check implementation Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 13/42] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 14/42] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 15/42] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 16/42] kasan, arm64: move initialization message Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 17/42] kasan, arm64: rename kasan_init_tags and mark as __init Andrey Konovalov
2020-11-13 22:15 ` Andrey Konovalov [this message]
2020-11-13 22:15 ` [PATCH mm v10 19/42] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 20/42] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 21/42] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 22/42] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 23/42] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-18 16:04 ` Alexander Potapenko
2020-11-13 22:15 ` [PATCH mm v10 24/42] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-11-18 15:48 ` Alexander Potapenko
2020-11-13 22:15 ` [PATCH mm v10 25/42] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 26/42] arm64: mte: Reset the page tag in page->flags Andrey Konovalov
2020-11-14 12:43 ` Catalin Marinas
2020-11-13 22:15 ` [PATCH mm v10 27/42] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 28/42] arm64: kasan: Allow enabling in-kernel MTE Andrey Konovalov
2020-11-14 12:47 ` Catalin Marinas
2020-11-13 22:15 ` [PATCH mm v10 29/42] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 30/42] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-11-13 22:15 ` [PATCH mm v10 31/42] kasan, mm: untag page address in free_reserved_area Andrey Konovalov
2020-11-18 16:07 ` Alexander Potapenko
2020-11-13 22:16 ` [PATCH mm v10 32/42] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 33/42] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 34/42] kasan: define KASAN_GRANULE_SIZE for HW_TAGS Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 35/42] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 36/42] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 37/42] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 38/42] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 39/42] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 40/42] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-13 22:16 ` [PATCH mm v10 41/42] kasan: add documentation for hardware tag-based mode Andrey Konovalov
2020-11-18 15:43 ` Alexander Potapenko
2020-11-13 22:16 ` [PATCH mm v10 42/42] kselftest/arm64: Check GCR_EL1 after context switch Andrey Konovalov
2020-11-13 23:35 ` [PATCH mm v10 00/42] kasan: add hardware tag-based mode for arm64 Andrew Morton
2020-11-16 14:48 ` Vincenzo Frascino
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=ec80ee52d741da81e4e2c08a09c3dff5feab5260.1605305705.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).