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=-11.2 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,USER_AGENT_SANE_1 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 DA5E7C55ABD for ; Wed, 11 Nov 2020 17:03:52 +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 334A02072C for ; Wed, 11 Nov 2020 17:03:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fLDGTAI6"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="C0lPrtGZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 334A02072C 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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DK7J42ssG3oHL+gZ8lzXO4rDj0KvKqUH48z6nDlXAUo=; b=fLDGTAI6drTCiZPir7Ou3PExZ u2sJoFkR/R4MTLz/XW+vP9A0hYWwp0vlk7viK/Z7sQw99wrWUEDVH0i1zkyn253YacHMKyxTvu4dV 9EoowOSMaWXY8GQ41EHQwygIn0DlnwNHFD/TD9W362FCFmIZQRZBtuHRX6VXoyq1oYxod9iNFKd4E TVid11UPSM3QObDDCH/5GbKMd7DBNzejvdM5M8CZkky7wnw3rYDQypeDDSVk1C+ghX/+J8h+mgTbG Zb4sHpRdVXqTwGt8A+d8kDx+avYvoGxOlPCok5KgBT/M2VqChh8BczST3VDVXwAHvsQ9zO5JMel3+ /KmZBVFDw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kctVo-0002n6-5W; Wed, 11 Nov 2020 17:02:24 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kctVl-0002mZ-Kn for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 17:02:22 +0000 Received: by mail-wr1-x443.google.com with SMTP id c17so3177885wrc.11 for ; Wed, 11 Nov 2020 09:02:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=X24sjVNgpxyUWyZmmGXSuDW61sfZW/dMlYXC795Q6f4=; b=C0lPrtGZD/j/Sfgz9VA8o53jywhNyVbrWkPXdinU7hgJCKm0EfQnx6aGcg9xzg6DGw wTdDu7zwV4uj3yxmK0/ksmxnQYA058iX/CpFPyp9CGjYSu+akHSdsIPdnbBGCuw0TeqJ bCd5MOxtNLyy/zAbzHSDWmig27i1mnqQpJNsXCt2YFtsjDnIN/szdxPuOhJv9FnkgUjo s0dOveQRdPcCPW7izH/aKuZSc7yPS7tz4QmEKtilZVGP9kRnfE0tfUpV7iSc8dI7gdXQ Tr1bJkr9N0lZOorDgxm6XyiJnEOSeXxtyjrPEVM183XhNK4R5fjUovdKJ0oFM/+1YNbS XHWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=X24sjVNgpxyUWyZmmGXSuDW61sfZW/dMlYXC795Q6f4=; b=jjR9YbasE0VJkr8Ryxc+07Noit6YFZyXCYJpjjMkdJtbmGzJdL1yzFdaOwZOpjBmwT Sa8pLOZuuYT1OyJAKutkdHo8KZUs5k0tP+674RBSvgLfm5kdKayT0MWky3WRAbImTBwK G+1uelknnSBQLNPO8wrQKRHbDqRabegsFxQczd3djbKhTlpA+WSlHujTYhWjE9ii8rR8 yrcvXFywo5sh5o9sOMD+uoOAshRoWrJkigg/JD6GpDqv5NH0nAh6s/phtQp1JWjc6irk G/bWnYSOs6aF9cNugbusEFghcPSw2JRGSgZfGHPRPI2vvTziJa2uGDj9JdGXfIDnqq8N C/VA== X-Gm-Message-State: AOAM530Bkue0mqhQJSY4tA/6uT7AoIe4NMqqB7oyz6lDK85iF7/ab8/X oL59dDPOU2PQDobnS9uky+mrlQ== X-Google-Smtp-Source: ABdhPJxGRYXeGNoPTHvyCyyaZirkOH54BZZpF1BtiSeGtu4yeREI8jYsqxEywTX4MOTQ8d12x0O59A== X-Received: by 2002:adf:e484:: with SMTP id i4mr18558640wrm.398.1605114140431; Wed, 11 Nov 2020 09:02:20 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id i11sm3321276wro.85.2020.11.11.09.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 09:02:19 -0800 (PST) Date: Wed, 11 Nov 2020 18:02:13 +0100 From: Marco Elver To: Andrey Konovalov Subject: Re: [PATCH v2 08/20] kasan: inline random_tag for HW_TAGS Message-ID: <20201111170213.GJ517454@elver.google.com> References: <73399d4c0644266d61ad81eb391f5ee10c09e098.1605046662.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <73399d4c0644266d61ad81eb391f5ee10c09e098.1605046662.git.andreyknvl@google.com> User-Agent: Mutt/1.14.6 (2020-07-11) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_120221_877325_B4856466 X-CRM114-Status: GOOD ( 22.67 ) 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: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Dmitry Vyukov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , 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 Tue, Nov 10, 2020 at 11:20PM +0100, 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 > Link: https://linux-review.googlesource.com/id/Iac5b2faf9a912900e16cca6834d621f5d4abf427 > --- > mm/kasan/hw_tags.c | 5 ----- > mm/kasan/kasan.h | 34 +++++++++++++++++----------------- > 2 files changed, 17 insertions(+), 22 deletions(-) Reviewed-by: Marco Elver But see style comments below. > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index 49ea5f5c5643..1476ac07666e 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -42,11 +42,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 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 8a5501ef2339..7498839a15d3 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) > { > @@ -279,6 +268,17 @@ 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) > +#define random_tag() hw_get_random_tag() Shouldn't this also be a function? +static inline u8 random_tag(void) { return hw_get_random_tag(); } Or is there a reason why this was made a macro? > +#else > +static inline u8 random_tag(void) > +{ > + return 0; > +} Could just be on 1 line: +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.222.g5d2a92d10f8-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel