Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / Atom feed
From: Andrey Konovalov <andreyknvl@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arm-kernel@lists.infradead.org,
	Marco Elver <elver@google.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Kevin Brodsky <kevin.brodsky@arm.com>,
	Will Deacon <will.deacon@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 Konovalov <andreyknvl@google.com>,
	Andrey Ryabinin <aryabinin@virtuozzo.com>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Dmitry Vyukov <dvyukov@google.com>
Subject: [PATCH mm v11 20/42] kasan: rename SHADOW layout macros to META
Date: Mon, 23 Nov 2020 21:07:44 +0100
Message-ID: <f96244ec59dc17db35173ec352c5592b14aefaf8.1606161801.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1606161801.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
these macros. Rename "SHADOW" to implementation-neutral "META".

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: Id2d836bf43b401bce1221cc06e745185f17b1cc
---
 mm/kasan/report.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 5d5733831ad7..ab28e350bf39 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -33,11 +33,11 @@
 #include "kasan.h"
 #include "../slab.h"
 
-/* Shadow layout customization. */
-#define SHADOW_BYTES_PER_BLOCK 1
-#define SHADOW_BLOCKS_PER_ROW 16
-#define SHADOW_BYTES_PER_ROW (SHADOW_BLOCKS_PER_ROW * SHADOW_BYTES_PER_BLOCK)
-#define SHADOW_ROWS_AROUND_ADDR 2
+/* Metadata layout customization. */
+#define META_BYTES_PER_BLOCK 1
+#define META_BLOCKS_PER_ROW 16
+#define META_BYTES_PER_ROW (META_BLOCKS_PER_ROW * META_BYTES_PER_BLOCK)
+#define META_ROWS_AROUND_ADDR 2
 
 static unsigned long kasan_flags;
 
@@ -240,7 +240,7 @@ static void print_address_description(void *addr, u8 tag)
 
 static bool row_is_guilty(const void *row, const void *guilty)
 {
-	return (row <= guilty) && (guilty < row + SHADOW_BYTES_PER_ROW);
+	return (row <= guilty) && (guilty < row + META_BYTES_PER_ROW);
 }
 
 static int shadow_pointer_offset(const void *row, const void *shadow)
@@ -249,7 +249,7 @@ static int shadow_pointer_offset(const void *row, const void *shadow)
 	 *    3 + (BITS_PER_LONG/8)*2 chars.
 	 */
 	return 3 + (BITS_PER_LONG/8)*2 + (shadow - row)*2 +
-		(shadow - row) / SHADOW_BYTES_PER_BLOCK + 1;
+		(shadow - row) / META_BYTES_PER_BLOCK + 1;
 }
 
 static void print_memory_metadata(const void *addr)
@@ -259,15 +259,15 @@ static void print_memory_metadata(const void *addr)
 	const void *shadow_row;
 
 	shadow_row = (void *)round_down((unsigned long)shadow,
-					SHADOW_BYTES_PER_ROW)
-		- SHADOW_ROWS_AROUND_ADDR * SHADOW_BYTES_PER_ROW;
+					META_BYTES_PER_ROW)
+		- META_ROWS_AROUND_ADDR * META_BYTES_PER_ROW;
 
 	pr_err("Memory state around the buggy address:\n");
 
-	for (i = -SHADOW_ROWS_AROUND_ADDR; i <= SHADOW_ROWS_AROUND_ADDR; i++) {
+	for (i = -META_ROWS_AROUND_ADDR; i <= META_ROWS_AROUND_ADDR; i++) {
 		const void *kaddr = kasan_shadow_to_mem(shadow_row);
 		char buffer[4 + (BITS_PER_LONG/8)*2];
-		char shadow_buf[SHADOW_BYTES_PER_ROW];
+		char shadow_buf[META_BYTES_PER_ROW];
 
 		snprintf(buffer, sizeof(buffer),
 			(i == 0) ? ">%px: " : " %px: ", kaddr);
@@ -276,17 +276,17 @@ static void print_memory_metadata(const void *addr)
 		 * function, because generic functions may try to
 		 * access kasan mapping for the passed address.
 		 */
-		memcpy(shadow_buf, shadow_row, SHADOW_BYTES_PER_ROW);
+		memcpy(shadow_buf, shadow_row, META_BYTES_PER_ROW);
 		print_hex_dump(KERN_ERR, buffer,
-			DUMP_PREFIX_NONE, SHADOW_BYTES_PER_ROW, 1,
-			shadow_buf, SHADOW_BYTES_PER_ROW, 0);
+			DUMP_PREFIX_NONE, META_BYTES_PER_ROW, 1,
+			shadow_buf, META_BYTES_PER_ROW, 0);
 
 		if (row_is_guilty(shadow_row, shadow))
 			pr_err("%*c\n",
 				shadow_pointer_offset(shadow_row, shadow),
 				'^');
 
-		shadow_row += SHADOW_BYTES_PER_ROW;
+		shadow_row += META_BYTES_PER_ROW;
 	}
 }
 
-- 
2.29.2.454.gaff20da3a2-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply index

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-23 20:07 [PATCH mm v11 00/42] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 01/42] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 02/42] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 03/42] kasan: group vmalloc code Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 04/42] kasan: shadow declarations only for software modes Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 05/42] kasan: rename (un)poison_shadow to (un)poison_range Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 06/42] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 07/42] kasan: only build init.c for software modes Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 08/42] kasan: split out shadow.c from common.c Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 09/42] kasan: define KASAN_MEMORY_PER_SHADOW_PAGE Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 10/42] kasan: rename report and tags files Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 11/42] kasan: don't duplicate config dependencies Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 12/42] kasan: hide invalid free check implementation Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 13/42] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 14/42] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 15/42] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 16/42] kasan, arm64: move initialization message Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 17/42] kasan, arm64: rename kasan_init_tags and mark as __init Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 18/42] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 19/42] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-11-23 20:07 ` Andrey Konovalov [this message]
2020-11-23 20:07 ` [PATCH mm v11 21/42] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 22/42] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 23/42] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 24/42] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 25/42] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 26/42] arm64: mte: Reset the page tag in page->flags Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 27/42] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-12-03 10:26   ` Catalin Marinas
2020-12-03 10:39     ` Vincenzo Frascino
2020-11-23 20:07 ` [PATCH mm v11 28/42] arm64: kasan: Allow enabling in-kernel MTE Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 29/42] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 30/42] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 31/42] kasan, mm: untag page address in free_reserved_area Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 32/42] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 33/42] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 34/42] kasan: define KASAN_GRANULE_SIZE for HW_TAGS Andrey Konovalov
2020-11-23 20:07 ` [PATCH mm v11 35/42] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-11-23 20:08 ` [PATCH mm v11 36/42] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-11-23 20:08 ` [PATCH mm v11 37/42] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-11-23 20:08 ` [PATCH mm v11 38/42] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-11-23 20:08 ` [PATCH mm v11 39/42] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-11-23 20:08 ` [PATCH mm v11 40/42] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-23 20:08 ` [PATCH mm v11 41/42] kasan: add documentation for hardware tag-based mode Andrey Konovalov
2020-11-23 20:08 ` [PATCH mm v11 42/42] 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=f96244ec59dc17db35173ec352c5592b14aefaf8.1606161801.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

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org
	public-inbox-index linux-arm-kernel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git