Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1492528pxb; Fri, 13 Nov 2020 14:21:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzOoAxoZX4uTOdG48I2aF0165//KMmPvgZOgwvOxPnhNAVdN0ESv3QNXDaCA9dF/BH/91DT X-Received: by 2002:a50:a689:: with SMTP id e9mr4811572edc.233.1605306115474; Fri, 13 Nov 2020 14:21:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605306115; cv=none; d=google.com; s=arc-20160816; b=L+tPuF7CXmYJYJtSr1D+UmlkNVbs3glcSF8ki5g6iMiwtOCvCzBDgniq/dDlWzBEau x9d8ZUG9B/MGOGh7CErNsiNnCH49edtHw58RQPeTWVz5Lv0DypTah3gbiji03wSyNczF qpfbe9MteRHr/KXzKr7oDuVDNnWba3UR0l7uUMUeBY+COa04xl+msDS9Z2MFL4y5X5g+ Oh4MFRTBHYPpyduaeB+bGbrPeQis6DKDbSWm0It7+H4nT23efTd3Nom4kuj4fQHEyDhs YkbQ2rT1X53naI7zixySTQN3b5+dMtDMui27gHwWMHkUEKPI/84dysZuISkeZNFHM2FO c5Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:sender:dkim-signature; bh=f330gwtucMwyJOv1r7QkUx5rGmL++YWUBK25FbPW7AY=; b=Cy0+WwhSXU7iAydA3sYR3IIim9xHD32ZUMDP9wqHFf0ZEbqqTjlrzBsE2euv1iULuh nZJGc+Kuw/xCUSa0vUfXCfI06F8t12uRPbafmv/luWUUkCRWruzQqb12h+AU/QT2wqL/ oXotPG/s8Y43z5DhHaETYFdUuZck7ZAkS+jyok+lszDohLD7jnh127TJKpSMqBDu4Una hH6J/0Gm5QE5dVuoy1erGe1wzeJ1v1Cf/RW/GAYyaiTp6SDDWYsH+d8i8PicJp25oCqx OkpNhgHlBiSl3aYsPAS/rhCqQv9qk1AjKZJ3pcAwzK140nlHt0Ws246m8S/UHqEzRVPW Zb0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=SynBjZ9o; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p13si7234185edy.436.2020.11.13.14.21.32; Fri, 13 Nov 2020 14:21:55 -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; dkim=pass header.i=@google.com header.s=20161025 header.b=SynBjZ9o; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726584AbgKMWRw (ORCPT + 99 others); Fri, 13 Nov 2020 17:17:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726530AbgKMWRW (ORCPT ); Fri, 13 Nov 2020 17:17:22 -0500 Received: from mail-ej1-x649.google.com (mail-ej1-x649.google.com [IPv6:2a00:1450:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 170BFC0613D1 for ; Fri, 13 Nov 2020 14:17:22 -0800 (PST) Received: by mail-ej1-x649.google.com with SMTP id z18so4953875eji.1 for ; Fri, 13 Nov 2020 14:17:22 -0800 (PST) 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=f330gwtucMwyJOv1r7QkUx5rGmL++YWUBK25FbPW7AY=; b=SynBjZ9oDXIIlYam9HHT3oufjK8LXlBevinNh8L4yoGfiUOhOq6TDoOUK8+CAQUuT0 JmMnqnf99wjXWMUCdmkSrq2/JEBUg8Tr3xgh8bizH2Z93bdxo9bI244g0DxCmUURDrA5 vMKkEpn5VkgtA3ZDSPjk3DlRb+5ac/A1w12tayTNAbeOwTNhlm+Jq/HMo5V/CNWnsulJ Z/GsPbpJ5poOiv2t2OKsIpiR+KnsUj2sOeSlngE+ifaf1FmFW/jGlGXQHiOEuDQJkm1r dciw71p9sHQ5K/CpMoBOfQeBtylx1XrptFfL3QaxiAe7rYv1cfLS5sTT/7x682P1D324 pQnQ== 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=f330gwtucMwyJOv1r7QkUx5rGmL++YWUBK25FbPW7AY=; b=kQA6yHJQeZkHpoNjG+SL4RR5ZNSF0HxWTzCCG2N6NCKhO1EDpj5am9nx8KFb5Vsk7g wKW95YlWfSSiJmPTyHTggdr7sWMYytN69ws9Ie+6B1JrPMdQELdIIkyTy6PLtHMdtNTZ nzoCF7iqZsVwzdsT1hW47e5ZCfQfhumkb64Zn/Lfjf6RbzNS2Bsi8mJtrzhmYDf9e4IP ABiVbYqaSYuFAkHhu0NI4aAklZruUU99PyGKEMMDmH0BsqrlMagAaPaO1ZQROzDMSxjP 6xhRkk9D66E52kp0TbCC2W8sVWRTxylcnrFny+EQC/PJMCxFVGmaWXHnbvO8IJzJKGVx xWSw== X-Gm-Message-State: AOAM530b9tGhOjLB1AfRWxC/4hObLuAVF9HGdILOFhuowyQ2M8mXsaf2 moZwlOVdMAz6gKh6Z70G3jVppnaYXxDL2iuL Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a17:906:4742:: with SMTP id j2mr4014622ejs.247.1605305840612; Fri, 13 Nov 2020 14:17:20 -0800 (PST) Date: Fri, 13 Nov 2020 23:15:55 +0100 In-Reply-To: Message-Id: <86f8a9be5ab50af11e5b1203157a39f0d9902024.1605305705.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v10 27/42] arm64: mte: Add in-kernel tag fault handler From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vincenzo Frascino Add the implementation of the in-kernel fault handler. When a tag fault happens on a kernel address: * MTE is disabled on the current CPU, * the execution continues. When a tag fault happens on a user address: * the kernel executes do_bad_area() and panics. The tag fault handler for kernel addresses is currently empty and will be filled in by a future commit. Signed-off-by: Vincenzo Frascino Co-developed-by: Andrey Konovalov Signed-off-by: Andrey Konovalov Reviewed-by: Catalin Marinas --- Change-Id: I9b8aa79567f7c45f4d6a1290efcf34567e620717 --- arch/arm64/include/asm/uaccess.h | 23 ++++++++++++++++ arch/arm64/mm/fault.c | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 385a189f7d39..d841a560fae7 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -200,13 +200,36 @@ do { \ CONFIG_ARM64_PAN)); \ } while (0) +/* + * The Tag Check Flag (TCF) mode for MTE is per EL, hence TCF0 + * affects EL0 and TCF affects EL1 irrespective of which TTBR is + * used. + * The kernel accesses TTBR0 usually with LDTR/STTR instructions + * when UAO is available, so these would act as EL0 accesses using + * TCF0. + * However futex.h code uses exclusives which would be executed as + * EL1, this can potentially cause a tag check fault even if the + * user disables TCF0. + * + * To address the problem we set the PSTATE.TCO bit in uaccess_enable() + * and reset it in uaccess_disable(). + * + * The Tag check override (TCO) bit disables temporarily the tag checking + * preventing the issue. + */ static inline void uaccess_disable(void) { + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0), + ARM64_MTE, CONFIG_KASAN_HW_TAGS)); + __uaccess_disable(ARM64_HAS_PAN); } static inline void uaccess_enable(void) { + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1), + ARM64_MTE, CONFIG_KASAN_HW_TAGS)); + __uaccess_enable(ARM64_HAS_PAN); } diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 183d1e6dd9e0..1e4b9353c68a 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -297,6 +298,44 @@ static void die_kernel_fault(const char *msg, unsigned long addr, do_exit(SIGKILL); } +static void report_tag_fault(unsigned long addr, unsigned int esr, + struct pt_regs *regs) +{ +} + +static void do_tag_recovery(unsigned long addr, unsigned int esr, + struct pt_regs *regs) +{ + static bool reported; + + if (!READ_ONCE(reported)) { + report_tag_fault(addr, esr, regs); + WRITE_ONCE(reported, true); + } + + /* + * Disable MTE Tag Checking on the local CPU for the current EL. + * It will be done lazily on the other CPUs when they will hit a + * tag fault. + */ + sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_NONE); + isb(); +} + +static bool is_el1_mte_sync_tag_check_fault(unsigned int esr) +{ + unsigned int ec = ESR_ELx_EC(esr); + unsigned int fsc = esr & ESR_ELx_FSC; + + if (ec != ESR_ELx_EC_DABT_CUR) + return false; + + if (fsc == ESR_ELx_FSC_MTE) + return true; + + return false; +} + static void __do_kernel_fault(unsigned long addr, unsigned int esr, struct pt_regs *regs) { @@ -313,6 +352,12 @@ static void __do_kernel_fault(unsigned long addr, unsigned int esr, "Ignoring spurious kernel translation fault at virtual address %016lx\n", addr)) return; + if (is_el1_mte_sync_tag_check_fault(esr)) { + do_tag_recovery(addr, esr, regs); + + return; + } + if (is_el1_permission_fault(addr, esr, regs)) { if (esr & ESR_ELx_WNR) msg = "write to read-only memory"; -- 2.29.2.299.gdc1121823c-goog