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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 D816FC433E2 for ; Tue, 15 Sep 2020 21:59:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8BDD420872 for ; Tue, 15 Sep 2020 21:59:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="p2QNOStD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728080AbgIOV6x (ORCPT ); Tue, 15 Sep 2020 17:58:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728099AbgIOV3Y (ORCPT ); Tue, 15 Sep 2020 17:29:24 -0400 Received: from mail-ej1-x64a.google.com (mail-ej1-x64a.google.com [IPv6:2a00:1450:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC997C061223 for ; Tue, 15 Sep 2020 14:17:24 -0700 (PDT) Received: by mail-ej1-x64a.google.com with SMTP id m24so1813388ejx.22 for ; Tue, 15 Sep 2020 14:17:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=pBsGqTIqbR91modi76ePsvmJJRuaBk1hVSkVG5VFwBQ=; b=p2QNOStDgd3DtDO2HMju2iMROSw8FGR9GwRtHaoapNRKPL7jpItd7Nvrv9ZUMnx5Q9 8omi9isnPo7q0hA0GQq1Gb/n+Qtd3gOUgcadRA63YAzQ5c7yW5bSifPYsUlu3RfXsOhw bKib5qq1Nz/zAypPDCWC6iYRJGxZO7ltEPxS+e+VLmx2xbYqSyangq+OO1QbSjCtxQfg nbiluYCPKo4yVY4Rm0yu2q7JTG14E6A9ir3gafO3HGJ6NORNnkxFV3omQs5MUN8mRZxp +p6amVva7PebyyovbInJ7KY0jaCFmoG0p9bHmALDzXjrJgSelm+GhpxYd0+OQ6a5kx4m v76Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=pBsGqTIqbR91modi76ePsvmJJRuaBk1hVSkVG5VFwBQ=; b=o0+MrWVhTgizPnihK1KKtcJ+WSMlTzm++Zn+dq54h3HGWM1YP1uhZ/LI0FAOiJV2l4 ZgMsHARkfGPp1tf7obKn2GDEyhH+4pyT/zT9PxyPNMz8oGTOYBmdCn9MR65gX1MbbUR4 kSvIGRpZsEhGCyklccupZiFL1qRJVCnUvr8QR/V1QSda0YARnyfMW50VRcFT6UWlZH1l Hc5jqiIXm5pq26d7BS7oNkYVdlOr27Q6E67s+0dmaQLFtAYWwJrVxyDZFJRPvNUGojz+ TfVqYQ6l/WUJyjGWRL18RjzJi0zQqZlRDpi492cQTwg89KGVhpgs0VLjVx70PRgBia3m alcg== X-Gm-Message-State: AOAM531PEiqR2VifRQKLjV7Ga4BahCosxhOeY6lmk4hYlaE0yJJT/GTz Fq5sXoofZf/FLnRLEmxh0vXtRo/CjrKPi76V X-Google-Smtp-Source: ABdhPJw8M8WWCio4qpRA1ZXyUA8Var1LZEn3zoWxmx7gA98yPdjDztcJ9EMI1/V5rg5Qsem0Jb9eVOShbM9zEULm X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a17:906:8559:: with SMTP id h25mr21784179ejy.536.1600204643277; Tue, 15 Sep 2020 14:17:23 -0700 (PDT) Date: Tue, 15 Sep 2020 23:16:07 +0200 In-Reply-To: Message-Id: <859111cf1d862ce26f094cf14511461c372e5bbc.1600204505.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 25/37] arm64: kasan: Enable in-kernel MTE From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vincenzo Frascino Hardware tag-based KASAN relies on Memory Tagging Extension (MTE) feature and requires it to be enabled. The Tag Checking operation causes a synchronous data abort as a consequence of a tag check fault when MTE is configured in synchronous mode. Enable MTE in Synchronous mode in EL1 to provide a more immediate way of tag check failure detection in the kernel. As part of this change enable match-all tag for EL1 to allow the kernel to access user pages without faulting. This is required because the kernel does not have knowledge of the tags set by the user in a page. Note: For MTE, the TCF bit field in SCTLR_EL1 affects only EL1 in a similar way as TCF0 affects EL0. Signed-off-by: Vincenzo Frascino Signed-off-by: Andrey Konovalov --- Change-Id: I4d67497268bb7f0c2fc5dcacefa1e273df4af71d --- arch/arm64/kernel/cpufeature.c | 7 +++++++ arch/arm64/mm/proc.S | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index add9da5d8ea3..eca06b8c74db 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1718,6 +1718,13 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) cleared_zero_page = true; mte_clear_page_tags(lm_alias(empty_zero_page)); } + + /* Enable in-kernel MTE only if KASAN_HW_TAGS is enabled */ + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) { + /* Enable MTE Sync Mode for EL1 */ + sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); + isb(); + } } #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 23c326a06b2d..5ba7ac5e9c77 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -427,6 +427,10 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x5, MAIR_EL1_SET #ifdef CONFIG_ARM64_MTE + mte_present .req x20 + + mov mte_present, #0 + /* * Update MAIR_EL1, GCR_EL1 and TFSR*_EL1 if MTE is supported * (ID_AA64PFR1_EL1[11:8] > 1). @@ -447,6 +451,8 @@ SYM_FUNC_START(__cpu_setup) /* clear any pending tag check faults in TFSR*_EL1 */ msr_s SYS_TFSR_EL1, xzr msr_s SYS_TFSRE0_EL1, xzr + + mov mte_present, #1 1: #endif msr mair_el1, x5 @@ -485,6 +491,13 @@ SYM_FUNC_START(__cpu_setup) orr x10, x10, #TCR_HA // hardware Access flag update 1: #endif /* CONFIG_ARM64_HW_AFDBM */ +#ifdef CONFIG_ARM64_MTE + /* Update TCR_EL1 if MTE is supported (ID_AA64PFR1_EL1[11:8] > 1) */ + cbz mte_present, 1f + orr x10, x10, #SYS_TCR_EL1_TCMA1 +1: + .unreq mte_present +#endif msr tcr_el1, x10 /* * Prepare SCTLR -- 2.28.0.618.gf4bc123cb7-goog 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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 9A9E4C43461 for ; Tue, 15 Sep 2020 21:17:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1D0F620770 for ; Tue, 15 Sep 2020 21:17:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="p2QNOStD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D0F620770 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9D6D190008D; Tue, 15 Sep 2020 17:17:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 988A590008A; Tue, 15 Sep 2020 17:17:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87D9990008D; Tue, 15 Sep 2020 17:17:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0061.hostedemail.com [216.40.44.61]) by kanga.kvack.org (Postfix) with ESMTP id 6FBCA90008A for ; Tue, 15 Sep 2020 17:17:25 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3668B3489 for ; Tue, 15 Sep 2020 21:17:25 +0000 (UTC) X-FDA: 77266556850.29.spark48_0b0a96527114 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 06219180868E5 for ; Tue, 15 Sep 2020 21:17:25 +0000 (UTC) X-HE-Tag: spark48_0b0a96527114 X-Filterd-Recvd-Size: 6158 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 21:17:24 +0000 (UTC) Received: by mail-ed1-f74.google.com with SMTP id n19so68530eds.8 for ; Tue, 15 Sep 2020 14:17:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=pBsGqTIqbR91modi76ePsvmJJRuaBk1hVSkVG5VFwBQ=; b=p2QNOStDgd3DtDO2HMju2iMROSw8FGR9GwRtHaoapNRKPL7jpItd7Nvrv9ZUMnx5Q9 8omi9isnPo7q0hA0GQq1Gb/n+Qtd3gOUgcadRA63YAzQ5c7yW5bSifPYsUlu3RfXsOhw bKib5qq1Nz/zAypPDCWC6iYRJGxZO7ltEPxS+e+VLmx2xbYqSyangq+OO1QbSjCtxQfg nbiluYCPKo4yVY4Rm0yu2q7JTG14E6A9ir3gafO3HGJ6NORNnkxFV3omQs5MUN8mRZxp +p6amVva7PebyyovbInJ7KY0jaCFmoG0p9bHmALDzXjrJgSelm+GhpxYd0+OQ6a5kx4m v76Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=pBsGqTIqbR91modi76ePsvmJJRuaBk1hVSkVG5VFwBQ=; b=LOZzDB9wwnZ8NVd5VMKeC9lL+PfmPFKSMEZfO8jA7rgxw60VP0d+Sa9NXMsRcumdma BPnMeL41wrYtl5taiv7YAbLHJc01rXb4gddnjgsRor5BvGFwES4wSt++GbVYNFTzA29+ 6X1tKmvEAVJmCGmalRa9DTGb0Tv9ase1MI8quFgSDyQOHSMHZyS8MqPMAsyQZADz98tW H1qHkvrAGCKFHAdpuow22UsCBypkNb7p3xx/nFc968iB/P1YgXPSTz3bgIGOonbSvz3R nrchxLCHTfEwuOsBFqUFEraTWQpEb4nT61xUDcydLJspRJXNawcAf1sLCNVVgWGTb/CE QZAw== X-Gm-Message-State: AOAM530HW1J9oHGgsEzXryl0fbmoPMj8FW/zVEns+F/3wk4iHkAY4uxy QhZnc1lyr2lZ7efUfUDC155zHWYYE3bIvHH3 X-Google-Smtp-Source: ABdhPJw8M8WWCio4qpRA1ZXyUA8Var1LZEn3zoWxmx7gA98yPdjDztcJ9EMI1/V5rg5Qsem0Jb9eVOShbM9zEULm X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a17:906:8559:: with SMTP id h25mr21784179ejy.536.1600204643277; Tue, 15 Sep 2020 14:17:23 -0700 (PDT) Date: Tue, 15 Sep 2020 23:16:07 +0200 In-Reply-To: Message-Id: <859111cf1d862ce26f094cf14511461c372e5bbc.1600204505.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 25/37] arm64: kasan: Enable in-kernel MTE From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 06219180868E5 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: From: Vincenzo Frascino Hardware tag-based KASAN relies on Memory Tagging Extension (MTE) feature and requires it to be enabled. The Tag Checking operation causes a synchronous data abort as a consequence of a tag check fault when MTE is configured in synchronous mode. Enable MTE in Synchronous mode in EL1 to provide a more immediate way of tag check failure detection in the kernel. As part of this change enable match-all tag for EL1 to allow the kernel to access user pages without faulting. This is required because the kernel does not have knowledge of the tags set by the user in a page. Note: For MTE, the TCF bit field in SCTLR_EL1 affects only EL1 in a similar way as TCF0 affects EL0. Signed-off-by: Vincenzo Frascino Signed-off-by: Andrey Konovalov --- Change-Id: I4d67497268bb7f0c2fc5dcacefa1e273df4af71d --- arch/arm64/kernel/cpufeature.c | 7 +++++++ arch/arm64/mm/proc.S | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index add9da5d8ea3..eca06b8c74db 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1718,6 +1718,13 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) cleared_zero_page = true; mte_clear_page_tags(lm_alias(empty_zero_page)); } + + /* Enable in-kernel MTE only if KASAN_HW_TAGS is enabled */ + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) { + /* Enable MTE Sync Mode for EL1 */ + sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); + isb(); + } } #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 23c326a06b2d..5ba7ac5e9c77 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -427,6 +427,10 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x5, MAIR_EL1_SET #ifdef CONFIG_ARM64_MTE + mte_present .req x20 + + mov mte_present, #0 + /* * Update MAIR_EL1, GCR_EL1 and TFSR*_EL1 if MTE is supported * (ID_AA64PFR1_EL1[11:8] > 1). @@ -447,6 +451,8 @@ SYM_FUNC_START(__cpu_setup) /* clear any pending tag check faults in TFSR*_EL1 */ msr_s SYS_TFSR_EL1, xzr msr_s SYS_TFSRE0_EL1, xzr + + mov mte_present, #1 1: #endif msr mair_el1, x5 @@ -485,6 +491,13 @@ SYM_FUNC_START(__cpu_setup) orr x10, x10, #TCR_HA // hardware Access flag update 1: #endif /* CONFIG_ARM64_HW_AFDBM */ +#ifdef CONFIG_ARM64_MTE + /* Update TCR_EL1 if MTE is supported (ID_AA64PFR1_EL1[11:8] > 1) */ + cbz mte_present, 1f + orr x10, x10, #SYS_TCR_EL1_TCMA1 +1: + .unreq mte_present +#endif msr tcr_el1, x10 /* * Prepare SCTLR -- 2.28.0.618.gf4bc123cb7-goog 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=-15.7 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_GIT 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 0A48FC433E2 for ; Tue, 15 Sep 2020 21:27:38 +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 81E002078E for ; Tue, 15 Sep 2020 21:27:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="elkiwb9G"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="p2QNOStD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81E002078E 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: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=B/sc232niNkKV5Dwm4OlVAS8Go1XEcOePUSrT/+mpdw=; b=elkiwb9GNgczHReQs9A5qqxNT M6/aEFJeMDPy8rzseKvgQNWkcJ2VmDY9rTc5VBjbJ9yyyG1zuna0b2BodX+kCBtsL0U3Y/bap6Cef o57XpIBY3wq09OLCOmplc5dKTrDhF4vd0ceENJG+TxJ5ZcpWwrPl8FX0EjlmOCyy+9ybTyLuwE5CZ xQWF0P9qwtoQQwGLTZkzNnChJTtIjgdVH0vSjjTV2MIOfwZJvI7PoI+Yk2h5mLiOkJX/+sQUFeklV lViaIjc8yqXuoiw5c7NmGP5cj19yxMi1mSqJgAKa1+2HYI63JD3MCog9KQn0qnEqHzPOUeIETXCvb GybkJa7Bg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIRl-0002PG-5n; Tue, 15 Sep 2020 21:25:05 +0000 Received: from mail-ed1-x54a.google.com ([2a00:1450:4864:20::54a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIKN-0007Bc-RF for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 21:17:32 +0000 Received: by mail-ed1-x54a.google.com with SMTP id d13so1776685edz.18 for ; Tue, 15 Sep 2020 14:17:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=pBsGqTIqbR91modi76ePsvmJJRuaBk1hVSkVG5VFwBQ=; b=p2QNOStDgd3DtDO2HMju2iMROSw8FGR9GwRtHaoapNRKPL7jpItd7Nvrv9ZUMnx5Q9 8omi9isnPo7q0hA0GQq1Gb/n+Qtd3gOUgcadRA63YAzQ5c7yW5bSifPYsUlu3RfXsOhw bKib5qq1Nz/zAypPDCWC6iYRJGxZO7ltEPxS+e+VLmx2xbYqSyangq+OO1QbSjCtxQfg nbiluYCPKo4yVY4Rm0yu2q7JTG14E6A9ir3gafO3HGJ6NORNnkxFV3omQs5MUN8mRZxp +p6amVva7PebyyovbInJ7KY0jaCFmoG0p9bHmALDzXjrJgSelm+GhpxYd0+OQ6a5kx4m v76Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=pBsGqTIqbR91modi76ePsvmJJRuaBk1hVSkVG5VFwBQ=; b=Y81FijVzupOF/pFBcc8bI1F6FrU8Jy0OMqSfSWISO6L0IxdA/tjeHsYgUnN4njILAy p7SO1qZi8j1wmpZrrozGWUXKUQ9Vw2ZZcCnApU0dhK+T3pze3sEGK6nOQppEsHEBIIT+ tg3akLgso7YVY2TIQmvzsBg6gH3f7dkpo3ioPXaqezo9H2QazKOsW5oWAg7y+honQzqz fCebBiUthG1iafNojeOmW1w1uYHc7Pj+yIgcWpGecpNFer8BKCUo1h7r0pWqekeJ6RTG /1bjMhOICjj9ObdzLo0pkDnXWig9925QzeIFukBUFtfD7Infyiqks55NGfSwYJGgdrh8 2/pA== X-Gm-Message-State: AOAM532pAXrHoP11UMvPDp7gio31H4zr5koWN8kjaynQci9oQUXF8C8V gB3l0veQNSCUbePkQ6nfek81x6Frug6qz8Qt X-Google-Smtp-Source: ABdhPJw8M8WWCio4qpRA1ZXyUA8Var1LZEn3zoWxmx7gA98yPdjDztcJ9EMI1/V5rg5Qsem0Jb9eVOShbM9zEULm X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a17:906:8559:: with SMTP id h25mr21784179ejy.536.1600204643277; Tue, 15 Sep 2020 14:17:23 -0700 (PDT) Date: Tue, 15 Sep 2020 23:16:07 +0200 In-Reply-To: Message-Id: <859111cf1d862ce26f094cf14511461c372e5bbc.1600204505.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 25/37] arm64: kasan: Enable in-kernel MTE From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_171727_989059_78F78155 X-CRM114-Status: GOOD ( 17.06 ) 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: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , 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 From: Vincenzo Frascino Hardware tag-based KASAN relies on Memory Tagging Extension (MTE) feature and requires it to be enabled. The Tag Checking operation causes a synchronous data abort as a consequence of a tag check fault when MTE is configured in synchronous mode. Enable MTE in Synchronous mode in EL1 to provide a more immediate way of tag check failure detection in the kernel. As part of this change enable match-all tag for EL1 to allow the kernel to access user pages without faulting. This is required because the kernel does not have knowledge of the tags set by the user in a page. Note: For MTE, the TCF bit field in SCTLR_EL1 affects only EL1 in a similar way as TCF0 affects EL0. Signed-off-by: Vincenzo Frascino Signed-off-by: Andrey Konovalov --- Change-Id: I4d67497268bb7f0c2fc5dcacefa1e273df4af71d --- arch/arm64/kernel/cpufeature.c | 7 +++++++ arch/arm64/mm/proc.S | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index add9da5d8ea3..eca06b8c74db 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1718,6 +1718,13 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) cleared_zero_page = true; mte_clear_page_tags(lm_alias(empty_zero_page)); } + + /* Enable in-kernel MTE only if KASAN_HW_TAGS is enabled */ + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) { + /* Enable MTE Sync Mode for EL1 */ + sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); + isb(); + } } #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 23c326a06b2d..5ba7ac5e9c77 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -427,6 +427,10 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x5, MAIR_EL1_SET #ifdef CONFIG_ARM64_MTE + mte_present .req x20 + + mov mte_present, #0 + /* * Update MAIR_EL1, GCR_EL1 and TFSR*_EL1 if MTE is supported * (ID_AA64PFR1_EL1[11:8] > 1). @@ -447,6 +451,8 @@ SYM_FUNC_START(__cpu_setup) /* clear any pending tag check faults in TFSR*_EL1 */ msr_s SYS_TFSR_EL1, xzr msr_s SYS_TFSRE0_EL1, xzr + + mov mte_present, #1 1: #endif msr mair_el1, x5 @@ -485,6 +491,13 @@ SYM_FUNC_START(__cpu_setup) orr x10, x10, #TCR_HA // hardware Access flag update 1: #endif /* CONFIG_ARM64_HW_AFDBM */ +#ifdef CONFIG_ARM64_MTE + /* Update TCR_EL1 if MTE is supported (ID_AA64PFR1_EL1[11:8] > 1) */ + cbz mte_present, 1f + orr x10, x10, #SYS_TCR_EL1_TCMA1 +1: + .unreq mte_present +#endif msr tcr_el1, x10 /* * Prepare SCTLR -- 2.28.0.618.gf4bc123cb7-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel