From patchwork Wed Apr 10 09:19:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13623974 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 CDA78CD11C2 for ; Wed, 10 Apr 2024 09:32:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.702959.1098670 (Exim 4.92) (envelope-from ) id 1ruUJA-0006cS-2i; Wed, 10 Apr 2024 09:31:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 702959.1098670; Wed, 10 Apr 2024 09:31:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruUJ9-0006cL-VJ; Wed, 10 Apr 2024 09:31:55 +0000 Received: by outflank-mailman (input) for mailman id 702959; Wed, 10 Apr 2024 09:31:54 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruUJ8-0006XG-UW for xen-devel@lists.xenproject.org; Wed, 10 Apr 2024 09:31:54 +0000 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [2a00:1450:4864:20::12e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2a033a4c-f71d-11ee-94a3-07e782e9044d; Wed, 10 Apr 2024 11:31:52 +0200 (CEST) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-516c97ddcd1so7785187e87.2 for ; Wed, 10 Apr 2024 02:31:52 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id s17-20020a195e11000000b00516cef1f1casm1814111lfb.181.2024.04.10.02.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 02:31:50 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2a033a4c-f71d-11ee-94a3-07e782e9044d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712741512; x=1713346312; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QtOy8penHihNF/nf/lux7OjWap5QccP5xHkOXb4bAUc=; b=YKpJchWQnelTCDvMgH10/9c0/Yadl4GBi0aavAhUD0t0Yg9ETBR+dh9K7PeIL5EMQt 8/JyoGhtRhrp3v5+N+sy2OgyxX//V9aCiwVd0Im8VnBwQOQisccWHMn3Ahfp32snBs36 PxtdKihfUTT/BgP9Ht5Dm0VVHFMUUg5ebyy3xOGubj0g4YaZ2k+HYetPJUhJW7n52P4w VYKmDT99u8SlsKHlxg9tYFXTK16jVSQGbEXo+66QLP2qs8OMk6NyScY03cYJW8Jb2g/f 1TElI68jsh9bpp2EYOGN2r2jPVFGLK06AYeZOPCpr9g9eG3zGQfew1xErjfTx7Jdh0ls S/Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712741512; x=1713346312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QtOy8penHihNF/nf/lux7OjWap5QccP5xHkOXb4bAUc=; b=fF6vBAFcPEmCvNWLH4eERdSoeRh/ji6zdkow4nTGMf23Z/XuLcoURZRcy9yi6d9ue3 K0t5v3HAehPfBlNslV895t/dg9NrxPysl1AszAhD7tjzEZSfBUeOsD2h9tZTwtm13UHX KAPiizodsRqwMRQScp/dmXwigsAJw9Iz52A4tDtSPHNIMwTyVUV9eom3bbB9QuR5wH3V AuJ+yKM3uwMUlNUM8ZBnLrJWP4/IkByAdswE3kkeK0ItT1re+b0VyJEbfksbXYc1yQEl Re6TxZXL2iqr+0fb8d1zgKnrIZ6d5xDJGsGMx4aYYqvafueQq7TNnWyCjhS3puSstYRS /BeA== X-Gm-Message-State: AOJu0YxbKpEk54g1zPFs5jES941+aZpTrryKy3Bs9glmSwDvhxa5yZrI Iu3nRGuMLXBC8ZAdY3CksOLLXcWTapCSTz/A1HqjtnwlRiOPQXlzKNf5AacUdIAkNw== X-Google-Smtp-Source: AGHT+IFwq2d/+Hv5j9m4Q4eOl0UbCfR4S9sXmHVSyxusDhW7AUuCpl4BAwN1eE/zziE+plJPIt1AHw== X-Received: by 2002:a05:6512:31cb:b0:516:9f20:9838 with SMTP id j11-20020a05651231cb00b005169f209838mr1615146lfe.19.1712741511733; Wed, 10 Apr 2024 02:31:51 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, edgar.iglesias@amd.com Subject: [RFC PATCH v1 1/2] xen/arm64: entry: Use xen/linkage.h to annotate symbols Date: Wed, 10 Apr 2024 11:19:46 +0200 Message-Id: <20240410091947.1498695-2-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240410091947.1498695-1-edgar.iglesias@gmail.com> References: <20240410091947.1498695-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros when annotating symbols. Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/arm64/entry.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index f963c923bb..6188dd2416 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -480,9 +480,9 @@ guest_fiq_invalid_compat: guest_error_compat: guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_serror -ENTRY(return_to_new_vcpu32) +FUNC(return_to_new_vcpu32) exit hyp=0, compat=1 -ENTRY(return_to_new_vcpu64) +FUNC(return_to_new_vcpu64) exit hyp=0, compat=0 return_from_trap: @@ -536,7 +536,7 @@ return_from_trap: * it. So the function will unmask SError exception for a small window and * then mask it again. */ -check_pending_guest_serror: +FUNC_LOCAL(check_pending_guest_serror) /* * Save elr_el2 to check whether the pending SError exception takes * place while we are doing this sync exception. @@ -586,7 +586,7 @@ abort_guest_exit_end: cset x19, ne ret -ENDPROC(check_pending_guest_serror) +END(check_pending_guest_serror) /* * Exception vectors. @@ -597,7 +597,7 @@ ENDPROC(check_pending_guest_serror) .endm .align 11 -ENTRY(hyp_traps_vector) +FUNC(hyp_traps_vector) ventry hyp_sync_invalid /* Synchronous EL2t */ ventry hyp_irq_invalid /* IRQ EL2t */ ventry hyp_fiq_invalid /* FIQ EL2t */ @@ -626,7 +626,7 @@ ENTRY(hyp_traps_vector) * * Returns prev in x0 */ -ENTRY(__context_switch) +FUNC(__context_switch) add x8, x0, #VCPU_arch_saved_context mov x9, sp stp x19, x20, [x8], #16 /* store callee-saved registers */ From patchwork Wed Apr 10 09:19:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13623975 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 41684CD129A for ; Wed, 10 Apr 2024 09:32:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.702960.1098680 (Exim 4.92) (envelope-from ) id 1ruUJB-0006r1-9f; Wed, 10 Apr 2024 09:31:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 702960.1098680; Wed, 10 Apr 2024 09:31:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruUJB-0006qs-6K; Wed, 10 Apr 2024 09:31:57 +0000 Received: by outflank-mailman (input) for mailman id 702960; Wed, 10 Apr 2024 09:31:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruUJA-0006XG-1z for xen-devel@lists.xenproject.org; Wed, 10 Apr 2024 09:31:56 +0000 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [2a00:1450:4864:20::131]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2b02e34a-f71d-11ee-94a3-07e782e9044d; Wed, 10 Apr 2024 11:31:54 +0200 (CEST) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-516dc51bb72so4985643e87.1 for ; Wed, 10 Apr 2024 02:31:54 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id y21-20020ac24475000000b005170a946960sm1071418lfl.87.2024.04.10.02.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 02:31:52 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2b02e34a-f71d-11ee-94a3-07e782e9044d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712741513; x=1713346313; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XrHNHtlt8FUpJ9wMxd9V9rpHBMaDrTyKZ2os3fPl9w0=; b=Xrs1tK7nABtGHP/k+m3JHUQg9FJKYVS958h7xFja3Mck8/3Hp/yrY5TZe/hnFs8TVG bPCcwkJMYXQwkraXpMS8w5D2ImZSQTYvYK8C8PO5lNkjHUxnn6rNJBV9X/jedAuFoKtv gskbe3822Ybh3Mi8k05O+llhagVlk6BCL9VPBjHw4BuUpi9i768JQkUy62MQCtutdU44 gKpJjAcnGctoCHcA1d4gWYzKSw7xc8apJ/qpgFPU+S2mMykcP6IaGa723rkpUjS6mW4k WEmMF2Vh7qbSrxNSmemC7E083Ng5SHPeF4nw/wf4oQmCVy84p+jtG4CtNsn4lva+iVap f5Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712741513; x=1713346313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XrHNHtlt8FUpJ9wMxd9V9rpHBMaDrTyKZ2os3fPl9w0=; b=hAw7rKIYGiCaFpeJklCTgIWODAhjZKCLiQ8wOlTn3oHYXSo/tD/AhCTW76ChyGGhxk YkMNo7ryCV0GISqDIUG6bYV3emQpW/lzZFOcKLKndFjZLm99oyNp841bQEnfP/Lp85Zl dA1fatRTDb5rJHwE/mNPAAXmFIU7x524TdcSeFJLCcv4c9EHIleHU41u3l2u3jyuAHiN tlBFGksS1Nye4E/CmYrMl8SqeQobIQMGQlG0picWZfh+WrfRkciyGgE4dHhHrCPnhixc 1FIp/Nyd8Bv7wxm5853Zxf+ARVZXmEPLgrUQ6smUtPwiSFAxdeQEvCSdjzUq9tCi9c16 PGsA== X-Gm-Message-State: AOJu0Yz21+3tlrJTKOJTNN6MkwPTH1tZDbpgvuO0eQExcq96fJVgDJHQ ZObva7ev1pDBeFaxRizTAwHt9KMjF+bBsdqQ68f3j4qoHC39ohE976kbgPW1YhuKfA== X-Google-Smtp-Source: AGHT+IEWDn5A82mPXnEXA6gVl1X9JVHOR8A0zSGHpa8cmyTDh13m38j9Khy0JNuwpAIXMJ0JKgXvng== X-Received: by 2002:a05:6512:614:b0:515:d335:a0ab with SMTP id b20-20020a056512061400b00515d335a0abmr1176626lfe.37.1712741513171; Wed, 10 Apr 2024 02:31:53 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, edgar.iglesias@amd.com Subject: [RFC PATCH v1 2/2] xen/arm64: entry: Add missing code symbol annotations Date: Wed, 10 Apr 2024 11:19:47 +0200 Message-Id: <20240410091947.1498695-3-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240410091947.1498695-1-edgar.iglesias@gmail.com> References: <20240410091947.1498695-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Add missing code symbol annotations. Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/arm64/entry.S | 60 ++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 6188dd2416..af9a592cae 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -289,21 +289,25 @@ b do_bad_mode .endm -hyp_sync_invalid: +FUNC_LOCAL(hyp_sync_invalid) entry hyp=1 invalid BAD_SYNC +END(hyp_sync_invalid) -hyp_irq_invalid: +FUNC_LOCAL(hyp_irq_invalid) entry hyp=1 invalid BAD_IRQ +END(hyp_irq_invalid) -hyp_fiq_invalid: +FUNC_LOCAL(hyp_fiq_invalid) entry hyp=1 invalid BAD_FIQ +END(hyp_fiq_invalid) -hyp_error_invalid: +FUNC_LOCAL(hyp_error_invalid) entry hyp=1 invalid BAD_ERROR +END(hyp_error_invalid) /* * SError received while running in the hypervisor mode. @@ -313,11 +317,12 @@ hyp_error_invalid: * simplicity, as SError should be rare and potentially fatal, * all interrupts are kept masked. */ -hyp_error: +FUNC_LOCAL(hyp_error) entry hyp=1 mov x0, sp bl do_trap_hyp_serror exit hyp=1 +END(hyp_error) /* * Synchronous exception received while running in the hypervisor mode. @@ -327,7 +332,7 @@ hyp_error: * some of them. So we want to inherit the state from the interrupted * context. */ -hyp_sync: +FUNC_LOCAL(hyp_sync) entry hyp=1 /* Inherit interrupts */ @@ -338,6 +343,7 @@ hyp_sync: mov x0, sp bl do_trap_hyp_sync exit hyp=1 +END(hyp_sync) /* * IRQ received while running in the hypervisor mode. @@ -352,7 +358,7 @@ hyp_sync: * would require some rework in some paths (e.g. panic, livepatch) to * ensure the ordering is enforced everywhere. */ -hyp_irq: +FUNC_LOCAL(hyp_irq) entry hyp=1 /* Inherit D, A, F interrupts and keep I masked */ @@ -365,8 +371,9 @@ hyp_irq: mov x0, sp bl do_trap_irq exit hyp=1 +END(hyp_irq) -guest_sync: +FUNC_LOCAL(guest_sync) /* * Save x0, x1 in advance */ @@ -413,8 +420,9 @@ fastpath_out_workaround: mov x1, xzr eret sb +END(guest_sync) -wa2_ssbd: +FUNC_LOCAL(wa2_ssbd) #ifdef CONFIG_ARM_SSBD alternative_cb arm_enable_wa2_handling b wa2_end @@ -450,42 +458,55 @@ wa2_end: mov x0, xzr eret sb -guest_sync_slowpath: +END(wa2_ssbd) + +FUNC_LOCAL(guest_sync_slowpath) /* * x0/x1 may have been scratch by the fast path above, so avoid * to save them. */ guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_sync, save_x0_x1=0 +END(guest_sync_slowpath) -guest_irq: +FUNC_LOCAL(guest_irq) guest_vector compat=0, iflags=IFLAGS__A__, trap=irq +END(guest_irq) -guest_fiq_invalid: +FUNC_LOCAL(guest_fiq_invalid) entry hyp=0, compat=0 invalid BAD_FIQ +END(guest_fiq_invalid) -guest_error: +FUNC_LOCAL(guest_error) guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error) -guest_sync_compat: +FUNC_LOCAL(guest_sync_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_sync +END(guest_sync_compat) -guest_irq_compat: +FUNC_LOCAL(guest_irq_compat) guest_vector compat=1, iflags=IFLAGS__A__, trap=irq +END(guest_irq_compat) -guest_fiq_invalid_compat: +FUNC_LOCAL(guest_fiq_invalid_compat) entry hyp=0, compat=1 invalid BAD_FIQ +END(guest_fiq_invalid_compat) -guest_error_compat: +FUNC_LOCAL(guest_error_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error_compat) FUNC(return_to_new_vcpu32) exit hyp=0, compat=1 +END(return_to_new_vcpu32) + FUNC(return_to_new_vcpu64) exit hyp=0, compat=0 +END(return_to_new_vcpu64) -return_from_trap: +FUNC_LOCAL(return_from_trap) msr daifset, #IFLAGS___I_ /* Mask interrupts */ ldr x21, [sp, #UREGS_PC] /* load ELR */ @@ -524,6 +545,7 @@ return_from_trap: eret sb +END(return_from_trap) /* * Consume pending SError generated by the guest if any. @@ -617,6 +639,7 @@ FUNC(hyp_traps_vector) ventry guest_irq_compat /* IRQ 32-bit EL0/EL1 */ ventry guest_fiq_invalid_compat /* FIQ 32-bit EL0/EL1 */ ventry guest_error_compat /* Error 32-bit EL0/EL1 */ +END(hyp_traps_vector) /* * struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next) @@ -647,6 +670,7 @@ FUNC(__context_switch) ldr lr, [x8] mov sp, x9 ret +END(__context_switch) /* * Local variables: