Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2290339pxb; Thu, 11 Feb 2021 08:46:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwEbxS90rFp92Ub3VKemGgXtpkuypYoCm90b4B/fGVfAetMM/Pv2oFnq3on2DMbH00eOOby X-Received: by 2002:a17:906:c9d8:: with SMTP id hk24mr9656946ejb.468.1613062007830; Thu, 11 Feb 2021 08:46:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613062007; cv=none; d=google.com; s=arc-20160816; b=x8H7WJNPW7h0eoY4hfuhtkCI3NB8bM9EYls5CsegVg6WVMx+uRv/xzjgHylrvyn9NL d4x+pT+JpDzbylJuRG/bwy+rEfKTwblz4hgv9uYKJjpFOgsed4wit061QyiOOPYFgV8j Fq0LMq3C/8BnUnPmmviyf0oYf4bpbd4LS2Is/Tsrq1gpgh3Z5iE1oui/DCaYNIMVW/pl MDPrDMyefwJ+05SwXGszV+fysS0dkv8s6W34aNO7aB3tGNTjZXcT6CCJuLVXL19rQWF3 iXHsKQPJw4aJLe2DX1WGaXCUS2K8iSGsRTtHbdub9pwLydkiP19ui6MjZWp1LC8iItp0 YbAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=oolWmrpVYPySsTT4nJoi1MYKxRgFPOly5i4Sg9gcoMg=; b=jUCfHXjl9LAAEEwOieB8VJGjIh7fIaIDj3VGzhdrGpy/UdcmTv5gzrfxlvFZwTcwyk AyUQIdGVF1bxk1icCskNnO9HZL1U+g4hxj8qN+g/AqfxFwltC38xTsa+QnpOiOSOCAM1 3rbcy4fLNSqEV+hKVal+rxVHTAOOo17CpTO4+nHk8xHxIWOXoAxARpcCifhgxPqqkZIx u+3QzSCebvCtq1tQ1X+1cgYVpJ+RHjJoUfEgGOSuyGfA/4By2/+vgXLfcJ72SOROLMwy 6e+ryNa0+paKksfrjnCOvs3Vipu2IM6lXR8HDe2aiZcDahsOoNshPOKhJ6KjJjjWwm0J q0kw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b3si3793758ejj.422.2021.02.11.08.46.24; Thu, 11 Feb 2021 08:46:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232076AbhBKQnA (ORCPT + 99 others); Thu, 11 Feb 2021 11:43:00 -0500 Received: from foss.arm.com ([217.140.110.172]:53502 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230238AbhBKPey (ORCPT ); Thu, 11 Feb 2021 10:34:54 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9B5F111B3; Thu, 11 Feb 2021 07:34:08 -0800 (PST) Received: from e119884-lin.cambridge.arm.com (e119884-lin.cambridge.arm.com [10.1.196.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B620D3F73D; Thu, 11 Feb 2021 07:34:06 -0800 (PST) From: Vincenzo Frascino To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Cc: Vincenzo Frascino , Andrew Morton , Catalin Marinas , Will Deacon , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Andrey Konovalov , Lorenzo Pieralisi Subject: [PATCH v13 1/7] arm64: mte: Add asynchronous mode support Date: Thu, 11 Feb 2021 15:33:47 +0000 Message-Id: <20210211153353.29094-2-vincenzo.frascino@arm.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210211153353.29094-1-vincenzo.frascino@arm.com> References: <20210211153353.29094-1-vincenzo.frascino@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org MTE provides an asynchronous mode for detecting tag exceptions. In particular instead of triggering a fault the arm64 core updates a register which is checked by the kernel after the asynchronous tag check fault has occurred. Add support for MTE asynchronous mode. The exception handling mechanism will be added with a future patch. Note: KASAN HW activates async mode via kasan.mode kernel parameter. The default mode is set to synchronous. The code that verifies the status of TFSR_EL1 will be added with a future patch. Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: Catalin Marinas Reviewed-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino --- arch/arm64/include/asm/memory.h | 3 ++- arch/arm64/include/asm/mte-kasan.h | 9 +++++++-- arch/arm64/kernel/mte.c | 19 ++++++++++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index c759faf7a1ff..91515383d763 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -243,7 +243,8 @@ static inline const void *__tag_set(const void *addr, u8 tag) } #ifdef CONFIG_KASAN_HW_TAGS -#define arch_enable_tagging() mte_enable_kernel() +#define arch_enable_tagging_sync() mte_enable_kernel_sync() +#define arch_enable_tagging_async() mte_enable_kernel_async() #define arch_set_tagging_report_once(state) mte_set_report_once(state) #define arch_init_tags(max_tag) mte_init_tags(max_tag) #define arch_get_random_tag() mte_get_random_tag() diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h index 7ab500e2ad17..4acf8bf41cad 100644 --- a/arch/arm64/include/asm/mte-kasan.h +++ b/arch/arm64/include/asm/mte-kasan.h @@ -77,7 +77,8 @@ static inline void mte_set_mem_tag_range(void *addr, size_t size, u8 tag) } while (curr != end); } -void mte_enable_kernel(void); +void mte_enable_kernel_sync(void); +void mte_enable_kernel_async(void); void mte_init_tags(u64 max_tag); void mte_set_report_once(bool state); @@ -104,7 +105,11 @@ static inline void mte_set_mem_tag_range(void *addr, size_t size, u8 tag) { } -static inline void mte_enable_kernel(void) +static inline void mte_enable_kernel_sync(void) +{ +} + +static inline void mte_enable_kernel_async(void) { } diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index a66c2806fc4d..706b7ab75f31 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -107,13 +107,26 @@ void mte_init_tags(u64 max_tag) write_sysreg_s(SYS_GCR_EL1_RRND | gcr_kernel_excl, SYS_GCR_EL1); } -void mte_enable_kernel(void) +static inline void __mte_enable_kernel(const char *mode, unsigned long tcf) { /* Enable MTE Sync Mode for EL1. */ - sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); + sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, tcf); isb(); + + pr_info_once("MTE: enabled in %s mode at EL1\n", mode); +} + +void mte_enable_kernel_sync(void) +{ + __mte_enable_kernel("synchronous", SCTLR_ELx_TCF_SYNC); +} +EXPORT_SYMBOL_GPL(mte_enable_kernel_sync); + +void mte_enable_kernel_async(void) +{ + __mte_enable_kernel("asynchronous", SCTLR_ELx_TCF_ASYNC); } -EXPORT_SYMBOL_GPL(mte_enable_kernel); +EXPORT_SYMBOL_GPL(mte_enable_kernel_async); void mte_set_report_once(bool state) { -- 2.30.0