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=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL 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 DEABBC388F9 for ; Wed, 11 Nov 2020 18:53:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4C5F520797 for ; Wed, 11 Nov 2020 18:53:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mJji5oqY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C5F520797 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 C43E66B006E; Wed, 11 Nov 2020 13:53:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF41A6B0070; Wed, 11 Nov 2020 13:53:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0B806B0071; Wed, 11 Nov 2020 13:53:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0188.hostedemail.com [216.40.44.188]) by kanga.kvack.org (Postfix) with ESMTP id 872F26B006E for ; Wed, 11 Nov 2020 13:53:35 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 26C778249980 for ; Wed, 11 Nov 2020 18:53:35 +0000 (UTC) X-FDA: 77473035990.19.way95_580734a27300 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id EF25E1AD1A3 for ; Wed, 11 Nov 2020 18:53:34 +0000 (UTC) X-HE-Tag: way95_580734a27300 X-Filterd-Recvd-Size: 8108 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 18:53:34 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id s13so3285288wmh.4 for ; Wed, 11 Nov 2020 10:53:34 -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=BsqGYO3Z3LmOG3+gEI3hEN4Yp+SLkMxnpyJBNBk4sQ4=; b=mJji5oqY1OzEJWl5UZxRmQOZNoPQQXzgVLDrguwlN3KVjusaaRWAIW55bqLaOdTrO8 8kxw3cgrFCfaLLsOFFp/61ToJUxCIhbKTYlAS7SIOQg9jIjMP1YBpno35r/ktCMAe94t GCTR14pyKLAIKWyBusMI9wPH2oxilh0yPLT4awiKGTO1Lw2BEyxk/R/rL1VZYTTtHPAU phUaRyeSdFCMkFeg1nZ3Rhp6Lzx0bt9MLd7wHCrO13piwCQ3lmW9zsUc48mjZmhUFqsh ep+Dh+x97AfCaJTvgHpIpa4PKlmi67Od3AicLntN9/tdxCudDvTK0f6vR981qSQ613s0 wY0Q== 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=BsqGYO3Z3LmOG3+gEI3hEN4Yp+SLkMxnpyJBNBk4sQ4=; b=YIjj2sqQ799sbKsBrhabc8gV7sO9L/5Ll+ge+Orsscxo0hseJGUDgdyWcc23zckVCq GHJULRuwJyFQB3vM6UmQmLS6XeSaHXMiJdmcR/N1GenDlVCrfA+hS6EUCuxZGiXP+xQq +ENdQWYBUP3ga/ve8HY06nhabJg9O/lI3P6wetWCorT99QqacGWPJ6WZeeTmtQYdWOwe vlkU6hhdM/E2bqCfUPLX1qWYakM+4xT+WRKTBU9SHk1Mz2tutd8LabXzAVKUv8oFYcf+ X4pdace9LB8Lgu0fj9GzuvQY7ZSJvMFN9GZ81sitHGC7uptb/sVNyEMPtGLOIVPuQS9M NqbQ== X-Gm-Message-State: AOAM532mQuj6wz8LGeGR+SY3+XpqGIpeRKKKWG68+vyk1sfhs2j3Ybv9 DBhaiv0A+lxufsyxdHXLRDanBQ== X-Google-Smtp-Source: ABdhPJxHLlPHjhrZhLExbqq4w/IszUCQZ0kyVJhn4iwR+4mytZR8qD9mf3bIoOZO54mtGqE6oZNn7Q== X-Received: by 2002:a1c:66c4:: with SMTP id a187mr5688966wmc.186.1605120812851; Wed, 11 Nov 2020 10:53:32 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id c185sm3646674wma.44.2020.11.11.10.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:53:32 -0800 (PST) Date: Wed, 11 Nov 2020 19:53:26 +0100 From: Marco Elver To: Andrey Konovalov Cc: Dmitry Vyukov , Alexander Potapenko , Catalin Marinas , Will Deacon , Vincenzo Frascino , Evgenii Stepanov , Andrey Ryabinin , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 14/20] kasan, mm: rename kasan_poison_kfree Message-ID: <20201111185326.GP517454@elver.google.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.14.6 (2020-07-11) 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 Tue, Nov 10, 2020 at 11:20PM +0100, Andrey Konovalov wrote: > Rename kasan_poison_kfree() to kasan_slab_free_mempool() as it better > reflects what this annotation does. This function is again so simple, and now it seems it's mempool specific, can't we just remove it and open-code it in mempool.c? > No functional changes. > > Signed-off-by: Andrey Konovalov > Reviewed-by: Dmitry Vyukov > Link: https://linux-review.googlesource.com/id/I5026f87364e556b506ef1baee725144bb04b8810 > --- > include/linux/kasan.h | 16 ++++++++-------- > mm/kasan/common.c | 16 ++++++++-------- > mm/mempool.c | 2 +- > 3 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 779f8e703982..534ab3e2935a 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -177,6 +177,13 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, unsigned > return false; > } > > +void __kasan_slab_free_mempool(void *ptr, unsigned long ip); > +static inline void kasan_slab_free_mempool(void *ptr, unsigned long ip) > +{ > + if (kasan_enabled()) > + __kasan_slab_free_mempool(ptr, ip); > +} > + > void * __must_check __kasan_slab_alloc(struct kmem_cache *s, > void *object, gfp_t flags); > static inline void * __must_check kasan_slab_alloc(struct kmem_cache *s, > @@ -217,13 +224,6 @@ static inline void * __must_check kasan_krealloc(const void *object, > return (void *)object; > } > > -void __kasan_poison_kfree(void *ptr, unsigned long ip); > -static inline void kasan_poison_kfree(void *ptr, unsigned long ip) > -{ > - if (kasan_enabled()) > - __kasan_poison_kfree(ptr, ip); > -} > - > void __kasan_kfree_large(void *ptr, unsigned long ip); > static inline void kasan_kfree_large(void *ptr, unsigned long ip) > { > @@ -263,6 +263,7 @@ 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_alloc(struct kmem_cache *s, void *object, > gfp_t flags) > { > @@ -282,7 +283,6 @@ static inline void *kasan_krealloc(const void *object, size_t new_size, > { > return (void *)object; > } > -static inline void kasan_poison_kfree(void *ptr, unsigned long ip) {} > static inline void kasan_kfree_large(void *ptr, unsigned long ip) {} > > #endif /* CONFIG_KASAN */ > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 819403548f2e..60793f8695a8 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -336,6 +336,14 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) > return ____kasan_slab_free(cache, object, ip, true); > } > > +void __kasan_slab_free_mempool(void *ptr, unsigned long ip) > +{ > + struct page *page; > + > + page = virt_to_head_page(ptr); > + ____kasan_slab_free(page->slab_cache, ptr, ip, false); > +} > + > static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) > { > kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); > @@ -427,14 +435,6 @@ void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flag > flags, true); > } > > -void __kasan_poison_kfree(void *ptr, unsigned long ip) > -{ > - struct page *page; > - > - page = virt_to_head_page(ptr); > - ____kasan_slab_free(page->slab_cache, ptr, ip, false); > -} > - > void __kasan_kfree_large(void *ptr, unsigned long ip) > { > if (ptr != page_address(virt_to_head_page(ptr))) > diff --git a/mm/mempool.c b/mm/mempool.c > index f473cdddaff0..b1f39fa75ade 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_poison_kfree(element, _RET_IP_); > + kasan_slab_free_mempool(element, _RET_IP_); This is already a kasan-prefixed function, so if kasan_slab_free_mempool() is only ever called in this function, we should just call kasan_slab_free() here directly with the 2 extra args it requires open-coded. > else if (pool->alloc == mempool_alloc_pages) > kasan_free_pages(element, (unsigned long)pool->pool_data); > } Thanks, -- Marco