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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 2C1BBC5517A for ; Wed, 11 Nov 2020 18:54:49 +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 94878206FB for ; Wed, 11 Nov 2020 18:54:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xrq6JPhz"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="mJji5oqY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94878206FB 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=Stszu77m3GrSDOTV5GBIaXUZntd9IcG099x0ajZq9Kk=; b=xrq6JPhz3m1U5GsVfBn/oVkPQ 2lak4cOJkqz6Wb8VaO5uiEZZndxkxXjVceaWP4uIjI5sV3tkB6jN1xL82HGMuhsAt+tvcAuQNFTOi pVUwuWKTqb/vFf/1KZE0fxbG9Dffl9z0ueCTl5Yyw8A+tVLLIlfn6vdvueoS9WaCGnM7p2RJWYyG9 UTlW8iEiHETqhHBayOyhY37S/mFGPI6yw4kh/fW3JL8zPTJAPqkD7uLs8qu0A/T7NpfKuI8UiruKG iEDa6wLiLWGAb6YLRKe9VZQyYI9RTwotM4ixlWF6JvpJu6zspIPSasNEDTQHCU21H3ILCHqcO9iyB 6CVUE1Dgw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcvFT-0003BW-Dc; Wed, 11 Nov 2020 18:53:39 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcvFO-00039n-EE for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 18:53:35 +0000 Received: by mail-wm1-x344.google.com with SMTP id p22so3212506wmg.3 for ; Wed, 11 Nov 2020 10:53:33 -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=I8q/vVa+ijcqTeGumhvfz2/56ujSv/ipRCCYIYw6Nv8Dnrwh2YRjHc3EBhT/+3jZ37 WnVL4uzRhb550MnSZ2chkFcEz9KrNPdQfuhXSmWEVtHb2H714+HEAm/CFdyt8N+zQl12 ZB6oQZfWB4wbyNhoNx2oUrQD0SK/q2/qZljDHcNZXyvrcplqm0nQls+5JfttSqzz+LAp DRra2n/KV4FWv0jtDMvUTk/KBFYWkGsaI6iOnxjkZxyYX6aZpEUTZa9hOnXdpehX1C2L 0minnejHj+fMVT8mK2x6xRQLLefivzrm6xIXu5+0NlK3mMAL8E/j1IVkTS3MurCoDCAl ZHJQ== X-Gm-Message-State: AOAM533T7VEz0CwYTGsEUM+OCVXbNx5kqf8gFRoc+i3wWYROtw14eadd rTjf38lYT57vvwSGoMBJpVEqZg== 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 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-Disposition: inline In-Reply-To: User-Agent: Mutt/1.14.6 (2020-07-11) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_135334_633958_DA791AA2 X-CRM114-Status: GOOD ( 23.36 ) 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 , Dmitry Vyukov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Evgenii Stepanov 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 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel