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 2CF96C4363A for ; Wed, 28 Oct 2020 11:08:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 77A52246A2 for ; Wed, 28 Oct 2020 11:08:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HT0S21FF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77A52246A2 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 954706B005D; Wed, 28 Oct 2020 07:08:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8DEC06B0062; Wed, 28 Oct 2020 07:08:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A8096B0068; Wed, 28 Oct 2020 07:08:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0100.hostedemail.com [216.40.44.100]) by kanga.kvack.org (Postfix) with ESMTP id 4B6886B005D for ; Wed, 28 Oct 2020 07:08:36 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E5FB2180AD807 for ; Wed, 28 Oct 2020 11:08:35 +0000 (UTC) X-FDA: 77421060990.04.bell96_0d08a1727284 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id CC6FF8008404 for ; Wed, 28 Oct 2020 11:08:35 +0000 (UTC) X-HE-Tag: bell96_0d08a1727284 X-Filterd-Recvd-Size: 6545 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Wed, 28 Oct 2020 11:08:35 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id l2so495586qkf.0 for ; Wed, 28 Oct 2020 04:08:35 -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=BV2fbXkevBYTBJzl8kvjc7MGIINM37SNxFV2YU5u4pc=; b=HT0S21FFEt+LKY4oXEUf6dkQ35v/XmYt4KlAwtTWz9MoKDVcYmi7ulko2Bd2xyQ/8x oG7TKCxunRYdFQCN24qaZtz/6sFftchSJ38Jw7Jk7zMVsZZwNbbiwY4dZTVLYaMutFVv zPknJDk+RMuhoxzzx4+mIT7kbu2EMzbsSblPQRZZcsLKgZb5oL6t9hH4AQJJXKVcBLH8 +yj8zElTJxXtWM/3H7Jf4iI/FKvYIkUMWjFCYM6oEkxDr0yZNV7PchuN/5ZqO9hNWoZS xU1fa2y8jGP9UImBjMRQVIyf5/ehx8LCaq9xo8ntDGf+vXH0I0DprD+DWc90kNK5fcyc IkYw== 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=BV2fbXkevBYTBJzl8kvjc7MGIINM37SNxFV2YU5u4pc=; b=thd2tTA70QbbuQ49PUriSD4c5hR8HC0NqpPX3iS+TV9PWrnsn9iHcsmibXHdzYCA+4 bN5LuTo0ozbfKfhqWbG+ZuFcQyvegu716TE63zIObViTUpRta7CFWuCKVLcZTZwgxkEj bCv2UKbOSL4nPcjL9Xh4oQHebDZwLi+RJ1DJJPDBOUera2Oxz/zr4CsuKHrH9JnDu6BI oBzSjC5zA5wc6/F0YnVxPtZg8rejMlo8ZmvBf3ijJPEf1iFeE4ClvlO2Qq1lLfgt9zNZ LfQoit2U5Uci+CeR0GuAlgI2Ugijf0CUjegi4p/gNuCR/RhGafvIYFixZhGXwKbDAfJw OiHw== X-Gm-Message-State: AOAM531xup4A122mUCcvhVlKoWCvhhz+RYrO1/sjUfyX7vNvqmTH7qRc alL77/iRCXIbOwWNZRRC0WByOOTcPD0LK+9a/l5Umg== X-Google-Smtp-Source: ABdhPJxl0qO8to3NJbfQAtehDg9+4/Sk3NGfn1TAKewWw3jUDYOR0ExTd1zLbMw7hj0IRx8TPOBHLOINw/p26OyC7Mg= X-Received: by 2002:a05:620a:5b9:: with SMTP id q25mr6625803qkq.501.1603883314438; Wed, 28 Oct 2020 04:08:34 -0700 (PDT) MIME-Version: 1.0 References: <56b19be34ee958103481bdfc501978556a168b42.1603372719.git.andreyknvl@google.com> In-Reply-To: <56b19be34ee958103481bdfc501978556a168b42.1603372719.git.andreyknvl@google.com> From: Dmitry Vyukov Date: Wed, 28 Oct 2020 12:08:23 +0100 Message-ID: Subject: Re: [PATCH RFC v2 10/21] kasan: inline random_tag for HW_TAGS 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 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 call. > > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/Iac5b2faf9a912900e16cca6834d621f5d4abf427 > --- > mm/kasan/hw_tags.c | 5 ----- > mm/kasan/kasan.h | 37 ++++++++++++++++++++----------------- > 2 files changed, 20 insertions(+), 22 deletions(-) > > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index c3a0e83b5e7a..4c24bfcfeff9 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -36,11 +36,6 @@ void kasan_unpoison_memory(const void *address, size_t size) > round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); > } > > -u8 random_tag(void) > -{ > - return 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 0ccbb3c4c519..94ba15c2f860 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -188,6 +188,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); > @@ -223,23 +229,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) > { > @@ -273,6 +262,20 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) > #define get_mem_tag(addr) arch_get_mem_tag(addr) > #define set_mem_tag_range(addr, size, tag) arch_set_mem_tag_range((addr), (size), (tag)) > > +#ifdef CONFIG_KASAN_SW_TAGS > +u8 random_tag(void); > +#elif defined(CONFIG_KASAN_HW_TAGS) > +static inline u8 random_tag(void) > +{ > + return get_random_tag(); What's the difference between random_tag() and get_random_tag()? Do we need both? > +} > +#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.0.rc1.297.gfa9743e501-goog >