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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 CDB19C54FD0 for ; Thu, 23 Apr 2020 15:24:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7DA2420728 for ; Thu, 23 Apr 2020 15:24:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7DA2420728 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 D790B8E0006; Thu, 23 Apr 2020 11:24:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB0338E0003; Thu, 23 Apr 2020 11:24:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC60A8E0006; Thu, 23 Apr 2020 11:24:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id A34F08E0003 for ; Thu, 23 Apr 2020 11:24:01 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 693D1989C for ; Thu, 23 Apr 2020 15:24:01 +0000 (UTC) X-FDA: 76739490282.13.news51_402d5fcca963a X-HE-Tag: news51_402d5fcca963a X-Filterd-Recvd-Size: 4207 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Thu, 23 Apr 2020 15:24:00 +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 E9B7531B; Thu, 23 Apr 2020 08:23:59 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (e121166-lin.cambridge.arm.com [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 80EE13F6CF; Thu, 23 Apr 2020 08:23:58 -0700 (PDT) Date: Thu, 23 Apr 2020 16:23:52 +0100 From: Lorenzo Pieralisi To: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org, 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 v3 18/23] arm64: mte: Restore the GCR_EL1 register after a suspend Message-ID: <20200423152352.GA21616@e121166-lin.cambridge.arm.com> References: <20200421142603.3894-1-catalin.marinas@arm.com> <20200421142603.3894-19-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200421142603.3894-19-catalin.marinas@arm.com> User-Agent: Mutt/1.9.4 (2018-02-28) 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 Tue, Apr 21, 2020 at 03:25:58PM +0100, Catalin Marinas wrote: > The CPU resume/suspend routines only take care of the common system > registers. Restore GCR_EL1 in addition via the __cpu_suspend_exit() > function. > > Signed-off-by: Catalin Marinas > Cc: Will Deacon > Cc: Lorenzo Pieralisi > --- > > Notes: > New in v3. > > arch/arm64/include/asm/mte.h | 4 ++++ > arch/arm64/kernel/mte.c | 8 ++++++++ > arch/arm64/kernel/suspend.c | 4 ++++ > 3 files changed, 16 insertions(+) Reviewed-by: Lorenzo Pieralisi > diff --git a/arch/arm64/include/asm/mte.h b/arch/arm64/include/asm/mte.h > index 3dc0a7977124..22eb3e06f311 100644 > --- a/arch/arm64/include/asm/mte.h > +++ b/arch/arm64/include/asm/mte.h > @@ -12,6 +12,7 @@ int mte_memcmp_pages(const void *page1_addr, const void *page2_addr); > #ifdef CONFIG_ARM64_MTE > void flush_mte_state(void); > void mte_thread_switch(struct task_struct *next); > +void mte_suspend_exit(void); > long set_mte_ctrl(unsigned long arg); > long get_mte_ctrl(void); > #else > @@ -21,6 +22,9 @@ static inline void flush_mte_state(void) > static inline void mte_thread_switch(struct task_struct *next) > { > } > +static inline void mte_suspend_exit(void) > +{ > +} > static inline long set_mte_ctrl(unsigned long arg) > { > return 0; > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > index 212b9fac294d..fa4a4196b248 100644 > --- a/arch/arm64/kernel/mte.c > +++ b/arch/arm64/kernel/mte.c > @@ -76,6 +76,14 @@ void mte_thread_switch(struct task_struct *next) > update_gcr_el1_excl(next->thread.gcr_incl); > } > > +void mte_suspend_exit(void) > +{ > + if (!system_supports_mte()) > + return; > + > + update_gcr_el1_excl(current->thread.gcr_incl); > +} > + > long set_mte_ctrl(unsigned long arg) > { > u64 tcf0; > diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c > index 9405d1b7f4b0..1d405b73d009 100644 > --- a/arch/arm64/kernel/suspend.c > +++ b/arch/arm64/kernel/suspend.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -74,6 +75,9 @@ void notrace __cpu_suspend_exit(void) > */ > if (arm64_get_ssbd_state() == ARM64_SSBD_FORCE_DISABLE) > arm64_set_ssbd_mitigation(false); > + > + /* Restore additional MTE-specific configuration */ > + mte_suspend_exit(); > } > > /*