From nobody Mon Feb 9 17:06:38 2026 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1572534663; cv=none; d=zoho.com; s=zohoarc; b=jWy0vlTWk3KO/BvhrT8OoXUQxs9MApAplddqhordFJKi/GTPwOXtuT7MZunK1uVrLorzByoWEOUyj2MjTUXZ9H1wIi3rvbbX43wIDxgZ+tbGWjosXANfFbOifZnZDY9ECoyDq3wDNEWJfVB0xStRnFJIegz4PiXqzafGa5tbAj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572534663; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0ulMyYHbO0A+z4U6laTfRnmGBcCmJEOpIYj/Iyv97Ek=; b=XSCx4a2pQgOP3QdLWVRSVOy1YluL4REKXWRu/s3NfbT+V1Ogu3fOxwZ2NhESX6hnwsLL4XoloYNhYNkw8sYScXn1SeXoiFMkIZ/oYPNfztztvce5fZBrQ2IWeMWO58WLZmX/+qXHhkcdQOtWVFuyG9sMwQIbY5uKklOKBRy1mDE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1572534663213899.1637334764577; Thu, 31 Oct 2019 08:11:03 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iQC5E-0006cZ-Jk; Thu, 31 Oct 2019 15:09:56 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iQC5D-0006bE-A4 for xen-devel@lists.xenproject.org; Thu, 31 Oct 2019 15:09:55 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 768f7188-fbf0-11e9-954c-12813bfff9fa; Thu, 31 Oct 2019 15:09:41 +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 130AD64F; Thu, 31 Oct 2019 08:09:41 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (unknown [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2887C3F71E; Thu, 31 Oct 2019 08:09:40 -0700 (PDT) X-Inumbo-ID: 768f7188-fbf0-11e9-954c-12813bfff9fa From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 31 Oct 2019 15:09:09 +0000 Message-Id: <20191031150922.22938-7-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191031150922.22938-1-julien.grall@arm.com> References: <20191031150922.22938-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH for-4.13 v4 06/19] xen/arm64: entry: Avoid open-coding interrupt flags X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: jgross@suse.com, Volodymyr Babchuk , Julien Grall , Stefano Stabellini , Julien Grall MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" At the moment, the interrupts to mask/unmask are hardcoded in the code making more difficult to find out what's going on. A new series of short-hand specific to the file entry.S is now added. The name of the short-hands should tell which interrupts will be changed by the msr daif{set, clr} instructions. Take the opportunity to replace the hardcoded values with the new short-hands. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v3: - Add Stefano's reviewed-by Changes in v2: - Patch added --- xen/arch/arm/arm64/entry.S | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 3e41ba65b6..fac4655bb9 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -6,6 +6,24 @@ #include #include =20 +#define IFLAGS_D_BIT 8 +#define IFLAGS_A_BIT 4 +#define IFLAGS_I_BIT 2 +#define IFLAGS_F_BIT 1 + +/* + * Short-hands to define the interrupts (D, A, I, F) + * + * _ means the interrupt state will not change + * X means the state of interrupt X will change + * + * To be used with msr daif{set, clr} only. + * + */ +#define IFLAGS__AI_ IFLAGS_A_BIT | IFLAGS_I_BIT +#define IFLAGS__A__ IFLAGS_A_BIT +#define IFLAGS___I_ IFLAGS_I_BIT + /* * Stack pushing/popping (register pairs only). Equivalent to store decrem= ent * before, load increment after. @@ -338,7 +356,7 @@ guest_sync_slowpath: ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", "nop; nop", SKIP_SYNCHRONIZE_SERROR_ENTRY_EXIT) - msr daifclr, #6 + msr daifclr, #IFLAGS__AI_ mov x0, sp bl do_trap_guest_sync 1: @@ -354,7 +372,7 @@ guest_irq: ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", "nop; nop", SKIP_SYNCHRONIZE_SERROR_ENTRY_EXIT) - msr daifclr, #4 + msr daifclr, #IFLAGS__A__ mov x0, sp bl do_trap_irq 1: @@ -366,7 +384,7 @@ guest_fiq_invalid: =20 guest_error: entry hyp=3D0, compat=3D0 - msr daifclr, #6 + msr daifclr, #IFLAGS__AI_ mov x0, sp bl do_trap_guest_serror exit hyp=3D0, compat=3D0 @@ -381,7 +399,7 @@ guest_sync_compat: ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", "nop; nop", SKIP_SYNCHRONIZE_SERROR_ENTRY_EXIT) - msr daifclr, #6 + msr daifclr, #IFLAGS__AI_ mov x0, sp bl do_trap_guest_sync 1: @@ -397,7 +415,7 @@ guest_irq_compat: ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", "nop; nop", SKIP_SYNCHRONIZE_SERROR_ENTRY_EXIT) - msr daifclr, #4 + msr daifclr, #IFLAGS__A__ mov x0, sp bl do_trap_irq 1: @@ -409,7 +427,7 @@ guest_fiq_invalid_compat: =20 guest_error_compat: entry hyp=3D0, compat=3D1 - msr daifclr, #6 + msr daifclr, #IFLAGS__AI_ mov x0, sp bl do_trap_guest_serror exit hyp=3D0, compat=3D1 @@ -420,7 +438,7 @@ ENTRY(return_to_new_vcpu64) exit hyp=3D0, compat=3D0 =20 return_from_trap: - msr daifset, #2 /* Mask interrupts */ + msr daifset, #IFLAGS___I_ /* Mask interrupts */ =20 ldr x21, [sp, #UREGS_PC] /* load ELR */ ldr w22, [sp, #UREGS_CPSR] /* load SPSR */ @@ -471,7 +489,7 @@ check_pending_vserror: * SError, the EL2 error exception will happen after PSTATE.A * is cleared. */ - msr daifclr, #4 + msr daifclr, #IFLAGS__A__ =20 /* * This is our single instruction exception window. A pending @@ -490,7 +508,7 @@ abort_guest_exit_start: .global abort_guest_exit_end abort_guest_exit_end: /* Mask PSTATE asynchronous abort bit, close the checking window. = */ - msr daifset, #4 + msr daifset, #IFLAGS__A__ =20 /* * Compare elr_el2 and the saved value to check whether we are --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel