From: Andrey Konovalov <andreyknvl@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
Marco Elver <elver@google.com>,
Elena Petrova <lenaptr@google.com>,
Andrey Konovalov <andreyknvl@google.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Branislav Rankov <Branislav.Rankov@arm.com>,
kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, Alexander Potapenko <glider@google.com>,
Evgenii Stepanov <eugenis@google.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Andrew Morton <akpm@linux-foundation.org>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Dmitry Vyukov <dvyukov@google.com>
Subject: [PATCH v7 19/41] kasan: define KASAN_GRANULE_PAGE
Date: Mon, 2 Nov 2020 17:03:59 +0100 [thread overview]
Message-ID: <bf5551a8f45509562a862aa49561603a0e065064.1604333009.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1604333009.git.andreyknvl@google.com>
Define KASAN_GRANULE_PAGE as (KASAN_GRANULE_SIZE << PAGE_SHIFT), which is
the same as (KASAN_GRANULE_SIZE * PAGE_SIZE), and use it across KASAN code
to simplify it.
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: I0b627b24187d06c8b9bb2f1d04d94b3d06945e73
---
mm/kasan/init.c | 10 ++++------
mm/kasan/kasan.h | 1 +
mm/kasan/shadow.c | 16 +++++++---------
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/mm/kasan/init.c b/mm/kasan/init.c
index 1a71eaa8c5f9..26b2663b3a42 100644
--- a/mm/kasan/init.c
+++ b/mm/kasan/init.c
@@ -441,9 +441,8 @@ void kasan_remove_zero_shadow(void *start, unsigned long size)
addr = (unsigned long)kasan_mem_to_shadow(start);
end = addr + (size >> KASAN_SHADOW_SCALE_SHIFT);
- if (WARN_ON((unsigned long)start %
- (KASAN_GRANULE_SIZE * PAGE_SIZE)) ||
- WARN_ON(size % (KASAN_GRANULE_SIZE * PAGE_SIZE)))
+ if (WARN_ON((unsigned long)start % KASAN_GRANULE_PAGE) ||
+ WARN_ON(size % KASAN_GRANULE_PAGE))
return;
for (; addr < end; addr = next) {
@@ -476,9 +475,8 @@ int kasan_add_zero_shadow(void *start, unsigned long size)
shadow_start = kasan_mem_to_shadow(start);
shadow_end = shadow_start + (size >> KASAN_SHADOW_SCALE_SHIFT);
- if (WARN_ON((unsigned long)start %
- (KASAN_GRANULE_SIZE * PAGE_SIZE)) ||
- WARN_ON(size % (KASAN_GRANULE_SIZE * PAGE_SIZE)))
+ if (WARN_ON((unsigned long)start % KASAN_GRANULE_PAGE) ||
+ WARN_ON(size % KASAN_GRANULE_PAGE))
return -EINVAL;
ret = kasan_populate_early_shadow(shadow_start, shadow_end);
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index fc9e4250a098..d8f54efb2899 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -7,6 +7,7 @@
#define KASAN_GRANULE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT)
#define KASAN_GRANULE_MASK (KASAN_GRANULE_SIZE - 1)
+#define KASAN_GRANULE_PAGE (KASAN_GRANULE_SIZE << PAGE_SHIFT)
#define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */
#define KASAN_TAG_INVALID 0xFE /* inaccessible memory tag */
diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c
index ca0cc4c31454..1fadd4930d54 100644
--- a/mm/kasan/shadow.c
+++ b/mm/kasan/shadow.c
@@ -161,7 +161,7 @@ static int __meminit kasan_mem_notifier(struct notifier_block *nb,
shadow_end = shadow_start + shadow_size;
if (WARN_ON(mem_data->nr_pages % KASAN_GRANULE_SIZE) ||
- WARN_ON(start_kaddr % (KASAN_GRANULE_SIZE << PAGE_SHIFT)))
+ WARN_ON(start_kaddr % KASAN_GRANULE_PAGE))
return NOTIFY_BAD;
switch (action) {
@@ -432,22 +432,20 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end,
unsigned long region_start, region_end;
unsigned long size;
- region_start = ALIGN(start, PAGE_SIZE * KASAN_GRANULE_SIZE);
- region_end = ALIGN_DOWN(end, PAGE_SIZE * KASAN_GRANULE_SIZE);
+ region_start = ALIGN(start, KASAN_GRANULE_PAGE);
+ region_end = ALIGN_DOWN(end, KASAN_GRANULE_PAGE);
- free_region_start = ALIGN(free_region_start,
- PAGE_SIZE * KASAN_GRANULE_SIZE);
+ free_region_start = ALIGN(free_region_start, KASAN_GRANULE_PAGE);
if (start != region_start &&
free_region_start < region_start)
- region_start -= PAGE_SIZE * KASAN_GRANULE_SIZE;
+ region_start -= KASAN_GRANULE_PAGE;
- free_region_end = ALIGN_DOWN(free_region_end,
- PAGE_SIZE * KASAN_GRANULE_SIZE);
+ free_region_end = ALIGN_DOWN(free_region_end, KASAN_GRANULE_PAGE);
if (end != region_end &&
free_region_end > region_end)
- region_end += PAGE_SIZE * KASAN_GRANULE_SIZE;
+ region_end += KASAN_GRANULE_PAGE;
shadow_start = kasan_mem_to_shadow((void *)region_start);
shadow_end = kasan_mem_to_shadow((void *)region_end);
--
2.29.1.341.ge80a0c044ae-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-02 16:08 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 16:03 [PATCH v7 00/41] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 01/41] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 02/41] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 03/41] arm64: mte: Reset the page tag in page->flags Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 04/41] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 05/41] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 06/41] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 07/41] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 08/41] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 09/41] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 10/41] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 11/41] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 12/41] kasan: group vmalloc code Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 13/41] s390/kasan: include asm/page.h from asm/kasan.h Andrey Konovalov
2020-11-04 17:19 ` Andrey Konovalov
2020-11-04 19:25 ` Vasily Gorbik
2020-11-04 19:26 ` Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 14/41] kasan: shadow declarations only for software modes Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 15/41] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 16/41] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-11-04 19:11 ` Vasily Gorbik
2020-11-04 19:22 ` Andrey Konovalov
2020-11-04 19:30 ` Vasily Gorbik
2020-11-04 19:32 ` Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 17/41] kasan: only build init.c for software modes Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 18/41] kasan: split out shadow.c from common.c Andrey Konovalov
2020-11-02 16:03 ` Andrey Konovalov [this message]
2020-11-02 16:04 ` [PATCH v7 20/41] kasan: rename report and tags files Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 21/41] kasan: don't duplicate config dependencies Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 22/41] kasan: hide invalid free check implementation Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 23/41] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 24/41] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 25/41] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 26/41] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 27/41] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 28/41] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 29/41] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 30/41] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 31/41] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 32/41] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 33/41] kasan: define KASAN_GRANULE_SIZE for HW_TAGS Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 34/41] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-11-04 17:28 ` Andrey Konovalov
2020-11-04 19:17 ` Vasily Gorbik
2020-11-02 16:04 ` [PATCH v7 35/41] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 36/41] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 37/41] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 38/41] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 39/41] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 40/41] kasan: add documentation for hardware tag-based mode Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 41/41] kselftest/arm64: Check GCR_EL1 after context switch 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=bf5551a8f45509562a862aa49561603a0e065064.1604333009.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).