From nobody Tue Mar 3 05:12:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1771624054; cv=none; d=zohomail.com; s=zohoarc; b=W5MRb9nXiHv5eV9j/n3wj3m3rl851cuH+gDmP3dWf08LqENpYol9F7p+Y0Sqfdk1TfpQ44hIvyKyu3oLVwaS3je8RTGTMkILzZS5l6TDFGgQfSoviAz42Y9oEy9OAu8v6KjI46kivyYrmKlM/PyenjLOumOquhwIOiaiHtqVECQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771624054; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=++I7y0Fz5SNLOYdyOKbflTxyKYPA97MXE/g2maqbcaQ=; b=ExNKjI52VZvooy7xrS3OCtAXvE40oms8UTeo5Dd0mg3WiDvwp3E6e7odR/uQlRHHYP3p43DLSkwO5R4vwQmEBjt6p7DuzljdUK2e2rjQ98R+sbF8m/Qi1V6pj81/ENEB/xoN7xOOPSWZpIM1SgYyhKf1kI6fcoCzOQ83J92QSoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1771624054745241.91283755267511; Fri, 20 Feb 2026 13:47:34 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1237612.1539878 (Exim 4.92) (envelope-from ) id 1vtYL8-0000hw-BE; Fri, 20 Feb 2026 21:47:10 +0000 Received: by outflank-mailman (output) from mailman id 1237612.1539878; Fri, 20 Feb 2026 21:47:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vtYL8-0000hl-7B; Fri, 20 Feb 2026 21:47:10 +0000 Received: by outflank-mailman (input) for mailman id 1237612; Fri, 20 Feb 2026 21:47:08 +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 1vtYL6-0008Ew-MR for xen-devel@lists.xenproject.org; Fri, 20 Feb 2026 21:47:08 +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 b3e4ef94-0ea5-11f1-b164-2bf370ae4941; Fri, 20 Feb 2026 22:47:07 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-481188b7760so21122925e9.0 for ; Fri, 20 Feb 2026 13:47:07 -0800 (PST) Received: from localhost.localdomain (host-92-22-18-152.as13285.net. [92.22.18.152]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483a8df83bcsm28940205e9.13.2026.02.20.13.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Feb 2026 13:47:06 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: b3e4ef94-0ea5-11f1-b164-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1771624027; x=1772228827; 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=++I7y0Fz5SNLOYdyOKbflTxyKYPA97MXE/g2maqbcaQ=; b=vk25ojic1m2Jr1Uc8xYH10oJ60/hXch9uMSBQg3XYs+ArESqN1Jobwlh+i9WbcMkJC 1BWuzTsCn8SRnZw8+lv+KGFpLgQLIeEFB7BDhk1xZ47Q5EY2VneDqLVS/OwGlT5EBg0/ H+i7AaNAvsUpWWDD3kZYsFpz7bDG8v1eBNCv4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771624027; x=1772228827; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=++I7y0Fz5SNLOYdyOKbflTxyKYPA97MXE/g2maqbcaQ=; b=r5LEQHMP2sG3j3KAtIno4R85Q1vmMaqLlA2AnpWHljv8HBmS2ZAtx/AkYAO1cetK/g 7ushFvrZli0yccEd1HbezUJ78Di/OiBHxhoKhyaI/RN3FceIGYOyU1bDo9kmqf6IwgMJ NBE9k4Ib70wcQB6ylSAXTDpiRCaJdZ9lS4bGJJyLONv70yWaAQW2EJRZ5nPnBqiLAQxu 3GlQacUVoPCdm+RPNbMl+j23PzDzl4NhPIXnTgRohyH/TvzFi4DaHA0mHXaZmJ2S9kGd 89L8bDMSHcr/OLrIzUh1tf4I2zjyShaApaPnE3MRqpXMIPT6NF0GzX1h5jLSST+HVML+ 0bQQ== X-Gm-Message-State: AOJu0Yw9S7Auah2bvufiBVkJaPFLm8wu02NbU92xM8pmerphK7V8gCR/ WaDdKRvLwfByp4rpSHxV5RNPLP8Tb8zmfCsF5Sh+2tjht1FK/9jqrFyOIgBMwva/watqost0r26 FiZix2KTO4w== X-Gm-Gg: AZuq6aJK9wGs05svOVMGYz15WGlSaU84M3aHLBhSr3Ju5/iFFpAIUo7Dt5iApcXEi1b NjNWhsd0L+yQAA8OoiKx1HY4iWlvUDyFAPhJiDHs7h1o1/p1xnR1mma32TFJrtjchluoORIEgDc JRbicZ8tPdQUqIhVKtLrrJAebGNyzPVnDc8Yqob3tDJSgZFVSkxVVn+Jqgur8HVzU09ygrcgtDv 85tL56JNb5PlAUz665KSPY6iVzgT3ZysfQ7hHOhfs3aARnnYDrcTXOmySkkdEvWqNbaaPMAVM9U BjEnjAcojRxgfDIXBlKZYfeRuH8PqEZwPJSwND5c0JDjyq6TaCP+xS9+U/6GBR9l/6hlrjQ/dbX M0h9jgKu/g0/N3GbdHtSnjIv7U2l5gtVOzw09T4lrnnFYXi6D23dvYuwLpaU463rXx5qAD9aECM Ihx8FDVZ4/CHKwUKkJTsh0//ZixZBbyFl3a4avMkeAkYxZ96QCgxKz/nWisqFDHPAhZjsI5aw= X-Received: by 2002:a05:600c:8b2c:b0:480:1b1a:5526 with SMTP id 5b1f17b1804b1-483a95e24ebmr19094485e9.16.1771624026566; Fri, 20 Feb 2026 13:47:06 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel , "consulting @ bugseng . com" , Nicola Vetrini Subject: [PATCH 05/12] x86: Adjust annotations of asm-used identifiers Date: Fri, 20 Feb 2026 21:46:46 +0000 Message-Id: <20260220214653.3497384-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260220214653.3497384-1-andrew.cooper3@citrix.com> References: <20260220214653.3497384-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1771624055014158500 do_entry_int82() is only called by assembly so gains asmlinkage. pvh_start_info_pa and early_hypercall_insn are data used by assembly, and n= eed a SAF-1 annotation. For the remaining SAF-1 anntations on functions, convert them to asmlinkage for consistency. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Michal Orzel CC: consulting@bugseng.com CC: Nicola Vetrini --- xen/arch/x86/boot/cmdline.c | 3 +-- xen/arch/x86/boot/reloc.c | 3 +-- xen/arch/x86/guest/xen/pvh-boot.c | 2 +- xen/arch/x86/guest/xen/xen.c | 2 +- xen/arch/x86/pv/hypercall.c | 2 +- xen/arch/x86/traps.c | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index 196c580e9151..5db5c7b20bf6 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -334,8 +334,7 @@ static void vga_parse(const char *cmdline, early_boot_o= pts_t *ebo) } #endif =20 -/* SAF-1-safe */ -void cmdline_parse_early(const char *cmdline, early_boot_opts_t *ebo) +void asmlinkage cmdline_parse_early(const char *cmdline, early_boot_opts_t= *ebo) { if ( !cmdline ) return; diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 7a375ad41c1c..82c2d237aab6 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -346,8 +346,7 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, me= mctx *ctx) return mbi_out; } =20 -/* SAF-1-safe */ -void *reloc(uint32_t magic, uint32_t in) +void *asmlinkage reloc(uint32_t magic, uint32_t in) { memctx ctx =3D { trampoline_phys + TRAMPOLINE_HEAP_END }; =20 diff --git a/xen/arch/x86/guest/xen/pvh-boot.c b/xen/arch/x86/guest/xen/pvh= -boot.c index e14d7e20e942..8d8f4a34e445 100644 --- a/xen/arch/x86/guest/xen/pvh-boot.c +++ b/xen/arch/x86/guest/xen/pvh-boot.c @@ -22,7 +22,7 @@ =20 /* Initialised in head.S, before .bss is zeroed. */ bool __initdata pvh_boot; -uint32_t __initdata pvh_start_info_pa; +uint32_t __initdata pvh_start_info_pa; /* SAF-1-safe */ =20 static multiboot_info_t __initdata pvh_mbi; static module_t __initdata pvh_mbi_mods[8]; diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 315e5ded05ab..8e13c2fbf307 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -40,7 +40,7 @@ DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); * 0 vmcall * > 0 vmmcall */ -int8_t __initdata early_hypercall_insn =3D -1; +int8_t __initdata early_hypercall_insn =3D -1; /* SAF-1-safe */ =20 /* * Called once during the first hypercall to figure out which instruction = to diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 17581d232e19..b3b9a3255531 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -180,7 +180,7 @@ void pv_ring1_init_hypercall_page(void *p) } } =20 -void do_entry_int82(struct cpu_user_regs *regs) +void asmlinkage do_entry_int82(struct cpu_user_regs *regs) { if ( unlikely(untrusted_msi) ) check_for_unexpected_msi((uint8_t)regs->entry_vector); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3c01c5eb53b5..29ea6054abab 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1336,8 +1336,7 @@ void asmlinkage do_int3(struct cpu_user_regs *regs) pv_inject_hw_exception(X86_EXC_BP, X86_EVENT_NO_EC); } =20 -/* SAF-1-safe */ -void do_general_protection(struct cpu_user_regs *regs) +void asmlinkage do_general_protection(struct cpu_user_regs *regs) { #ifdef CONFIG_PV struct vcpu *v =3D current; --=20 2.39.5