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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2A781C48BF6 for ; Thu, 29 Feb 2024 14:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=VpKez2lxWuTYHKaJJDnqoRsI7GP5F9ST0SJeHKDJGpI=; b=KX+GGr0F1Z36oq AfQsIZlik0ZLuR+kGvin7g65tTt+TgIaW18na8JIqjT4SrMdCg2xYe00qSutp24NEh3AExSU+VqIn RwwqZVMgNvh/K3/Q6DuWYLXd0QD8x4ekJf2N2xSFU4ahhLVMh1EukGyRcwwehsDZNfq37apmlAPS+ 1fSGZrGJSPtZyRVoEl2Bdt9b44oxOQRhDAbbiTV1UgKyaNLEjCjjQJY1b0mpJm2IBdNZQlh9FX9BI uxmzlorh19NVRgZJu8Uu2/6nJSOakF0G9Y0y2Tn9G/7fPzU5WpO8RjvQU5XdqOgN6xligG/8JZE9R 8nTgMs9Zlt8F3c37ijag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfhLc-0000000DrJM-1ng5; Thu, 29 Feb 2024 14:25:20 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfhLD-0000000Dr82-29Vg for linux-arm-kernel@lists.infradead.org; Thu, 29 Feb 2024 14:25:18 +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 6BE251FB; Thu, 29 Feb 2024 06:25:32 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.68.196]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 757EE3F6C4; Thu, 29 Feb 2024 06:24:51 -0800 (PST) Date: Thu, 29 Feb 2024 14:24:43 +0000 From: Mark Rutland To: Jinjie Ruan Cc: catalin.marinas@arm.com, will@kernel.org, ardb@kernel.org, broonie@kernel.org, masahiroy@kernel.org, robh@kernel.org, scott@os.amperecomputing.com, joey.gouly@arm.com, ndesaulniers@google.com, anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 2/2] arm64: Rename disable_daif to disable_all_int Message-ID: References: <20240229132802.1682026-1-ruanjinjie@huawei.com> <20240229132802.1682026-3-ruanjinjie@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240229132802.1682026-3-ruanjinjie@huawei.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240229_062455_757717_8DB228E9 X-CRM114-Status: GOOD ( 17.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Thu, Feb 29, 2024 at 09:28:02PM +0800, Jinjie Ruan wrote: > As commit 0fbeb3187548 ("arm64: explicitly mask all exceptions") said, > the disable_daif macro is used to make it clear to 'mask all > exceptions'. However, if ALLINT is introduced by FEAT_NMI, DAIF and > ALLINT should be set to mask IRQs and NMIs, the disable_daif name > is not appropriate, so rename it to disable_all_int in all places. > > Signed-off-by: Jinjie Ruan These macros only touch DAIF, and don't touch ALLINT, so the name *is* appropriate. Please leave these as-is for now; as and when we manipulate ALLINT these will need a more substantial rework. Mark. > --- > arch/arm64/include/asm/assembler.h | 2 +- > arch/arm64/kernel/entry.S | 2 +- > arch/arm64/mm/proc.S | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h > index ab8b396428da..b93916594e8a 100644 > --- a/arch/arm64/include/asm/assembler.h > +++ b/arch/arm64/include/asm/assembler.h > @@ -34,7 +34,7 @@ > wx\n .req w\n > .endr > > - .macro disable_daif > + .macro disable_all_int > msr daifset, #0xf > .endm > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index 7ef0e127b149..cb12003120ef 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -334,7 +334,7 @@ alternative_else_nop_endif > > .macro kernel_exit, el > .if \el != 0 > - disable_daif > + disable_all_int > .endif > > #ifdef CONFIG_ARM64_PSEUDO_NMI > diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S > index bfd2ad896108..4cd5558c5957 100644 > --- a/arch/arm64/mm/proc.S > +++ b/arch/arm64/mm/proc.S > @@ -142,7 +142,7 @@ SYM_FUNC_START(cpu_do_resume) > * exception. Mask them until local_daif_restore() in cpu_suspend() > * resets them. > */ > - disable_daif > + disable_all_int > msr mdscr_el1, x10 > > msr sctlr_el1, x12 > -- > 2.34.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel