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 E9AF6CCA480 for ; Mon, 20 Jun 2022 13:40:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87EF26B0075; Mon, 20 Jun 2022 09:40:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82F6E8E0002; Mon, 20 Jun 2022 09:40:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 71DA88E0001; Mon, 20 Jun 2022 09:40:16 -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 6336A6B0075 for ; Mon, 20 Jun 2022 09:40:16 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2DD511C1 for ; Mon, 20 Jun 2022 13:40:16 +0000 (UTC) X-FDA: 79598723232.24.4B394D0 Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) by imf02.hostedemail.com (Postfix) with ESMTP id D33558001C for ; Mon, 20 Jun 2022 13:40:15 +0000 (UTC) Received: by mail-yb1-f180.google.com with SMTP id i15so14168752ybp.1 for ; Mon, 20 Jun 2022 06:40:15 -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=o4db5qe9nfedraUSjBeWLX6x7hDJFPJYx1QIcCVkfBw=; b=gqJJODRW9TVM68r7z9oFsjnJGqLfS8dsvkZOhGNY0ryjyuxUArQlopicrr9CxvISNX eel4zLPD1tiL8PUNgn/Ppy2idcxs58uP58n1o8bkpYLpDAWfoZghGGBVPNfhtGq2gF7W RdWBkk6iZWRtX8ffH8HMV8nohwWKaRInEzCFW0iqsKNLOzH1Bm5ZF3m9YHB8ArCJr2V7 dJbG/N9Q2bGIb0sQsgGdmgQ0Dsa4K5f0o2fXuamYhVN1WF1iXCBzNEHJSIDRJ0bNjzZv nP3EXdhYqAYmDdg1ZJ3Biy/6my1x3VclaSuWwpxHsFdkd4n3QyLhla8cMFjRV9T/tckb I8PA== 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=o4db5qe9nfedraUSjBeWLX6x7hDJFPJYx1QIcCVkfBw=; b=Wqm2WAfnbZzr8XV5dsYmdQPGUbs9tDXoFM5v2mzl7am0nEGm6E+nmrjf4W0FkJjogi BTPrk6aVThtGka6lWinItL2oyxgMYpr6dFkWzFk7VO3Xi0PmVOg6BWErYhIQgUhPoKCg 7PasuwV3EkLlhU6H3VMmV9WFR7YqjGluSnRR4awrtFj/wkQ4DWoJG0rrRjMhIyyYyV79 wMDw+P0vsjzVEZ3gS7RTJSFHXOnZVW6GDjrRsH1aVvmC3td5mnxgO0xTLSKumDT+hFio FpkhysjCeqDBgRc5Xa+B4yewX5fSySrH42Tn+2iCoXcrryeWBCleuyDHDLTsJhE+aV+u 8WQw== X-Gm-Message-State: AJIora9bdaMTNaX3DcQWBCdGvQLwhTFAwie3HgGfFEfkwikcUT0WnzCU 25ds2uGtc+WtfwliDdPtbCcdKoA/Jw829vz9v7GYaQ== X-Google-Smtp-Source: AGRyM1u+xdcL1FA8R5vc+y26zqgQbjzMDTgmfLW+tUOodR6tKbJRiRRfIk5BpTke++hURuzNbavNuBuCx94z7FEcjW0= X-Received: by 2002:a25:c5cb:0:b0:668:c187:9d0 with SMTP id v194-20020a25c5cb000000b00668c18709d0mr16817150ybe.609.1655732414865; Mon, 20 Jun 2022 06:40:14 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Marco Elver Date: Mon, 20 Jun 2022 15:39:39 +0200 Message-ID: Subject: Re: [PATCH 04/32] kasan: split save_alloc_info implementations 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=1655732415; a=rsa-sha256; cv=none; b=D4XegvmS7XC75KQv/72CLieGHtSSU/uJ02+kN9ASzSGDBbnXLK+YSrcZWF13pL+spSiA3Q 233oPuKOs1jGHxX1WSEHRjd6YFCVw2VNKD8OAmsuqZmSdPt+/4QiNLAHU9KYIhMnBc6SVC 6pVq6KIROYDUIW4tHF7VKT0N9Yse/HI= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=gqJJODRW; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of elver@google.com designates 209.85.219.180 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=1655732415; 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=o4db5qe9nfedraUSjBeWLX6x7hDJFPJYx1QIcCVkfBw=; b=XOPELA2FfurIanCRvIewCA5UShE60SP0usMouC+LLsLLiEZC8PoiU6X2mf52Ni0Xh9s0/F W2M7CEZ3ghca4Ion4bhDKNT4L6mbs/IsqYKu8dxA7dTiKAv4afnaXTLR71XDg2KEuMBLpf dsNPzpXgU2jdZIlqf7aebjR8NTb3vEQ= Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=gqJJODRW; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of elver@google.com designates 209.85.219.180 as permitted sender) smtp.mailfrom=elver@google.com X-Rspam-User: X-Stat-Signature: zfntsf9bhnywd87dyo3qu1nmoxt3pjr6 X-Rspamd-Queue-Id: D33558001C X-Rspamd-Server: rspam08 X-HE-Tag: 1655732415-774702 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:15, wrote: > > From: Andrey Konovalov > > Provide standalone implementations of save_alloc_info() for the Generic > and tag-based modes. > > For now, the implementations are the same, but they will diverge later > in the series. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver > --- > mm/kasan/common.c | 13 ++----------- > mm/kasan/generic.c | 9 +++++++++ > mm/kasan/kasan.h | 1 + > mm/kasan/tags.c | 9 +++++++++ > 4 files changed, 21 insertions(+), 11 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index a6107e8375e0..2848c7a2402a 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -423,15 +423,6 @@ void __kasan_slab_free_mempool(void *ptr, unsigned long ip) > } > } > > -static void save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) > -{ > - struct kasan_alloc_meta *alloc_meta; > - > - alloc_meta = kasan_get_alloc_meta(cache, object); > - if (alloc_meta) > - kasan_set_track(&alloc_meta->alloc_track, flags); > -} > - > void * __must_check __kasan_slab_alloc(struct kmem_cache *cache, > void *object, gfp_t flags, bool init) > { > @@ -462,7 +453,7 @@ void * __must_check __kasan_slab_alloc(struct kmem_cache *cache, > > /* Save alloc info (if possible) for non-kmalloc() allocations. */ > if (kasan_stack_collection_enabled() && !cache->kasan_info.is_kmalloc) > - save_alloc_info(cache, (void *)object, flags); > + kasan_save_alloc_info(cache, (void *)object, flags); > > return tagged_object; > } > @@ -508,7 +499,7 @@ static inline void *____kasan_kmalloc(struct kmem_cache *cache, > * This also rewrites the alloc info when called from kasan_krealloc(). > */ > if (kasan_stack_collection_enabled() && cache->kasan_info.is_kmalloc) > - save_alloc_info(cache, (void *)object, flags); > + kasan_save_alloc_info(cache, (void *)object, flags); > > /* Keep the tag that was set by kasan_slab_alloc(). */ > return (void *)object; > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index 03a3770cfeae..98c451a3b01f 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -358,6 +358,15 @@ void kasan_record_aux_stack_noalloc(void *addr) > return __kasan_record_aux_stack(addr, false); > } > > +void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) > +{ > + struct kasan_alloc_meta *alloc_meta; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (alloc_meta) > + kasan_set_track(&alloc_meta->alloc_track, flags); > +} > + > void kasan_save_free_info(struct kmem_cache *cache, > void *object, u8 tag) > { > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 6df8d7b01073..610057e651d2 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -284,6 +284,7 @@ struct slab *kasan_addr_to_slab(const void *addr); > > 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_free_track(struct kmem_cache *cache, > void *object, u8 tag); > diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c > index b453a353bc86..1ba3c8399f72 100644 > --- a/mm/kasan/tags.c > +++ b/mm/kasan/tags.c > @@ -17,6 +17,15 @@ > > #include "kasan.h" > > +void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) > +{ > + struct kasan_alloc_meta *alloc_meta; > + > + alloc_meta = kasan_get_alloc_meta(cache, object); > + if (alloc_meta) > + kasan_set_track(&alloc_meta->alloc_track, flags); > +} > + > void kasan_save_free_info(struct kmem_cache *cache, > void *object, u8 tag) > { > -- > 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/ae1389c0717d1875077ee3f6cd4beb5b7e046ae0.1655150842.git.andreyknvl%40google.com.