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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 0CF36C433E0 for ; Fri, 15 Jan 2021 13:21:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AC2BB23358 for ; Fri, 15 Jan 2021 13:21:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC2BB23358 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=21b9/YsyT/OfRAt9fZZat8s0PzfVYl86UQdv1Jq8tRw=; b=cfkhlIWfmQAsXb6nbfGI08i3y xtQvr1gIpl6f3QM4d8O9MKOwgCipHI1yZ7LXyquVIDNik9m382g/qj66jCM4FV+o2yKj8vRcVu61O JHeBB3ZRZkyt2KKaZZGG9kbC9xr5Pngiu1GPxgLMnyLVJ4FW2wTr3ESNL8z98LdqRq4bWqGu0YHRY 0gaSXhXUVHkejt2+HtOWjuJdrwczFMjI9R3CngdU7j53eubrHwj1AFg+FD7pFNwNWmuwZmmLA93up TCsOKj5u6SVQYA/5AnJ4IDA9llysKmiytFKqJiL4iv/0Tiwj+VJht7TKSGQRnV64WzMJvZAUUj8uz Ef7+01mVg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0P13-0003Wi-OG; Fri, 15 Jan 2021 13:19:49 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0P10-0003VK-JC for linux-arm-kernel@lists.infradead.org; Fri, 15 Jan 2021 13:19:47 +0000 Received: by mail-wm1-x329.google.com with SMTP id i63so7338293wma.4 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=Ksbg/Q4dmecBG8wX9r/W/T/ThrPvLrzcRDKsGtTYFxOXy91PQ29GyrSvXedlFacwP+ tOM/Q38KACt5g6KknYplj/JsEsClnUtY1EiKof8axtj4+UZHFgRerD0ah5QzA1zpcFm0 m5mb5OQKJBbeMhkeVxoSp0dgW9qqq9RflAikcvzBST0Je7COWrWnFQv1rjcSCYj+RyyV Bo1U3n6SBBjS+MhHrH0QkfzfecZNfscY9WWS80U3qZUDGuko5cdzoK+EFJK5bAp/7iG6 CAXQsmgJ4VLT65OyTcS/ezQQ0+uVOrmRE8hBbQlBa6ItiC3eziBFjzz7X8S3oUzVKKQG ev2w== X-Gm-Message-State: AOAM530Xqid202ZWRuTJxVUe7dfUv3I1ICI3ulyx9gjlSzng0/l/4p99 guuvkaeZ80L+jy6E5giAP/mtOw== 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 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-Disposition: inline In-Reply-To: <03fae8b66a7f4b85abadc80a2d216ac4db815444.1610652890.git.andreyknvl@google.com> User-Agent: Mutt/2.0.2 (2020-11-20) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210115_081946_701914_B8A303A7 X-CRM114-Status: GOOD ( 22.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Peter Collingbourne , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel