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 A26D0C43334 for ; Mon, 20 Jun 2022 13:40:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EF388E0002; Mon, 20 Jun 2022 09:40:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C2236B0074; Mon, 20 Jun 2022 09:40:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 262F48E0002; Mon, 20 Jun 2022 09:40:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1802F6B0073 for ; Mon, 20 Jun 2022 09:40:26 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id E33766023F for ; Mon, 20 Jun 2022 13:40:25 +0000 (UTC) X-FDA: 79598723610.10.BAD1C58 Received: from mail-yb1-f172.google.com (mail-yb1-f172.google.com [209.85.219.172]) by imf09.hostedemail.com (Postfix) with ESMTP id A09D9140014 for ; Mon, 20 Jun 2022 13:40:25 +0000 (UTC) Received: by mail-yb1-f172.google.com with SMTP id v81so19067709ybe.0 for ; Mon, 20 Jun 2022 06:40:25 -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=qC8/39KyiVmkl5BIZHurMzBUhpZZ/2u2VsK+Aq1J8ck=; b=n5grsZvn37HTJvF7JA9iDYlBioHc18d2ANnnTFPfnz1iuWR3ngzEQtfFNI+L/z2FCv Kw+da3fcl8sTfSrM9d6BVz6LjzSfp55xy/s0TYpzX7DgcpiMalQQrXPtLO8qf+CKxXxJ oOFitOjgxGC+ccHqd9xVj9y8uqqfj/EvCg+GbaGgcURdSWtTE++dQKmGgq89cUK5rIbQ uEZeryy2q/4qpoHxj7npuMm7okgUIbpgP/y6GiGmfbAaRsPjfvoaN1Fh3VMF1i5Rr/Xb 7jOf0IVwtVIMfaJvlfqFCPiQACWG43TX47vx95xFwHd+dzwJV/nCX96F3XL9Apn/2c3V XIlg== 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=qC8/39KyiVmkl5BIZHurMzBUhpZZ/2u2VsK+Aq1J8ck=; b=nroXYJCdANDKPiV+1+Uc7ClRMV7MeKwEcSmDaKhsFIiSUD5FYlGsFiOI960nIuStPE p1dBbcXYnHKQgh4EqaeUlzhg1eAi385yarH9alL2yrTkuvBKWtLAtfvaSom7yPZ2Su3S ZSnX+f6I9/G7QoPx8nwnjpUKGTdpyOxZCUxObtxnA/6SyF89GRJ0n1iZl/D13dNNRm9L ri1FbuIOM4GKDQhPZKaWjKcis0dwU9F1ZtgTJcag2LexmsJjeXXoi+6CeGBjomK/17Se N/alnGW35RFjN64eTviDurN8CkKYzNzqeN8rUTUmJWtQzB/z2z3PJrLKKSFWG6CFYYM3 9JPg== X-Gm-Message-State: AJIora/GZ4oIQkvwWHm2LD5aqdT/orrtlVAxwAw5ea/Rb6CjRBKJhwmV doRSbMmgxwQpG9Pxe11KA2evBwvcntqHFZCv7FacbQ== X-Google-Smtp-Source: AGRyM1tFQRMqH7PE0XOK25t/U3BmF+AvWBCqJkpRyfkJZxomI2+bNrTC9wgUda8cQUepFpAOOZt1wJOnaH/B7Ysif/s= X-Received: by 2002:a25:1583:0:b0:668:e74a:995f with SMTP id 125-20020a251583000000b00668e74a995fmr11104743ybv.1.1655732424678; Mon, 20 Jun 2022 06:40:24 -0700 (PDT) MIME-Version: 1.0 References: <8d1cf94238a325e441f684cbdbb2a1da0db78add.1655150842.git.andreyknvl@google.com> In-Reply-To: <8d1cf94238a325e441f684cbdbb2a1da0db78add.1655150842.git.andreyknvl@google.com> From: Marco Elver Date: Mon, 20 Jun 2022 15:39:48 +0200 Message-ID: Subject: Re: [PATCH 08/32] kasan: introduce kasan_init_object_meta 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-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=n5grsZvn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of elver@google.com designates 209.85.219.172 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=1655732425; 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=qC8/39KyiVmkl5BIZHurMzBUhpZZ/2u2VsK+Aq1J8ck=; b=VfyaVAG/elXeCad5qnYAtjklCbrJtbdvFEBhUKyZz6g1WdASogJ32BIINFXQ8B06flU3q5 eAynRriO8I1ztHFSC0W0GsjGygLE9ON/2P5Wuhc9nB2RWA9tj+GnJz0UdZUBrgWIBikm5O 7ghaskRsqlmuvgUShPx77XX1WhAOuHI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655732425; a=rsa-sha256; cv=none; b=8VYBEY9N2TS2xrRCPvLzk1l8+UOwjPDlnYdhStczjY8x/RaCcgbTjDJ/oB9YJMSgGnBwZt wKdsFBYADYVQiHXkenAe0Xt8dQ7U2QNIV3L692n0LvsWHAi7weli5dK1xRpR1M2qeGxyYF uaZEAxEOVf93NwVsm4MvN4WkwDsBc1o= X-Stat-Signature: uswt8ybdf58hunrfp84d9f13mucrqt5s X-Rspamd-Queue-Id: A09D9140014 X-Rspam-User: Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=n5grsZvn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of elver@google.com designates 209.85.219.172 as permitted sender) smtp.mailfrom=elver@google.com X-Rspamd-Server: rspam10 X-HE-Tag: 1655732425-331470 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_init_object_meta() helper that initializes metadata for a slab > object and use it in the common 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 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/common.c | 10 +++------- > mm/kasan/generic.c | 9 +++++++++ > mm/kasan/kasan.h | 2 ++ > mm/kasan/tags.c | 9 +++++++++ > 4 files changed, 23 insertions(+), 7 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 2848c7a2402a..f0ee1c1b4b3c 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -312,13 +312,9 @@ static inline u8 assign_tag(struct kmem_cache *cache, > void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache, > const void *object) > { > - struct kasan_alloc_meta *alloc_meta; > - > - if (kasan_stack_collection_enabled()) { > - alloc_meta = kasan_get_alloc_meta(cache, object); > - if (alloc_meta) > - __memset(alloc_meta, 0, sizeof(*alloc_meta)); > - } > + /* Initialize per-object metadata if it is present. */ > + if (kasan_stack_collection_enabled()) > + kasan_init_object_meta(cache, object); > > /* Tag is ignored in set_tag() without CONFIG_KASAN_SW/HW_TAGS */ > object = set_tag(object, assign_tag(cache, object, true)); > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index f212b9ae57b5..5462ddbc21e6 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -328,6 +328,15 @@ DEFINE_ASAN_SET_SHADOW(f3); > DEFINE_ASAN_SET_SHADOW(f5); > DEFINE_ASAN_SET_SHADOW(f8); > > +void kasan_init_object_meta(struct kmem_cache *cache, const void *object) > +{ > + struct kasan_alloc_meta *alloc_meta; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (alloc_meta) > + __memset(alloc_meta, 0, sizeof(*alloc_meta)); > +} > + > static void __kasan_record_aux_stack(void *addr, bool can_alloc) > { > struct slab *slab = kasan_addr_to_slab(addr); > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 4005da62a1e1..751c3b17749a 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -278,6 +278,8 @@ void kasan_report_invalid_free(void *object, unsigned long ip); > struct page *kasan_addr_to_page(const void *addr); > struct slab *kasan_addr_to_slab(const void *addr); > > +void kasan_init_object_meta(struct kmem_cache *cache, const void *object); > + > 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); > diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c > index 7b1fc8e7c99c..2e200969a4b8 100644 > --- a/mm/kasan/tags.c > +++ b/mm/kasan/tags.c > @@ -17,6 +17,15 @@ > > #include "kasan.h" > > +void kasan_init_object_meta(struct kmem_cache *cache, const void *object) > +{ > + struct kasan_alloc_meta *alloc_meta; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (alloc_meta) > + __memset(alloc_meta, 0, sizeof(*alloc_meta)); > +} > + > void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) > { > 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/8d1cf94238a325e441f684cbdbb2a1da0db78add.1655150842.git.andreyknvl%40google.com.