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=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 7EEC5C00A89 for ; Fri, 30 Oct 2020 15:48:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E356E2151B for ; Fri, 30 Oct 2020 15:48:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="n8Ybetdb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E356E2151B 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 3A5D16B0070; Fri, 30 Oct 2020 11:48:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 388D46B0071; Fri, 30 Oct 2020 11:48:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 268AD6B0073; Fri, 30 Oct 2020 11:48:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0174.hostedemail.com [216.40.44.174]) by kanga.kvack.org (Postfix) with ESMTP id ED39D6B0070 for ; Fri, 30 Oct 2020 11:48:37 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7FC4E181AEF10 for ; Fri, 30 Oct 2020 15:48:37 +0000 (UTC) X-FDA: 77429024274.19.smell05_3c0364b27297 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 43F071AD1B9 for ; Fri, 30 Oct 2020 15:48:37 +0000 (UTC) X-HE-Tag: smell05_3c0364b27297 X-Filterd-Recvd-Size: 6611 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 30 Oct 2020 15:48:36 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id r186so5574085pgr.0 for ; Fri, 30 Oct 2020 08:48:36 -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=2vQT2iQtNVbEevXMap0BKv0WHD5DBzsJ42aVxPlssZQ=; b=n8YbetdbXrwHaFu5Z+ES9pzJl1mjzn/6kfBcwgNdwidkZBJwlppvMVpGe9VtJvMk46 1sOqVNyttpqEaAiXFolVaj5fEJ5p7um2oGsUYn51dvU/cyACDZ0mMi0l20Z+3H0sHBOH UNu8grmQW3F4oYhlTVkOWxxv39avcn3JklliTTHlpntMAQtB/o4WGRYW2UvUHrHVjRqD pdsYa7WBTe8yk5flxUPxRJi2Uf35lnMtJDdL0+dTAHrgp8l9v9kngGzEuU2QEYGd+2q8 94q/DQn52sbC+LNJ4+vqb9myTThKNhYfjHkxbxgUokhw7kvDQTBr6Rm/6AYGfRQaU/M7 eCig== 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=2vQT2iQtNVbEevXMap0BKv0WHD5DBzsJ42aVxPlssZQ=; b=DsKuooJrpDCA9a+gtH5eYNVrgTJ3JlS1Qgsm2CoRgTJu3lgno/vHuHnYqD0Lue89wm 7FHJ15NH65R3BaPex9gwMGu3opxfxow+xOy8QMsKO52dOZZZUf2RhOIZiqttY1EdYBh6 Y3/nD/6Nu+U8PcAjRbmtmC5uZXrKPWBXRfLXIzwNoTxCWH0OMoAc7G5Z7d6y2Sv9h1rV a+pVHzE/NA/5mX4em+uUgrhEnGkLPZooPzzRRBAhQkjDEslHStIWmtrvxwxaR1wRLupt yBAStUHj2nMEP1wokrzA0uysYKLm1Z0W7ljPpf3f9CNU7H1H5o1UZFreGXd220qKsDL0 pFzA== X-Gm-Message-State: AOAM531wjYsDz+oG3OIxTAN+5gw7/Ix5RbAp9GSoqgFL3rK3EKPXDZdb 8TcxYZ+CuPMq03gOjK2YCxdY7p7oFxVhPgZ6jub1ng== X-Google-Smtp-Source: ABdhPJyWs6P4V1KrvnpjlVCkOTtmQP4vylcUtLxXlvFLNPOslyhmAyxboGbGiIxOM/p6VQU24ObF7p093ISZQFWSMqU= X-Received: by 2002:a63:1906:: with SMTP id z6mr2767197pgl.286.1604072915294; Fri, 30 Oct 2020 08:48:35 -0700 (PDT) MIME-Version: 1.0 References: <56b19be34ee958103481bdfc501978556a168b42.1603372719.git.andreyknvl@google.com> In-Reply-To: From: Andrey Konovalov Date: Fri, 30 Oct 2020 16:48:23 +0100 Message-ID: Subject: Re: [PATCH RFC v2 10/21] kasan: inline random_tag for HW_TAGS 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:08 PM Dmitry Vyukov wrote: > > 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? Not really. Will simplify this in the next version and give cleaner names.