[mm,v2,28/33] kasan: rework function arguments in report.c

Message ID	0333e02a35742ef14103440a7091b34ce437ddf3.1658189199.git.andreyknvl@google.com (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: andrey.konovalov@linux.dev To: Marco Elver <elver@google.com>, Alexander Potapenko <glider@google.com> Cc: Andrey Konovalov <andreyknvl@gmail.com>, Dmitry Vyukov <dvyukov@google.com>, Andrey Ryabinin <ryabinin.a.a@gmail.com>, kasan-dev@googlegroups.com, Peter Collingbourne <pcc@google.com>, Evgenii Stepanov <eugenis@google.com>, Florian Mayer <fmayer@google.com>, Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH mm v2 28/33] kasan: rework function arguments in report.c Date: Tue, 19 Jul 2022 02:10:08 +0200 Message-Id: <0333e02a35742ef14103440a7091b34ce437ddf3.1658189199.git.andreyknvl@google.com> In-Reply-To: <cover.1658189199.git.andreyknvl@google.com> References: <cover.1658189199.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	kasan: switch tag-based modes to stack ring from per-object metadata \| expand [mm,v2,00/33] kasan: switch tag-based modes to stack ring from per-object metadata [mm,v2,01/33] kasan: check KASAN_NO_FREE_META in __kasan_metadata_size [mm,v2,02/33] kasan: rename kasan_set__info to kasan_save__info [mm,v2,03/33] kasan: move is_kmalloc check out of save_alloc_info [mm,v2,04/33] kasan: split save_alloc_info implementations [mm,v2,05/33] kasan: drop CONFIG_KASAN_TAGS_IDENTIFY [mm,v2,06/33] kasan: introduce kasan_print_aux_stacks [mm,v2,07/33] kasan: introduce kasan_get_alloc_track [mm,v2,08/33] kasan: introduce kasan_init_object_meta [mm,v2,09/33] kasan: clear metadata functions for tag-based modes [mm,v2,10/33] kasan: move kasan_get_*_meta to generic.c [mm,v2,11/33] kasan: introduce kasan_requires_meta [mm,v2,12/33] kasan: introduce kasan_init_cache_meta [mm,v2,13/33] kasan: drop CONFIG_KASAN_GENERIC check from kasan_init_cache_meta [mm,v2,14/33] kasan: only define kasan_metadata_size for Generic mode [mm,v2,15/33] kasan: only define kasan_never_merge for Generic mode [mm,v2,16/33] kasan: only define metadata offsets for Generic mode [mm,v2,17/33] kasan: only define metadata structs for Generic mode [mm,v2,18/33] kasan: only define kasan_cache_create for Generic mode [mm,v2,19/33] kasan: pass tagged pointers to kasan_save_alloc/free_info [mm,v2,20/33] kasan: move kasan_get_alloc/free_track definitions [mm,v2,21/33] kasan: cosmetic changes in report.c [mm,v2,22/33] kasan: use virt_addr_valid in kasan_addr_to_page/slab [mm,v2,23/33] kasan: use kasan_addr_to_slab in print_address_description [mm,v2,24/33] kasan: make kasan_addr_to_page static [mm,v2,25/33] kasan: simplify print_report [mm,v2,26/33] kasan: introduce complete_report_info [mm,v2,27/33] kasan: fill in cache and object in complete_report_info [mm,v2,28/33] kasan: rework function arguments in report.c [mm,v2,29/33] kasan: introduce kasan_complete_mode_report_info [mm,v2,30/33] kasan: implement stack ring for tag-based modes [mm,v2,31/33] kasan: support kasan.stacktrace for SW_TAGS [mm,v2,32/33] kasan: dynamically allocate stack ring entries [mm,v2,33/33] kasan: better identify bug types for tag-based modes

Message ID

0333e02a35742ef14103440a7091b34ce437ddf3.1658189199.git.andreyknvl@google.com (mailing list archive)

State

New

Headers

From: andrey.konovalov@linux.dev
To: Marco Elver <elver@google.com>,
	Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>,
	Dmitry Vyukov <dvyukov@google.com>,
	Andrey Ryabinin <ryabinin.a.a@gmail.com>,
	kasan-dev@googlegroups.com,
	Peter Collingbourne <pcc@google.com>,
	Evgenii Stepanov <eugenis@google.com>,
	Florian Mayer <fmayer@google.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-mm@kvack.org,
	linux-kernel@vger.kernel.org,
	Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH mm v2 28/33] kasan: rework function arguments in report.c
Date: Tue, 19 Jul 2022 02:10:08 +0200
Message-Id: 
 <0333e02a35742ef14103440a7091b34ce437ddf3.1658189199.git.andreyknvl@google.com>
In-Reply-To: <cover.1658189199.git.andreyknvl@google.com>
References: <cover.1658189199.git.andreyknvl@google.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

kasan: switch tag-based modes to stack ring from per-object metadata | expand

Commit Message

andrey.konovalov@linux.dev July 19, 2022, 12:10 a.m. UTC

From: Andrey Konovalov <andreyknvl@google.com>

Pass a pointer to kasan_report_info to describe_object() and
describe_object_stacks(), instead of passing the structure's fields.

The untagged pointer and the tag are still passed as separate arguments
to some of the functions to avoid duplicating the untagging logic.

This is preparatory change for the next patch.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
 mm/kasan/report.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 763de8e68887..ec018f849992 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -213,8 +213,8 @@  static inline struct page *addr_to_page(const void *addr)
 	return NULL;
 }
 
-static void describe_object_addr(struct kmem_cache *cache, void *object,
-				const void *addr)
+static void describe_object_addr(const void *addr, struct kmem_cache *cache,
+				 void *object)
 {
 	unsigned long access_addr = (unsigned long)addr;
 	unsigned long object_addr = (unsigned long)object;
@@ -242,33 +242,32 @@  static void describe_object_addr(struct kmem_cache *cache, void *object,
 		(void *)(object_addr + cache->object_size));
 }
 
-static void describe_object_stacks(struct kmem_cache *cache, void *object,
-					const void *addr, u8 tag)
+static void describe_object_stacks(u8 tag, struct kasan_report_info *info)
 {
 	struct kasan_track *alloc_track;
 	struct kasan_track *free_track;
 
-	alloc_track = kasan_get_alloc_track(cache, object);
+	alloc_track = kasan_get_alloc_track(info->cache, info->object);
 	if (alloc_track) {
 		print_track(alloc_track, "Allocated");
 		pr_err("\n");
 	}
 
-	free_track = kasan_get_free_track(cache, object, tag);
+	free_track = kasan_get_free_track(info->cache, info->object, tag);
 	if (free_track) {
 		print_track(free_track, "Freed");
 		pr_err("\n");
 	}
 
-	kasan_print_aux_stacks(cache, object);
+	kasan_print_aux_stacks(info->cache, info->object);
 }
 
-static void describe_object(struct kmem_cache *cache, void *object,
-				const void *addr, u8 tag)
+static void describe_object(const void *addr, u8 tag,
+			    struct kasan_report_info *info)
 {
 	if (kasan_stack_collection_enabled())
-		describe_object_stacks(cache, object, addr, tag);
-	describe_object_addr(cache, object, addr);
+		describe_object_stacks(tag, info);
+	describe_object_addr(addr, info->cache, info->object);
 }
 
 static inline bool kernel_or_module_addr(const void *addr)
@@ -296,7 +295,7 @@  static void print_address_description(void *addr, u8 tag,
 	pr_err("\n");
 
 	if (info->cache && info->object) {
-		describe_object(info->cache, info->object, addr, tag);
+		describe_object(addr, tag, info);
 		pr_err("\n");
 	}

[mm,v2,28/33] kasan: rework function arguments in report.c

Commit Message

Patch