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 0A2D7C55178 for ; Wed, 28 Oct 2020 11:09:10 +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 7D1A2246A2 for ; Wed, 28 Oct 2020 11:09:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TyX8BWOD"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="HT0S21FF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D1A2246A2 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=QfbBG27rdDU2Q3hj/ccfw8IbtXo+25Oeitabde+lYsA=; b=TyX8BWODGrqwPAPsrMUIUoOdb Giebf6W1AZHCNxdlwxuUwxZL4TncpQq/3szJFJU6XaqH6G+1sjh6/NAirLpeALdgWtdBZZX2FNfqy rG0vx5K76gRyErye29qOspB7bht/YVZZxwT2a8dslVprhvs4/RrXuAiveYjF7/qPmxxzFai9OIuf7 f23vuLmNpi5MO6wKxHsorrkpnixvqfdRTKGhmQpzVuIiyZXhoTbTeYAYhC2QhxNJjAXdlC+aDhODE RYb5G6uleKfOdukTq3ryba2igmyvHsd0aok1zQ/fyEr0Zf5wUn04D6Cdh2TY6Wro+ArSCsWBj4vgg O8tncEj/g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXjJq-0004H5-9w; Wed, 28 Oct 2020 11:08:42 +0000 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXjJl-0004G6-5J for linux-arm-kernel@lists.infradead.org; Wed, 28 Oct 2020 11:08:39 +0000 Received: by mail-qk1-x741.google.com with SMTP id s14so4055751qkg.11 for ; Wed, 28 Oct 2020 04:08: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=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=RbrLYCvEgpy7gekgYeD4IvI5OTHkLV+Gsx3OmFbpZmomAHSTiBNm1Sgf11pZmY7/Sv RDTHga6CDHGR97Pu1xaNBgc8m7Yihing5az0iPJ/XmYFzv9Ds/UXMv8OLk6YTYeEmOyP Evg0f/N7hB0TVcQlUiWyIF/EeNCnScW97mIn/fMkoZL9FEJNRufuIP8g0i4V86oaCAag cs8W2rQCHcaIsd72GsWWElDjXAHsYJaWtz5UK9pUb7U804RIHRJsjQiDghUeTylH9f9d vjyf6eeid7f2nIpToo2YR0WH15FUHHmV12KtXJNCPQVAsKLmwgMfruymyr9e/mkrahW2 tO0A== X-Gm-Message-State: AOAM5317fY2magYeCATGMv/fkZcr0L0QgIj0En3nR7rPFH62TAi66Vgs TD194/qxYa9oZ5DF4jIpJqEYCTOmioL9+0iJdUhRZQ== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201028_070837_237396_22F5ACDB X-CRM114-Status: GOOD ( 21.33 ) 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 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel