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 X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2892EC433E0 for ; Fri, 15 Jan 2021 13:19:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CB3B022583 for ; Fri, 15 Jan 2021 13:19:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB3B022583 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 63A308D0171; Fri, 15 Jan 2021 08:19:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E7C88D0162; Fri, 15 Jan 2021 08:19:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AED78D0171; Fri, 15 Jan 2021 08:19:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0242.hostedemail.com [216.40.44.242]) by kanga.kvack.org (Postfix) with ESMTP id 24F118D0162 for ; Fri, 15 Jan 2021 08:19:47 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D27BE180AD804 for ; Fri, 15 Jan 2021 13:19:46 +0000 (UTC) X-FDA: 77708066772.05.use56_03127632752f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id B7A331801E8EC for ; Fri, 15 Jan 2021 13:19:46 +0000 (UTC) X-HE-Tag: use56_03127632752f X-Filterd-Recvd-Size: 8944 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 13:19:46 +0000 (UTC) Received: by mail-wm1-f41.google.com with SMTP id c124so7323303wma.5 for ; Fri, 15 Jan 2021 05:19:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=5KScXesbEjxL3jaiuXSfmiGP49GRLi2XSqWfLcjiqag=; b=QXqqruHIZL3TiO4DkGU1qdVNUytHa1R/5tOlaed8VpAb4bi/Ynb9GmTxzYA6KTsGfZ IdHf7dFVQepg1TgHfUI/F/A8S30avmU6zTQ6T2r/1KiUDyZwbakpfScHIvUDnUpzI8fp CtzdM9SBd20/xz9B0ErH31ZG5Br9RFicZt4qKo9ZFXL/Ar2iiGGcAzwPwCzEwBL9xVUK yFEPPaQW5V6mGFDEwJfQwL/ajl2UJjpP3oC8Lm3JwuMNqFxe8Z8njqlNWG5NaGVVSp6L iUHQjw9q4hC6our/aTZs2FaiMObR3uag7RI+rU4Tknu9YClSpoUtk8+H8Z/Ng/Bu4hXw Aw8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=5KScXesbEjxL3jaiuXSfmiGP49GRLi2XSqWfLcjiqag=; b=ijOlwA8OHgxkGcecsHbyHBPkIkHuCt2eVBZuQxiM+MsHktCYkcLWt4u+1OBhGHXoj5 A+I09NvC5yre30n5u61zf3eSbSu7nwMsmC5tC2RjWOk6U3FZsbUnpiEI4ubTfLsnkG4x pP9hphO8QoFovepXludGLgX3lavmeaS6C/CCaMjDp1LbAfO3zSmu+zN94d4S24Y1A2Ev nvzlWMMv8NgIw0cKXL5QfhPSNR8h+iO84sF0f/T6YW15gmNBsu4iXNeB8jzTiJiEU466 RE0mJt4S4TRoeVoJmeBDrsa9M4TUfF6MzSeVdK/sd7SqdWD7MjrXyEvVxPUXi0eobXl+ 8E5Q== X-Gm-Message-State: AOAM532m0dT9rpzfVAgQ+Ma931Rz3sRqrotIbXSqBOCIVjwA+NGuY447 o3BPPQXYqyL0tikF5FsZWb41/Q== X-Google-Smtp-Source: ABdhPJwjcEj7RsyxDUitn9zYbJIMTLawVNr46NnQ/snkhHnec+aYiSZCT9AQ+s1XfeYsjPqymTeOaQ== X-Received: by 2002:a1c:4c7:: with SMTP id 190mr8760735wme.32.1610716784979; Fri, 15 Jan 2021 05:19:44 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id a8sm12661374wmd.6.2021.01.15.05.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 05:19:44 -0800 (PST) Date: Fri, 15 Jan 2021 14:19:38 +0100 From: Marco Elver To: Andrey Konovalov Cc: Andrew Morton , Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Will Deacon , Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 11/15] kasan: move _RET_IP_ to inline wrappers Message-ID: References: <03fae8b66a7f4b85abadc80a2d216ac4db815444.1610652890.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <03fae8b66a7f4b85abadc80a2d216ac4db815444.1610652890.git.andreyknvl@google.com> User-Agent: Mutt/2.0.2 (2020-11-20) 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 Thu, Jan 14, 2021 at 08:36PM +0100, Andrey Konovalov wrote: > Generic mm functions that call KASAN annotations that might report a bug > pass _RET_IP_ to them as an argument. This allows KASAN to include the > name of the function that called the mm function in its report's header. > > Now that KASAN has inline wrappers for all of its annotations, move > _RET_IP_ to those wrappers to simplify annotation call sites. > > Link: https://linux-review.googlesource.com/id/I8fb3c06d49671305ee184175a39591bc26647a67 > Signed-off-by: Andrey Konovalov Much nicer! Reviewed-by: Marco Elver > --- > include/linux/kasan.h | 20 +++++++++----------- > mm/mempool.c | 2 +- > mm/slab.c | 2 +- > mm/slub.c | 4 ++-- > 4 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 5e0655fb2a6f..bba1637827c3 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -181,19 +181,18 @@ static __always_inline void * __must_check kasan_init_slab_obj( > } > > bool __kasan_slab_free(struct kmem_cache *s, void *object, unsigned long ip); > -static __always_inline bool kasan_slab_free(struct kmem_cache *s, void *object, > - unsigned long ip) > +static __always_inline bool kasan_slab_free(struct kmem_cache *s, void *object) > { > if (kasan_enabled()) > - return __kasan_slab_free(s, object, ip); > + return __kasan_slab_free(s, object, _RET_IP_); > return false; > } > > void __kasan_slab_free_mempool(void *ptr, unsigned long ip); > -static __always_inline void kasan_slab_free_mempool(void *ptr, unsigned long ip) > +static __always_inline void kasan_slab_free_mempool(void *ptr) > { > if (kasan_enabled()) > - __kasan_slab_free_mempool(ptr, ip); > + __kasan_slab_free_mempool(ptr, _RET_IP_); > } > > void * __must_check __kasan_slab_alloc(struct kmem_cache *s, > @@ -237,10 +236,10 @@ static __always_inline void * __must_check kasan_krealloc(const void *object, > } > > void __kasan_kfree_large(void *ptr, unsigned long ip); > -static __always_inline void kasan_kfree_large(void *ptr, unsigned long ip) > +static __always_inline void kasan_kfree_large(void *ptr) > { > if (kasan_enabled()) > - __kasan_kfree_large(ptr, ip); > + __kasan_kfree_large(ptr, _RET_IP_); > } > > bool kasan_save_enable_multi_shot(void); > @@ -273,12 +272,11 @@ static inline void *kasan_init_slab_obj(struct kmem_cache *cache, > { > return (void *)object; > } > -static inline bool kasan_slab_free(struct kmem_cache *s, void *object, > - unsigned long ip) > +static inline bool kasan_slab_free(struct kmem_cache *s, void *object) > { > return false; > } > -static inline void kasan_slab_free_mempool(void *ptr, unsigned long ip) {} > +static inline void kasan_slab_free_mempool(void *ptr) {} > static inline void *kasan_slab_alloc(struct kmem_cache *s, void *object, > gfp_t flags) > { > @@ -298,7 +296,7 @@ static inline void *kasan_krealloc(const void *object, size_t new_size, > { > return (void *)object; > } > -static inline void kasan_kfree_large(void *ptr, unsigned long ip) {} > +static inline void kasan_kfree_large(void *ptr) {} > > #endif /* CONFIG_KASAN */ > > diff --git a/mm/mempool.c b/mm/mempool.c > index 624ed51b060f..79959fac27d7 100644 > --- a/mm/mempool.c > +++ b/mm/mempool.c > @@ -104,7 +104,7 @@ static inline void poison_element(mempool_t *pool, void *element) > static __always_inline void kasan_poison_element(mempool_t *pool, void *element) > { > if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) > - kasan_slab_free_mempool(element, _RET_IP_); > + kasan_slab_free_mempool(element); > else if (pool->alloc == mempool_alloc_pages) > kasan_free_pages(element, (unsigned long)pool->pool_data); > } > diff --git a/mm/slab.c b/mm/slab.c > index d7c8da9319c7..afeb6191fb1e 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -3421,7 +3421,7 @@ static __always_inline void __cache_free(struct kmem_cache *cachep, void *objp, > memset(objp, 0, cachep->object_size); > > /* Put the object into the quarantine, don't touch it for now. */ > - if (kasan_slab_free(cachep, objp, _RET_IP_)) > + if (kasan_slab_free(cachep, objp)) > return; > > /* Use KCSAN to help debug racy use-after-free. */ > diff --git a/mm/slub.c b/mm/slub.c > index 75fb097d990d..0afb53488238 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1514,7 +1514,7 @@ static inline void *kmalloc_large_node_hook(void *ptr, size_t size, gfp_t flags) > static __always_inline void kfree_hook(void *x) > { > kmemleak_free(x); > - kasan_kfree_large(x, _RET_IP_); > + kasan_kfree_large(x); > } > > static __always_inline bool slab_free_hook(struct kmem_cache *s, void *x) > @@ -1544,7 +1544,7 @@ static __always_inline bool slab_free_hook(struct kmem_cache *s, void *x) > KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ASSERT); > > /* KASAN might put x into memory quarantine, delaying its reuse */ > - return kasan_slab_free(s, x, _RET_IP_); > + return kasan_slab_free(s, x); > } > > static inline bool slab_free_freelist_hook(struct kmem_cache *s, > -- > 2.30.0.284.gd98b1dd5eaa7-goog >