From: Vincenzo Frascino <vincenzo.frascino@arm.com>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Dmitry Vyukov <dvyukov@google.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>,
Evgenii Stepanov <eugenis@google.com>,
Branislav Rankov <Branislav.Rankov@arm.com>,
Andrey Konovalov <andreyknvl@google.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: [PATCH v16 6/9] arm64: mte: Conditionally compile mte_enable_kernel_*()
Date: Mon, 15 Mar 2021 13:20:16 +0000 [thread overview]
Message-ID: <20210315132019.33202-7-vincenzo.frascino@arm.com> (raw)
In-Reply-To: <20210315132019.33202-1-vincenzo.frascino@arm.com>
mte_enable_kernel_*() are not needed if KASAN_HW is disabled.
Add ash defines around the functions to conditionally compile the
functions.
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
---
arch/arm64/kernel/mte.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c
index 9362928ba0d5..50f0724c8d8f 100644
--- a/arch/arm64/kernel/mte.c
+++ b/arch/arm64/kernel/mte.c
@@ -26,9 +26,11 @@ u64 gcr_kernel_excl __ro_after_init;
static bool report_fault_once = true;
+#ifdef CONFIG_KASAN_HW_TAGS
/* Whether the MTE asynchronous mode is enabled. */
DEFINE_STATIC_KEY_FALSE(mte_async_mode);
EXPORT_SYMBOL_GPL(mte_async_mode);
+#endif
static void mte_sync_page_tags(struct page *page, pte_t *ptep, bool check_swap)
{
@@ -120,6 +122,7 @@ static inline void __mte_enable_kernel(const char *mode, unsigned long tcf)
pr_info_once("MTE: enabled in %s mode at EL1\n", mode);
}
+#ifdef CONFIG_KASAN_HW_TAGS
void mte_enable_kernel_sync(void)
{
/*
@@ -147,6 +150,7 @@ void mte_enable_kernel_async(void)
if (!system_uses_mte_async_mode())
static_branch_enable(&mte_async_mode);
}
+#endif
void mte_set_report_once(bool state)
{
--
2.30.2
next prev parent reply other threads:[~2021-03-15 13:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 13:20 [PATCH v16 0/9] arm64: ARMv8.5-A: MTE: Add async mode support Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 1/9] arm64: mte: Add asynchronous " Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 2/9] kasan: Add KASAN mode kernel parameter Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 3/9] arm64: mte: Drop arch_enable_tagging() Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 4/9] kasan: Add report for async mode Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 5/9] arm64: mte: Enable TCO in functions that can read beyond buffer limits Vincenzo Frascino
2021-03-15 13:20 ` Vincenzo Frascino [this message]
2021-03-15 18:41 ` [PATCH v16 6/9] arm64: mte: Conditionally compile mte_enable_kernel_*() Catalin Marinas
2021-03-16 10:06 ` Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 7/9] arm64: mte: Enable async tag check fault Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 8/9] arm64: mte: Report async tag faults before suspend Vincenzo Frascino
2021-03-15 13:20 ` [PATCH v16 9/9] kasan, arm64: tests supports for HW_TAGS async mode Vincenzo Frascino
2021-03-18 18:56 ` [PATCH v16 0/9] arm64: ARMv8.5-A: MTE: Add async mode support Catalin Marinas
2021-03-18 19:03 ` Andrey Konovalov
2021-03-23 15:08 ` Andrey Konovalov
2021-04-11 13:02 ` Catalin Marinas
2021-04-13 9:47 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210315132019.33202-7-vincenzo.frascino@arm.com \
--to=vincenzo.frascino@arm.com \
--cc=Branislav.Rankov@arm.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).