Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Feedback-ID: i12284293:Fastmail
Date:   Thu, 14 Dec 2023 13:01:09 +0100
From:   Alyssa Ross <hi@alyssa.is>
To:     Arnd Bergmann <arnd@kernel.org>
Cc:     Juergen Gross <jgross@suse.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>,
        "H. Peter Anvin" <hpa@zytor.com>, xen-devel@lists.xenproject.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] x86/xen: add CPU dependencies for 32-bit build
Message-ID: <snd4jotxfjwcekc52dhkyhn6gcxtaqyo3fchxd5acgvsvcoiqi@douctxdas3fu>
References: <20231204084722.3789473-1-arnd@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="bjargecwevzoc6i5"
Content-Disposition: inline
In-Reply-To: <20231204084722.3789473-1-arnd@kernel.org>
Precedence: bulk


--bjargecwevzoc6i5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Dec 04, 2023 at 09:47:01AM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Xen only supports modern CPUs even when running a 32-bit kernel, and it now
> requires a kernel built for a 64 byte (or larger) cache line:
>
> In file included from <command-line>:
> In function 'xen_vcpu_setup',
>     inlined from 'xen_vcpu_setup_restore' at arch/x86/xen/enlighten.c:111:3,
>     inlined from 'xen_vcpu_restore' at arch/x86/xen/enlighten.c:141:3:
> include/linux/compiler_types.h:435:45: error: call to '__compiletime_assert_287' declared with attribute error: BUILD_BUG_ON failed: sizeof(*vcpup) > SMP_CACHE_BYTES
> arch/x86/xen/enlighten.c:166:9: note: in expansion of macro 'BUILD_BUG_ON'
>   166 |         BUILD_BUG_ON(sizeof(*vcpup) > SMP_CACHE_BYTES);
>       |         ^~~~~~~~~~~~
>
> Enforce the dependency with a whitelist of CPU configurations. In normal
> distro kernels, CONFIG_X86_GENERIC is enabled, and this works fine. When this
> is not set, still allow Xen to be built on kernels that target a 64-bit
> capable CPU.
>
> Fixes: db2832309a82 ("x86/xen: fix percpu vcpu_info allocation")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

This fixes 32-bit distro kernel builds in Nixpkgs, which regressed
with a recent stable kernel update.  Thanks!

Tested-by: Alyssa Ross <hi@alyssa.is>

>  arch/x86/xen/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
> index 9b1ec5d8c99c..a65fc2ae15b4 100644
> --- a/arch/x86/xen/Kconfig
> +++ b/arch/x86/xen/Kconfig
> @@ -9,6 +9,7 @@ config XEN
>  	select PARAVIRT_CLOCK
>  	select X86_HV_CALLBACK_VECTOR
>  	depends on X86_64 || (X86_32 && X86_PAE)
> +	depends on X86_64 || (X86_GENERIC || MPENTIUM4 || MCORE2 || MATOM || MK8)
>  	depends on X86_LOCAL_APIC && X86_TSC
>  	help
>  	  This is the Linux Xen port.  Enabling this will allow the
> --
> 2.39.2
>

--bjargecwevzoc6i5
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEH9wgcxqlHM/ARR3h+dvtSFmyccAFAmV67oEACgkQ+dvtSFmy
ccAnEw//dm9vi/PyxEvDgewLQcikutEaQ4Mr/mlXW1mcleyv2baqH09M6PSn/g4D
GeZIGzxLMK54gwgw0b+zqgXD1r7x2A27qQLsFOpEFM+LE3LcejJcULczHvznQ1IX
3kFLjGWh0zzFPrQYZ/CST9RtP0w57LF0QHgZ8Mc4Am4n5+irPeLX8/K14LiK//6i
79L1E/3N4w3L3TG2QP/6KinYgjhDNMJlzUgclSv6etMkZ35FRV+vAeZbh8porE/j
vkba4GuxjuHiBXGe4oKBDjtNJJyxVbEJzW+CHguwxtYimxq1cuwQNBhZpDZ5xjVn
5n53mxAeOX0IwXUoiQfhVUJ4OIidpUiDn9+9OCZPk/jDGCh0QbGkRxNTXw1iywSJ
iQ3EX3Iron/n1wwP/cX3ntCkJZkQxbSNwqXJ0OZtxqTeOcBJKqFibiytCGAPuzaf
iXDiowlss71+d005qC7+RmCVr2lj81B60OIungWzBUfN606XLrTLZk7u5Q2Y/0Md
nDPx123HMbHxon+2aiTsKHJwQ6gcebUGNVPKXv5zTHyLBS6Nm4ngWTrAVCU1srDg
K01jNFSd2vFGYXDpbxHF8nDczQ207UxHv80BYcbKT9UejszhTY8Bv7ApKsDpU5Ax
1vs0Q92y0gbzq56sB+v30doKgMH5Afkw5+M+HBT1ZtDdiBGJ/O8=
=hV3v
-----END PGP SIGNATURE-----

--bjargecwevzoc6i5--