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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED 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 E0E7FC433E0 for ; Thu, 7 Jan 2021 11:39:37 +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 8B1D822CF8 for ; Thu, 7 Jan 2021 11:39:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B1D822CF8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/c/1IlYStq7kmXjGp3U+zlPLG0LreC96t0T/4lWVCTE=; b=TOr6/VdD9CY8XCOJUSseMVEP0 kAfxiD6Zq+oeEFLB4ySblSjiWb5AFx0rMU/UhY/HMnWDVWiVb8lOPlnm8LFQKZEn7LJCZJ+3oqbfR leVFc9LKNT8DqpLNkosva3QusUSqLEwzCYp5AaDQsCKZKNJYEKq3VpAz47IoyDorLN4sETW4QBYAU 4kMbX9fK8OzaEbq2eFyE6lQrsSaIOinaYG0wM2eVnmuQ38H5YXWgdWlpTvxXPTHwdJtCXszax+u1E FHaCiyTUWC6oiXqDIQxT41xZd3z2xtNagtR7XDZrjgFr2WC5O9AcjLS8c8TZyZOmQ3pUUiO59SZSX HJ09DDjjQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxTbq-0005Pz-Vx; Thu, 07 Jan 2021 11:37:43 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxTbn-0005PP-J8 for linux-arm-kernel@lists.infradead.org; Thu, 07 Jan 2021 11:37:40 +0000 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 6F61931B; Thu, 7 Jan 2021 03:37:35 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.34.174]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 612343F719; Thu, 7 Jan 2021 03:37:34 -0800 (PST) Date: Thu, 7 Jan 2021 11:37:31 +0000 From: Mark Rutland To: Catalin Marinas Subject: Re: [PATCH] arm64: Move PSTATE.TCO setting to separate functions Message-ID: <20210107113731.GC7523@C02TD0UTHF1T.local> References: <20210104124715.12826-1-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210104124715.12826-1-catalin.marinas@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210107_063739_705694_8026827A X-CRM114-Status: GOOD ( 16.07 ) 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: Vincenzo Frascino , Will Deacon , linux-arm-kernel@lists.infradead.org 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 On Mon, Jan 04, 2021 at 12:47:15PM +0000, Catalin Marinas wrote: > For consistency with __uaccess_{disable,enable}_hw_pan(), move the > PSTATE.TCO setting into dedicated __uaccess_{disable,enable}_tco() > functions. > > Signed-off-by: Catalin Marinas > Cc: Vincenzo Frascino > Cc: Mark Rutland Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/uaccess.h | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h > index 6f986e09a781..534a7d33b12f 100644 > --- a/arch/arm64/include/asm/uaccess.h > +++ b/arch/arm64/include/asm/uaccess.h > @@ -159,6 +159,18 @@ static inline void __uaccess_enable_hw_pan(void) > CONFIG_ARM64_PAN)); > } > > +static inline void __uaccess_disable_tco(void) > +{ > + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0), > + ARM64_MTE, CONFIG_KASAN_HW_TAGS)); > +} > + > +static inline void __uaccess_enable_tco(void) > +{ > + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1), > + ARM64_MTE, CONFIG_KASAN_HW_TAGS)); > +} > + > /* > * The Tag Check Flag (TCF) mode for MTE is per EL, hence TCF0 > * affects EL0 and TCF affects EL1 irrespective of which TTBR is > @@ -178,8 +190,7 @@ static inline void __uaccess_enable_hw_pan(void) > */ > static inline void uaccess_disable_privileged(void) > { > - asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0), > - ARM64_MTE, CONFIG_KASAN_HW_TAGS)); > + __uaccess_disable_tco(); > > if (uaccess_ttbr0_disable()) > return; > @@ -189,8 +200,7 @@ static inline void uaccess_disable_privileged(void) > > static inline void uaccess_enable_privileged(void) > { > - asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1), > - ARM64_MTE, CONFIG_KASAN_HW_TAGS)); > + __uaccess_enable_tco(); > > if (uaccess_ttbr0_enable()) > return; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel