From nobody Thu Aug 13 09:21:38 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC7923E5EC7 for ; Wed, 5 Aug 2026 08:21:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918118; cv=none; b=gZaRE2crGfzeKjTjKs2aq2WQOyClJ67JJ0NOtK+gcDYO97ufmg2fEkBtUc6oeKqSlRcTDI7GQvkMzmAkZ30Iq9aMAqxi7aPAiCcfLd+rQH42yl1EI8ai9tK4ZZY4HlHf9wwtbJV4dm8Hhw2kbke07M9nfJCWY7FWVTIaV29RU4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918118; c=relaxed/simple; bh=uH3H/bdhEh1J1cf2cKu9iYE5f6+eSglUBS0V7lTn7ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GxAdpsg9JXAudVeK0kBriLxem7wY3zpu9oKx4vGqYBf0HkHt2pAQ7TJKfW5RKQ2ITcpOATlDDTtLOWRaqKJCu5+W3Us7b/xt9VqAZHeHM6Sw+GssCvFevG3KtvFRKDmLlC8w5qH/E311Tc6SQsK/jPwQH4TINPaIm8yLEkC0uDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=U0We0YVg; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=d/1ekcpK; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="U0We0YVg"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="d/1ekcpK" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9A9A03EE8; Wed, 5 Aug 2026 08:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918110; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OnKrqMmp33/ctRIhxID+//YqIMVJKj3PyOBSZaP2xuU=; b=U0We0YVgtE6Lxr5fhgkZV4EPZV4UcNMdx3VBu/3Izclwsm7Hnj9w7gorTh5rQe13AD+/69 xXh21lfM+lTYYlEGZH0XpHEhCoLJicV76a8THubZMQ0w7UsuNrynMImvBie915Rl1dzayG W50M4W4wCMy1AZoEUW1rFEympNqdWJ8= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918106; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OnKrqMmp33/ctRIhxID+//YqIMVJKj3PyOBSZaP2xuU=; b=d/1ekcpK9nnUZFXy4S14oeT+Xd9XtV0nWExr3VJY/OyzjkbB7z++Xy5zWJxldQAaNRQ6w9 8lPrfsBJqWdxX4WbBOBk8xqYbHC3PINbhZA+wZLnPIuG0NKpPyx9VrCIjTXAGg7NvTpBfP bknonSPBSw93SQAOzDJLLpO+jfnj3Dk= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 441B5779C3; Wed, 5 Aug 2026 08:21:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iCFSD5rycmoKcQAAD6G6ig (envelope-from ); Wed, 05 Aug 2026 08:21:46 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org Subject: [PATCH 1/4] x86/xen: Remove redundant config dependency on X86_LOCAL_APIC Date: Wed, 5 Aug 2026 10:21:34 +0200 Message-ID: <20260805082137.1214967-2-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260805082137.1214967-1-jgross@suse.com> References: <20260805082137.1214967-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -6.79 X-Spam-Level: X-Spam-Flag: NO X-Spamd-Result: default: False [-6.79 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.19)[-0.957]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[10]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid,imap1.dmz-prg2.suse.org:helo]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="utf-8" CONFIG_XEN depends on CONFIG_X86_LOCAL_APIC already, so the dependency of CONFIG_XEN_PVHVM on CONFIG_X86_LOCAL_APIC can be dropped. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Stefano Stabellini --- arch/x86/xen/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 99b06f5c47cd..bb420a4cb75f 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -52,7 +52,7 @@ config XEN_PV_DOM0 =20 config XEN_PVHVM def_bool y - depends on XEN && X86_LOCAL_APIC + depends on XEN =20 config XEN_PVHVM_SMP def_bool y --=20 2.55.0 From nobody Thu Aug 13 09:21:38 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5D3A382F10 for ; Wed, 5 Aug 2026 08:22:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918124; cv=none; b=NUm8+49uRk2hl32JQwKvqZZroOra3tjmHPLfwxehi6U5ECn19HdW8lz6CuCYwWOhZb7AhEby0ZNqURaOPGousGjbrB9+3ZLoX4F0zkW6obFO15EU94qRoHfWEFMsSzCCBzXKXe8sXdIUhIcF4sO+kFGq6zGSdO11s1IKe7nVjBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918124; c=relaxed/simple; bh=44d5uhDd+9wqqcTkPxuK6CDLz22OW0ftDWiH0qYDQTM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GWgxtmFvqEzp+VHwDEw/MZ5VNmBUlxug5TnImhoVic3nASDg/UJIfnnRV8q/Wbz77hoEYT98soJi5ETsERTK6EdLVI/ef5h9XG56sLlsf8KOLi00+rNY/m/gIY1o+HFq5gqkTS/Hi5oiS0o8Qj0RRUxJ6/NsIl47ErC0SLt4ViI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=Icw1np+I; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=uagAu9Tw; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="Icw1np+I"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="uagAu9Tw" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 47C4C3F15; Wed, 5 Aug 2026 08:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918116; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QTV4RA7a/5E53gmfFy4/nD7fff7Xl7GxWpiD9bWHF94=; b=Icw1np+Iuhkh3s+vA0MCKTbiRgi95UQZZMNkcXwb1/IcajlD9mm0uNFnpDGWuNBJXGFFkL awCxHi8KyyJ2XsACjgHcqjED1D7WAzdZMrROIc2MSOFnpWjRHS2rdnYoMRGJ/392d+4Prk r3ZXc5Jl5rjd9iP0PLnUf/sbfjjXmSE= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918112; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QTV4RA7a/5E53gmfFy4/nD7fff7Xl7GxWpiD9bWHF94=; b=uagAu9Tw6T6dPEjLyaJcTFNAs5xlAvIeSFOvl1jQwWRVjHj//uFbTJBNd8O9U/pZ8Grgat bKfoZSJ8Yo4lMT9NYfMpXjJy9fQmfT2ElgeW41BcReoxF0WdDpAujPkQTibTaONqQmejct IIEgjgt6AGcsH3KQnnmLwyOqbMYmUeQ= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EC717779B6; Wed, 5 Aug 2026 08:21:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id vQ1QOJ/ycmoPcQAAD6G6ig (envelope-from ); Wed, 05 Aug 2026 08:21:51 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Boris Ostrovsky , Stefano Stabellini , Oleksandr Tyshchenko , xen-devel@lists.xenproject.org Subject: [PATCH 2/4] xen: Drop CONFIG_XEN_PVHVM Date: Wed, 5 Aug 2026 10:21:35 +0200 Message-ID: <20260805082137.1214967-3-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260805082137.1214967-1-jgross@suse.com> References: <20260805082137.1214967-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -6.79 X-Spam-Level: X-Spam-Flag: NO X-Spamd-Result: default: False [-6.79 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.19)[-0.958]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWELVE(0.00)[12]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLfdszjqhz8kzzb9uwpzdm8png)]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.com:mid]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="utf-8" On x86 CONFIG_XEN_PVHVM is now a synonym of CONFIG_XEN. In Xen specific x86 code it can be just dropped, in non-Xen specific x86 code it can be replaced with CONFIG_XEN. In architecture independent code it is used only where CONFIG_XEN is defined, so it can be replaced with CONFIG_X86 there. Signed-off-by: Juergen Gross Reviewed-by: Stefano Stabellini --- arch/x86/include/asm/idtentry.h | 2 +- arch/x86/kernel/cpu/hypervisor.c | 2 +- arch/x86/xen/Kconfig | 10 +++------- arch/x86/xen/Makefile | 9 ++++----- arch/x86/xen/time.c | 2 -- arch/x86/xen/xen-ops.h | 4 ---- drivers/xen/Kconfig | 2 +- drivers/xen/events/events_base.c | 7 ------- drivers/xen/xenbus/xenbus_probe.c | 2 +- include/xen/platform_pci.h | 6 +++--- 10 files changed, 14 insertions(+), 32 deletions(-) diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentr= y.h index 20f548702404..f400cfac69a6 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -745,7 +745,7 @@ DECLARE_IDTENTRY_SYSVEC(HYPERV_STIMER0_VECTOR, sysvec_= hyperv_stimer0); DECLARE_IDTENTRY_SYSVEC(HYPERVISOR_CALLBACK_VECTOR, sysvec_acrn_hv_callbac= k); #endif =20 -#ifdef CONFIG_XEN_PVHVM +#ifdef CONFIG_XEN DECLARE_IDTENTRY_SYSVEC(HYPERVISOR_CALLBACK_VECTOR, sysvec_xen_hvm_callbac= k); #endif =20 diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervi= sor.c index f3e9219845e8..73428afca796 100644 --- a/arch/x86/kernel/cpu/hypervisor.c +++ b/arch/x86/kernel/cpu/hypervisor.c @@ -31,7 +31,7 @@ static const __initconst struct hypervisor_x86 * const hy= pervisors[] =3D #ifdef CONFIG_XEN_PV &x86_hyper_xen_pv, #endif -#ifdef CONFIG_XEN_PVHVM +#ifdef CONFIG_XEN &x86_hyper_xen_hvm, #endif &x86_hyper_vmware, diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index bb420a4cb75f..9e5bb51eecf4 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -50,24 +50,20 @@ config XEN_PV_DOM0 def_bool y depends on XEN_PV && XEN_DOM0 =20 -config XEN_PVHVM - def_bool y - depends on XEN - config XEN_PVHVM_SMP def_bool y - depends on XEN_PVHVM && SMP + depends on XEN && SMP =20 config XEN_PVHVM_GUEST bool "Xen PVHVM guest support" default y - depends on XEN_PVHVM && PCI + depends on XEN && PCI help Support running as a Xen PVHVM guest. =20 config XEN_PVH bool "Xen PVH guest support" - depends on XEN && XEN_PVHVM && ACPI + depends on XEN && ACPI select PVH help Support for running as a Xen PVH guest. diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 717264ae269b..32d651aa9bc2 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -16,11 +16,10 @@ obj-y +=3D mmu.o obj-y +=3D time.o obj-y +=3D grant-table.o obj-y +=3D suspend.o - -obj-$(CONFIG_XEN_PVHVM) +=3D enlighten_hvm.o -obj-$(CONFIG_XEN_PVHVM) +=3D mmu_hvm.o -obj-$(CONFIG_XEN_PVHVM) +=3D suspend_hvm.o -obj-$(CONFIG_XEN_PVHVM) +=3D platform-pci-unplug.o +obj-y +=3D enlighten_hvm.o +obj-y +=3D mmu_hvm.o +obj-y +=3D suspend_hvm.o +obj-y +=3D platform-pci-unplug.o =20 obj-$(CONFIG_XEN_PV) +=3D setup.o obj-$(CONFIG_XEN_PV) +=3D apic.o diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index d62c14334b35..5c7822254a01 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -586,7 +586,6 @@ void __init xen_init_time_ops(void) x86_platform.set_wallclock =3D xen_set_wallclock; } =20 -#ifdef CONFIG_XEN_PVHVM static void xen_hvm_setup_cpu_clockevents(void) { int cpu =3D smp_processor_id(); @@ -643,7 +642,6 @@ void __init xen_hvm_init_time_ops(void) =20 hvm_time_initialized =3D true; } -#endif =20 /* Kernel parameter to specify Xen timer slop */ static int __init parse_xen_timer_slop(char *ptr) diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index dc265bdda24d..47eebbb3684a 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -236,11 +236,7 @@ void xen_pin_vcpu(int cpu); =20 void xen_emergency_restart(void); =20 -#ifdef CONFIG_XEN_PVHVM void xen_hvm_post_suspend(int suspend_cancelled); -#else -static inline void xen_hvm_post_suspend(int suspend_cancelled) {} -#endif =20 /* * The maximum amount of extra memory compared to the base size. The diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index f9a35ed266ec..cfb517cd77dc 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -311,7 +311,7 @@ config XEN_EFI =20 config XEN_AUTO_XLATE def_bool y - depends on ARM || ARM64 || XEN_PVHVM + depends on ARM || ARM64 || X86 help Support for auto-translated physmap guests. =20 diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_b= ase.c index 6ea945508a89..fd16d652c81f 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -2180,7 +2180,6 @@ static struct irq_chip xen_percpu_chip __read_mostly = =3D { }; =20 #ifdef CONFIG_X86 -#ifdef CONFIG_XEN_PVHVM /* Vector callbacks are better than PCI interrupts to receive event * channel notifications because we can receive vector callbacks on any * vcpu and we don't need PCI support or APIC interactions. */ @@ -2242,12 +2241,6 @@ static __init void xen_alloc_callback_vector(void) pr_info("Xen HVM callback vector for event delivery is enabled\n"); sysvec_install(HYPERVISOR_CALLBACK_VECTOR, sysvec_xen_hvm_callback); } -#else -void xen_setup_callback_vector(void) {} -static inline void xen_init_setup_upcall_vector(void) {} -int xen_set_upcall_vector(unsigned int cpu) {} -static inline void xen_alloc_callback_vector(void) {} -#endif /* CONFIG_XEN_PVHVM */ #endif /* CONFIG_X86 */ =20 bool xen_fifo_events =3D true; diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_= probe.c index fafb2b84fa5c..082b8c1fee8e 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -831,7 +831,7 @@ static void xenbus_probe(void) */ static bool xs_hvm_defer_init_for_callback(void) { -#ifdef CONFIG_XEN_PVHVM +#ifdef CONFIG_X86 return xen_store_domain_type =3D=3D XS_HVM && !xen_have_vector_callback; #else diff --git a/include/xen/platform_pci.h b/include/xen/platform_pci.h index e51e7cb71a85..267040c1f504 100644 --- a/include/xen/platform_pci.h +++ b/include/xen/platform_pci.h @@ -30,7 +30,7 @@ static inline int xen_must_unplug_nics(void) { #if (defined(CONFIG_XEN_NETDEV_FRONTEND) || \ defined(CONFIG_XEN_NETDEV_FRONTEND_MODULE)) && \ - defined(CONFIG_XEN_PVHVM) + defined(CONFIG_X86) return 1; #else return 0; @@ -40,14 +40,14 @@ static inline int xen_must_unplug_nics(void) { static inline int xen_must_unplug_disks(void) { #if (defined(CONFIG_XEN_BLKDEV_FRONTEND) || \ defined(CONFIG_XEN_BLKDEV_FRONTEND_MODULE)) && \ - defined(CONFIG_XEN_PVHVM) + defined(CONFIG_X86) return 1; #else return 0; #endif } =20 -#if defined(CONFIG_XEN_PVHVM) +#if defined(CONFIG_X86) extern bool xen_has_pv_devices(void); extern bool xen_has_pv_disk_devices(void); extern bool xen_has_pv_nic_devices(void); --=20 2.55.0 From nobody Thu Aug 13 09:21:38 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 293423E5A17 for ; Wed, 5 Aug 2026 08:22:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918129; cv=none; b=r807rcdHBs0gaF0Bjea824Lx0mUgfNiQeGk2XvnJl4xJ0XvAdf3iiJ4mA4wZwVjK/EflmpfRk0U10kjFhqo2v8UpxNYpIXm48qAm3lP4PzNf92v9xhG+sYxSEO9Gq5rtpkuYkJ6uqKDrOrprrKTeKqOo65bL58ACAkD7rkTUV98= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918129; c=relaxed/simple; bh=LHLX83MUMlbjBOZFOPmz5qbImzzDSRDKb1QypG/cApc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XFo5CvCfZnT37lHrDKz28NEKGhAkf19iKPY92vF6gCQjirh22ulv+Jzo+iiCQTjw0HcHgh6pa76taGcKvXvnfbNgW7oFg6js37fNmdVr0TkAM2BRbZG67GDvGw1NP8UbCtMg6TJIydGEHxIT/GK9p4jGCw86CTgXLaoRmde/Iyw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=Un5S22ck; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=aDNX1xHe; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="Un5S22ck"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="aDNX1xHe" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id CD87B7FC54; Wed, 5 Aug 2026 08:21:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918121; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S6wRDsn8zV14CO6Sq0N2+3DPezIzqVg17lA8ie3S0eU=; b=Un5S22ckkkMJV+DlydoaTV76Mst3f0Mr745x2lsvZTgHTbZ2DxOFRNna5KaPLtdY/mp+Nh vuAyKT3ikDFEgkC40MNnRXHIjTpDf/iCQoa4/rEV+61AKT3jMUoYsL3ZrAmsMqVhORMArP Btm09DVWxJzk5PFBlU4wxaBMmsYTWeo= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918117; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S6wRDsn8zV14CO6Sq0N2+3DPezIzqVg17lA8ie3S0eU=; b=aDNX1xHePNwswx+9Pi36xqmHVw1AeMuAKP4+T7bm2glLOOcnbtQ2dCSMwPoz21GQbBRONH nImWX83UwYbG8rfNzz9sy+zpogUnOZC/3L81GCVvwidEmDqUpYkR8L4AQxm1dcfwXJvNB4 G1fURSmZMBIYonryH72LDCm3UB/9RZY= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A2099779C2; Wed, 5 Aug 2026 08:21:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sW4hJqXycmobcQAAD6G6ig (envelope-from ); Wed, 05 Aug 2026 08:21:57 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org Cc: Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , xen-devel@lists.xenproject.org Subject: [PATCH 3/4] xen: Drop CONFIG_XEN_AUTO_XLATE Date: Wed, 5 Aug 2026 10:21:36 +0200 Message-ID: <20260805082137.1214967-4-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260805082137.1214967-1-jgross@suse.com> References: <20260805082137.1214967-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-6.79 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.19)[-0.966]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:mid,suse.com:email]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -6.79 X-Spam-Level: Content-Type: text/plain; charset="utf-8" CONFIG_XEN_AUTO_XLATE is referenced only in code built with CONFIG_XEN enabled. As it is enabled for all architectures supporting Xen, it can be just dropped. Signed-off-by: Juergen Gross Reviewed-by: Stefano Stabellini --- drivers/xen/Kconfig | 6 ------ drivers/xen/Makefile | 2 +- drivers/xen/privcmd.c | 4 ++-- include/xen/xen-ops.h | 22 ---------------------- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index cfb517cd77dc..32e35a8580ee 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -309,12 +309,6 @@ config XEN_EFI def_bool y depends on (ARM || ARM64 || X86_64) && EFI =20 -config XEN_AUTO_XLATE - def_bool y - depends on ARM || ARM64 || X86 - help - Support for auto-translated physmap guests. - config XEN_ACPI def_bool y depends on X86 && ACPI diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index c0503f1c7d5b..6ce2e2a52d47 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_HOTPLUG_CPU) +=3D cpu_hotplug.o obj-y +=3D grant-table.o features.o balloon.o manage.o time.o obj-y +=3D mem-reservation.o +obj-y +=3D xlate_mmu.o obj-y +=3D events/ obj-y +=3D xenbus/ =20 @@ -29,7 +30,6 @@ obj-$(CONFIG_XEN_PRIVCMD) +=3D xen-privcmd.o obj-$(CONFIG_XEN_ACPI_PROCESSOR) +=3D xen-acpi-processor.o obj-$(CONFIG_XEN_EFI) +=3D efi.o obj-$(CONFIG_XEN_SCSI_BACKEND) +=3D xen-scsiback.o -obj-$(CONFIG_XEN_AUTO_XLATE) +=3D xlate_mmu.o obj-$(CONFIG_XEN_PVCALLS_BACKEND) +=3D pvcalls-back.o obj-$(CONFIG_XEN_PVCALLS_FRONTEND) +=3D pvcalls-front.o xen-evtchn-y :=3D evtchn.o diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 725a49a0eee7..7cfc28f1bb86 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -794,7 +794,7 @@ static long privcmd_ioctl_mmap_resource(struct file *fi= le, goto out; } =20 - if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) && !xen_pv_domain()) { + if (!xen_pv_domain()) { unsigned int nr =3D DIV_ROUND_UP(kdata.num, XEN_PFN_PER_PAGE); struct page **pages; unsigned int i; @@ -825,7 +825,7 @@ static long privcmd_ioctl_mmap_resource(struct file *fi= le, if (rc) goto out; =20 - if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) && !xen_pv_domain()) { + if (!xen_pv_domain()) { rc =3D xen_remap_vma_range(vma, kdata.addr, kdata.num << PAGE_SHIFT); } else { unsigned int domid =3D diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 496e6013c689..15e0c3f4b7bb 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -59,7 +59,6 @@ static inline int xen_remap_pfn(struct vm_area_struct *vm= a, unsigned long addr, =20 struct vm_area_struct; =20 -#ifdef CONFIG_XEN_AUTO_XLATE int xen_xlate_remap_gfn_array(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *gfn, int nr, @@ -68,27 +67,6 @@ int xen_xlate_remap_gfn_array(struct vm_area_struct *vma, struct page **pages); int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma, int nr, struct page **pages); -#else -/* - * These two functions are called from arch/x86/xen/mmu.c and so stubs - * are needed for a configuration not specifying CONFIG_XEN_AUTO_XLATE. - */ -static inline int xen_xlate_remap_gfn_array(struct vm_area_struct *vma, - unsigned long addr, - xen_pfn_t *gfn, int nr, - int *err_ptr, pgprot_t prot, - unsigned int domid, - struct page **pages) -{ - return -EOPNOTSUPP; -} - -static inline int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma, - int nr, struct page **pages) -{ - return -EOPNOTSUPP; -} -#endif =20 int xen_remap_vma_range(struct vm_area_struct *vma, unsigned long addr, unsigned long len); --=20 2.55.0 From nobody Thu Aug 13 09:21:38 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D49863C5DA1 for ; Wed, 5 Aug 2026 08:22:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918135; cv=none; b=R/mjXxY6swV2QR7q++TdNDMSWLCJjtfhBRDIMnP7AE2wxOhQnPHGYPNMXCI90H18cJ+nOaZgE+TyCBjE/AomOd/Rcp03gMYr+NwcILzW34DQ8XSOwKWcNTq81FnUdMFvQiOeG+IEmeYKAlpRI+cp6ewYqA2SpnC6+RfwcC1Nhik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918135; c=relaxed/simple; bh=5b15oW0k59tN4boGMRX3CYvLdTdV/fndrNHi/QjXCeQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tMB0cfT0E4wLv3PFSW9KB1BUEZ3zxTkVB58WORt7nsHFIYTFmEw764mV3+rtmyV2HiE9TuSiG3dE3zuRcW/uyR+8DGXW52BMYzoId9omtoC7sEx853t/KixUUjPWthCucT9NMxg3cYefMH0VrVq0PIRy35JRKHjVhqcUsugfCb0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=ZoGUiQsj; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=mo44s7jJ; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="ZoGUiQsj"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="mo44s7jJ" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 717A67FC46; Wed, 5 Aug 2026 08:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918127; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rPDqya+4UA57J3GUJhbUC4MCTBzBvrkl/Z2toy8Sr1k=; b=ZoGUiQsj0jyqR8egDB6TgaUfolmQBnQi1EashLbUpEn9JMdtMrIgLSHNpTtJXjrYXCeDKw R3YHsrovTBo+1vz/RXS20N/cv10G2LLDnDVoozg98STi8eOF8ZpSZuE9Z5HiJQTJzuNYju tq5iViYKyQrSu0vC9Cx984N5YONY5Nc= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1785918123; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rPDqya+4UA57J3GUJhbUC4MCTBzBvrkl/Z2toy8Sr1k=; b=mo44s7jJ01TikRPeLn+M7SzLNQoKze3eAxQ4UHYFODcY4riiv0QCSJnyczh3TFIu1NDoOy HMcPUpmkdfSt0h+nx86nxIPWVbyGP0dvshsoT8uyF88sKCYLQGR/NY4BXdU6YQYC5UaKVJ Y3cGuKyyN+V46bgtJruvIgsMvqkW4YI= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2AD8B779B6; Wed, 5 Aug 2026 08:22:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id kWcaCavycmohcQAAD6G6ig (envelope-from ); Wed, 05 Aug 2026 08:22:03 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org Subject: [PATCH 4/4] x86/xen: Drop CONFIG_XEN_PVHVM_SMP Date: Wed, 5 Aug 2026 10:21:37 +0200 Message-ID: <20260805082137.1214967-5-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260805082137.1214967-1-jgross@suse.com> References: <20260805082137.1214967-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -6.79 X-Spam-Level: X-Spam-Flag: NO X-Spamd-Result: default: False [-6.79 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.19)[-0.958]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.com:mid]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLfdszjqhz8kzzb9uwpzdm8png)]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="utf-8" CONFIG_XEN_PVHVM_SMP is referenced only on x86 in Xen specific code, so it can be replaced with CONFIG_SMP. Signed-off-by: Juergen Gross Reviewed-by: Stefano Stabellini --- arch/x86/xen/Kconfig | 4 ---- arch/x86/xen/Makefile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 9e5bb51eecf4..609e79942fcb 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -50,10 +50,6 @@ config XEN_PV_DOM0 def_bool y depends on XEN_PV && XEN_DOM0 =20 -config XEN_PVHVM_SMP - def_bool y - depends on XEN && SMP - config XEN_PVHVM_GUEST bool "Xen PVHVM guest support" default y diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 32d651aa9bc2..9c7e9ffffb85 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -37,8 +37,8 @@ obj-$(CONFIG_XEN_PVH) +=3D enlighten_pvh.o obj-$(CONFIG_EVENT_TRACING) +=3D trace.o =20 obj-$(CONFIG_SMP) +=3D smp.o +obj-$(CONFIG_SMP) +=3D smp_hvm.o obj-$(CONFIG_XEN_PV_SMP) +=3D smp_pv.o -obj-$(CONFIG_XEN_PVHVM_SMP) +=3D smp_hvm.o =20 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+=3D spinlock.o =20 --=20 2.55.0