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 02EA8C4363A for ; Wed, 28 Oct 2020 11:05:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 56E05246A0 for ; Wed, 28 Oct 2020 11:05:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="h3qRf1hh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56E05246A0 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 7AFB96B005C; Wed, 28 Oct 2020 07:05:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 761816B005D; Wed, 28 Oct 2020 07:05:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6296D6B0062; Wed, 28 Oct 2020 07:05:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0051.hostedemail.com [216.40.44.51]) by kanga.kvack.org (Postfix) with ESMTP id 368706B005C for ; Wed, 28 Oct 2020 07:05:35 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D00B98249980 for ; Wed, 28 Oct 2020 11:05:34 +0000 (UTC) X-FDA: 77421053388.28.month67_2c0c27b27284 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id A9E0C6C3B for ; Wed, 28 Oct 2020 11:05:34 +0000 (UTC) X-HE-Tag: month67_2c0c27b27284 X-Filterd-Recvd-Size: 6800 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Wed, 28 Oct 2020 11:05:34 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id k9so4062292qki.6 for ; Wed, 28 Oct 2020 04:05:34 -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=BnTFjO5iPodWJwaiH+f8UvOorIZZfBBlIOwtDZT/AaY=; b=h3qRf1hhxPBFncyZU6ggg2vVRf3ny01avB3rYfcswnrnL7hpcvdQ/ffCr5ZbjB6NqW tlk7dvRBAX/tOJ++AAhJYiuW2zodOUkl8Gk58vDUuiblXQ9ZLGcDn8jLflHztUhbZWKE y4PN9oFn0AXRD4aSeNw4YsPkeFXja10LLv9FYGvelX2DjbrT5nR+S13oUOoPFrnLrUKo qOeHjJwAzGjgqJr4ADWW4oQZ0Bpi/dklAUdtQVBYAoH/se+qGLX9AA160DVpvCl9Qjit jv2iw7KvirDZ+Uk+DwP1LDgwoP0dH43sIQKbJHVLaZ9Lq7n6dWVC2R8vhv1jO8OKw0ev v/Ug== 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=BnTFjO5iPodWJwaiH+f8UvOorIZZfBBlIOwtDZT/AaY=; b=mvN/UY+cvh0AZmZECka7UGBeYY+kYgDDiftfDTPsKAAonXKWFxw6EQgWFLTxsV8fHH qIivPlFfmPii/TboVcoryL68nHfoeQt9feJa7SKySoYt9xfrKsRsQretpQEvkF5TBAej ik0+PFW72qCl7D33DGwjbjzhypwSMy8a9RHFFlOszmKsw/Y4kJage2rZ+z24Go7LWhF4 BoKzQMrfVBnysjO8O1IPRUlXI6soG9z0OoiaqAascIlEMGb1btsuDqA6fPgrrZdjlAev QAsly5dWUO1bE5RJYzCS4z7up59x4aluYwexX5ng6i6ZxqALuLVNUUUNG6VT9TFrLIO8 Cxbw== X-Gm-Message-State: AOAM532iCQYEsztECvr8/x9TcEZAbKzfd50S6D4ThZ0o0u1R7s3E8H/S ivXiYo0hAsUGuFrf7Wscju0nmuk27c9GDKY6yEEDCA== X-Google-Smtp-Source: ABdhPJzaSm5cm7TtWwkPsVr7gNmNlCL4EX8BlsO0vzHgljAGxOVHvBFFcnrWGxTyWKQ8aPnxQqB2zP5KvizdBxj5bJE= X-Received: by 2002:a37:a00c:: with SMTP id j12mr834383qke.231.1603883132900; Wed, 28 Oct 2020 04:05:32 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Wed, 28 Oct 2020 12:05:21 +0100 Message-ID: Subject: Re: [PATCH RFC v2 09/21] kasan: inline kasan_reset_tag for tag-based modes 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: > > 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. > > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/I4d2061acfe91d480a75df00b07c22d8494ef14b5 > --- > include/linux/kasan.h | 5 ++++- > mm/kasan/hw_tags.c | 5 ----- > mm/kasan/kasan.h | 6 ++---- > mm/kasan/sw_tags.c | 5 ----- > 4 files changed, 6 insertions(+), 15 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 93d9834b7122..6377d7d3a951 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -187,7 +187,10 @@ static inline void kasan_record_aux_stack(void *ptr) {} > > void __init kasan_init_tags(void); > > -void *kasan_reset_tag(const void *addr); > +static inline void *kasan_reset_tag(const void *addr) > +{ > + return (void *)arch_kasan_reset_tag(addr); It seems that all implementations already return (void *), so the cast is not needed. > +} > > bool kasan_report(unsigned long addr, size_t size, > bool is_write, unsigned long ip); > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index b372421258c8..c3a0e83b5e7a 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -24,11 +24,6 @@ void __init kasan_init_tags(void) > pr_info("KernelAddressSanitizer initialized\n"); > } > > -void *kasan_reset_tag(const void *addr) > -{ > - return reset_tag(addr); > -} > - > void kasan_poison_memory(const void *address, size_t size, u8 value) > { > set_mem_tag_range(reset_tag(address), > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 456b264e5124..0ccbb3c4c519 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -246,15 +246,13 @@ 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 > > +/* kasan_reset_tag() defined in include/linux/kasan.h. */ > +#define reset_tag(addr) ((void *)kasan_reset_tag(addr)) The cast is not needed. I would also now remove reset_tag entirely by replacing it with kasan_reset_tag. Having 2 names for the same thing does not add clarity. > #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) > > #ifndef arch_init_tags > diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c > index 099af6dc8f7e..4db41f274702 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) > { > -- > 2.29.0.rc1.297.gfa9743e501-goog >