From patchwork Wed Sep 15 19:03:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 12497271 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 52E9BC433F5 for ; Wed, 15 Sep 2021 19:06:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 1758961029 for ; Wed, 15 Sep 2021 19:06:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1758961029 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=YHk9B4okPuY7oFEB4/JNHYJucVowW0gaafc+0SH87s8=; b=48LZNC8OfEIaDWEU8A4v/f/guV TbEXZr8l/KbwxxW8N/asu2EaeGf5e218HJq7b/pvT+DcgdAdCOtCTGkyXD4JAPK51LJhtTNn+6rYr 4ulr/xOnlHVQawP+kK5w+idMTvwTkMFYxII4m3p9zS/g2fzm8TW7SYgHf1yJOZxB8Vg8idn3PLz8r 9QBoVMvwIXJ/cGr8rCSWeepI1jxSpaHygZcaT+MjD+743WvpR5Q9ZxNrGN1xX+5CRMyHUimBM7U7f ysEZq0J4YMcMDwslheqTFPSxFsI7Ma9gqPbfuv9YLTGU1juIVY3uJnQps8Zx6J8daNp5cnlyi6vHv y0OWGYEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mQaCO-009l0b-Aq; Wed, 15 Sep 2021 19:04:00 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mQaCA-009kz9-Jv for linux-arm-kernel@lists.infradead.org; Wed, 15 Sep 2021 19:03:48 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id k15-20020a25240f000000b0059efafc5a58so4903822ybk.11 for ; Wed, 15 Sep 2021 12:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=XBl2lyIrFkC8nd7RJzwdwjzekwYEQo+H+0At1uVViOE=; b=KoVgzflx63+pzM4aYTl9GJGX/wG3bUgkF6dQwkzpSQ2InnH8lk23ExLIHZlnrO69KK sLyzp2G3KF1z+mM2xSQMcbgWA234gJuMlPb3NzQ9m77dBzURE2rcRoCk+Yn2d+p81sO4 UKMPlYP9KqD0sLoh+CTVr/J/Q60myl40RdrpIWFVk6dmniv/YzOpHacrLb6/5jQQh2ni Xu4avqYtMEgf1UhOPh3PdZZ4awlltFGdWu/uJVioet63LELfLvFhlM0WFwzGma5X/1so sR67z9OvUjuiupvJJwuoSfuSsjaMO1dIVHihRikmw8zRiJV0t2GQmSRbvqr/IzOOvf5E oRnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=XBl2lyIrFkC8nd7RJzwdwjzekwYEQo+H+0At1uVViOE=; b=yPXsEgAK5B0TOme4kwZo1cWwCHtr47c27HRWIEASEMBdzdJI+VpOBsdctoIUvP3OU4 yPFMRKD9GzS+oz5pDaMsWCeEaQ4JriAd7SuukwkUjWUbBvsbLosECKkocIeQH9lh4jxG 33ADEm2l4kZ40Ov0LZcI+isWWLQJj5X1TNaHekFVewuiq9QzOFyOrIAJAUIDt1ACHft1 9unmAMXvBsSqR0Qe7pDWIJ+owQwULIhyNtH1JEPfk6FzLSlODkmJYwlq1KVvmCYVahze /ygsIewg+aSmRZNKUEcDNvEuwDChPBGo2ajKnsuQ/xzM+lPReAWFT5BZfzNbSpaxW2K7 UCQw== X-Gm-Message-State: AOAM531avGmHkL4IoTNPAYfZYlksoCvFouT6i9AJp46dtkUT4eX/nKmi bR6Nu8fcr+8afyTUNzBTEENaUag= X-Google-Smtp-Source: ABdhPJyPbURM6Lsw6FM+KjHoUbS51UeMuRPSO2hLfR32eX7CGCoC8xlTldmCPMRWeDbzenRse4vpO68= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:931e:1e8c:a36f:9255]) (user=pcc job=sendgmr) by 2002:a25:2256:: with SMTP id i83mr1898650ybi.269.1631732624332; Wed, 15 Sep 2021 12:03:44 -0700 (PDT) Date: Wed, 15 Sep 2021 12:03:36 -0700 In-Reply-To: <20210915190336.398390-1-pcc@google.com> Message-Id: <20210915190336.398390-2-pcc@google.com> Mime-Version: 1.0 References: <20210915190336.398390-1-pcc@google.com> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog Subject: [PATCH v3 2/2] arm64: kasan: mte: move GCR_EL1 switch to task switch when KASAN disabled From: Peter Collingbourne To: Catalin Marinas , Vincenzo Frascino , Will Deacon , Andrey Konovalov Cc: Peter Collingbourne , Evgenii Stepanov , linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210915_120346_702226_602BD62A X-CRM114-Status: GOOD ( 18.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org It is not necessary to write to GCR_EL1 on every kernel entry and exit when HW tag-based KASAN is disabled because the kernel will not execute any IRG instructions in that mode. Since accessing GCR_EL1 can be expensive on some microarchitectures, avoid doing so by moving the access to task switch when HW tag-based KASAN is disabled. Signed-off-by: Peter Collingbourne Acked-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I78e90d60612a94c24344526f476ac4ff216e10d2 Reviewed-by: Catalin Marinas --- v2: - add prerequisite patch to fix booting on non-MTE hardware arch/arm64/kernel/entry.S | 10 +++++----- arch/arm64/kernel/mte.c | 24 +++++++++++++++++++++--- include/linux/kasan.h | 9 +++++++-- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index bc6d5a970a13..2f69ae43941d 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -168,9 +168,9 @@ alternative_else_nop_endif .macro mte_set_kernel_gcr, tmp, tmp2 #ifdef CONFIG_KASAN_HW_TAGS -alternative_if_not ARM64_MTE +alternative_cb kasan_hw_tags_enable b 1f -alternative_else_nop_endif +alternative_cb_end mov \tmp, KERNEL_GCR_EL1 msr_s SYS_GCR_EL1, \tmp 1: @@ -178,10 +178,10 @@ alternative_else_nop_endif .endm .macro mte_set_user_gcr, tsk, tmp, tmp2 -#ifdef CONFIG_ARM64_MTE -alternative_if_not ARM64_MTE +#ifdef CONFIG_KASAN_HW_TAGS +alternative_cb kasan_hw_tags_enable b 1f -alternative_else_nop_endif +alternative_cb_end ldr \tmp, [\tsk, #THREAD_MTE_CTRL] mte_set_gcr \tmp, \tmp2 diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index e5e801bc5312..bb8204d4c5d3 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -157,7 +157,7 @@ void mte_check_tfsr_el1(void) } #endif -static void mte_update_sctlr_user(struct task_struct *task) +static void mte_update_sctlr_user_and_gcr_excl(struct task_struct *task) { /* * This must be called with preemption disabled and can only be called @@ -177,6 +177,24 @@ static void mte_update_sctlr_user(struct task_struct *task) else if (resolved_mte_tcf & MTE_CTRL_TCF_SYNC) sctlr |= SCTLR_EL1_TCF0_SYNC; task->thread.sctlr_user = sctlr; + + /* + * SYS_GCR_EL1 will be set to current->thread.mte_ctrl value by + * mte_set_user_gcr() in kernel_exit, but only if KASAN is enabled. + */ + if (!kasan_hw_tags_enabled()) + write_sysreg_s(((mte_ctrl >> MTE_CTRL_GCR_USER_EXCL_SHIFT) & + SYS_GCR_EL1_EXCL_MASK) | SYS_GCR_EL1_RRND, + SYS_GCR_EL1); +} + +void __init kasan_hw_tags_enable(struct alt_instr *alt, __le32 *origptr, + __le32 *updptr, int nr_inst) +{ + BUG_ON(nr_inst != 1); /* Branch -> NOP */ + + if (kasan_hw_tags_enabled()) + *updptr = cpu_to_le32(aarch64_insn_gen_nop()); } void mte_thread_init_user(void) @@ -197,7 +215,7 @@ void mte_thread_switch(struct task_struct *next) if (!system_supports_mte()) return; - mte_update_sctlr_user(next); + mte_update_sctlr_user_and_gcr_excl(next); /* * Check if an async tag exception occurred at EL1. @@ -242,7 +260,7 @@ long set_mte_ctrl(struct task_struct *task, unsigned long arg) task->thread.mte_ctrl = mte_ctrl; if (task == current) { preempt_disable(); - mte_update_sctlr_user(task); + mte_update_sctlr_user_and_gcr_excl(task); update_sctlr_el1(task->thread.sctlr_user); preempt_enable(); } diff --git a/include/linux/kasan.h b/include/linux/kasan.h index dd874a1ee862..de5f5913374d 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -89,7 +89,7 @@ static __always_inline bool kasan_enabled(void) return static_branch_likely(&kasan_flag_enabled); } -static inline bool kasan_has_integrated_init(void) +static inline bool kasan_hw_tags_enabled(void) { return kasan_enabled(); } @@ -104,7 +104,7 @@ static inline bool kasan_enabled(void) return IS_ENABLED(CONFIG_KASAN); } -static inline bool kasan_has_integrated_init(void) +static inline bool kasan_hw_tags_enabled(void) { return false; } @@ -125,6 +125,11 @@ static __always_inline void kasan_free_pages(struct page *page, #endif /* CONFIG_KASAN_HW_TAGS */ +static inline bool kasan_has_integrated_init(void) +{ + return kasan_hw_tags_enabled(); +} + #ifdef CONFIG_KASAN struct kasan_cache {