From patchwork Wed Feb 26 16:01:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13992764 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 88587C19F2E for ; Wed, 26 Feb 2025 16:01:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.896921.1305673 (Exim 4.92) (envelope-from ) id 1tnJqW-000455-Mg; Wed, 26 Feb 2025 16:01:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 896921.1305673; Wed, 26 Feb 2025 16:01:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tnJqW-00044y-Jy; Wed, 26 Feb 2025 16:01:16 +0000 Received: by outflank-mailman (input) for mailman id 896921; Wed, 26 Feb 2025 16:01:15 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tnJqV-0003hk-E8 for xen-devel@lists.xenproject.org; Wed, 26 Feb 2025 16:01:15 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e7f9750f-f45a-11ef-9aae-95dc52dad729; Wed, 26 Feb 2025 17:01:14 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43996e95114so46923555e9.3 for ; Wed, 26 Feb 2025 08:01:14 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba52b88asm26362165e9.4.2025.02.26.08.01.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 08:01:13 -0800 (PST) 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: e7f9750f-f45a-11ef-9aae-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1740585674; x=1741190474; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=lu1GiGzAFS51pwrdfGOQ2MVzi5IX7VZ3x23jbu0DltE=; b=anHB5MqSb9zcWGtU+Q1p7QBAjOuakQdgMWC1N8sIyZUp9D83xU+An3dSSiqc7buLja JN4O2P/XWCmrlNMuZ5w5t5kniN8IVxniejwsYgN8tWG/EmEl9hp1+ZRj0Rmv4be4Z1CQ fS+VAITPQj1L4FCJ6hBD9CKCaV1G8Whx2TOqHa7Y5R2Kv/hEqCFT/hJGcsWDQlLDsDWD 8T0j9oLRiyFkmVtv2AlPlGvRkPRo9z7RkSNjvwMzZ3AgklPhHTHueroT+SLjd8TM08Vy gHLXX/t3jo13ZUs2gK/4WVgaMgsMTyZ4iYhM0NX3kWCLWx1bRxuIX283Rz5rKO0frrWN LEBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740585674; x=1741190474; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lu1GiGzAFS51pwrdfGOQ2MVzi5IX7VZ3x23jbu0DltE=; b=xOsDuYDLwJvhuWM8ZxFfuGITlV5Km31hhQnbqUZVW/OJRBkKIvebk2TUCIY546j0AR kF8dTx3pCrvDwkEsnarfTTJvl6J4EAD5exymErD9TYMsNSpabdHd26/ZQuR4pf/3c7X5 iQwUTgxQLXvJeWJop8ngqhVogypn0Hafag3MK03s9Yc7kR9fkFwiZyiy5fAt71CcWk4h 3V7oIJgIiXGK605xX/clrfOx75gbj4qRVhfplRcJM55iMfP3KXUqxUFVuxRqNAQZmsd4 TU9p4tYFW04LZPT2nIeFDrin3TkHI9t+f65Um8V7agxS4IEcZVszLCq7iotQx0rYJ8bx pt5w== X-Gm-Message-State: AOJu0Ywa5Gx9pzJtmF0z/5Gj4uF+M7nTof0j/8w9Na3+IZJSvCnOvs5E PROhprkaQjtFlJ3idI9G0NLwp0NBtPZgR0EdasKTtWnui1jTwvePaaNWELAcgBgAxMjtmDtJaec = X-Gm-Gg: ASbGncsOK/4Pc73XDIMkz/52QUFQyZqE0CnBYBDCZs7sXEUvqPT50OvdchWXSZBURWR uLQbpS4JlpskN9UXvu5AMj0/P1n+HgoySlI/w/Js5y8EEmWZMt3h+YmoK87flbUNjIm2vGzocgp WsE2KMEhfTe3arft/QW4LivTul/eLLqYeNCZH+4SorR27omc8HVa7WAnS5nGv62ApHJ6eN3aX2J gja9QLqZMVWuhqIxt0iQ62uHFxrTeauwWqNsnhhaOon3ral8U0K4oqW0Jlvme5ITjd3mQLBKkLJ eKPpapznTSLTK5c1AKxEDhH/d+Vrtxh+uEu/86MdgzsD4yR1UEggMOVjImZHRDGyuj5bFx+67p9 0NvF20o6nqaY= X-Google-Smtp-Source: AGHT+IGNLDpINgeqhpuTNoLy1ceMddi+bZR97DIn9Jdtk94MbsabaeKg5GNNKHue+X7RBo7cBBcbgg== X-Received: by 2002:a05:600c:1547:b0:439:884c:96ae with SMTP id 5b1f17b1804b1-439aebda78fmr168967295e9.27.1740585674348; Wed, 26 Feb 2025 08:01:14 -0800 (PST) Message-ID: <1bbd7673-6e7b-41a4-b1ba-5cc043db10b8@suse.com> Date: Wed, 26 Feb 2025 17:01:13 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v8 3/6] Arm32: use new-style entry annotations for entry code From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Julien Grall , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Signed-off-by: Jan Beulich --- Should the GLOBAL()s also be replaced? --- v7: New. --- a/xen/arch/arm/arm32/entry.S +++ b/xen/arch/arm/arm32/entry.S @@ -31,7 +31,7 @@ * r4: Set to a non-zero value if a pending Abort exception took place. * Otherwise, it will be set to zero. */ -prepare_context_from_guest: +FUNC_LOCAL(prepare_context_from_guest) #ifdef CONFIG_ARM32_HARDEN_BRANCH_PREDICTOR /* * Restore vectors table to the default as it may have been @@ -140,7 +140,7 @@ abort_guest_exit_end: skip_check: b enter_hypervisor_from_guest_preirq -ENDPROC(prepare_context_from_guest) +END(prepare_context_from_guest) /* * Macro to define a trap entry. @@ -362,13 +362,13 @@ trap_irq: trap_fiq: vector fiq -return_from_trap: +LABEL_LOCAL(return_from_trap) /* * Restore the stack pointer from r11. It was saved on exception * entry (see __DEFINE_TRAP_ENTRY). */ mov sp, r11 -ENTRY(return_to_new_vcpu32) +LABEL(return_to_new_vcpu32) ldr r11, [sp, #UREGS_cpsr] and r11, #PSR_MODE_MASK cmp r11, #PSR_MODE_HYP @@ -426,6 +426,7 @@ return_to_hypervisor: clrex eret sb +END(return_from_trap) /* * struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next) @@ -435,12 +436,13 @@ return_to_hypervisor: * * Returns prev in r0 */ -ENTRY(__context_switch) +FUNC(__context_switch) add ip, r0, #VCPU_arch_saved_context stmia ip!, {r4 - sl, fp, sp, lr} /* Save register state */ add r4, r1, #VCPU_arch_saved_context ldmia r4, {r4 - sl, fp, sp, pc} /* Load registers and return */ +END(__context_switch) /* * Local variables: