From patchwork Thu Dec 21 18:35:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13502531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0084AC46CCD for ; Thu, 21 Dec 2023 18:35:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 536726B0080; Thu, 21 Dec 2023 13:35:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BEA56B0085; Thu, 21 Dec 2023 13:35:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EADB6B008A; Thu, 21 Dec 2023 13:35:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E05716B0085 for ; Thu, 21 Dec 2023 13:35:51 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B4D64A0DEF for ; Thu, 21 Dec 2023 18:35:51 +0000 (UTC) X-FDA: 81591679302.22.E08619E Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) by imf22.hostedemail.com (Postfix) with ESMTP id 00541C000E for ; Thu, 21 Dec 2023 18:35:49 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Wp4SgxAx; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.181 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703183750; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wLcCaNYp1HtmrZAPrigLSWnYXTa9aslZ8ruUHa0DHbo=; b=vl0HHfwM3rG7cQzT8ip00AazDUhiFweydbFLGsWvek6E9jOnC5To1cD8E6OoqF49XN8zmX 49gKg/aeV2SbRznV11xYNBtqX19rbXOhAfzVZ8IU41LORcGvLBXtY/ibAm+a3KD66E6GR0 8gfJDhFcaZPRYGRm0O/606vZPhpLAd4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Wp4SgxAx; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.181 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703183750; a=rsa-sha256; cv=none; b=fbqt9VltgM+IeJTykfHImQWQMtSxKdtKjJXmJzInuKL7VAv+IDApqRL/oIG4XIH4BryN84 EVYakBKd/G3/2rsnM/hBMVy/BBznFaSV9qXQ33+jaA7kQ+65wlVCsSEuQjeAjYSF1dkw68 tTFd4yzTbG9x8dqfuskpqVU0OfXO0CY= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1703183748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wLcCaNYp1HtmrZAPrigLSWnYXTa9aslZ8ruUHa0DHbo=; b=Wp4SgxAxzf33U9vG6eCpb57dWh/1TqzRC2qPSlMKfzo4YFjahK6jxrjxwucpfy7HNf515z HVTQaBE2QE4c7zE1ojOnJfPr31drq3YJKN5R0J3wvccZ6BKYlSSN5VG/UPs4jM7chLnJJ2 iVscHV7PW/6Z659boGsoyF6DsXA5Ssw= From: andrey.konovalov@linux.dev To: Andrew Morton , Juntong Deng Cc: Andrey Konovalov , Marco Elver , Alexander Potapenko , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH mm 3/4] kasan: simplify saving extra info into tracks Date: Thu, 21 Dec 2023 19:35:39 +0100 Message-Id: <20231221183540.168428-3-andrey.konovalov@linux.dev> In-Reply-To: <20231221183540.168428-1-andrey.konovalov@linux.dev> References: <20231221183540.168428-1-andrey.konovalov@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 00541C000E X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 7xd54aaouk5uiu9hoaa8n8r4pftcw47j X-HE-Tag: 1703183749-203953 X-HE-Meta: U2FsdGVkX1+EuL7HFDTaNv8m0n2VCcJ1KJ4wujhOYyhd5l5GUEM6LRu5i5okZ58Mdkaw/FHKDZQCpTI8i/P0Js/B2n6mlqBwiX2oxroktWU+UFvZlYNJOXxhkx70Eggee2ePGi43HrWNy9KLO6tIrDqL3RZc6zvnQkb2AIXJGT8NjTgpsNxf41GoV72Qj2x0ZKicKgJtQ7vWhRTHYNCQ87NDJEH4XzNDlOsdpe2Jiy0pLGTbI7cGwwupYtz4iBDsly6CCGjqHh1ysLM+++QE1txBc9VK3K7tcshVFZhDFfdtFcQ+XZn7aaL+GFbwSaKHGziKqjYKjeOj5sHbHsKm1C9teO4gyyl6IqQ3swGg9WE8h/tJZViPwf0EValWqRsKhrfXUaU0JgKxt/nkcGAVEdJ6EOX8Vj1bjmZqnRMJBRC5OoPMgaKjHF+q5zCwzJAniDcUSpWUEDgFQVyiGykNUlpeEZPO1uuQ70X/nT4rpLzIjAV7Y3ODj2KKWDRSmEbTfr3lzx+QXXVDBYuT0YqY0Xmgv1CFiyf02z5qzzGb4OnRsI4JSiFlDr0Xna2u6dhVcPzkMDe08IK8aN2IgkrhxWZI22Z0otunD2R8Do5/7CEzfcjDx2SXPlXxyjJQDQb5BdaTsOIGZ5S8liXERglZJtde9zejhKSJArQKZHa1NmWWcVR4VEwsWoETtzfWHKq9LvTj79KnjzoQbZD58keBgYYBl4JHQlc+5Ug+19QT8f5BWpYzMqFkYaTdzPwLpc54kDQkEs2v0pFHXCMf+Q7NI3UPKko+xywm5EZCAW98NUPBDaJAEVeck4rm6XHG5MN1NoB1nrlRWCBR1g28J/rhmPGIvV3PdwW8+8gY63xCDtNjQk2BGlPOsV+2WG4ae7KNwwA3jnMPkMybuUqLJk91TbbTou1INqresR72fqAMCpxLQVFZybuUKFs319MUhAKLi4gjUThn8jHiKnYLwe4 QJ0Ru5RO InfQT4si0uV0z2cnkKpWjUNuU1Vui2FyqjA92HnaSd5koX230Kn0nn/ywZ8vfvzP9GB6PULC8RgAg4foOb25PoB41BTi9k85XZ2a3X/N5EnNPVLNE7cp6letS8rA51V3ybmXVx3ykMA/Wn3KPUu+KuDg4kIrxYhXuMtFp4yl+4jOZJgY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Andrey Konovalov Avoid duplicating code for saving extra info into tracks: reuse the common function for this. Fixes: 5d4c6ac94694 ("kasan: record and report more information") Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver --- mm/kasan/common.c | 12 ++++++++++-- mm/kasan/generic.c | 4 ++-- mm/kasan/kasan.h | 3 ++- mm/kasan/tags.c | 17 +---------------- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index fe6c4b43ad9f..d004a0f4406c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -48,7 +48,7 @@ depot_stack_handle_t kasan_save_stack(gfp_t flags, depot_flags_t depot_flags) return stack_depot_save_flags(entries, nr_entries, flags, depot_flags); } -void kasan_set_track(struct kasan_track *track, gfp_t flags) +void kasan_set_track(struct kasan_track *track, depot_stack_handle_t stack) { #ifdef CONFIG_KASAN_EXTRA_INFO u32 cpu = raw_smp_processor_id(); @@ -58,8 +58,16 @@ void kasan_set_track(struct kasan_track *track, gfp_t flags) track->timestamp = ts_nsec >> 3; #endif /* CONFIG_KASAN_EXTRA_INFO */ track->pid = current->pid; - track->stack = kasan_save_stack(flags, + track->stack = stack; +} + +void kasan_save_track(struct kasan_track *track, gfp_t flags) +{ + depot_stack_handle_t stack; + + stack = kasan_save_stack(flags, STACK_DEPOT_FLAG_CAN_ALLOC | STACK_DEPOT_FLAG_GET); + kasan_set_track(track, stack); } #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index 769e43e05d0b..11b575707b05 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -553,7 +553,7 @@ void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) stack_depot_put(alloc_meta->aux_stack[1]); __memset(alloc_meta, 0, sizeof(*alloc_meta)); - kasan_set_track(&alloc_meta->alloc_track, flags); + kasan_save_track(&alloc_meta->alloc_track, flags); } void kasan_save_free_info(struct kmem_cache *cache, void *object) @@ -564,7 +564,7 @@ void kasan_save_free_info(struct kmem_cache *cache, void *object) if (!free_meta) return; - kasan_set_track(&free_meta->free_track, 0); + kasan_save_track(&free_meta->free_track, 0); /* The object was freed and has free track set. */ *(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREETRACK; } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 9072ce4c1263..31fb6bb26fed 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -372,7 +372,8 @@ static inline void kasan_init_object_meta(struct kmem_cache *cache, const void * #endif depot_stack_handle_t kasan_save_stack(gfp_t flags, depot_flags_t depot_flags); -void kasan_set_track(struct kasan_track *track, gfp_t flags); +void kasan_set_track(struct kasan_track *track, depot_stack_handle_t stack); +void kasan_save_track(struct kasan_track *track, gfp_t flags); void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags); void kasan_save_free_info(struct kmem_cache *cache, void *object); diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c index c4d14dbf27c0..d65d48b85f90 100644 --- a/mm/kasan/tags.c +++ b/mm/kasan/tags.c @@ -94,17 +94,6 @@ void __init kasan_init_tags(void) } } -#ifdef CONFIG_KASAN_EXTRA_INFO -static void save_extra_info(struct kasan_stack_ring_entry *entry) -{ - u32 cpu = raw_smp_processor_id(); - u64 ts_nsec = local_clock(); - - entry->track.cpu = cpu; - entry->track.timestamp = ts_nsec >> 3; -} -#endif /* CONFIG_KASAN_EXTRA_INFO */ - static void save_stack_info(struct kmem_cache *cache, void *object, gfp_t gfp_flags, bool is_free) { @@ -137,11 +126,7 @@ static void save_stack_info(struct kmem_cache *cache, void *object, old_stack = entry->track.stack; entry->size = cache->object_size; - entry->track.pid = current->pid; - entry->track.stack = stack; -#ifdef CONFIG_KASAN_EXTRA_INFO - save_extra_info(entry); -#endif /* CONFIG_KASAN_EXTRA_INFO */ + kasan_set_track(&entry->track, stack); entry->is_free = is_free; entry->ptr = object;