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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 CFED6C56201 for ; Fri, 30 Oct 2020 15:50:12 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4817E221EB for ; Fri, 30 Oct 2020 15:50:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bm3J5avu"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="n8Ybetdb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4817E221EB Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5GDaq9ybMhNAUzcsZ/GDrHukn0bnoHVBbis1ls/xYJU=; b=bm3J5avuXaMJeE475fAGEDlKA Tw85Ie5lRV7CtrMgSqWlhTjyeQynHmT6jSfhcHH7jZoehFLQk15cQz+rMh+amupJlFxDpDvjWO6Ja W7rvqK9RDENU6SPkE92VQXHbOOnsvBBWRUQ0FKlW1m6gOoxLA8R6BpD5EITfpofDAiTbofzRM+zLR 3sxxIuQMHnSmZbKAEwmVaD8ZXO5+9ccuEFxEyS8K4DFqO6p1x4fxcW1MLb0Qa6SJQckqNQqRl7h6l GXVuqrG5XH702CM7otT0pUzWrsw7AbDJsr+UxaZKxiXlsf0cCI3oV89NPlEFr4zxpSSqYFOD1tRx1 o0Try+pFg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYWdt-0002h5-8O; Fri, 30 Oct 2020 15:48:41 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYWdp-0002fi-PO for linux-arm-kernel@lists.infradead.org; Fri, 30 Oct 2020 15:48:38 +0000 Received: by mail-pf1-x444.google.com with SMTP id e15so5649845pfh.6 for ; Fri, 30 Oct 2020 08:48:37 -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=T0/JAP+hbPh1ZL/IxJGgEk4nFRTtVbZJymq5euGAImfy8Dt2qIm7CM/PfCghxoX5st jVA1g7xq9kiqD8Rra2fWMGNjG64ecyPKuweEUk0PiL9pQ22otJV/GxqQHddYyCe9mNi5 ohnUoSPW6/yj4Vk7NYXZ822IDYMw5G7BKB843sVnbq3ffcj9/BGVf9kK7Dax0Wi3wo1f 3i9XaRHozRszovd4QMl+0/iFdn+yEiqJjShxf7LquQQTC3z8KOKXSOBwp73RnSWRWl/x ITKxbZdl4zienQ8t/SEK8i0Dg9dWRxYsSHDRnxjxlTPNhDoN1wFXH751XJVDBY8fJZqY ohkA== X-Gm-Message-State: AOAM532UU9IcFtoi8vkc7o4Phmz9vPC+IyY0g7/KGVkr/MFAwDUjjDZS zCYs88K2kkG+4hUxLd9RwDXt94Z6PncgQQ//2tG33Q== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201030_114837_874458_81FCE7E5 X-CRM114-Status: GOOD ( 21.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Linux-MM , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Kostya Serebryany , Alexander Potapenko , Linux ARM , Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Peter Collingbourne , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel