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 EE2F3C5519F for ; Tue, 17 Nov 2020 10:58:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6038421534 for ; Tue, 17 Nov 2020 10:58:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fDqno3OW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6038421534 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 9683B6B0036; Tue, 17 Nov 2020 05:58:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9187B6B005D; Tue, 17 Nov 2020 05:58:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B9116B0068; Tue, 17 Nov 2020 05:58:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0072.hostedemail.com [216.40.44.72]) by kanga.kvack.org (Postfix) with ESMTP id 4E7956B0036 for ; Tue, 17 Nov 2020 05:58:14 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E69B7181AEF10 for ; Tue, 17 Nov 2020 10:58:13 +0000 (UTC) X-FDA: 77493610866.30.drum08_56010a727331 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id BF1CF180B3C83 for ; Tue, 17 Nov 2020 10:58:13 +0000 (UTC) X-HE-Tag: drum08_56010a727331 X-Filterd-Recvd-Size: 6215 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Tue, 17 Nov 2020 10:58:13 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id u4so19875959qkk.10 for ; Tue, 17 Nov 2020 02:58:13 -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=+Jz410s78Ji+rZ5O7FNsycPBxAAt6VG4My0PmY/OfBI=; b=fDqno3OWElAqTjsKqJ+zxGI0TP7VkHHQ18I4rj8hb2q7NpNzhrmgAVKg5hA3xmMksY 0+tji4xpEzSjkR7Xhrlg1HbLigM5Np5RNo637NRj1hbJKqq1ThPdVoYEldfSc3zXuznD SXc0GSnSZdQdqkyrq//gkeQgOL/vIlTy0uJxLMcsD1GuC8K4bZLzkGRTQ/HsTUW91tLg 7K6wqgxvlkRDKaEYaCNpuUfExMTGQru5dB1MwKFCcrGvB7TWirhhAOBaZileEc2ttqRJ om+xd06jtPXK0LgOTn23XvDoKVnELczfPnnfIjXV9l9l1RK0Z7qZvngh8SeEmWqVFHgS 4sRQ== 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=+Jz410s78Ji+rZ5O7FNsycPBxAAt6VG4My0PmY/OfBI=; b=MQ/XNFjtEXhAWk25ZgyIVw3OnlbLFVM8s0FyGvujmE9zT1dR5CjPwWcfsYgZOZ0AVA QMr6EpeQvYqb1uV3aTf+NRy0/IFTwOfOFk5IN8NuQG8OtGip15un8jUEAbZMUfwK2kZa Eh4ZNhQj3ABvK4T/wkuXaDNgmNJ4m/jsnPyZyigYd2Lyh9OzQ/CsXnaBvy/Jc77dEIUf 0moZorjNnTVnSwII90VlTpHPGKOOXpj3tCUJA8xlHrJ4i2t0APh+iQlpex2gZ25BY5zJ F87NGM+bTpTQbtaC/q+X6nfmJDNNs5Oa88bmhpbnLN4jXjm06b3kk4ST4EkjGKwj29Fl QP3w== X-Gm-Message-State: AOAM532+ZM9fGJCfByxA+c5jCTnpeyCRzv1+h7iW7Q0lXjSa+bahQqWe t1obQvKVujv1ijBtNNEGLF3D0tnSEvuN5G7M/mMYwQ== X-Google-Smtp-Source: ABdhPJzOEnvk+cKL0XzmEKvnbDHMeXONdJ4hWIDnE4U7IwhAltThKlUJijIu5XRXmqmkW9pgOtkZfB1YWN7FrE+L9Js= X-Received: by 2002:a37:7b44:: with SMTP id w65mr19464097qkc.350.1605610692298; Tue, 17 Nov 2020 02:58:12 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Tue, 17 Nov 2020 11:58:01 +0100 Message-ID: Subject: Re: [PATCH mm v3 08/19] kasan: inline random_tag for HW_TAGS To: Andrey Konovalov Cc: Andrew Morton , Catalin Marinas , Will Deacon , Vincenzo Frascino , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , 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 Fri, Nov 13, 2020 at 11:20 PM Andrey Konovalov wrote: > > Using random_tag() currently results in a function call. Move its > definition to mm/kasan/kasan.h and turn it into a static inline function > for hardware tag-based mode to avoid uneeded function calls. > > Signed-off-by: Andrey Konovalov > Reviewed-by: Marco Elver Reviewed-by: Dmitry Vyukov > Link: https://linux-review.googlesource.com/id/Iac5b2faf9a912900e16cca6834d621f5d4abf427 > --- > mm/kasan/hw_tags.c | 5 ----- > mm/kasan/kasan.h | 31 ++++++++++++++----------------- > 2 files changed, 14 insertions(+), 22 deletions(-) > > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index a34476764f1d..3cdd87d189f6 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -51,11 +51,6 @@ void unpoison_range(const void *address, size_t size) > round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); > } > > -u8 random_tag(void) > -{ > - return hw_get_random_tag(); > -} > - > bool check_invalid_free(void *addr) > { > u8 ptr_tag = get_tag(addr); > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 5e8cd2080369..7876a2547b7d 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -190,6 +190,12 @@ static inline bool addr_has_metadata(const void *addr) > > #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ > > +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) > +void print_tags(u8 addr_tag, const void *addr); > +#else > +static inline void print_tags(u8 addr_tag, const void *addr) { } > +#endif > + > bool check_invalid_free(void *addr); > > void *find_first_bad_addr(void *addr, size_t size); > @@ -225,23 +231,6 @@ static inline void quarantine_reduce(void) { } > static inline void quarantine_remove_cache(struct kmem_cache *cache) { } > #endif > > -#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) > - > -void print_tags(u8 addr_tag, const void *addr); > - > -u8 random_tag(void); > - > -#else > - > -static inline void print_tags(u8 addr_tag, const void *addr) { } > - > -static inline u8 random_tag(void) > -{ > - return 0; > -} > - > -#endif > - > #ifndef arch_kasan_set_tag > static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) > { > @@ -281,6 +270,14 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) > > #endif /* CONFIG_KASAN_HW_TAGS */ > > +#ifdef CONFIG_KASAN_SW_TAGS > +u8 random_tag(void); > +#elif defined(CONFIG_KASAN_HW_TAGS) > +static inline u8 random_tag(void) { return hw_get_random_tag(); } > +#else > +static inline u8 random_tag(void) { return 0; } > +#endif > + > /* > * Exported functions for interfaces called from assembly or from generated > * code. Declarations here to avoid warning about missing declarations. > -- > 2.29.2.299.gdc1121823c-goog >