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=-17.4 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_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 F07A5C388F7 for ; Wed, 28 Oct 2020 16:58:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6C513247F4 for ; Wed, 28 Oct 2020 16:58:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="E6BSgQbS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C513247F4 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 C2CC36B0070; Wed, 28 Oct 2020 12:58:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDC726B0071; Wed, 28 Oct 2020 12:58:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B19306B0072; Wed, 28 Oct 2020 12:58:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0052.hostedemail.com [216.40.44.52]) by kanga.kvack.org (Postfix) with ESMTP id 86B516B0070 for ; Wed, 28 Oct 2020 12:58:17 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 220B5180AD80F for ; Wed, 28 Oct 2020 16:58:17 +0000 (UTC) X-FDA: 77421942234.15.boat76_610d2a927286 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id CC6D71814B0C9 for ; Wed, 28 Oct 2020 16:58:16 +0000 (UTC) X-HE-Tag: boat76_610d2a927286 X-Filterd-Recvd-Size: 7909 Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Wed, 28 Oct 2020 16:58:16 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id s14so5166349qkg.11 for ; Wed, 28 Oct 2020 09:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5Xc9c29FA+GYfQKQjFulHFDr1xP7AG55TTtOHUWqRAY=; b=E6BSgQbSGDlSTN7HPIHDJ/BdEgY80jDDm8vopkX+hEVwsGV3h2/mbYrYGqdylcyxdA 5+tNaqX6KrlOEq55j6lEqPli9lKhuXjb0z+XRBMrr011C6Irw7dy3nKagZIFCzd+jikP aEUkI3xU4D2N5VIjVxfUmWDiBt2hbIuJIGDYr8jc9LDxNaU8pxygPZjqjrzuIfAgwkV6 ger3g6fw395Uf8aHjfbXf7TBi4WbAh2xI7NfS86JzAq2cARkaiW6RxjV6MD+2yz6DsN1 C/yVBhRhE3aws8UaT+aeuCSEFuCGy7vasZ6dt1HczXEpyQRRZ0IHtZYv2CehjEo4RSvv JYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5Xc9c29FA+GYfQKQjFulHFDr1xP7AG55TTtOHUWqRAY=; b=uTw3OSSl4zqxQfEBkWLV0XfwPfWXthZpgfpQ6Q5qaBm947riWxKz93OCsYtbRemxo7 XYKmnt4shoDXWTvINdxPNaOFycWITuFKYt7NrEbbd/H5JtGRAQzY1ZpY17IeAriL5Wpr 6SN7hUMjCO9em7qipM8A0aMtJUi/lXiTiiHBCgo/YdI4/Lize04G3fgOQcPhUUPwDzTv r8iM6g1aJQ4NjsAYytiJh4f257HHPTn4/93Wa64CYaP7Wevl1HXQFtLNUuPelt6ekovU 1rb1eQrHcSN6rn0qwAU5ssP1IZCKd1ZrJvFx7cdJwt8EvgFOPKhXSJkXofH11seZkzDP sF2g== X-Gm-Message-State: AOAM532Dt4r/RoI7Gw3Y6RppjWVaG3AdgcgIx86gH9tRTfT6qWEXmMoH 5zJkSre5vbL9wAj2h+u1KMsMW57p6wtbybNU01pFoA== X-Google-Smtp-Source: ABdhPJwqOIb+3XgNehLv0cxHQ2ZjoGlJK+b6tjZ4gdRgnShqGfKBRmmQ5ljY9OpQAZG7k35gaoiZa/jbhr/jRgYQYxQ= X-Received: by 2002:a05:620a:1188:: with SMTP id b8mr8384202qkk.265.1603904295369; Wed, 28 Oct 2020 09:58:15 -0700 (PDT) MIME-Version: 1.0 References: <5a6f32308101c49da5eef652437bd3da9234c0da.1603372719.git.andreyknvl@google.com> In-Reply-To: <5a6f32308101c49da5eef652437bd3da9234c0da.1603372719.git.andreyknvl@google.com> From: Dmitry Vyukov Date: Wed, 28 Oct 2020 17:58:03 +0100 Message-ID: Subject: Re: [PATCH RFC v2 18/21] kasan: rename kasan_poison_kfree To: Andrey Konovalov Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux-MM , LKML Content-Type: text/plain; charset="UTF-8" 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, Oct 22, 2020 at 3:20 PM Andrey Konovalov wrote: > > Rename kasan_poison_kfree() into kasan_slab_free_mempool() as it better > reflects what this annotation does. > > No functional changes. > > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/I5026f87364e556b506ef1baee725144bb04b8810 Reviewed-by: Dmitry Vyukov > --- > 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 8654275aa62e..2ae92f295f76 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -162,6 +162,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 (static_branch_likely(&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, > @@ -202,13 +209,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 (static_branch_likely(&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) > { > @@ -244,6 +244,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) > { > @@ -264,7 +265,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 b82dbae0c5d6..5622b0ec0907 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -334,6 +334,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); > @@ -436,14 +444,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 79bff63ecf27..0e8d877fbbc6 100644 > --- a/mm/mempool.c > +++ b/mm/mempool.c > @@ -106,7 +106,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_); > if (pool->alloc == mempool_alloc_pages) > kasan_free_pages(element, (unsigned long)pool->pool_data); > } > -- > 2.29.0.rc1.297.gfa9743e501-goog >