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 BE02CC4363A for ; Wed, 28 Oct 2020 11:36:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 099B2246C9 for ; Wed, 28 Oct 2020 11:36:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="nVxi4Qml" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 099B2246C9 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 206FD6B006C; Wed, 28 Oct 2020 07:36:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B70E6B006E; Wed, 28 Oct 2020 07:36:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07E746B0070; Wed, 28 Oct 2020 07:36:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0169.hostedemail.com [216.40.44.169]) by kanga.kvack.org (Postfix) with ESMTP id CC8F36B006C for ; Wed, 28 Oct 2020 07:36:49 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 59C718249980 for ; Wed, 28 Oct 2020 11:36:49 +0000 (UTC) X-FDA: 77421132138.02.light37_521772127284 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 3A0C310097AA2 for ; Wed, 28 Oct 2020 11:36:49 +0000 (UTC) X-HE-Tag: light37_521772127284 X-Filterd-Recvd-Size: 10549 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Wed, 28 Oct 2020 11:36:48 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id h19so3232776qtq.4 for ; Wed, 28 Oct 2020 04:36:48 -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=xtWeH9vKHS87nYy3SpCk02misk39ek51FjthjBeLR7U=; b=nVxi4QmlPRwCG5ENSq6Y/kcS/R/tAH6ALJ5DL1Q0SkjHocaBBe36+73OwpRYK1p73k 6NlXVzpjzeSPJ7ZvL1Pv8y2esMIkA4EFuj80+WjoF+OJln9RmRcsiIpFQ4dP6MPPj4sG r1lWtlA77yP3pANJ3SG0zMXOAvmkKI614IV98c5NvoDiNMflp4X9Z8o2NzRkVbV6K39o yU7WAl2vG5YJ3sT6tFPeIqr56Q5knPRmQleMuj4npWX4M+2JlNrElSFx7ZOWYiit4qO/ Kyi3h/oDiTddlytJM+UuIHGAgHWEiGwTi4a21qCmNUr5gSrOqJv8/CmIjEGXE9h+IA5k QE3w== 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=xtWeH9vKHS87nYy3SpCk02misk39ek51FjthjBeLR7U=; b=X157MYNxaZrpdr8DFcxyOQQutSG0JkzDR4FfUZzzQghPHzwMz4jYEqXUwmhBdGW720 R/iSoPclA5XSZGjGvarrXe2bNeRkNnK+l47p8U/JAjWx/PsBFqS13isDsT9gsnVo70fb Muqdgr25GIN320m5d4+YwSFIUtSnBqctdAdJY1N7F1rgZhK/5i2kE6xAaDN1E7bSIGsh +q4wd43dq/q6yrLZVMDpz3o6kwQAuYuqocBsnmyqoc7rGgAZT9t1bkX/s9Bv7WTJndJx vG2pqY+tMXg3e8qJl4ivuTFI7cg74J0hzkc16HWRkPHH8hWc8oNkpKaNgcmtpbE+u3T2 8QBQ== X-Gm-Message-State: AOAM5326tGA05NbCtwb6ArDpx4e36VRj1anM0X3Y5foQtuC1z48W5msG MRdGA1kwSV4wA4I6puXQ47ZqVlEV1uGqziNHx+alsg== X-Google-Smtp-Source: ABdhPJz/AewA5C088h4+b6/U+Mjkm80aV8Lk6rSvIZIJVDXlLxxf0tWbupmZlj8P/uKrQE4AnpQA2e+GJOdJ1tn2wvM= X-Received: by 2002:ac8:44ae:: with SMTP id a14mr6754128qto.67.1603885007705; Wed, 28 Oct 2020 04:36:47 -0700 (PDT) MIME-Version: 1.0 References: <6f87cb86aeeca9f4148d435ff01ad7d21af4bdfc.1603372719.git.andreyknvl@google.com> In-Reply-To: <6f87cb86aeeca9f4148d435ff01ad7d21af4bdfc.1603372719.git.andreyknvl@google.com> From: Dmitry Vyukov Date: Wed, 28 Oct 2020 12:36:36 +0100 Message-ID: Subject: Re: [PATCH RFC v2 12/21] kasan: inline and rename kasan_unpoison_memory 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:19 PM Andrey Konovalov wrote: > > Currently kasan_unpoison_memory() is used as both an external annotation > and as internal memory poisoning helper. Rename external annotation to > kasan_unpoison_data() and inline the internal helper for for hardware > tag-based mode to avoid undeeded function calls. > > There's the external annotation kasan_unpoison_slab() that is currently > defined as static inline and uses kasan_unpoison_memory(). With this > change it's turned into a function call. Overall, this results in the > same number of calls for hardware tag-based mode as > kasan_unpoison_memory() is now inlined. Can't we leave kasan_unpoison_slab as is? Or there are other reasons to uninline it? It seems that uninling it is orthogonal to the rest of this patch. > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/Ia7c8b659f79209935cbaab3913bf7f082cc43a0e > --- > include/linux/kasan.h | 16 ++++++---------- > kernel/fork.c | 2 +- > mm/kasan/common.c | 10 ++++++++++ > mm/kasan/hw_tags.c | 6 ------ > mm/kasan/kasan.h | 7 +++++++ > mm/slab_common.c | 2 +- > 6 files changed, 25 insertions(+), 18 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 6377d7d3a951..2b9023224474 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -66,14 +66,15 @@ static inline void kasan_disable_current(void) {} > > #ifdef CONFIG_KASAN > > -void kasan_unpoison_memory(const void *address, size_t size); > - > void kasan_alloc_pages(struct page *page, unsigned int order); > void kasan_free_pages(struct page *page, unsigned int order); > > void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, > slab_flags_t *flags); > > +void kasan_unpoison_data(const void *address, size_t size); > +void kasan_unpoison_slab(const void *ptr); > + > void kasan_poison_slab(struct page *page); > void kasan_unpoison_object_data(struct kmem_cache *cache, void *object); > void kasan_poison_object_data(struct kmem_cache *cache, void *object); > @@ -98,11 +99,6 @@ struct kasan_cache { > int free_meta_offset; > }; > > -size_t __ksize(const void *); > -static inline void kasan_unpoison_slab(const void *ptr) > -{ > - kasan_unpoison_memory(ptr, __ksize(ptr)); > -} > size_t kasan_metadata_size(struct kmem_cache *cache); > > bool kasan_save_enable_multi_shot(void); > @@ -110,8 +106,6 @@ void kasan_restore_multi_shot(bool enabled); > > #else /* CONFIG_KASAN */ > > -static inline void kasan_unpoison_memory(const void *address, size_t size) {} > - > static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} > static inline void kasan_free_pages(struct page *page, unsigned int order) {} > > @@ -119,6 +113,9 @@ static inline void kasan_cache_create(struct kmem_cache *cache, > unsigned int *size, > slab_flags_t *flags) {} > > +static inline void kasan_unpoison_data(const void *address, size_t size) { } > +static inline void kasan_unpoison_slab(const void *ptr) { } > + > static inline void kasan_poison_slab(struct page *page) {} > static inline void kasan_unpoison_object_data(struct kmem_cache *cache, > void *object) {} > @@ -158,7 +155,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, > return false; > } > > -static inline void kasan_unpoison_slab(const void *ptr) { } > static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } > > #endif /* CONFIG_KASAN */ > diff --git a/kernel/fork.c b/kernel/fork.c > index b41fecca59d7..858d78eee6ec 100644 > --- a/kernel/fork.c > +++ b/kernel/fork.c > @@ -225,7 +225,7 @@ static unsigned long *alloc_thread_stack_node(struct task_struct *tsk, int node) > continue; > > /* Mark stack accessible for KASAN. */ > - kasan_unpoison_memory(s->addr, THREAD_SIZE); > + kasan_unpoison_data(s->addr, THREAD_SIZE); > > /* Clear stale pointers from reused stack. */ > memset(s->addr, 0, THREAD_SIZE); > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 9008fc6b0810..1a5e6c279a72 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -184,6 +184,16 @@ struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, > return (void *)reset_tag(object) + cache->kasan_info.free_meta_offset; > } > > +void kasan_unpoison_data(const void *address, size_t size) > +{ > + kasan_unpoison_memory(address, size); > +} > + > +void kasan_unpoison_slab(const void *ptr) > +{ > + kasan_unpoison_memory(ptr, __ksize(ptr)); > +} > + > void kasan_poison_slab(struct page *page) > { > unsigned long i; > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index f03161f3da19..915142da6b57 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -24,12 +24,6 @@ void __init kasan_init_tags(void) > pr_info("KernelAddressSanitizer initialized\n"); > } > > -void kasan_unpoison_memory(const void *address, size_t size) > -{ > - set_mem_tag_range(reset_tag(address), > - round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); > -} > - > void kasan_set_free_info(struct kmem_cache *cache, > void *object, u8 tag) > { > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 8d84ae6f58f1..da08b2533d73 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -280,6 +280,12 @@ static inline void kasan_poison_memory(const void *address, size_t size, u8 valu > round_up(size, KASAN_GRANULE_SIZE), value); > } > > +static inline void kasan_unpoison_memory(const void *address, size_t size) > +{ > + set_mem_tag_range(reset_tag(address), > + round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); > +} > + > static inline bool check_invalid_free(void *addr) > { > u8 ptr_tag = get_tag(addr); > @@ -292,6 +298,7 @@ static inline bool check_invalid_free(void *addr) > #else /* CONFIG_KASAN_HW_TAGS */ > > void kasan_poison_memory(const void *address, size_t size, u8 value); > +void kasan_unpoison_memory(const void *address, size_t size); > bool check_invalid_free(void *addr); > > #endif /* CONFIG_KASAN_HW_TAGS */ > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 53d0f8bb57ea..f1b0c4a22f08 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -1176,7 +1176,7 @@ size_t ksize(const void *objp) > * We assume that ksize callers could use whole allocated area, > * so we need to unpoison this area. > */ > - kasan_unpoison_memory(objp, size); > + kasan_unpoison_data(objp, size); > return size; > } > EXPORT_SYMBOL(ksize); > -- > 2.29.0.rc1.297.gfa9743e501-goog >