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.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 18D33C00A89 for ; Fri, 30 Oct 2020 16:19:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6A44B20719 for ; Fri, 30 Oct 2020 16:19:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FSWYLdrs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A44B20719 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 688B26B005D; Fri, 30 Oct 2020 12:19:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 636FC6B0062; Fri, 30 Oct 2020 12:19:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54D026B006E; Fri, 30 Oct 2020 12:19:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 243916B005D for ; Fri, 30 Oct 2020 12:19:34 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id BC972181AEF10 for ; Fri, 30 Oct 2020 16:19:33 +0000 (UTC) X-FDA: 77429102226.21.park31_1f15b3f27297 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 9BA64180442C2 for ; Fri, 30 Oct 2020 16:19:33 +0000 (UTC) X-HE-Tag: park31_1f15b3f27297 X-Filterd-Recvd-Size: 6447 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Fri, 30 Oct 2020 16:19:32 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id c20so5711900pfr.8 for ; Fri, 30 Oct 2020 09:19:32 -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=dpV5+JCLvAj2Fu+RD4QwotunWLsVQxGyCVUUhxPbUwA=; b=FSWYLdrsonhTJtcOLvC+jZU5Gj1TiA4iVM4P+e7yP8fAWGTh8vu2UxOIjyuwkiIOPt a1hTR+idNBMdtcwt9Oj+iztkSkcLlLF8E8p/8YDZpHg7lUTYpb00t4iX9e/noadWmM85 mwRpvEQM6ry77L8lRbp36lbmguKJZoWwPPAzpC2R1QOXjJ1NHx4tcTvC/KAZZUjjYSGc 3dxlAbMdhxw9eFPv/nRYT4EarwQdQXcuTifYWjaeYtMck8M2FlMfI1sIehL+oLRWOqGA 4dteKZ6l+l+OtrqdHCLmSkbSO6HudQ0urxyg3yEScFf4qZdq0tIgnAb4Wwjo1Hng8+Fr rwSw== 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=dpV5+JCLvAj2Fu+RD4QwotunWLsVQxGyCVUUhxPbUwA=; b=tb3vKall95cmMoUbgYfYMb3p2pVFgvPBjWRNWHltu5/NdxrL7GjsJ9vqsr3skKEbI9 JekggDo2R8DkZhpGtBdxdDFgipUD81liYxXI7YNQeeB4Q+es/OgSnhP6aWtBPHkXmQtj wfj73FMVnI/yzdVkneTUyIQTseyt8R/eaegwbYl91de27YFmGjDEM373tfjrO2RkaZCO anXOi7HMu/scoaWJyb4b0bFEjaN/wVGtUQhr52lWC8gh5HyFlPyvXdPwzomIrjJmMcwA +j6UTk0G32dupB5I3tm+bIUTDf4OyD6Q8VpO/uy1770/I12nH1Hqi/D2tvX0P4B47l7P ixPw== X-Gm-Message-State: AOAM530W0K0bQ7J7NWtDtvmApKfm4YynxHLP9S/r0yh8vIUEKQBJ4wX2 xKI1kI6bZREHHkEx+Qj0kZPrYHfk32r+uonFfGU0ew== X-Google-Smtp-Source: ABdhPJz/tsifaJhuXgriAGLYjzjyVMccUTostGEnlnHrU3UURZ5aFDAMgOdFOEkCTdURXzV9DDUOO3ioWvzoL92ld40= X-Received: by 2002:a17:90b:807:: with SMTP id bk7mr3737334pjb.166.1604074771799; Fri, 30 Oct 2020 09:19:31 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Andrey Konovalov Date: Fri, 30 Oct 2020 17:19:20 +0100 Message-ID: Subject: Re: [PATCH RFC v2 09/21] kasan: inline kasan_reset_tag for tag-based modes To: Dmitry Vyukov 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 Wed, Oct 28, 2020 at 12:05 PM Dmitry Vyukov wrote: > > 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. arch_kasan_reset_tag() (->__tag_reset() -> __untagged_addr()) preserves the type of the argument, so the cast is 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. Will remove it.