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=-9.7 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 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 73902C2D0E4 for ; Tue, 17 Nov 2020 11:03:39 +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 D34B720773 for ; Tue, 17 Nov 2020 11:03:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qH/WbPuP"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="V/pl5jqI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D34B720773 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:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=51b1zNmrER9QnMsNHaPL37W1OOoSjgykOt3APKtT0Us=; b=qH/WbPuPPTDftVK0fWyH1rfI/ U0mLwX1KhSlQCeP7z/8yDbb8R55EWi1PG7GE2c1SrKuutu/LRuunX/RkuYPI8ArrkwP+zw4+TRJ2S bU36dMxoscO0CSfAQ10HKuogcD3qBQLh0okqO6S65RjaPonCbYyO2ODGeLMpGcAhLnPlcGgZnVBa8 0h322EPrTv099XKduWKx6VUxr03MMNpG39ZsbXKBrwofHBp1tSnwyzOJjkY2ttI7XqLPTNOmCofQb rk4VkQlnLv1VH4xmnIyRpApJONAQzsf333r+dfu4hl0eMgPpylCODL5UnTAvNilfsKelwtyidhQdm g33MOusWQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keyjQ-0007Sp-9S; Tue, 17 Nov 2020 11:01:04 +0000 Received: from mail-qv1-xf43.google.com ([2607:f8b0:4864:20::f43]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keyfL-0005U7-MC for linux-arm-kernel@lists.infradead.org; Tue, 17 Nov 2020 10:56:57 +0000 Received: by mail-qv1-xf43.google.com with SMTP id e14so3188330qve.3 for ; Tue, 17 Nov 2020 02:56:49 -0800 (PST) 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=6ELfOh3o2Oz00GU28PxWEqBY//Oi7TOLxsG1nguiQlU=; b=V/pl5jqIh+2ezoffKlNITSMBE0cztAbTM+xvLzTsn+2LWIa2+mhS/l/P2vxcQhj8M6 htu/SliDlpXQDIXZutlBibaqXHG/jXytFbOgRrA4r6wPZ/ne35vx4cMg104hQi61rujX yBvhh4hKGvZkV7P2WxykAOH6xwLyhmNtWT9Q5pgLnUi6/tIHqJjFz8Bet/Q8PI9YqlbE nNXLQuSbymSqn5+UOY/4lzVv120jtyXv2caC86g2sr4Mhq2UPXV3hT4S+vsuWPZJyY7d XHnpSaW4NZznafoOpG1kXPT7mX+DnQAdJapvgqZJfs6IGlXgUhGgNK2LZsWEamgEf2Ao RoVQ== 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=6ELfOh3o2Oz00GU28PxWEqBY//Oi7TOLxsG1nguiQlU=; b=WHKOVADH3MDDAjf7bdAW8Pb2U4njD6Gwk35YJgWafKxnlWjfDpEwTnT3MSmD4r6CXG GPRTayKysyrV8wzWRWRd8jFzGPpHcBLviZaxq+wdhA/1vS8JvLT+47PXxrKRfGNyiT4w kxbdSx0jpcCXlsp1dIfkaGtc0zQqy/McK5p/GQA/DibeEcEjGErlR/7yKYATt1kZqQO6 9+6o4rWNiRHN0u6e0scKd1rnv/jTYhB+i/pOEs1epeeqS7TfVcKm507M54/06p9QiYer PhE53bIbWlQdiKIOTTRCahmcGQootvcATsxIAhdgWn/IvItAxleEndBGZ3yNNnCW1zEW BQWw== X-Gm-Message-State: AOAM530rsMfTx8E4VEmXZXovFpie7llGhdKiL/wHNKdQVmvriVCDzUu7 2IogJo+Dkm4252naYQNwQos/FSGSmt9ZsBvZlgbX5Q== X-Google-Smtp-Source: ABdhPJxOpGPOi9L+fxrQF4m5lulcs6Mojw3PctNg0DwDGHv8FpOzPPM7+6WQHYQF9xcA2a+jDhrSZtMS2VLAlanH6Uk= X-Received: by 2002:a05:6214:20a3:: with SMTP id 3mr253140qvd.13.1605610607646; Tue, 17 Nov 2020 02:56:47 -0800 (PST) MIME-Version: 1.0 References: <4c2a23ccb3572459da7585a776d2d45f6e8b8580.1605305978.git.andreyknvl@google.com> In-Reply-To: <4c2a23ccb3572459da7585a776d2d45f6e8b8580.1605305978.git.andreyknvl@google.com> From: Dmitry Vyukov Date: Tue, 17 Nov 2020 11:56:36 +0100 Message-ID: Subject: Re: [PATCH mm v3 07/19] kasan: inline kasan_reset_tag for tag-based modes To: Andrey Konovalov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201117_055651_867955_CE11C42A X-CRM114-Status: GOOD ( 25.05 ) 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: Marco Elver , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Linux-MM , Alexander Potapenko , Linux ARM , 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 Fri, Nov 13, 2020 at 11:20 PM Andrey Konovalov wrote: > > Using kasan_reset_tag() currently results in a function call. As it's > called quite often from the allocator code, this leads to a noticeable > slowdown. Move it to include/linux/kasan.h and turn it into a static > inline function. Also remove the now unneeded reset_tag() internal KASAN > macro and use kasan_reset_tag() instead. > > Signed-off-by: Andrey Konovalov > Reviewed-by: Marco Elver Reviewed-by: Dmitry Vyukov > Link: https://linux-review.googlesource.com/id/I4d2061acfe91d480a75df00b07c22d8494ef14b5 > --- > include/linux/kasan.h | 5 ++++- > mm/kasan/common.c | 6 +++--- > mm/kasan/hw_tags.c | 9 ++------- > mm/kasan/kasan.h | 4 ---- > mm/kasan/report.c | 4 ++-- > mm/kasan/report_hw_tags.c | 2 +- > mm/kasan/report_sw_tags.c | 4 ++-- > mm/kasan/shadow.c | 4 ++-- > mm/kasan/sw_tags.c | 9 ++------- > 9 files changed, 18 insertions(+), 29 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index f2109bf0c5f9..1594177f86bb 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -193,7 +193,10 @@ static inline void kasan_record_aux_stack(void *ptr) {} > > #if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) > > -void *kasan_reset_tag(const void *addr); > +static inline void *kasan_reset_tag(const void *addr) > +{ > + return (void *)arch_kasan_reset_tag(addr); > +} > > bool kasan_report(unsigned long addr, size_t size, > bool is_write, unsigned long ip); > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index fabd843eff3d..1ac4f435c679 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -180,14 +180,14 @@ size_t kasan_metadata_size(struct kmem_cache *cache) > struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, > const void *object) > { > - return (void *)reset_tag(object) + cache->kasan_info.alloc_meta_offset; > + return kasan_reset_tag(object) + cache->kasan_info.alloc_meta_offset; > } > > struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, > const void *object) > { > BUILD_BUG_ON(sizeof(struct kasan_free_meta) > 32); > - return (void *)reset_tag(object) + cache->kasan_info.free_meta_offset; > + return kasan_reset_tag(object) + cache->kasan_info.free_meta_offset; > } > > void kasan_poison_slab(struct page *page) > @@ -284,7 +284,7 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object, > > tag = get_tag(object); > tagged_object = object; > - object = reset_tag(object); > + object = kasan_reset_tag(object); > > if (is_kfence_address(object)) > return false; > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index 68e77363e58b..a34476764f1d 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -31,18 +31,13 @@ void __init kasan_init_hw_tags(void) > pr_info("KernelAddressSanitizer initialized\n"); > } > > -void *kasan_reset_tag(const void *addr) > -{ > - return reset_tag(addr); > -} > - > void poison_range(const void *address, size_t size, u8 value) > { > /* Skip KFENCE memory if called explicitly outside of sl*b. */ > if (is_kfence_address(address)) > return; > > - hw_set_mem_tag_range(reset_tag(address), > + hw_set_mem_tag_range(kasan_reset_tag(address), > round_up(size, KASAN_GRANULE_SIZE), value); > } > > @@ -52,7 +47,7 @@ void unpoison_range(const void *address, size_t size) > if (is_kfence_address(address)) > return; > > - hw_set_mem_tag_range(reset_tag(address), > + hw_set_mem_tag_range(kasan_reset_tag(address), > round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); > } > > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 0eab7e4cecb8..5e8cd2080369 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -248,15 +248,11 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) > return addr; > } > #endif > -#ifndef arch_kasan_reset_tag > -#define arch_kasan_reset_tag(addr) ((void *)(addr)) > -#endif > #ifndef arch_kasan_get_tag > #define arch_kasan_get_tag(addr) 0 > #endif > > #define set_tag(addr, tag) ((void *)arch_kasan_set_tag((addr), (tag))) > -#define reset_tag(addr) ((void *)arch_kasan_reset_tag(addr)) > #define get_tag(addr) arch_kasan_get_tag(addr) > > #ifdef CONFIG_KASAN_HW_TAGS > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index df16bef0d810..76a0e3ae2049 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -328,7 +328,7 @@ void kasan_report_invalid_free(void *object, unsigned long ip) > unsigned long flags; > u8 tag = get_tag(object); > > - object = reset_tag(object); > + object = kasan_reset_tag(object); > > #if IS_ENABLED(CONFIG_KUNIT) > if (current->kunit_test) > @@ -361,7 +361,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write, > disable_trace_on_warning(); > > tagged_addr = (void *)addr; > - untagged_addr = reset_tag(tagged_addr); > + untagged_addr = kasan_reset_tag(tagged_addr); > > info.access_addr = tagged_addr; > if (addr_has_metadata(untagged_addr)) > diff --git a/mm/kasan/report_hw_tags.c b/mm/kasan/report_hw_tags.c > index da543eb832cd..57114f0e14d1 100644 > --- a/mm/kasan/report_hw_tags.c > +++ b/mm/kasan/report_hw_tags.c > @@ -22,7 +22,7 @@ const char *get_bug_type(struct kasan_access_info *info) > > void *find_first_bad_addr(void *addr, size_t size) > { > - return reset_tag(addr); > + return kasan_reset_tag(addr); > } > > void metadata_fetch_row(char *buffer, void *row) > diff --git a/mm/kasan/report_sw_tags.c b/mm/kasan/report_sw_tags.c > index 317100fd95b9..7604b46239d4 100644 > --- a/mm/kasan/report_sw_tags.c > +++ b/mm/kasan/report_sw_tags.c > @@ -41,7 +41,7 @@ const char *get_bug_type(struct kasan_access_info *info) > int i; > > tag = get_tag(info->access_addr); > - addr = reset_tag(info->access_addr); > + addr = kasan_reset_tag(info->access_addr); > page = kasan_addr_to_page(addr); > if (page && PageSlab(page)) { > cache = page->slab_cache; > @@ -72,7 +72,7 @@ const char *get_bug_type(struct kasan_access_info *info) > void *find_first_bad_addr(void *addr, size_t size) > { > u8 tag = get_tag(addr); > - void *p = reset_tag(addr); > + void *p = kasan_reset_tag(addr); > void *end = p + size; > > while (p < end && tag == *(u8 *)kasan_mem_to_shadow(p)) > diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c > index d8a122f887a0..37153bd1c126 100644 > --- a/mm/kasan/shadow.c > +++ b/mm/kasan/shadow.c > @@ -82,7 +82,7 @@ void poison_range(const void *address, size_t size, u8 value) > * some of the callers (e.g. kasan_poison_object_data) pass tagged > * addresses to this function. > */ > - address = reset_tag(address); > + address = kasan_reset_tag(address); > > /* Skip KFENCE memory if called explicitly outside of sl*b. */ > if (is_kfence_address(address)) > @@ -103,7 +103,7 @@ void unpoison_range(const void *address, size_t size) > * some of the callers (e.g. kasan_unpoison_object_data) pass tagged > * addresses to this function. > */ > - address = reset_tag(address); > + address = kasan_reset_tag(address); > > /* > * Skip KFENCE memory if called explicitly outside of sl*b. Also note > diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c > index 6d7648cc3b98..e17de2619bbf 100644 > --- a/mm/kasan/sw_tags.c > +++ b/mm/kasan/sw_tags.c > @@ -67,11 +67,6 @@ u8 random_tag(void) > return (u8)(state % (KASAN_TAG_MAX + 1)); > } > > -void *kasan_reset_tag(const void *addr) > -{ > - return reset_tag(addr); > -} > - > bool check_memory_region(unsigned long addr, size_t size, bool write, > unsigned long ret_ip) > { > @@ -107,7 +102,7 @@ bool check_memory_region(unsigned long addr, size_t size, bool write, > if (tag == KASAN_TAG_KERNEL) > return true; > > - untagged_addr = reset_tag((const void *)addr); > + untagged_addr = kasan_reset_tag((const void *)addr); > if (unlikely(untagged_addr < > kasan_shadow_to_mem((void *)KASAN_SHADOW_START))) { > return !kasan_report(addr, size, write, ret_ip); > @@ -126,7 +121,7 @@ bool check_memory_region(unsigned long addr, size_t size, bool write, > bool check_invalid_free(void *addr) > { > u8 tag = get_tag(addr); > - u8 shadow_byte = READ_ONCE(*(u8 *)kasan_mem_to_shadow(reset_tag(addr))); > + u8 shadow_byte = READ_ONCE(*(u8 *)kasan_mem_to_shadow(kasan_reset_tag(addr))); > > return (shadow_byte == KASAN_TAG_INVALID) || > (tag != KASAN_TAG_KERNEL && tag != shadow_byte); > -- > 2.29.2.299.gdc1121823c-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel