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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 2267FC4BA24 for ; Thu, 27 Feb 2020 11:50:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DCAB624693 for ; Thu, 27 Feb 2020 11:50:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCAB624693 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 793A76B0003; Thu, 27 Feb 2020 06:50:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7452A6B0005; Thu, 27 Feb 2020 06:50:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65A356B0006; Thu, 27 Feb 2020 06:50:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0227.hostedemail.com [216.40.44.227]) by kanga.kvack.org (Postfix) with ESMTP id 49F3B6B0003 for ; Thu, 27 Feb 2020 06:50:36 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E3B07181AC9CC for ; Thu, 27 Feb 2020 11:50:35 +0000 (UTC) X-FDA: 76535739630.06.pets92_22491c192a546 X-HE-Tag: pets92_22491c192a546 X-Filterd-Recvd-Size: 3243 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Thu, 27 Feb 2020 11:50:35 +0000 (UTC) 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 B003D1FB; Thu, 27 Feb 2020 03:50:34 -0800 (PST) Received: from arrakis.emea.arm.com (arrakis.cambridge.arm.com [10.1.196.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5F1E73F73B; Thu, 27 Feb 2020 03:50:33 -0800 (PST) Date: Thu, 27 Feb 2020 11:50:31 +0000 From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org Cc: Will Deacon , Vincenzo Frascino , Szabolcs Nagy , Richard Earnshaw , Kevin Brodsky , Andrey Konovalov , Peter Collingbourne , linux-mm@kvack.org, linux-arch@vger.kernel.org Subject: Re: [PATCH v2 10/19] arm64: mte: Handle synchronous and asynchronous tag check faults Message-ID: <20200227115031.GC3281767@arrakis.emea.arm.com> References: <20200226180526.3272848-1-catalin.marinas@arm.com> <20200226180526.3272848-11-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200226180526.3272848-11-catalin.marinas@arm.com> 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: On Wed, Feb 26, 2020 at 06:05:17PM +0000, Catalin Marinas wrote: > diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile > index fc6488660f64..d4a378bc0a60 100644 > --- a/arch/arm64/kernel/Makefile > +++ b/arch/arm64/kernel/Makefile > @@ -63,6 +63,7 @@ obj-$(CONFIG_CRASH_CORE) += crash_core.o > obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o > obj-$(CONFIG_ARM64_SSBD) += ssbd.o > obj-$(CONFIG_ARM64_PTR_AUTH) += pointer_auth.o > +obj-$(CONFIG_ARM64_MTE) += mte.o > > obj-y += vdso/ probes/ > obj-$(CONFIG_COMPAT_VDSO) += vdso32/ > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index 9461d812ae27..9338b340e869 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S [...] > @@ -738,6 +763,8 @@ work_pending: > */ > ret_to_user: > disable_daif > + /* Check for asynchronous tag check faults in the uaccess routines */ > + check_mte_async_tcf x1, x2 > gic_prio_kentry_setup tmp=x3 > ldr x1, [tsk, #TSK_TI_FLAGS] > and x2, x1, #_TIF_WORK_MASK I got this wrong, check_mte_async expects the flags as the first argument (one may experience weird behaviour with overriding the TIF flags; thanks to Kevin for debugging). The diff below should fix it: diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 9338b340e869..6e7f315911e8 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -764,9 +764,9 @@ work_pending: ret_to_user: disable_daif /* Check for asynchronous tag check faults in the uaccess routines */ - check_mte_async_tcf x1, x2 gic_prio_kentry_setup tmp=x3 ldr x1, [tsk, #TSK_TI_FLAGS] + check_mte_async_tcf x1, x2 and x2, x1, #_TIF_WORK_MASK cbnz x2, work_pending finish_ret_to_user: