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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FDD9C433F5 for ; Tue, 22 Feb 2022 16:38:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E0A18D0006; Tue, 22 Feb 2022 11:38:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 28F048D0003; Tue, 22 Feb 2022 11:38:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1575C8D0006; Tue, 22 Feb 2022 11:38:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id 06FB38D0003 for ; Tue, 22 Feb 2022 11:38:48 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C5AA6204AF for ; Tue, 22 Feb 2022 16:38:47 +0000 (UTC) X-FDA: 79170974694.06.57EDB49 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by imf18.hostedemail.com (Postfix) with ESMTP id 453001C0006 for ; Tue, 22 Feb 2022 16:38:47 +0000 (UTC) Received: by mail-io1-f50.google.com with SMTP id f14so13164894ioz.1 for ; Tue, 22 Feb 2022 08:38:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nBeATWRt/9xAoBmmOaPs45M5p9E5iP+SG496fp1PBf8=; b=psHRdgtYM6NLXmpyq412JUfy727bT+kjrgeq33Scg1FhAl9tHK7inxt+HLIiAh0xPm NNQ18JS/rqF5A5bXphjIRnJmWSFQ8Jbl9+xzoj1Wi1F52k44xgB00GUhL5VDSCC3+oLM KIQOXsB1LmXm+S7RWrvx8Immz/45m+D7xLuSm+cuAiU1OoeUJdtoEd4oh26l7P6VIK9W h/0f2vF4CpEcyRtSd1uy5ENRfW8YQJlugddSXuC2yj6Iy52di8E6k4TeB94sZl+SAFYh KCE/8r2oyXlVCZHx2TX4VeOajKdxmSDGSgLB3Jd9T1NmWKcvNvr+Yqq1WCrPF609xKFC gzvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nBeATWRt/9xAoBmmOaPs45M5p9E5iP+SG496fp1PBf8=; b=UVNT7csG1avKaNzOuXgGkU+jJf5fx2Pl+LrtLfegqGjTdPv6SyM2rcTFSZRFFn2yJb XNz89Z5t3NtoR7x5CwO/BAoH92wLPXwd71yMj7Wh5OifGmpR80mVJvMwTAiUgOaM6vv5 vJIb7h8ELbDDuvn2ufvBoewrVmLZ3xjZiHXbW1YzfF3KTi4cfJdKc5I8ZXiCbDlxHbXI KS/a92yWPLFAKuBAip+AjKRJd3q2GyL4bFplrbuLbZC2eIIc13Ay6FIyrf7cQ41t07na MoUEqfyICj57tdiCeeTfKpTuKXRXrKePEKXeERr2g8F7pZKdDpGpZlpK9gF0LL4T0YUX 1zlg== X-Gm-Message-State: AOAM531HeSsukjt8QAcSFsCv3dSL4/HLCuBhWH7gUXcC0hQXIDNkaqao a/IQbSkq2OwduISOgFjXMSBMjOmtZhtqA0JWW6Y= X-Google-Smtp-Source: ABdhPJyzeaXQLOnUb+VHAEu00VBo/6jHhOtPKkLHDx8AOlAwwIt+AR/brikay4/J4UXgh8RCg/sPpvQYge1MPsvYwzI= X-Received: by 2002:a05:6638:3391:b0:314:bf3e:2bff with SMTP id h17-20020a056638339100b00314bf3e2bffmr14455339jav.71.1645547925612; Tue, 22 Feb 2022 08:38:45 -0800 (PST) MIME-Version: 1.0 References: <20220219012945.894950-1-pcc@google.com> In-Reply-To: <20220219012945.894950-1-pcc@google.com> From: Andrey Konovalov Date: Tue, 22 Feb 2022 17:38:34 +0100 Message-ID: Subject: Re: [PATCH v5 1/2] kasan: split kasan_*enabled() functions into a separate header To: Peter Collingbourne Cc: Catalin Marinas , Vincenzo Frascino , Will Deacon , Mark Rutland , Evgenii Stepanov , Linux ARM , Linux Memory Management List Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 453001C0006 X-Stat-Signature: ndakt18p4ok4i8ojafrhb5i5twtgzuaw Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=psHRdgtY; spf=pass (imf18.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.166.50 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-HE-Tag: 1645547927-271117 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 Sat, Feb 19, 2022 at 2:30 AM Peter Collingbourne wrote: > > In an upcoming commit we are going to need to call > kasan_hw_tags_enabled() from arch/arm64/include/asm/mte.h. This > would create a circular dependency between headers if KASAN_GENERIC > or KASAN_SW_TAGS is enabled: linux/kasan.h -> linux/pgtable.h -> > asm/pgtable.h -> asm/mte.h -> linux/kasan.h. Break the cycle > by introducing a new header linux/kasan-enabled.h with the > kasan_*enabled() functions that can be included from asm/mte.h. > > Link: https://linux-review.googlesource.com/id/I5b0d96c6ed0026fc790899e14d42b2fac6ab568e > Signed-off-by: Peter Collingbourne > --- > include/linux/kasan-enabled.h | 33 +++++++++++++++++++++++++++++++++ > include/linux/kasan.h | 23 +---------------------- > 2 files changed, 34 insertions(+), 22 deletions(-) > create mode 100644 include/linux/kasan-enabled.h > > diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h > new file mode 100644 > index 000000000000..4b6615375022 > --- /dev/null > +++ b/include/linux/kasan-enabled.h > @@ -0,0 +1,33 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _LINUX_KASAN_ENABLED_H > +#define _LINUX_KASAN_ENABLED_H > + > +#ifdef CONFIG_KASAN_HW_TAGS > + > +DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); > + > +static __always_inline bool kasan_enabled(void) > +{ > + return static_branch_likely(&kasan_flag_enabled); > +} > + > +static inline bool kasan_hw_tags_enabled(void) > +{ > + return kasan_enabled(); > +} > + > +#else /* CONFIG_KASAN_HW_TAGS */ > + > +static inline bool kasan_enabled(void) > +{ > + return IS_ENABLED(CONFIG_KASAN); > +} > + > +static inline bool kasan_hw_tags_enabled(void) > +{ > + return false; > +} > + > +#endif /* CONFIG_KASAN_HW_TAGS */ > + > +#endif /* LINUX_KASAN_ENABLED_H */ > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 4a45562d8893..b6a93261c92a 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -3,6 +3,7 @@ > #define _LINUX_KASAN_H > > #include > +#include > #include > #include > #include > @@ -83,33 +84,11 @@ static inline void kasan_disable_current(void) {} > > #ifdef CONFIG_KASAN_HW_TAGS > > -DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); > - > -static __always_inline bool kasan_enabled(void) > -{ > - return static_branch_likely(&kasan_flag_enabled); > -} > - > -static inline bool kasan_hw_tags_enabled(void) > -{ > - return kasan_enabled(); > -} > - > void kasan_alloc_pages(struct page *page, unsigned int order, gfp_t flags); > void kasan_free_pages(struct page *page, unsigned int order); > > #else /* CONFIG_KASAN_HW_TAGS */ > > -static inline bool kasan_enabled(void) > -{ > - return IS_ENABLED(CONFIG_KASAN); > -} > - > -static inline bool kasan_hw_tags_enabled(void) > -{ > - return false; > -} > - > static __always_inline void kasan_alloc_pages(struct page *page, > unsigned int order, gfp_t flags) > { > -- > 2.35.1.473.g83b2b277ed-goog > Reviewed-by: Andrey Konovalov