From mboxrd@z Thu Jan 1 00:00:00 1970 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 B7C72C433EF for ; Mon, 20 Jun 2022 13:40:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54BDA8E0001; Mon, 20 Jun 2022 09:40:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 521966B007B; Mon, 20 Jun 2022 09:40:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E99B8E0001; Mon, 20 Jun 2022 09:40:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2FD2B6B0073 for ; Mon, 20 Jun 2022 09:40:23 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 0B16B60218 for ; Mon, 20 Jun 2022 13:40:23 +0000 (UTC) X-FDA: 79598723526.14.5EF4850 Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by imf18.hostedemail.com (Postfix) with ESMTP id 9CA791C0004 for ; Mon, 20 Jun 2022 13:40:22 +0000 (UTC) Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-3178ea840easo62657587b3.13 for ; Mon, 20 Jun 2022 06:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=G3ftVDEg1TDDghcSSxJkEC5/y2JJbqzI/pYg/LWTE5M=; b=eQi9zaETbW4lHIIHxYGnQFaf8AKQt0sBKp0IbSlyW9dV5l1FyBP28/JhSX7ZhHu+EC tq9L0qSxqCjnYc8aQp21Dd+5qgn0BytcW0NQTRXtMcAQa7B+KEsgsbEmNd6TAlPi9AIQ ZZOT1mZeBnc/gpoJG9mRYLpUl2CTZMQwYc/Cjht516keHKmlelKQqbybpmzoSewBOAlb P8TTBOQauRSlBcojdTn+Vvy+OZRLdawcAIc/nuA2hRx8y0fw6cRh3e48d3wxu6Ao3go3 YpU8fhOcLfj3jeqCwfG7NEi3xcWiwxHToSWrmUMunOpsbs0chbwsMR1i5RxQjQsiyVuX j7cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=G3ftVDEg1TDDghcSSxJkEC5/y2JJbqzI/pYg/LWTE5M=; b=yEKqqiMtxI5XthsIFnuhnFOu/IiyJr6pgdIrE80BpF+zfy21T3mGr/1Y/Sp0WBKYny V1LeYzzNJfz1Vb7VHdfiy0vM71dPSzBge/B2Zo+4F/LqmrbxXQbWGAFpXwcHXompY86R zvNqQB+rC1hlICFoAKUSFZJ7g3ReEYtfNizwQAYks2ZL7mb0A38lIcysxXN+lyA3MRc7 ih+bPXK0xJ3BXrGMFkTSnwZOPR1Gdg+t7+XGN4r6p5QfkHHdfLJwwlgyzI30RLW9ivle b+jjBGtiJbUN6woQn5MwQ9Ni8i9Y7JYzTRT6LNzQgzvoCuRhQrsloubr+rxolgccBNHf ms7w== X-Gm-Message-State: AJIora/r1wW4e1me5mH5BLS5p77F7HYlCsAlgcIu5NQD1FA0KNx1mINn 5nDjZmyI02CrKh0gUca72EVLP7chjqlD76/xsfm/wg== X-Google-Smtp-Source: AGRyM1tuzS2F5lnMM3e3LuptJnclgKnMIb8eaxxILsezytDKBMYiD1qJfqe3ULRqbbhVvRi5Hs3vo84qgTBXGVi6G+M= X-Received: by 2002:a81:3a12:0:b0:314:6097:b801 with SMTP id h18-20020a813a12000000b003146097b801mr27848775ywa.512.1655732421684; Mon, 20 Jun 2022 06:40:21 -0700 (PDT) MIME-Version: 1.0 References: <184ac9df81406e73611e1f639c5d4d09f8d7693a.1655150842.git.andreyknvl@google.com> In-Reply-To: <184ac9df81406e73611e1f639c5d4d09f8d7693a.1655150842.git.andreyknvl@google.com> From: Marco Elver Date: Mon, 20 Jun 2022 15:39:45 +0200 Message-ID: Subject: Re: [PATCH 07/32] kasan: introduce kasan_get_alloc_track To: andrey.konovalov@linux.dev Cc: Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Peter Collingbourne , Evgenii Stepanov , Florian Mayer , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655732422; a=rsa-sha256; cv=none; b=OdMy8IAqLEfk8UFzxt3OxS2cJqj39S0y3hRrVTJqLAKJGD/2SNu1cj35m6Rx1xQ5FJvuxr vRqbw3MmT1EmCQz9FLfSfRwC86iWzJZKckTtYKI09LcQ2uCobo/ZWj79ldsIb0PfNs8YQI Z1AVoNyQ+wh2xuGaKje+Dvw3NNJX2Q0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=eQi9zaET; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of elver@google.com designates 209.85.128.179 as permitted sender) smtp.mailfrom=elver@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655732422; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=G3ftVDEg1TDDghcSSxJkEC5/y2JJbqzI/pYg/LWTE5M=; b=FcBMZHx6mvYI/1/bi1VInUnlHm/79VKoH8dYLkGS3N6EMSMTL2HhhlDNJQhqPkn3mYDTuU 0PK2a0/wTAYglEJRPcf/dnRv4/dDtWiqL5ah+ALiOqgg0o5v/fmOm6AITo9RtVS7MtkaCX sbB47GBqmkC6IN8FEFFgZ/QpSu14GKE= Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=eQi9zaET; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of elver@google.com designates 209.85.128.179 as permitted sender) smtp.mailfrom=elver@google.com X-Stat-Signature: oaomqjpr4c7jwuooq7w9d8wyb1pif9r3 X-Rspamd-Queue-Id: 9CA791C0004 X-Rspam-User: X-Rspamd-Server: rspam03 X-HE-Tag: 1655732422-831979 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: On Mon, 13 Jun 2022 at 22:16, wrote: > > From: Andrey Konovalov > > Add a kasan_get_alloc_track() helper that fetches alloc_track for a slab > object and use this helper in the common reporting code. > > For now, the implementations of this helper are the same for the Generic > and tag-based modes, but they will diverge later in the series. > > This change hides references to alloc_meta from the common reporting code. > This is desired as only the Generic mode will be using per-object metadata > after this series. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver > --- > mm/kasan/generic.c | 14 +++++++++++++- > mm/kasan/kasan.h | 4 +++- > mm/kasan/report.c | 8 ++++---- > mm/kasan/tags.c | 14 +++++++++++++- > 4 files changed, 33 insertions(+), 7 deletions(-) > > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index 98c451a3b01f..f212b9ae57b5 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -381,8 +381,20 @@ void kasan_save_free_info(struct kmem_cache *cache, > *(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREETRACK; > } > > +struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache, > + void *object) > +{ > + struct kasan_alloc_meta *alloc_meta; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (!alloc_meta) > + return NULL; > + > + return &alloc_meta->alloc_track; > +} > + > struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, > - void *object, u8 tag) > + void *object, u8 tag) > { > if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_SLAB_FREETRACK) > return NULL; > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index bcea5ed15631..4005da62a1e1 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -282,8 +282,10 @@ depot_stack_handle_t kasan_save_stack(gfp_t flags, bool can_alloc); > void kasan_set_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, u8 tag); > +struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache, > + void *object); > struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, > - void *object, u8 tag); > + void *object, u8 tag); > > #if defined(CONFIG_KASAN_GENERIC) && \ > (defined(CONFIG_SLAB) || defined(CONFIG_SLUB)) > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index 35dd8aeb115c..f951fd39db74 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -251,12 +251,12 @@ static void describe_object_addr(struct kmem_cache *cache, void *object, > static void describe_object_stacks(struct kmem_cache *cache, void *object, > const void *addr, u8 tag) > { > - struct kasan_alloc_meta *alloc_meta; > + struct kasan_track *alloc_track; > struct kasan_track *free_track; > > - alloc_meta = kasan_get_alloc_meta(cache, object); > - if (alloc_meta) { > - print_track(&alloc_meta->alloc_track, "Allocated"); > + alloc_track = kasan_get_alloc_track(cache, object); > + if (alloc_track) { > + print_track(alloc_track, "Allocated"); > pr_err("\n"); > } > > diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c > index e0e5de8ce834..7b1fc8e7c99c 100644 > --- a/mm/kasan/tags.c > +++ b/mm/kasan/tags.c > @@ -38,8 +38,20 @@ void kasan_save_free_info(struct kmem_cache *cache, > kasan_set_track(&alloc_meta->free_track, GFP_NOWAIT); > } > > +struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache, > + void *object) > +{ > + struct kasan_alloc_meta *alloc_meta; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (!alloc_meta) > + return NULL; > + > + return &alloc_meta->alloc_track; > +} > + > struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, > - void *object, u8 tag) > + void *object, u8 tag) > { > struct kasan_alloc_meta *alloc_meta; > > -- > 2.25.1 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/184ac9df81406e73611e1f639c5d4d09f8d7693a.1655150842.git.andreyknvl%40google.com.