From xen-changelog-bounces@lists.xenproject.org Fri May 01 12:11:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2026 12:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1298666.1573794 (Exim 4.92) (envelope-from ) id 1wImhz-0008FB-KT; Fri, 01 May 2026 12:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1298666.1573794; Fri, 01 May 2026 12:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wImhz-0008F3-HU; Fri, 01 May 2026 12:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1298666; Fri, 01 May 2026 12:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wImhy-0008Ex-8W for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wImhy-00BpLF-0Y for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wImhy-00AUln-0C for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZHl6/8jnhZvt0ajJEQyRUHl9YPraMMfS1/GynucPCNI=; b=MblhoVahmu/MfyED718zx4noWZ NHXNcZ3zLMsBsFvC4ZaU31mCoKRfDRh5k46soiEwxn7mLnDFqmsnoHH2AlApkyc3kjKQh6jnMIGF4 pb/BRFeVaXc2KueoShUTe5bFjxtQvg/Sqy+ORBTs9WXOk3Y4GkJ9gEApB3sW5a+nD+k4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pdx: Undef the correct macro Message-Id: Date: Fri, 01 May 2026 12:11:02 +0000 commit 9e13c0ca186c073f17f0f055658c7d33b3ea6877 Author: Andrew Cooper AuthorDate: Fri May 1 09:37:30 2026 +0100 Commit: Andrew Cooper CommitDate: Fri May 1 10:51:19 2026 +0100 x86/pdx: Undef the correct macro This was caused by a rename during review. No functional change. Reported-by: Luca Fancellu Fixes: bd0b3a876d80 ("pdx: allow per-arch optimization of PDX conversion helpers") Signed-off-by: Andrew Cooper Reviewed-by: Luca Fancellu --- xen/arch/x86/include/asm/pdx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/pdx.h b/xen/arch/x86/include/asm/pdx.h index 6be7e1185e..6c10234ecf 100644 --- a/xen/arch/x86/include/asm/pdx.h +++ b/xen/arch/x86/include/asm/pdx.h @@ -57,7 +57,7 @@ static inline paddr_t directmapoff_to_maddr(unsigned long offset) return offset; } -#undef PDX_ASM_GOTO_SKIP +#undef PDX_ASM_GOTO #endif /* X86_PDX_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 01 12:11:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2026 12:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1298667.1573798 (Exim 4.92) (envelope-from ) id 1wImi9-0008GR-LN; Fri, 01 May 2026 12:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1298667.1573798; Fri, 01 May 2026 12:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wImi9-0008GJ-Iq; Fri, 01 May 2026 12:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1298667; Fri, 01 May 2026 12:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wImi8-0008G9-9s for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wImi8-00BpLL-0t for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wImi8-00AUmo-0j for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jUmR630d8WwdgpzKDxYJp5rWr4MrPflnScEBsvxMnfU=; b=6qZSpjceSTPe0t+u9/8t3+XFqs uBj2IiyiqkcmcUgNdWw/rnvWUOPk2FI9lOs0VABgrID3a2wdh73shR7ploQa3qQT1ZvXktC1WqQiZ Ny0HQY8z+aRDbEWgJ9pCDta4QgE+tI0UuDpoyiJ5Q/uplRj2iLs8JjU0QDXfibQeaI1o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpu: identify uninitialized CPU data using BAD_APICID Message-Id: Date: Fri, 01 May 2026 12:11:12 +0000 commit cd0413bfacf262b258029cbccbeadf99a7fef2b4 Author: Roger Pau Monne AuthorDate: Thu Apr 30 13:46:47 2026 +0200 Commit: Andrew Cooper CommitDate: Fri May 1 10:51:19 2026 +0100 x86/cpu: identify uninitialized CPU data using BAD_APICID Uninitialized cpu_data[] entries have the apicid field set to BAD_APICID, not boot_cpu_data.apicid. Fix the check in cpu_smpboot_free() to use the correct condition. Fixes: 7126b7f806d5 ("x86/CPU: re-work populating of cpu_data[]") Signed-off-by: Roger Pau Monné Reviewed-by: Teddy Astie Reviewed-by: Andrew Cooper --- xen/arch/x86/smpboot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 491cbbba33..ff05955bae 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -961,8 +961,7 @@ static void cpu_smpboot_free(unsigned int cpu, bool remove) * In that case the socket number cannot be relied upon, but the respective * socket_cpumask[] slot also wouldn't have been set. */ - if ( c[cpu].apicid != boot_cpu_data.apicid && - cpumask_empty(socket_cpumask[socket]) ) + if ( c[cpu].apicid != BAD_APICID && cpumask_empty(socket_cpumask[socket]) ) { xfree(socket_cpumask[socket]); socket_cpumask[socket] = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 01 12:11:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2026 12:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1298669.1573802 (Exim 4.92) (envelope-from ) id 1wImiJ-0008JB-Mj; Fri, 01 May 2026 12:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1298669.1573802; Fri, 01 May 2026 12:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wImiJ-0008J4-KD; Fri, 01 May 2026 12:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1298669; Fri, 01 May 2026 12:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wImiI-0008Iq-Cb for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wImiI-00BpLQ-1A for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wImiI-00AUoW-13 for xen-changelog@lists.xenproject.org; Fri, 01 May 2026 12:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eRX/h7bwJZnByPfyUJk+e8QNO0RBAmNBPEyXtCAp2EQ=; b=jL5BC9e7bvjUZvX3eXzDJhMbu6 3GjGvro6UStkVAVLjfaZJHH3QOfaXXP7bNdmcVihjBbfuOiPIQmbwoOFqY7jGTndXmH6R5o6SXDVR Hd8OF3dc7GO5scI69oAC3zNaByF04ch0/7V3QfmAr1hambRIN4cDMe/aIncnCWvGitao=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: use --platform on `docker build` and `push` Message-Id: Date: Fri, 01 May 2026 12:11:22 +0000 commit 61f957d48c78df6c5254b6f54d6170d3bd3d717e Author: Anthony PERARD AuthorDate: Wed Apr 29 14:48:01 2026 +0200 Commit: Andrew Cooper CommitDate: Fri May 1 10:51:19 2026 +0100 CI: use --platform on `docker build` and `push` Without --platform, it seems recent versions of docker ignores the platform of the image when pushing, and it's pushed as the platform of the runner. If we happen to build an arm64 image on x86, with recent version of docker, the image will be push as if it was an x86 image, then `docker run --platform=linux/arm64 ...` fails. Even if it would work without --platform, gitlab-runner will not be able to use the image. To go back to the previous behavior, we will extract --platform from the dockerfiles, and use it on the command line. --platform= is needed on both docker-build and docker-push. The first one so that the image is tagged with the right platform, and the second one so that we can push a "generic" image without been tagged to a particular platform. --platform on docker-push allow to easly use the container on any arch, without having to use --platform on docker-pull or docker-run. `docker push --platform` seem to have been added to 1.46, according to the [doc], and doesn't exist on Podman. So we need to check that we are using `docker` and that the API version is new enough. [doc] https://docs.docker.com/reference/cli/docker/image/push/ Also, introduce the $img variable, to make the lines a bit shorter. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- automation/build/Makefile | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/automation/build/Makefile b/automation/build/Makefile index fedf7524da..d578cd3476 100644 --- a/automation/build/Makefile +++ b/automation/build/Makefile @@ -15,10 +15,28 @@ help: include yocto/yocto.inc +# Find out if we are running Podman, if not is likely docker. +is-docker = $(if $(filter Podman,$(shell $(DOCKER_CMD) version)),,1) + +# Find out the docker API version is at least 1.46. We exploit `sort -V` to +# compare the versions at it can sort by version. +docker-api-version = $(shell $(DOCKER_CMD) version -f '{{.Client.APIVersion}}') +docker-min-version = $(firstword $(shell printf "1.46\n$(docker-api-version)" | sort -V)) +docker-have-push-platform = $(if $(filter 1.46,$(docker-min-version)),1) + +# check if we can use `X push --platform`. +# `podman push` doesn't support --platform. +# `docker` only have it on recent version. +builder-have-push-platform = $(and $(is-docker),$(docker-have-push-platform)) + %: %.dockerfile ## Builds containers - $(DOCKER_CMD) build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( Envelope-to: archives@lists.xen.org Delivery-date: Sun, 03 May 2026 04:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1299259.1573901 (Exim 4.92) (envelope-from ) id 1wJOLN-0006FU-A4; Sun, 03 May 2026 04:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1299259.1573901; Sun, 03 May 2026 04:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJOLN-0006FM-7Q; Sun, 03 May 2026 04:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1299259; Sun, 03 May 2026 04:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJOLM-0006FE-EV for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wJOLM-00F0r5-1L for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wJOLM-00CsSk-0u for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XTSUTgRStvXr6ftsp9eOJgaOcAiaPYcNq13DD4RvmR8=; b=QeAgMJNcCxpKYpLWFsJfCxAg6q 93T4inDWTr4wWvR7T6OmJZhA//UxvOLcVXB971pozXPaMxrKbAbAdD2tu3Gf/A66F53VmBJkt3Vfa sT79bXzjgdC3cIaHvgj2RTdUAOD9AAhVJt/T3JdzP75q6tXQnwHFKX2rjQFLlZ3TVM08=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu: identify uninitialized CPU data using BAD_APICID Message-Id: Date: Sun, 03 May 2026 04:22:12 +0000 commit cd0413bfacf262b258029cbccbeadf99a7fef2b4 Author: Roger Pau Monne AuthorDate: Thu Apr 30 13:46:47 2026 +0200 Commit: Andrew Cooper CommitDate: Fri May 1 10:51:19 2026 +0100 x86/cpu: identify uninitialized CPU data using BAD_APICID Uninitialized cpu_data[] entries have the apicid field set to BAD_APICID, not boot_cpu_data.apicid. Fix the check in cpu_smpboot_free() to use the correct condition. Fixes: 7126b7f806d5 ("x86/CPU: re-work populating of cpu_data[]") Signed-off-by: Roger Pau Monné Reviewed-by: Teddy Astie Reviewed-by: Andrew Cooper --- xen/arch/x86/smpboot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 491cbbba33..ff05955bae 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -961,8 +961,7 @@ static void cpu_smpboot_free(unsigned int cpu, bool remove) * In that case the socket number cannot be relied upon, but the respective * socket_cpumask[] slot also wouldn't have been set. */ - if ( c[cpu].apicid != boot_cpu_data.apicid && - cpumask_empty(socket_cpumask[socket]) ) + if ( c[cpu].apicid != BAD_APICID && cpumask_empty(socket_cpumask[socket]) ) { xfree(socket_cpumask[socket]); socket_cpumask[socket] = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 03 04:22:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 03 May 2026 04:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1299258.1573897 (Exim 4.92) (envelope-from ) id 1wJOLE-0006EF-9M; Sun, 03 May 2026 04:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1299258.1573897; Sun, 03 May 2026 04:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJOLE-0006E6-65; Sun, 03 May 2026 04:22:04 +0000 Received: by outflank-mailman (input) for mailman id 1299258; Sun, 03 May 2026 04:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJOLC-0006E0-9G for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wJOLC-00F0qz-0j for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wJOLC-00CsR1-0L for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=s+b2k1fCO7AH26xtlMYog5n/JT7nBba1X2LueTRPDz8=; b=budzE4cAkZfRNveBHHkRXHeWFV KjtAbHWQEnt2/FZm97P/WpmRhbzDsDWO7CHFGx3ISx+VuxVuX/PZan7v8Rg8AZWqjGxWqdOoGI+nG mA9DDEjgsLyT18sAvgdVWZeQKu1/YMUZqPlphcCg/E8GWYv+iX+8EFjK5abAHsgqhZUg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pdx: Undef the correct macro Message-Id: Date: Sun, 03 May 2026 04:22:02 +0000 commit 9e13c0ca186c073f17f0f055658c7d33b3ea6877 Author: Andrew Cooper AuthorDate: Fri May 1 09:37:30 2026 +0100 Commit: Andrew Cooper CommitDate: Fri May 1 10:51:19 2026 +0100 x86/pdx: Undef the correct macro This was caused by a rename during review. No functional change. Reported-by: Luca Fancellu Fixes: bd0b3a876d80 ("pdx: allow per-arch optimization of PDX conversion helpers") Signed-off-by: Andrew Cooper Reviewed-by: Luca Fancellu --- xen/arch/x86/include/asm/pdx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/pdx.h b/xen/arch/x86/include/asm/pdx.h index 6be7e1185e..6c10234ecf 100644 --- a/xen/arch/x86/include/asm/pdx.h +++ b/xen/arch/x86/include/asm/pdx.h @@ -57,7 +57,7 @@ static inline paddr_t directmapoff_to_maddr(unsigned long offset) return offset; } -#undef PDX_ASM_GOTO_SKIP +#undef PDX_ASM_GOTO #endif /* X86_PDX_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 03 04:22:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 03 May 2026 04:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1299260.1573905 (Exim 4.92) (envelope-from ) id 1wJOLX-0006Jh-Bd; Sun, 03 May 2026 04:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1299260.1573905; Sun, 03 May 2026 04:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJOLX-0006JX-8t; Sun, 03 May 2026 04:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1299260; Sun, 03 May 2026 04:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJOLW-0006JM-Gv for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wJOLW-00F0rF-1c for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wJOLW-00CsVM-1V for xen-changelog@lists.xenproject.org; Sun, 03 May 2026 04:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yIGFrva0Hn7gllzQr8fLc+blrCbazYGZ2JAP4EPXDaA=; b=MsMw5WvgjRfWC3adlcaYx085jZ jP5Qdqk4zdAXlBH0KGeGyKOxTr5fiedecXwd2hSRm21nQCxZo7PFs64As8mjbsYfTEbBiQWj4ABOb D7hwSaP3cmlAQx/vwJyQ+YT7GsNkocHe4l56UdF8dBd/nvzb2UZII4m1xfUj9w0ec3BE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: use --platform on `docker build` and `push` Message-Id: Date: Sun, 03 May 2026 04:22:22 +0000 commit 61f957d48c78df6c5254b6f54d6170d3bd3d717e Author: Anthony PERARD AuthorDate: Wed Apr 29 14:48:01 2026 +0200 Commit: Andrew Cooper CommitDate: Fri May 1 10:51:19 2026 +0100 CI: use --platform on `docker build` and `push` Without --platform, it seems recent versions of docker ignores the platform of the image when pushing, and it's pushed as the platform of the runner. If we happen to build an arm64 image on x86, with recent version of docker, the image will be push as if it was an x86 image, then `docker run --platform=linux/arm64 ...` fails. Even if it would work without --platform, gitlab-runner will not be able to use the image. To go back to the previous behavior, we will extract --platform from the dockerfiles, and use it on the command line. --platform= is needed on both docker-build and docker-push. The first one so that the image is tagged with the right platform, and the second one so that we can push a "generic" image without been tagged to a particular platform. --platform on docker-push allow to easly use the container on any arch, without having to use --platform on docker-pull or docker-run. `docker push --platform` seem to have been added to 1.46, according to the [doc], and doesn't exist on Podman. So we need to check that we are using `docker` and that the API version is new enough. [doc] https://docs.docker.com/reference/cli/docker/image/push/ Also, introduce the $img variable, to make the lines a bit shorter. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- automation/build/Makefile | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/automation/build/Makefile b/automation/build/Makefile index fedf7524da..d578cd3476 100644 --- a/automation/build/Makefile +++ b/automation/build/Makefile @@ -15,10 +15,28 @@ help: include yocto/yocto.inc +# Find out if we are running Podman, if not is likely docker. +is-docker = $(if $(filter Podman,$(shell $(DOCKER_CMD) version)),,1) + +# Find out the docker API version is at least 1.46. We exploit `sort -V` to +# compare the versions at it can sort by version. +docker-api-version = $(shell $(DOCKER_CMD) version -f '{{.Client.APIVersion}}') +docker-min-version = $(firstword $(shell printf "1.46\n$(docker-api-version)" | sort -V)) +docker-have-push-platform = $(if $(filter 1.46,$(docker-min-version)),1) + +# check if we can use `X push --platform`. +# `podman push` doesn't support --platform. +# `docker` only have it on recent version. +builder-have-push-platform = $(and $(is-docker),$(docker-have-push-platform)) + %: %.dockerfile ## Builds containers - $(DOCKER_CMD) build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2026 08:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1299580.1574116 (Exim 4.92) (envelope-from ) id 1wJojf-0003Ic-3C; Mon, 04 May 2026 08:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1299580.1574116; Mon, 04 May 2026 08:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJojf-0003IU-0f; Mon, 04 May 2026 08:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1299580; Mon, 04 May 2026 08:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJoje-0003IO-1v for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 08:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wJojd-00Gmkk-3D for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 08:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wJojd-00ELWb-30 for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 08:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/NH6qokUBowxXQcD93mb2leMjftiJD6y03H0poghi5k=; b=hMyiWTOa0EXneWxrWDtKqh5Bzg 0xNrxa0EMLa3emlvBnCp2K1msoT5OeLTRohi7GlG/yUVG3d0ynpMH4y6DUS/YSAq/Dw+aN6T9f1LI 1r0m3A0jXb7RKQdIv+NxdYZlYLbowUTynJirK2mFyqM4YSFIbyCfeauC1saoyqtGNy4M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: gic-v2: disable interrupt bypass on CPU shutdown Message-Id: Date: Mon, 04 May 2026 08:33:01 +0000 commit 6f00fd9d6c1d6f08ab21f16c0406b3bb2c1e3b01 Author: Mykola Kvach AuthorDate: Tue Apr 28 14:57:55 2026 +0300 Commit: Michal Orzel CommitDate: Mon May 4 10:20:00 2026 +0200 xen/arm: gic-v2: disable interrupt bypass on CPU shutdown The GICv2 CPU shutdown path currently writes 0 to GICC_CTLR. Per IHI0048B.b section 2.3.1, clearing the architected bypass-disable bits selects bypass rather than deasserted interrupt outputs when the CPU interface stops driving them. Tables 2-2 and 2-3 show that a zeroed GICC_CTLR can fall back to the legacy IRQ/FIQ inputs instead of fully disabling the interface. Fix this by reading GICC_CTLR, then setting the bypass-disable bits and clearing the group-enable bits that are architecturally defined for the current GICC_CTLR view before writing the value back. When Security Extensions are implemented Xen accesses the Non-secure copy of GICC_CTLR, where IRQBypDisGrp1 and FIQBypDisGrp1 are at bits [6:5] and bits [8:7] are reserved. Without Security Extensions (GICD_CTLR.DS=1), GICD_IGROUPR is RAZ/WI and all interrupts are Group 0, so clearing EnableGrp0 alone is sufficient to stop interrupt delivery through the CPU interface. Section 2.3.2 also states that wakeup event signals remain available even when both GIC interrupt signaling and interrupt bypass are disabled, so disabling bypass does not break the power-management use case, i.e. suspend modes. Fixes: 5e40a1b4351e ("arm: SMP CPU shutdown") Signed-off-by: Mykola Kvach Reviewed-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/gic-v2.c | 12 +++++++++++- xen/arch/arm/include/asm/gic.h | 25 +++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 014f955967..43a379fdda 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -408,7 +408,17 @@ static void gicv2_cpu_init(void) static void gicv2_cpu_disable(void) { - writel_gicc(0x0, GICC_CTLR); + uint32_t ctlr = readl_gicc(GICC_CTLR); + + if ( readl_gicd(GICD_TYPER) & GICD_TYPE_SEC ) + ctlr |= GICC_NS_CTLR_BYPASS_DISABLE_GRP1_MASK; + else + ctlr |= GICC_CTLR_BYPASS_DISABLE_GRP0_MASK | + GICC_CTLR_BYPASS_DISABLE_GRP1_MASK; + + ctlr &= ~GICC_CTL_ENABLE; + + writel_gicc(ctlr, GICC_CTLR); } static void gicv2_hyp_init(void) diff --git a/xen/arch/arm/include/asm/gic.h b/xen/arch/arm/include/asm/gic.h index 8e713aa477..ff22dea40d 100644 --- a/xen/arch/arm/include/asm/gic.h +++ b/xen/arch/arm/include/asm/gic.h @@ -102,8 +102,29 @@ #define GICD_TYPE_SEC 0x400 #define GICD_TYPER_DVIS (1U << 18) -#define GICC_CTL_ENABLE 0x1 -#define GICC_CTL_EOI (0x1 << 9) +/* + * Xen runs in the Non-secure world. When Security Extensions are present, + * Xen accesses the Non-secure GICC_CTLR view, where bit[0] is EnableGrp1 + * and bits[6:5] are the Group 1 bypass-disable bits. Otherwise Xen sees the + * common GICC_CTLR layout, where bit[0] is EnableGrp0, bit[1] is EnableGrp1, + * bits[6:5] are the Group 0 bypass-disable bits, and bits[8:7] are the + * Group 1 bypass-disable bits. + */ +#define GICC_CTL_ENABLE (0x1 << 0) +#define GICC_CTL_ENABLE_GRP1 (0x1 << 1) +#define GICC_CTL_FIQBypDisGrp0 (0x1 << 5) +#define GICC_CTL_IRQBypDisGrp0 (0x1 << 6) +#define GICC_CTL_FIQBypDisGrp1 (0x1 << 7) +#define GICC_CTL_IRQBypDisGrp1 (0x1 << 8) + +#define GICC_CTLR_BYPASS_DISABLE_GRP0_MASK \ + (GICC_CTL_FIQBypDisGrp0 | GICC_CTL_IRQBypDisGrp0) +#define GICC_CTLR_BYPASS_DISABLE_GRP1_MASK \ + (GICC_CTL_FIQBypDisGrp1 | GICC_CTL_IRQBypDisGrp1) +#define GICC_NS_CTLR_BYPASS_DISABLE_GRP1_MASK \ + GICC_CTLR_BYPASS_DISABLE_GRP0_MASK + +#define GICC_CTL_EOI (0x1 << 9) #define GICC_IA_IRQ 0x03ff #define GICC_IA_CPU_MASK 0x1c00 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 08:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2026 08:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1299581.1574120 (Exim 4.92) (envelope-from ) id 1wJojp-0003KB-4f; Mon, 04 May 2026 08:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1299581.1574120; Mon, 04 May 2026 08:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJojp-0003K3-1y; Mon, 04 May 2026 08:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1299581; Mon, 04 May 2026 08:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJojo-0003Jr-4S for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 08:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wJojo-00Gmko-0J for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 08:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wJojo-00ELXC-09 for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 08:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+cMgQ0VD+S3IHebz5eAM7qaMJWJJjjnn+UDmxSNGroE=; b=HQCULl0r1ikI4Kn8AtpC3cmDJs pNtGvnjn4FJ4p05ntEto7LYQH8/+IFZZn4N3zToDsXocaDxVzeLpXEjh3KnHaAFQUzWCHB06HGrsN /MO7QzothtXAC8un17fD6RofuR+ETHhR/l0P9Sjgu7QvXv/aAoHWgoh3/x/+Dku0wl4Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: vpsci: ignore upper 32 bits for SMC32 PSCI arguments Message-Id: Date: Mon, 04 May 2026 08:33:12 +0000 commit f4af571dd70bea97d8de82d7aa39c62c530db897 Author: Mykola Kvach AuthorDate: Tue Mar 31 21:31:29 2026 +0300 Commit: Michal Orzel CommitDate: Mon May 4 10:20:00 2026 +0200 xen/arm: vpsci: ignore upper 32 bits for SMC32 PSCI arguments SMCCC DEN0028G, section 3.1, states that for AArch64 SMC/HVC calls using Wn, only the least significant 32 bits are significant and the upper 32 bits must be ignored by the implementation. So for SMC32 PSCI calls, Xen must not treat non-zero upper bits in the argument registers as an error. Instead, they should be discarded when decoding the arguments. Arm ARM DDI 0487J.a (D1-5406) also notes that the upper 32 bits may be implementation defined when entering from AArch32. Xen zeros them on entry, but that guarantee is only relevant for 32-bit domains. Update PSCI v0.2+ CPU_ON, CPU_SUSPEND, AFFINITY_INFO and SYSTEM_SUSPEND to read SMC32 arguments via PSCI_ARG32(), while keeping the SMC64 handling unchanged. No functional change is intended for PSCI 0.1. Suggested-by: Julien Grall Signed-off-by: Mykola Kvach Reviewed-by: Bertrand Marquis --- xen/arch/arm/vpsci.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index bd87ec430d..ac6af6118f 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -305,13 +305,16 @@ static int32_t do_psci_1_0_features(uint32_t psci_func_id) #define PSCI_ARG32(reg, n) PSCI_ARG(reg, n) #endif +#define PSCI_ARG_CONV(reg, n, conv_64) \ + ((conv_64) ? PSCI_ARG(reg, n) : PSCI_ARG32(reg, n)) + /* * PSCI 0.1 calls. It will return false if the function ID is not * handled. */ bool do_vpsci_0_1_call(struct cpu_user_regs *regs, uint32_t fid) { - switch ( (uint32_t)get_user_reg(regs, 0) ) + switch ( fid ) { case PSCI_cpu_off: { @@ -346,6 +349,8 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) * adding/removing a function. SSSC_SMCCC_*_REVISION should be * updated once per release. */ + bool is_conv_64 = smccc_is_conv_64(fid); + switch ( fid ) { case PSCI_0_2_FN32_PSCI_VERSION: @@ -378,9 +383,9 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_0_2_FN32_CPU_ON: case PSCI_0_2_FN64_CPU_ON: { - register_t vcpuid = PSCI_ARG(regs, 1); - register_t epoint = PSCI_ARG(regs, 2); - register_t cid = PSCI_ARG(regs, 3); + register_t vcpuid = PSCI_ARG_CONV(regs, 1, is_conv_64); + register_t epoint = PSCI_ARG_CONV(regs, 2, is_conv_64); + register_t cid = PSCI_ARG_CONV(regs, 3, is_conv_64); perfc_incr(vpsci_cpu_on); PSCI_SET_RESULT(regs, do_psci_0_2_cpu_on(vcpuid, epoint, cid)); @@ -391,8 +396,8 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_0_2_FN64_CPU_SUSPEND: { uint32_t pstate = PSCI_ARG32(regs, 1); - register_t epoint = PSCI_ARG(regs, 2); - register_t cid = PSCI_ARG(regs, 3); + register_t epoint = PSCI_ARG_CONV(regs, 2, is_conv_64); + register_t cid = PSCI_ARG_CONV(regs, 3, is_conv_64); perfc_incr(vpsci_cpu_suspend); PSCI_SET_RESULT(regs, do_psci_0_2_cpu_suspend(pstate, epoint, cid)); @@ -402,7 +407,7 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_0_2_FN32_AFFINITY_INFO: case PSCI_0_2_FN64_AFFINITY_INFO: { - register_t taff = PSCI_ARG(regs, 1); + register_t taff = PSCI_ARG_CONV(regs, 1, is_conv_64); uint32_t laff = PSCI_ARG32(regs, 2); perfc_incr(vpsci_cpu_affinity_info); @@ -422,14 +427,8 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_1_0_FN32_SYSTEM_SUSPEND: case PSCI_1_0_FN64_SYSTEM_SUSPEND: { - register_t epoint = PSCI_ARG(regs, 1); - register_t cid = PSCI_ARG(regs, 2); - - if ( fid == PSCI_1_0_FN32_SYSTEM_SUSPEND ) - { - epoint &= GENMASK(31, 0); - cid &= GENMASK(31, 0); - } + register_t epoint = PSCI_ARG_CONV(regs, 1, is_conv_64); + register_t cid = PSCI_ARG_CONV(regs, 2, is_conv_64); perfc_incr(vpsci_system_suspend); PSCI_SET_RESULT(regs, do_psci_1_0_system_suspend(epoint, cid)); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 09:33:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2026 09:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1299641.1574187 (Exim 4.92) (envelope-from ) id 1wJpfi-0005nY-M1; Mon, 04 May 2026 09:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1299641.1574187; Mon, 04 May 2026 09:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJpfi-0005nQ-JD; Mon, 04 May 2026 09:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1299641; Mon, 04 May 2026 09:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJpfh-0005nK-NL for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 09:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wJpfh-00Gnu2-21 for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 09:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wJpfh-00EOd6-1s for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 09:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YkmuHswXYzV5SMiKQjupUrR3xW7yT1IWbGjGzmiJSMY=; b=nS9Y6i+FPPV6TE75p82sCPKIjh WN1stbUFsY9hzdnLU0Sgvr8QcsVWjsOJSwgEOQR4bOKl8rBD7vSyQdc/w51/DXI2Qa/fANUMAzUS/ 3Mbdsj1nK76ItmVtNIY5wdUzmYC8gEk7fgipFVMqhTQvRTc/Dv9bnUD5VXIzVwdJkrOE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: gic-v2: disable interrupt bypass on CPU shutdown Message-Id: Date: Mon, 04 May 2026 09:33:01 +0000 commit 6f00fd9d6c1d6f08ab21f16c0406b3bb2c1e3b01 Author: Mykola Kvach AuthorDate: Tue Apr 28 14:57:55 2026 +0300 Commit: Michal Orzel CommitDate: Mon May 4 10:20:00 2026 +0200 xen/arm: gic-v2: disable interrupt bypass on CPU shutdown The GICv2 CPU shutdown path currently writes 0 to GICC_CTLR. Per IHI0048B.b section 2.3.1, clearing the architected bypass-disable bits selects bypass rather than deasserted interrupt outputs when the CPU interface stops driving them. Tables 2-2 and 2-3 show that a zeroed GICC_CTLR can fall back to the legacy IRQ/FIQ inputs instead of fully disabling the interface. Fix this by reading GICC_CTLR, then setting the bypass-disable bits and clearing the group-enable bits that are architecturally defined for the current GICC_CTLR view before writing the value back. When Security Extensions are implemented Xen accesses the Non-secure copy of GICC_CTLR, where IRQBypDisGrp1 and FIQBypDisGrp1 are at bits [6:5] and bits [8:7] are reserved. Without Security Extensions (GICD_CTLR.DS=1), GICD_IGROUPR is RAZ/WI and all interrupts are Group 0, so clearing EnableGrp0 alone is sufficient to stop interrupt delivery through the CPU interface. Section 2.3.2 also states that wakeup event signals remain available even when both GIC interrupt signaling and interrupt bypass are disabled, so disabling bypass does not break the power-management use case, i.e. suspend modes. Fixes: 5e40a1b4351e ("arm: SMP CPU shutdown") Signed-off-by: Mykola Kvach Reviewed-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/gic-v2.c | 12 +++++++++++- xen/arch/arm/include/asm/gic.h | 25 +++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 014f955967..43a379fdda 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -408,7 +408,17 @@ static void gicv2_cpu_init(void) static void gicv2_cpu_disable(void) { - writel_gicc(0x0, GICC_CTLR); + uint32_t ctlr = readl_gicc(GICC_CTLR); + + if ( readl_gicd(GICD_TYPER) & GICD_TYPE_SEC ) + ctlr |= GICC_NS_CTLR_BYPASS_DISABLE_GRP1_MASK; + else + ctlr |= GICC_CTLR_BYPASS_DISABLE_GRP0_MASK | + GICC_CTLR_BYPASS_DISABLE_GRP1_MASK; + + ctlr &= ~GICC_CTL_ENABLE; + + writel_gicc(ctlr, GICC_CTLR); } static void gicv2_hyp_init(void) diff --git a/xen/arch/arm/include/asm/gic.h b/xen/arch/arm/include/asm/gic.h index 8e713aa477..ff22dea40d 100644 --- a/xen/arch/arm/include/asm/gic.h +++ b/xen/arch/arm/include/asm/gic.h @@ -102,8 +102,29 @@ #define GICD_TYPE_SEC 0x400 #define GICD_TYPER_DVIS (1U << 18) -#define GICC_CTL_ENABLE 0x1 -#define GICC_CTL_EOI (0x1 << 9) +/* + * Xen runs in the Non-secure world. When Security Extensions are present, + * Xen accesses the Non-secure GICC_CTLR view, where bit[0] is EnableGrp1 + * and bits[6:5] are the Group 1 bypass-disable bits. Otherwise Xen sees the + * common GICC_CTLR layout, where bit[0] is EnableGrp0, bit[1] is EnableGrp1, + * bits[6:5] are the Group 0 bypass-disable bits, and bits[8:7] are the + * Group 1 bypass-disable bits. + */ +#define GICC_CTL_ENABLE (0x1 << 0) +#define GICC_CTL_ENABLE_GRP1 (0x1 << 1) +#define GICC_CTL_FIQBypDisGrp0 (0x1 << 5) +#define GICC_CTL_IRQBypDisGrp0 (0x1 << 6) +#define GICC_CTL_FIQBypDisGrp1 (0x1 << 7) +#define GICC_CTL_IRQBypDisGrp1 (0x1 << 8) + +#define GICC_CTLR_BYPASS_DISABLE_GRP0_MASK \ + (GICC_CTL_FIQBypDisGrp0 | GICC_CTL_IRQBypDisGrp0) +#define GICC_CTLR_BYPASS_DISABLE_GRP1_MASK \ + (GICC_CTL_FIQBypDisGrp1 | GICC_CTL_IRQBypDisGrp1) +#define GICC_NS_CTLR_BYPASS_DISABLE_GRP1_MASK \ + GICC_CTLR_BYPASS_DISABLE_GRP0_MASK + +#define GICC_CTL_EOI (0x1 << 9) #define GICC_IA_IRQ 0x03ff #define GICC_IA_CPU_MASK 0x1c00 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 04 09:33:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2026 09:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1299642.1574191 (Exim 4.92) (envelope-from ) id 1wJpfs-0005pe-N9; Mon, 04 May 2026 09:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1299642.1574191; Mon, 04 May 2026 09:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJpfs-0005pW-KX; Mon, 04 May 2026 09:33:12 +0000 Received: by outflank-mailman (input) for mailman id 1299642; Mon, 04 May 2026 09:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wJpfr-0005pM-Oh for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 09:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wJpfr-00GnuJ-2N for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 09:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wJpfr-00EOds-2C for xen-changelog@lists.xenproject.org; Mon, 04 May 2026 09:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WSXMezb1jMUGnOogFCGxUFHUOP1MxG4ERFQDcoB0uKA=; b=TkvtvMaSQEVyFaMjczD8+gBZmV mXiAMijEo5AObgSTNLXYqkrr6SUYF2G9dE8FfRszxLbQqzg7gyOIGvbkMeaArYzLA6ny3cwoLW/2g T1kWlR5AD051tzLqy++l13xZqteJQQdQVFhWEinZHdhSMnxRvcnYy6rMX239lsS6PonY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: vpsci: ignore upper 32 bits for SMC32 PSCI arguments Message-Id: Date: Mon, 04 May 2026 09:33:11 +0000 commit f4af571dd70bea97d8de82d7aa39c62c530db897 Author: Mykola Kvach AuthorDate: Tue Mar 31 21:31:29 2026 +0300 Commit: Michal Orzel CommitDate: Mon May 4 10:20:00 2026 +0200 xen/arm: vpsci: ignore upper 32 bits for SMC32 PSCI arguments SMCCC DEN0028G, section 3.1, states that for AArch64 SMC/HVC calls using Wn, only the least significant 32 bits are significant and the upper 32 bits must be ignored by the implementation. So for SMC32 PSCI calls, Xen must not treat non-zero upper bits in the argument registers as an error. Instead, they should be discarded when decoding the arguments. Arm ARM DDI 0487J.a (D1-5406) also notes that the upper 32 bits may be implementation defined when entering from AArch32. Xen zeros them on entry, but that guarantee is only relevant for 32-bit domains. Update PSCI v0.2+ CPU_ON, CPU_SUSPEND, AFFINITY_INFO and SYSTEM_SUSPEND to read SMC32 arguments via PSCI_ARG32(), while keeping the SMC64 handling unchanged. No functional change is intended for PSCI 0.1. Suggested-by: Julien Grall Signed-off-by: Mykola Kvach Reviewed-by: Bertrand Marquis --- xen/arch/arm/vpsci.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index bd87ec430d..ac6af6118f 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -305,13 +305,16 @@ static int32_t do_psci_1_0_features(uint32_t psci_func_id) #define PSCI_ARG32(reg, n) PSCI_ARG(reg, n) #endif +#define PSCI_ARG_CONV(reg, n, conv_64) \ + ((conv_64) ? PSCI_ARG(reg, n) : PSCI_ARG32(reg, n)) + /* * PSCI 0.1 calls. It will return false if the function ID is not * handled. */ bool do_vpsci_0_1_call(struct cpu_user_regs *regs, uint32_t fid) { - switch ( (uint32_t)get_user_reg(regs, 0) ) + switch ( fid ) { case PSCI_cpu_off: { @@ -346,6 +349,8 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) * adding/removing a function. SSSC_SMCCC_*_REVISION should be * updated once per release. */ + bool is_conv_64 = smccc_is_conv_64(fid); + switch ( fid ) { case PSCI_0_2_FN32_PSCI_VERSION: @@ -378,9 +383,9 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_0_2_FN32_CPU_ON: case PSCI_0_2_FN64_CPU_ON: { - register_t vcpuid = PSCI_ARG(regs, 1); - register_t epoint = PSCI_ARG(regs, 2); - register_t cid = PSCI_ARG(regs, 3); + register_t vcpuid = PSCI_ARG_CONV(regs, 1, is_conv_64); + register_t epoint = PSCI_ARG_CONV(regs, 2, is_conv_64); + register_t cid = PSCI_ARG_CONV(regs, 3, is_conv_64); perfc_incr(vpsci_cpu_on); PSCI_SET_RESULT(regs, do_psci_0_2_cpu_on(vcpuid, epoint, cid)); @@ -391,8 +396,8 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_0_2_FN64_CPU_SUSPEND: { uint32_t pstate = PSCI_ARG32(regs, 1); - register_t epoint = PSCI_ARG(regs, 2); - register_t cid = PSCI_ARG(regs, 3); + register_t epoint = PSCI_ARG_CONV(regs, 2, is_conv_64); + register_t cid = PSCI_ARG_CONV(regs, 3, is_conv_64); perfc_incr(vpsci_cpu_suspend); PSCI_SET_RESULT(regs, do_psci_0_2_cpu_suspend(pstate, epoint, cid)); @@ -402,7 +407,7 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_0_2_FN32_AFFINITY_INFO: case PSCI_0_2_FN64_AFFINITY_INFO: { - register_t taff = PSCI_ARG(regs, 1); + register_t taff = PSCI_ARG_CONV(regs, 1, is_conv_64); uint32_t laff = PSCI_ARG32(regs, 2); perfc_incr(vpsci_cpu_affinity_info); @@ -422,14 +427,8 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) case PSCI_1_0_FN32_SYSTEM_SUSPEND: case PSCI_1_0_FN64_SYSTEM_SUSPEND: { - register_t epoint = PSCI_ARG(regs, 1); - register_t cid = PSCI_ARG(regs, 2); - - if ( fid == PSCI_1_0_FN32_SYSTEM_SUSPEND ) - { - epoint &= GENMASK(31, 0); - cid &= GENMASK(31, 0); - } + register_t epoint = PSCI_ARG_CONV(regs, 1, is_conv_64); + register_t cid = PSCI_ARG_CONV(regs, 2, is_conv_64); perfc_incr(vpsci_system_suspend); PSCI_SET_RESULT(regs, do_psci_1_0_system_suspend(epoint, cid)); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:44:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300261.1574782 (Exim 4.92) (envelope-from ) id 1wKARo-00018p-5t; Tue, 05 May 2026 07:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300261.1574782; Tue, 05 May 2026 07:44:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKARo-00018h-2w; Tue, 05 May 2026 07:44:04 +0000 Received: by outflank-mailman (input) for mailman id 1300261; Tue, 05 May 2026 07:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKARm-00018a-EI for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKARm-000q5f-15 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKARm-00FYt1-0r for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2JAoGMkRaafi0RNxl8wJCJaPvkiJGt6W5uAD80taKes=; b=Kc1/cOrrUuU3jteLr49C+BhNlu Qwf43gdEVbQ8QW6GoR+ZVAbuhXHZfIEee4QWGNmrxQJuqiB8w+R2ch6D1bLBWHpYSyMuDDb3st01a J4wKwBtaFbrjbC+x//W7uMT2ICXd7ZTpoYgfDfty8UoaZ44G1cfwMlNNGtN3TBILJzcI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: unlock P2M slightly earlier in shadow_track_dirty_vram() Message-Id: Date: Tue, 05 May 2026 07:44:02 +0000 commit d367f87cfd7429aa3646e58e764563ce6f361842 Author: Jan Beulich AuthorDate: Tue May 5 08:20:55 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:20:55 2026 +0200 x86/shadow: unlock P2M slightly earlier in shadow_track_dirty_vram() There's no need to call vfree() with the lock still held. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm/shadow/hvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/hvm.c b/xen/arch/x86/mm/shadow/hvm.c index 3565c7940d..cf4862cbc9 100644 --- a/xen/arch/x86/mm/shadow/hvm.c +++ b/xen/arch/x86/mm/shadow/hvm.c @@ -1200,8 +1200,8 @@ int shadow_track_dirty_vram(struct domain *d, paging_unlock(d); rc = -EFAULT; } - vfree(dirty_bitmap); p2m_unlock(p2m_get_hostp2m(d)); + vfree(dirty_bitmap); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:44:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300262.1574786 (Exim 4.92) (envelope-from ) id 1wKARy-0001Ak-6y; Tue, 05 May 2026 07:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300262.1574786; Tue, 05 May 2026 07:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKARy-0001Ab-4I; Tue, 05 May 2026 07:44:14 +0000 Received: by outflank-mailman (input) for mailman id 1300262; Tue, 05 May 2026 07:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKARw-0001AM-FR for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKARw-000q5o-1N for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKARw-00FYuh-1G for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d/zltZHGuhe3fsaWI1+K6cSnVrX1OtMBJt38wNmK/bA=; b=SwTF4PHEDRXvjD8XJSKG3ig+4t Ohj9aPXMoWcCMZzydg3BSjpw787oMDmX8Wxio4Tj/98AesUvCLSQv/3bQDWz/skV2G8k5mqtrmQRK yJk8FhTWiof5dpmJcQgMRUBFSV+F1T6fz/w2IVKELy0ZSn6hIqYi9ZS/MW0VEtZwAhek=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Arm: device.c is init-only when OVERLAY_DTB=n Message-Id: Date: Tue, 05 May 2026 07:44:12 +0000 commit 227a9aae44a31c440f05e66ed0841b21fb99837d Author: Jan Beulich AuthorDate: Tue May 5 08:21:45 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:21:45 2026 +0200 Arm: device.c is init-only when OVERLAY_DTB=n Introduce an annotation similar to __hwdom_init and use it througout the file. All external callers are either themselves __init or are limited to OVERLAY_DTB=y. Adjust the Makefile accordingly to also have string literals moved into .init.rodata. Signed-off-by: Jan Beulich Reviewed-by: Michal Orzel --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/device.c | 33 ++++++++++++++++++--------------- xen/include/xen/dt-overlay.h | 8 ++++++++ 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 69200b2728..982c6c396a 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_HAS_ALTERNATIVE) += alternative.o obj-y += cpuerrata.o obj-y += cpufeature.o obj-y += decode.o -obj-y += device.o +obj-y += $(if $(CONFIG_OVERLAY_DTB),device.o,device.init.o) obj-$(CONFIG_IOREQ_SERVER) += dm.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-y += domain.o diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index 74b54cad34..7d9644fd8b 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -16,8 +17,8 @@ #include #include -int map_irq_to_domain(struct domain *d, unsigned int irq, - bool need_mapping, const char *devname) +int __overlay_init map_irq_to_domain(struct domain *d, unsigned int irq, + bool need_mapping, const char *devname) { int res; @@ -49,8 +50,8 @@ int map_irq_to_domain(struct domain *d, unsigned int irq, return 0; } -int map_range_to_domain(const struct dt_device_node *dev, - uint64_t addr, uint64_t len, void *data) +int __overlay_init map_range_to_domain(const struct dt_device_node *dev, + uint64_t addr, uint64_t len, void *data) { struct map_range_data *mr_data = data; struct domain *d = mr_data->d; @@ -124,10 +125,10 @@ int map_range_to_domain(const struct dt_device_node *dev, * < 0 error * 0 success */ -int map_device_irqs_to_domain(struct domain *d, - struct dt_device_node *dev, - bool need_mapping, - struct rangeset *irq_ranges) +int __overlay_init map_device_irqs_to_domain(struct domain *d, + struct dt_device_node *dev, + bool need_mapping, + struct rangeset *irq_ranges) { unsigned int i, nirq; int res, irq; @@ -180,9 +181,9 @@ int map_device_irqs_to_domain(struct domain *d, return 0; } -static int map_dt_irq_to_domain(const struct dt_device_node *dev, - const struct dt_irq *dt_irq, - void *data) +static int __overlay_init map_dt_irq_to_domain(const struct dt_device_node *dev, + const struct dt_irq *dt_irq, + void *data) { struct map_range_data *mr_data = data; struct domain *d = mr_data->d; @@ -219,8 +220,8 @@ static int map_dt_irq_to_domain(const struct dt_device_node *dev, * then we may need to perform additional mappings in order to make * the child resources available to domain 0. */ -static int map_device_children(const struct dt_device_node *dev, - struct map_range_data *mr_data) +static int __overlay_init map_device_children(const struct dt_device_node *dev, + struct map_range_data *mr_data) { if ( dt_device_type_is_equal(dev, "pci") ) { @@ -250,8 +251,10 @@ static int map_device_children(const struct dt_device_node *dev, * - Assign the device to the guest if it's protected by an IOMMU * - Map the IRQs and iomem regions to DOM0 */ -int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt, - struct rangeset *iomem_ranges, struct rangeset *irq_ranges) +int __overlay_init handle_device(struct domain *d, struct dt_device_node *dev, + p2m_type_t p2mt, + struct rangeset *iomem_ranges, + struct rangeset *irq_ranges) { unsigned int naddr; unsigned int i; diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h index b2cedf3f2a..7400382842 100644 --- a/xen/include/xen/dt-overlay.h +++ b/xen/include/xen/dt-overlay.h @@ -42,10 +42,18 @@ struct xen_sysctl_dt_overlay; struct xen_domctl_dt_overlay; #ifdef CONFIG_OVERLAY_DTB + +#define __overlay_init + long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op); long dt_overlay_domctl(struct domain *d, struct xen_domctl_dt_overlay *op); + #else + #include + +#define __overlay_init __init + static inline long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) { return -EOPNOTSUPP; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:44:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300263.1574790 (Exim 4.92) (envelope-from ) id 1wKAS8-0001Cm-8I; Tue, 05 May 2026 07:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300263.1574790; Tue, 05 May 2026 07:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKAS8-0001Ce-5Z; Tue, 05 May 2026 07:44:24 +0000 Received: by outflank-mailman (input) for mailman id 1300263; Tue, 05 May 2026 07:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKAS6-0001CX-Hd for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKAS6-000q6A-1f for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKAS6-00FYw0-1Y for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yiBpfbanle6KBrW+v6qE1AFi0W4ucpSrQJ/u7RW/k9Q=; b=YXVAHj6GWlJWZpLogZSm/XILn6 zmbm+oMtBPFV6u3R7R/DwPiHRESYFYXMXU2OOvVLgf5Xfeg8kJI0b/OG915u35n9s3RZw2kj+Y48I a6A5/gQ0TDifj+rUqXP9bUZAtc0q96bLnHy1JT7y5LKToxFLA4+xkk3kmzEHudbhCm2Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mwait-idle: Remove unused driver version constant Message-Id: Date: Tue, 05 May 2026 07:44:22 +0000 commit 6c9344ee3d48b8bb7758c72d9e4eeb8841b8f7ec Author: Artem Bityutskiy AuthorDate: Tue May 5 08:25:56 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:25:56 2026 +0200 x86/mwait-idle: Remove unused driver version constant The MWAIT_IDLE_VERSION constant has not been updated since 2016 and serves no useful purpose. The driver version is implicitly defined by the hypervisor version, making this constant redundant. Remove the constant to eliminate potential confusion about version tracking. Signed-off-by: Artem Bityutskiy Reviewed-by: Andy Shevchenko Link: https://patch.msgid.link/20251215111229.132705-1-dedekind1@gmail.com Signed-off-by: Rafael J. Wysocki Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 25ff69011ddf Adjust description to fit our code base. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/mwait-idle.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 6776eeb9ac..48b7a1e721 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -58,7 +58,6 @@ #include -#define MWAIT_IDLE_VERSION "0.4.1" #undef PREFIX #define PREFIX "mwait-idle: " @@ -1636,9 +1635,6 @@ static int __init mwait_idle_probe(void) if (boot_cpu_has(X86_FEATURE_XEN_ARAT)) lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE; - pr_debug(PREFIX "v" MWAIT_IDLE_VERSION " model %#x\n", - boot_cpu_data.model); - pr_debug(PREFIX "lapic_timer_reliable_states %#x\n", lapic_timer_reliable_states); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:44:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300264.1574794 (Exim 4.92) (envelope-from ) id 1wKASI-0001Eu-9i; Tue, 05 May 2026 07:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300264.1574794; Tue, 05 May 2026 07:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASI-0001Em-6s; Tue, 05 May 2026 07:44:34 +0000 Received: by outflank-mailman (input) for mailman id 1300264; Tue, 05 May 2026 07:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASG-0001Eg-KP for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKASG-000q6G-1v for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKASG-00FYxJ-1p for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X0EsFGZkdnlg5sxGDPGWLwjB8SW9esIRhIUQRK/l1+M=; b=FhDLkB8Fmxp4i5J2IBAih5snk3 mdNY3Su7dJdDcb4OCnCuBnnm/60q8DeYsEzGgU2U5mVO9t6o2syTKFAcHbblLeat0Gt8QGYdGIzb9 uywss+cRfwCqxu/GUxYnXxy62n8ZLS4FRRHaAcoDVN4wZfhUAZL1MKOZKHq3cZudXjp4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: remove setup_physical_bridge_port() function Message-Id: Date: Tue, 05 May 2026 07:44:32 +0000 commit 280e4ca4dffd1558d237804a8bf349b9c3874660 Author: Elliott Mitchell AuthorDate: Tue May 5 08:26:41 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:26:41 2026 +0200 tools: remove setup_physical_bridge_port() function Only the setup_virtual_bridge_port() function was used. As such merge that with _setup_bridge_port() and leave that as the remaining function. The last user of setup_physical_bridge_port() was removed in 9fabe55939a8 ("tools/hotplug: Remove network-*"). Signed-off-by: Elliott Mitchell Acked-by: Anthony PERARD --- tools/hotplug/Linux/vif-bridge | 2 +- tools/hotplug/Linux/vif-openvswitch | 2 +- tools/hotplug/Linux/xen-network-common.sh | 22 ++++++---------------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index 906047e82f..6164c7a52f 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -78,7 +78,7 @@ fi case "$command" in add|online) - setup_virtual_bridge_port "$dev" + setup_bridge_port "$dev" set_mtu "$bridge" "$dev" "$type_if" add_to_bridge "$bridge" "$dev" ;; diff --git a/tools/hotplug/Linux/vif-openvswitch b/tools/hotplug/Linux/vif-openvswitch index 18bfb6cefb..a8aea2acb5 100644 --- a/tools/hotplug/Linux/vif-openvswitch +++ b/tools/hotplug/Linux/vif-openvswitch @@ -88,7 +88,7 @@ add_to_openvswitch () { case "$command" in add|online) check_tools - setup_virtual_bridge_port $dev + setup_bridge_port $dev add_to_openvswitch $dev ;; diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 42fa704e8d..0150a4840e 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -79,32 +79,22 @@ find_dhcpd_arg_file() } # configure interfaces which act as pure bridge ports: -_setup_bridge_port() { +setup_bridge_port() { local dev="$1" - local virtual="$2" # take interface down ... ip link set dev ${dev} down - if [ $virtual -ne 0 ] ; then - # Initialise a dummy MAC address. We choose the numerically - # largest non-broadcast address to prevent the address getting - # stolen by an Ethernet bridge for STP purposes. - # (FE:FF:FF:FF:FF:FF) - ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true - fi + # Initialise a dummy MAC address. We choose the numerically + # largest non-broadcast address to prevent the address getting + # stolen by an Ethernet bridge for STP purposes. + # (FE:FF:FF:FF:FF:FF) + ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true # ... and configure it ip address flush dev ${dev} } -setup_physical_bridge_port() { - _setup_bridge_port $1 0 -} -setup_virtual_bridge_port() { - _setup_bridge_port $1 1 -} - # Usage: create_bridge bridge create_bridge () { local bridge=$1 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:44:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300266.1574798 (Exim 4.92) (envelope-from ) id 1wKASS-0001H3-B0; Tue, 05 May 2026 07:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300266.1574798; Tue, 05 May 2026 07:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASS-0001Gw-8L; Tue, 05 May 2026 07:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1300266; Tue, 05 May 2026 07:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASQ-0001Go-O9 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKASQ-000q6M-2K for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKASQ-00FYyV-28 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O9DC0aA5gL/cclVPq9T4FDWqtyPYPi8wy7vC7wYrie8=; b=nAEp5PFeZadUanX4zbAV8AkFe4 V6hTFY2k/IU9hBFHY7qb+OsHc5o30K5MTmN0MrLkbSmfgubdp/4yPCGBGwWuZVkf9GUbwojOEs8uL L1Hu2k8wy9qrQ1YcjkkQL3p8nJmOqs4ldTzX3qnT2eRmjEWS3tGewIiOQ1EMqcZ3lFu8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuidle: split the max_cstate variable Message-Id: Date: Tue, 05 May 2026 07:44:42 +0000 commit 93acfeb78b508984aa815d00629cc8b6b90dc047 Author: Jan Beulich AuthorDate: Tue May 5 08:27:29 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:27:29 2026 +0200 x86/cpuidle: split the max_cstate variable The admin can control the upper bound wanted not only via command line option, but also via XEN_SYSCTL_pm_op_set_max_cstate. While decisions how to set up the system are okay this way as long as we deem the command line option a strict upper bound, what to do during S3 resume should not be based on that potentially varying value. Decisions there need to use solely the strict upper bound we may have enforced ourselves (or which was forced onto us via command line option). Rather than altering pit_broadcast_is_available(), drop the function altogether. It's pretty odd for acpi/cpu_idle.c to call into time.c, just for that to call into acpi/cpu_idle.c again. Fixes: 8d24303023ec ("x86: don't write_tsc() non-zero values on CPUs updating only the lower 32 bits") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/acpi/cpu_idle.c | 37 +++++++++++++++++++++---------------- xen/arch/x86/cpu/intel.c | 4 ++-- xen/arch/x86/cpu/mwait-idle.c | 17 +++++++++-------- xen/arch/x86/include/asm/time.h | 1 - xen/arch/x86/time.c | 11 +++-------- xen/include/xen/acpi.h | 34 +++++++++++++++++++--------------- xen/include/xen/cpuidle.h | 2 +- 7 files changed, 55 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 3001e98a6e..1a749fabd2 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -119,7 +119,7 @@ bool lapic_timer_init(void) lapic_timer_off = hpet_broadcast_enter; lapic_timer_on = hpet_broadcast_exit; } - else if ( pit_broadcast_is_available() ) + else if ( cpuidle_usable_deep_cstate() ) { lapic_timer_off = pit_broadcast_enter; lapic_timer_on = pit_broadcast_exit; @@ -131,12 +131,15 @@ bool lapic_timer_init(void) } void (*__read_mostly pm_idle_save)(void); -unsigned int max_cstate __read_mostly = UINT_MAX; + +unsigned int max_usable_cstate __read_mostly = UINT_MAX; +unsigned int max_allowed_cstate __read_mostly = UINT_MAX; unsigned int max_csubstate __read_mostly = UINT_MAX; static int __init cf_check parse_cstate(const char *s) { - max_cstate = simple_strtoul(s, &s, 0); + max_allowed_cstate = simple_strtoul(s, &s, 0); + max_usable_cstate = max_allowed_cstate; if ( *s == ',' ) max_csubstate = simple_strtoul(s + 1, NULL, 0); return 0; @@ -413,10 +416,11 @@ static void cf_check dump_cx(unsigned char key) unsigned int cpu; printk("'%c' pressed -> printing ACPI Cx structures\n", key); - if ( max_cstate < UINT_MAX ) + if ( max_cstate() < UINT_MAX ) { - printk("max state: C%u\n", max_cstate); - if ( max_csubstate < UINT_MAX ) + printk("max state: C%u\n", max_cstate()); + if ( max_allowed_cstate <= max_usable_cstate && + max_csubstate < UINT_MAX ) printk("max sub-state: %u\n", max_csubstate); else printk("max sub-state: unlimited\n"); @@ -690,18 +694,18 @@ static void cf_check acpi_processor_idle(void) u32 exp = 0, pred = 0; u32 irq_traced[4] = { 0 }; - if ( max_cstate > 0 && power && + if ( max_cstate() > 0 && power && (next_state = cpuidle_current_governor->select(power)) > 0 ) { unsigned int max_state = sched_has_urgent_vcpu() ? ACPI_STATE_C1 - : max_cstate; + : max_cstate(); do { cx = &power->states[next_state]; } while ( (cx->type > max_state || cx->entry_method == ACPI_CSTATE_EM_NONE || (cx->entry_method == ACPI_CSTATE_EM_FFH && - cx->type == max_cstate && + cx->type == max_allowed_cstate && (cx->address & MWAIT_SUBSTATE_MASK) > max_csubstate)) && --next_state ); if ( next_state ) @@ -1448,7 +1452,7 @@ static void amd_cpuidle_init(struct acpi_processor_power *power) for ( i = 0; i < nr; ++i ) { - if ( cx[i].type > max_cstate ) + if ( cx[i].type > max_cstate() ) break; power->states[i + 1] = cx[i]; power->states[i + 1].idx = i + 1; @@ -1611,21 +1615,22 @@ int pmstat_reset_cx_stat(unsigned int cpu) void cpuidle_disable_deep_cstate(void) { - if ( max_cstate > ACPI_STATE_C1 ) + if ( max_usable_cstate > ACPI_STATE_C1 ) { if ( local_apic_timer_c2_ok ) - max_cstate = ACPI_STATE_C2; + max_usable_cstate = ACPI_STATE_C2; else - max_cstate = ACPI_STATE_C1; + max_usable_cstate = ACPI_STATE_C1; } hpet_disable_legacy_broadcast(); } -bool cpuidle_using_deep_cstate(void) +bool cpuidle_usable_deep_cstate(void) { - return xen_cpuidle && max_cstate > (local_apic_timer_c2_ok ? ACPI_STATE_C2 - : ACPI_STATE_C1); + return xen_cpuidle && + max_usable_cstate > (local_apic_timer_c2_ok ? ACPI_STATE_C2 + : ACPI_STATE_C1); } static int cf_check cpu_callback( diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 18b3c79dc9..90c9d36186 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -384,12 +384,12 @@ static void probe_c3_errata(const struct cpuinfo_x86 *c) }; /* Serialized by the AP bringup code. */ - if ( max_cstate > 1 && (c->apicid & (c->x86_num_siblings - 1)) && + if ( max_usable_cstate > 1 && (c->apicid & (c->x86_num_siblings - 1)) && x86_match_cpu(models) ) { printk(XENLOG_WARNING "Disabling C-states C3 and C6 due to CPU errata\n"); - max_cstate = 1; + max_usable_cstate = 1; } } diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 48b7a1e721..c0d5767f87 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -1044,15 +1044,16 @@ static void cf_check mwait_idle(void) u64 before, after; u32 exp = 0, pred = 0, irq_traced[4] = { 0 }; - if (max_cstate > 0 && power && + if (max_cstate() > 0 && power && (next_state = cpuidle_current_governor->select(power)) > 0) { unsigned int max_state = sched_has_urgent_vcpu() ? ACPI_STATE_C1 - : max_cstate; + : max_cstate(); do { cx = &power->states[next_state]; - } while ((cx->type > max_state || (cx->type == max_cstate && - MWAIT_HINT2SUBSTATE(cx->address) > max_csubstate)) && + } while ((cx->type > max_state || + (cx->type == max_allowed_cstate && + MWAIT_HINT2SUBSTATE(cx->address) > max_csubstate)) && --next_state); if (!next_state) cx = NULL; @@ -1457,7 +1458,7 @@ static void __init sklh_idle_state_table_update(void) u64 msr; /* if PC10 disabled via cmdline max_cstate=7 or shallower */ - if (max_cstate <= 7) + if (max_cstate() <= 7) return; /* if PC10 not present in CPUID.MWAIT.EDX */ @@ -1622,7 +1623,7 @@ static int __init mwait_idle_probe(void) !mwait_substates) return -ENODEV; - if (!max_cstate || !opt_mwait_idle) { + if (!max_cstate() || !opt_mwait_idle) { pr_debug(PREFIX "disabled\n"); return -EPERM; } @@ -1710,8 +1711,8 @@ static int cf_check mwait_idle_cpu_init( hint = flg2MWAIT(cpuidle_state_table[cstate].flags); state = MWAIT_HINT2CSTATE(hint) + 1; - if (state > max_cstate) { - printk(PREFIX "max C-state %u reached\n", max_cstate); + if (state > max_cstate()) { + printk(PREFIX "max C-state %u reached\n", max_cstate()); break; } diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index 29e1888ffb..44f995ff05 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -31,7 +31,6 @@ int cpu_frequency_change(u64 freq); void cf_check pit_broadcast_enter(void); void cf_check pit_broadcast_exit(void); -int pit_broadcast_is_available(void); uint64_t cf_check acpi_pm_tick_to_ns(uint64_t ticks); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 008d9e97d9..8209d37d32 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -517,7 +517,7 @@ static int64_t __init cf_check init_hpet(struct platform_timesource *pts) bool disable_hpet = false; if ( hpet_address && strcmp(opt_clocksource, pts->id) && - cpuidle_using_deep_cstate() ) + cpuidle_usable_deep_cstate() ) { if ( pci_conf_read16(PCI_SBDF(0, 0, 0x1f, 0), PCI_VENDOR_ID) == PCI_VENDOR_ID_INTEL ) @@ -2663,7 +2663,7 @@ static int _disable_pit_irq(bool init) * XXX dom0 may rely on RTC interrupt delivery, so only enable * hpet_broadcast if FSB mode available or if force_hpet_broadcast. */ - if ( cpuidle_using_deep_cstate() && !boot_cpu_has(X86_FEATURE_XEN_ARAT) ) + if ( cpuidle_usable_deep_cstate() && !boot_cpu_has(X86_FEATURE_XEN_ARAT) ) { init ? hpet_broadcast_init() : hpet_broadcast_resume(); if ( !hpet_broadcast_is_available() ) @@ -2715,11 +2715,6 @@ void cf_check pit_broadcast_exit(void) reprogram_timer(this_cpu(timer_deadline)); } -int pit_broadcast_is_available(void) -{ - return cpuidle_using_deep_cstate(); -} - void send_timer_event(struct vcpu *v) { send_guest_vcpu_virq(v, VIRQ_TIMER); @@ -3007,7 +3002,7 @@ static void cf_check dump_softtsc(unsigned char key) else if ( boot_cpu_has(X86_FEATURE_CONSTANT_TSC ) ) { printk("TSC has constant rate, "); - if ( max_cstate <= ACPI_STATE_C2 && tsc_max_warp == 0 ) + if ( max_usable_cstate <= ACPI_STATE_C2 && tsc_max_warp == 0 ) printk("no deep Cstates, passed warp test, deemed reliable, "); else printk("deep Cstates possible, so not reliable, "); diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index ca87cd15a8..2fdf38cf74 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -142,30 +142,34 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); #ifdef CONFIG_ACPI_CSTATE /* - * max_cstate sets the highest legal C-state. - * max_cstate = 0: C0 okay, but not C1 - * max_cstate = 1: C1 okay, but not C2 - * max_cstate = 2: C2 okay, but not C3 etc. - - * max_csubstate sets the highest legal C-state sub-state. Only applies to the - * highest legal C-state. - * max_cstate = 1, max_csubstate = 0 ==> C0, C1 okay, but not C1E - * max_cstate = 1, max_csubstate = 1 ==> C0, C1 and C1E okay, but not C2 - * max_cstate = 2, max_csubstate = 0 ==> C0, C1, C1E, C2 okay, but not C3 - * max_cstate = 2, max_csubstate = 1 ==> C0, C1, C1E, C2 okay, but not C3 + * max_{allowed,usable}_cstate sets the highest allowed / usable C-state. + * max_usable_cstate, while affected by the command line, is internally driven, + * whereas max_allowed_cstate can be set from both command line and systcl. + * max_*_cstate = 0: C0 okay, but not C1 + * max_*_cstate = 1: C1 okay, but not C2 + * max_*_cstate = 2: C2 okay, but not C3 etc. + * + * max_csubstate sets the highest allowed C-state sub-state. Only applies to + * the highest allowed C-state. + * max_allowed_cstate = 1, max_csubstate = 0 ==> C0, C1 okay, but not C1E + * max_allowed_cstate = 1, max_csubstate = 1 ==> C0, C1 and C1E okay, but not C2 + * max_allowed_cstate = 2, max_csubstate = 0 ==> C0, C1, C1E, C2 okay, but not C3 + * max_allowed_cstate = 2, max_csubstate = 1 ==> C0, C1, C1E, C2 okay, but not C3 */ -extern unsigned int max_cstate; +extern unsigned int max_usable_cstate; +extern unsigned int max_allowed_cstate; extern unsigned int max_csubstate; +#define max_cstate() min(max_usable_cstate, max_allowed_cstate) + static inline unsigned int acpi_get_cstate_limit(void) { - return max_cstate; + return max_allowed_cstate; } static inline void acpi_set_cstate_limit(unsigned int new_limit) { - max_cstate = new_limit; - return; + max_allowed_cstate = new_limit; } static inline unsigned int acpi_get_csubstate_limit(void) diff --git a/xen/include/xen/cpuidle.h b/xen/include/xen/cpuidle.h index 120e354fe3..80b730cf02 100644 --- a/xen/include/xen/cpuidle.h +++ b/xen/include/xen/cpuidle.h @@ -89,7 +89,7 @@ struct cpuidle_governor extern int8_t xen_cpuidle; extern struct cpuidle_governor *cpuidle_current_governor; -bool cpuidle_using_deep_cstate(void); +bool cpuidle_usable_deep_cstate(void); void cpuidle_disable_deep_cstate(void); #define CPUIDLE_DRIVER_STATE_START 1 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:44:54 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300267.1574802 (Exim 4.92) (envelope-from ) id 1wKASc-0001Jc-Dp; Tue, 05 May 2026 07:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300267.1574802; Tue, 05 May 2026 07:44:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASc-0001JU-B8; Tue, 05 May 2026 07:44:54 +0000 Received: by outflank-mailman (input) for mailman id 1300267; Tue, 05 May 2026 07:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASa-0001JJ-RK for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKASa-000q6Q-2c for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKASa-00FYzG-2W for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fy3toIEyMddZ51x6DSgbFNBzsHeM47yhhyxqZzUdObQ=; b=YhQjpSeTFZR75i6CoVOUEFfi7h CTBairNHDwAjD4VvRc5ZYlQAnR3oHeLI8y90e3nErVeYWuYK08hp9NDQuLSDuFONpaBKYgJXbWF6J o5P0xxpkpEVm6LHU9PFu7ZMJupUFWGOnXydvlha3kiPpnBc0oPpkTKJkwFAqsfDUdWAc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: drop dead code from HVM_PARAM_IDENT_PT setting Message-Id: Date: Tue, 05 May 2026 07:44:52 +0000 commit 76a79d86662053f1144133ecc7b6030c5577bee9 Author: Jan Beulich AuthorDate: Tue May 5 08:28:56 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:28:56 2026 +0200 x86/HVM: drop dead code from HVM_PARAM_IDENT_PT setting The setting of d->arch.hvm.params[] will uniformly happen at the bottom of hvm_set_param(), hence as per Misra's classification redundantly doing so earlier is "dead code". Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/hvm/hvm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4a81afce02..f759a397c5 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4242,10 +4242,7 @@ static int hvm_set_param(struct domain *d, uint32_t index, uint64_t value) * capabilities. Short circuit the pause if possible. */ if ( paging_mode_shadow(d) || !using_vmx() ) - { - d->arch.hvm.params[index] = value; break; - } /* * Update GUEST_CR3 in each VMCS to point at identity map. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:45:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300269.1574805 (Exim 4.92) (envelope-from ) id 1wKASm-0001M2-F8; Tue, 05 May 2026 07:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300269.1574805; Tue, 05 May 2026 07:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASm-0001Lv-Cb; Tue, 05 May 2026 07:45:04 +0000 Received: by outflank-mailman (input) for mailman id 1300269; Tue, 05 May 2026 07:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASk-0001Ln-Ug for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKASk-000q6s-2y for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKASk-00FYzs-2n for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2+GeLl9o1buhLfkwbdqelbgP29iXSe+RgCXbPT5PgpA=; b=paX8tnRMza2guzr9gDap/kZlgo jD/ExsAVj9hlTpMnNoghsaUKYBmEHKF7AfYVd9tU4upIDr3M21khS8+vcdwqPxg9o/ob+vLZHl5dH SQc98lVVcOo981fI7IDPZ6kAzz1l+EvwuT1+B9ef00BLj/04iCSMMNoAWG0xLxfEaC5M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/mm: normalize page count types to unsigned long Message-Id: Date: Tue, 05 May 2026 07:45:02 +0000 commit 48054287a840011bce4c07f3db47ea1a4c669155 Author: Bernhard Kaindl AuthorDate: Tue May 5 08:29:45 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:29:45 2026 +0200 xen/mm: normalize page count types to unsigned long The current use of long for total_avail_pages and outstanding_claims creates an unnecessary mix of signed and unsigned types during page allocation calculations. This necessitates awkward constructs like '+ 0UL' to satisfy type matching in macros such as min(). Address this by normalizing `total_avail_pages` and `outstanding_claims` from `long` to `unsigned long`. As a direct consequence of making `total_avail_pages` unsigned, the post-decrement assertions checking for `>= 0` are no longer logically sound. Adjust those assertions to pre-decrement checks. No functional change intended. Suggested-by: Jan Beulich Signed-off-by: Bernhard Kaindl Reviewed-by: Jan Beulich --- xen/common/page_alloc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b1edef8712..2c4ff2c34c 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -484,10 +484,11 @@ static heap_by_zone_and_order_t *_heap[MAX_NUMNODES]; static unsigned long node_need_scrub[MAX_NUMNODES]; static unsigned long *avail[MAX_NUMNODES]; -static long total_avail_pages; +static unsigned long total_avail_pages; static DEFINE_SPINLOCK(heap_lock); -static long outstanding_claims; /* total outstanding claims by all domains */ +/* Total outstanding claims by all domains */ +static unsigned long outstanding_claims; static unsigned long avail_heap_pages( unsigned int zone_lo, unsigned int zone_hi, unsigned int node) @@ -1047,8 +1048,8 @@ static struct page_info *alloc_heap_pages( ASSERT(avail[node][zone] >= request); avail[node][zone] -= request; + ASSERT(total_avail_pages >= request); total_avail_pages -= request; - ASSERT(total_avail_pages >= 0); if ( d && d->outstanding_pages && !(memflags & MEMF_no_refcount) ) { @@ -1240,8 +1241,8 @@ static int reserve_offlined_page(struct page_info *head) continue; avail[node][zone]--; + ASSERT(total_avail_pages > 0); total_avail_pages--; - ASSERT(total_avail_pages >= 0); page_list_add_tail(cur_head, test_bit(_PGC_broken, &cur_head->count_info) ? -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:45:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 07:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300270.1574810 (Exim 4.92) (envelope-from ) id 1wKASw-0001O4-Gq; Tue, 05 May 2026 07:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300270.1574810; Tue, 05 May 2026 07:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASw-0001Nx-E6; Tue, 05 May 2026 07:45:14 +0000 Received: by outflank-mailman (input) for mailman id 1300270; Tue, 05 May 2026 07:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKASv-0001Np-0u for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:45:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKASu-000q6w-3D for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKASu-00FZ0e-38 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 07:45:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mzFHyFgl7qN+nEIpzj0dcAPM88kEcIiBhmRys3/bWks=; b=BAOMJLyvytxGcT4/et3LAF2Hsl 8pJQamFCzh9hiovodHfcf+fkh3Njm3Zg7m1Sl6bxjdqFcXUtFxAMOy2DSgqs3YpAXjPsNkFhIgN18 /FypKbCwiB6UroL4XOcI1gDMHXwp9huh5c/M+jTBgmmXXT8shC3DkNasx7qxCNnU4Mig=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG: add xenstored watch depth feature Message-Id: Date: Tue, 05 May 2026 07:45:12 +0000 commit 07bff81a219a756309e1c75e967b9c432e59c6e4 Author: Juergen Gross AuthorDate: Tue May 5 08:30:20 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:30:20 2026 +0200 CHANGELOG: add xenstored watch depth feature Signed-off-by: Juergen Gross Acked-by: Oleksii Kurochko --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb41d89997..ce46020dbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added - Support for per-domain Xenstore quota in C xenstored (includes xenstore-stubdom), libxl and xl. + - Support for Xenstore watch depth feature in C xenstored (includes + xenstore-stubdom). - On x86: - Support for Bus Lock Threshold on AMD Zen5 and later CPUs, used by Xen to mitigate (by rate-limiting) the system wide impact of an HVM guest -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:44:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300351.1574877 (Exim 4.92) (envelope-from ) id 1wKBNq-0004ih-GO; Tue, 05 May 2026 08:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300351.1574877; Tue, 05 May 2026 08:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBNq-0004iZ-DQ; Tue, 05 May 2026 08:44:02 +0000 Received: by outflank-mailman (input) for mailman id 1300351; Tue, 05 May 2026 08:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBNp-0004iO-Ki for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBNp-000rmh-1o for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBNp-00FbaB-1g for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jOqKq1XfV5V9GrIwOz7MFqf7syYBcfsl8PZS3apOpnU=; b=B0GzLwQOr+IA5+4sjm/lWCrc5Z VgO3fwNx/KNdZl3UnR+IpjbuSGEkxPjLJYi3xET9WrVpl5bilOijYgFSMEzy6nGu2sze+T3o8DMUJ ExfBfqthYXC46f0PomlrcbpWKtGZ+WrPufD1N1Rjs5tYZzgqR3FFHM1b0lz4/Osh+6k0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: unlock P2M slightly earlier in shadow_track_dirty_vram() Message-Id: Date: Tue, 05 May 2026 08:44:01 +0000 commit d367f87cfd7429aa3646e58e764563ce6f361842 Author: Jan Beulich AuthorDate: Tue May 5 08:20:55 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:20:55 2026 +0200 x86/shadow: unlock P2M slightly earlier in shadow_track_dirty_vram() There's no need to call vfree() with the lock still held. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm/shadow/hvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/hvm.c b/xen/arch/x86/mm/shadow/hvm.c index 3565c7940d..cf4862cbc9 100644 --- a/xen/arch/x86/mm/shadow/hvm.c +++ b/xen/arch/x86/mm/shadow/hvm.c @@ -1200,8 +1200,8 @@ int shadow_track_dirty_vram(struct domain *d, paging_unlock(d); rc = -EFAULT; } - vfree(dirty_bitmap); p2m_unlock(p2m_get_hostp2m(d)); + vfree(dirty_bitmap); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:44:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300354.1574880 (Exim 4.92) (envelope-from ) id 1wKBO0-0004oF-Hg; Tue, 05 May 2026 08:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300354.1574880; Tue, 05 May 2026 08:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBO0-0004o9-Ek; Tue, 05 May 2026 08:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1300354; Tue, 05 May 2026 08:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBNz-0004nz-Md for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBNz-000rmx-28 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBNz-00FbbM-1z for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hBMASSHTLhPYF/lcctEavXnESGbDwpJ/T3Cbvd2l05Y=; b=Yy5Fn27V0IGQfifxgl11pgHeZc TJ6v6mcf3Qy/g213fRCuaGY+/oBqVNc9wvPr0lFjdYsRtxk55MpMppzpAm094o1rmGNtRt2e+s4Jc lGb8JX7H4GP2S9zprElMCsiR/nGIy2CJSm8iPqKFDVjwMvcg5Eak1XLkUVFUrYur6kXA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Arm: device.c is init-only when OVERLAY_DTB=n Message-Id: Date: Tue, 05 May 2026 08:44:11 +0000 commit 227a9aae44a31c440f05e66ed0841b21fb99837d Author: Jan Beulich AuthorDate: Tue May 5 08:21:45 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:21:45 2026 +0200 Arm: device.c is init-only when OVERLAY_DTB=n Introduce an annotation similar to __hwdom_init and use it througout the file. All external callers are either themselves __init or are limited to OVERLAY_DTB=y. Adjust the Makefile accordingly to also have string literals moved into .init.rodata. Signed-off-by: Jan Beulich Reviewed-by: Michal Orzel --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/device.c | 33 ++++++++++++++++++--------------- xen/include/xen/dt-overlay.h | 8 ++++++++ 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 69200b2728..982c6c396a 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_HAS_ALTERNATIVE) += alternative.o obj-y += cpuerrata.o obj-y += cpufeature.o obj-y += decode.o -obj-y += device.o +obj-y += $(if $(CONFIG_OVERLAY_DTB),device.o,device.init.o) obj-$(CONFIG_IOREQ_SERVER) += dm.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-y += domain.o diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index 74b54cad34..7d9644fd8b 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -16,8 +17,8 @@ #include #include -int map_irq_to_domain(struct domain *d, unsigned int irq, - bool need_mapping, const char *devname) +int __overlay_init map_irq_to_domain(struct domain *d, unsigned int irq, + bool need_mapping, const char *devname) { int res; @@ -49,8 +50,8 @@ int map_irq_to_domain(struct domain *d, unsigned int irq, return 0; } -int map_range_to_domain(const struct dt_device_node *dev, - uint64_t addr, uint64_t len, void *data) +int __overlay_init map_range_to_domain(const struct dt_device_node *dev, + uint64_t addr, uint64_t len, void *data) { struct map_range_data *mr_data = data; struct domain *d = mr_data->d; @@ -124,10 +125,10 @@ int map_range_to_domain(const struct dt_device_node *dev, * < 0 error * 0 success */ -int map_device_irqs_to_domain(struct domain *d, - struct dt_device_node *dev, - bool need_mapping, - struct rangeset *irq_ranges) +int __overlay_init map_device_irqs_to_domain(struct domain *d, + struct dt_device_node *dev, + bool need_mapping, + struct rangeset *irq_ranges) { unsigned int i, nirq; int res, irq; @@ -180,9 +181,9 @@ int map_device_irqs_to_domain(struct domain *d, return 0; } -static int map_dt_irq_to_domain(const struct dt_device_node *dev, - const struct dt_irq *dt_irq, - void *data) +static int __overlay_init map_dt_irq_to_domain(const struct dt_device_node *dev, + const struct dt_irq *dt_irq, + void *data) { struct map_range_data *mr_data = data; struct domain *d = mr_data->d; @@ -219,8 +220,8 @@ static int map_dt_irq_to_domain(const struct dt_device_node *dev, * then we may need to perform additional mappings in order to make * the child resources available to domain 0. */ -static int map_device_children(const struct dt_device_node *dev, - struct map_range_data *mr_data) +static int __overlay_init map_device_children(const struct dt_device_node *dev, + struct map_range_data *mr_data) { if ( dt_device_type_is_equal(dev, "pci") ) { @@ -250,8 +251,10 @@ static int map_device_children(const struct dt_device_node *dev, * - Assign the device to the guest if it's protected by an IOMMU * - Map the IRQs and iomem regions to DOM0 */ -int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt, - struct rangeset *iomem_ranges, struct rangeset *irq_ranges) +int __overlay_init handle_device(struct domain *d, struct dt_device_node *dev, + p2m_type_t p2mt, + struct rangeset *iomem_ranges, + struct rangeset *irq_ranges) { unsigned int naddr; unsigned int i; diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h index b2cedf3f2a..7400382842 100644 --- a/xen/include/xen/dt-overlay.h +++ b/xen/include/xen/dt-overlay.h @@ -42,10 +42,18 @@ struct xen_sysctl_dt_overlay; struct xen_domctl_dt_overlay; #ifdef CONFIG_OVERLAY_DTB + +#define __overlay_init + long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op); long dt_overlay_domctl(struct domain *d, struct xen_domctl_dt_overlay *op); + #else + #include + +#define __overlay_init __init + static inline long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) { return -EOPNOTSUPP; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:44:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300355.1574885 (Exim 4.92) (envelope-from ) id 1wKBOB-0004sj-J4; Tue, 05 May 2026 08:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300355.1574885; Tue, 05 May 2026 08:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOB-0004sb-GC; Tue, 05 May 2026 08:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1300355; Tue, 05 May 2026 08:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBO9-0004sH-Ox for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBO9-000rnJ-2O for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBO9-00FbcO-2J for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QaPdDTceEYVHglb2/O8Z9slK/HESr16viKaMT9HZXrU=; b=D+K8tlOfeTbEYDtR0M32jPazA+ kf8oLJo56gimPNhvEN7c/gnkAXtiemY/85ggkgxXjl1Mtq+6sH3kyXSgMEgTrq1dBoPOTMgu8jcH9 5NQxzs1JtckwTUJmur2SELYRkVxbTx5QVFtylOGDCR0PcRK8h36+FBQVWogkoix8P6LU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mwait-idle: Remove unused driver version constant Message-Id: Date: Tue, 05 May 2026 08:44:21 +0000 commit 6c9344ee3d48b8bb7758c72d9e4eeb8841b8f7ec Author: Artem Bityutskiy AuthorDate: Tue May 5 08:25:56 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:25:56 2026 +0200 x86/mwait-idle: Remove unused driver version constant The MWAIT_IDLE_VERSION constant has not been updated since 2016 and serves no useful purpose. The driver version is implicitly defined by the hypervisor version, making this constant redundant. Remove the constant to eliminate potential confusion about version tracking. Signed-off-by: Artem Bityutskiy Reviewed-by: Andy Shevchenko Link: https://patch.msgid.link/20251215111229.132705-1-dedekind1@gmail.com Signed-off-by: Rafael J. Wysocki Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 25ff69011ddf Adjust description to fit our code base. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/mwait-idle.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 6776eeb9ac..48b7a1e721 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -58,7 +58,6 @@ #include -#define MWAIT_IDLE_VERSION "0.4.1" #undef PREFIX #define PREFIX "mwait-idle: " @@ -1636,9 +1635,6 @@ static int __init mwait_idle_probe(void) if (boot_cpu_has(X86_FEATURE_XEN_ARAT)) lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE; - pr_debug(PREFIX "v" MWAIT_IDLE_VERSION " model %#x\n", - boot_cpu_data.model); - pr_debug(PREFIX "lapic_timer_reliable_states %#x\n", lapic_timer_reliable_states); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:44:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300356.1574888 (Exim 4.92) (envelope-from ) id 1wKBOL-0004vq-Ke; Tue, 05 May 2026 08:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300356.1574888; Tue, 05 May 2026 08:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOL-0004vj-HX; Tue, 05 May 2026 08:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1300356; Tue, 05 May 2026 08:44:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOJ-0004vU-SI for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBOJ-000rnZ-2i for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBOJ-00FbdZ-2Z for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=itPRqomsy6oQ2FTNB8NwkNVGl4jUwSOYMDpjRFK3Ixk=; b=C7kblBqBlkuLBSIMchb4Lrpc4M TU2dbsBst2pRn0RjcdCecRBNxx7KipXbAWcLa0QfeROqpYFTK4MG5bvDHbjYxVcmnHdp9FvrfPsut CT3YCrD5VnahONrGaEXBhh6t/c3+Q66k+3SJVjyC8Ea2cIAH95UUwD2HbUcYYf/QM7CI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: remove setup_physical_bridge_port() function Message-Id: Date: Tue, 05 May 2026 08:44:31 +0000 commit 280e4ca4dffd1558d237804a8bf349b9c3874660 Author: Elliott Mitchell AuthorDate: Tue May 5 08:26:41 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:26:41 2026 +0200 tools: remove setup_physical_bridge_port() function Only the setup_virtual_bridge_port() function was used. As such merge that with _setup_bridge_port() and leave that as the remaining function. The last user of setup_physical_bridge_port() was removed in 9fabe55939a8 ("tools/hotplug: Remove network-*"). Signed-off-by: Elliott Mitchell Acked-by: Anthony PERARD --- tools/hotplug/Linux/vif-bridge | 2 +- tools/hotplug/Linux/vif-openvswitch | 2 +- tools/hotplug/Linux/xen-network-common.sh | 22 ++++++---------------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index 906047e82f..6164c7a52f 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -78,7 +78,7 @@ fi case "$command" in add|online) - setup_virtual_bridge_port "$dev" + setup_bridge_port "$dev" set_mtu "$bridge" "$dev" "$type_if" add_to_bridge "$bridge" "$dev" ;; diff --git a/tools/hotplug/Linux/vif-openvswitch b/tools/hotplug/Linux/vif-openvswitch index 18bfb6cefb..a8aea2acb5 100644 --- a/tools/hotplug/Linux/vif-openvswitch +++ b/tools/hotplug/Linux/vif-openvswitch @@ -88,7 +88,7 @@ add_to_openvswitch () { case "$command" in add|online) check_tools - setup_virtual_bridge_port $dev + setup_bridge_port $dev add_to_openvswitch $dev ;; diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 42fa704e8d..0150a4840e 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -79,32 +79,22 @@ find_dhcpd_arg_file() } # configure interfaces which act as pure bridge ports: -_setup_bridge_port() { +setup_bridge_port() { local dev="$1" - local virtual="$2" # take interface down ... ip link set dev ${dev} down - if [ $virtual -ne 0 ] ; then - # Initialise a dummy MAC address. We choose the numerically - # largest non-broadcast address to prevent the address getting - # stolen by an Ethernet bridge for STP purposes. - # (FE:FF:FF:FF:FF:FF) - ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true - fi + # Initialise a dummy MAC address. We choose the numerically + # largest non-broadcast address to prevent the address getting + # stolen by an Ethernet bridge for STP purposes. + # (FE:FF:FF:FF:FF:FF) + ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true # ... and configure it ip address flush dev ${dev} } -setup_physical_bridge_port() { - _setup_bridge_port $1 0 -} -setup_virtual_bridge_port() { - _setup_bridge_port $1 1 -} - # Usage: create_bridge bridge create_bridge () { local bridge=$1 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:44:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300357.1574893 (Exim 4.92) (envelope-from ) id 1wKBOV-0004z4-Nj; Tue, 05 May 2026 08:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300357.1574893; Tue, 05 May 2026 08:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOV-0004yx-L4; Tue, 05 May 2026 08:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1300357; Tue, 05 May 2026 08:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOT-0004yj-VM for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBOT-000rnh-32 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBOT-00Fbeb-2v for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:41 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zHsC5fHmo0fptwjqMxM/dirclgZYmaUfUtMMDT4pjFA=; b=PZ/c9aGImjXzppLRevBbLCqV4U /V+XenlysM4wpY2zDOQU0YrIpUm7+Jy4RBMiKAGE6wRUD1cFKS1Dn01Zw8KK237s9eVUHkQPHzGbj UX2jK5hS9QhoAMttdlVySXiH7j3JXhTV82tBLQ9u1x/HXi97qdeuCeGs4tsqrgHnnZqs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuidle: split the max_cstate variable Message-Id: Date: Tue, 05 May 2026 08:44:41 +0000 commit 93acfeb78b508984aa815d00629cc8b6b90dc047 Author: Jan Beulich AuthorDate: Tue May 5 08:27:29 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:27:29 2026 +0200 x86/cpuidle: split the max_cstate variable The admin can control the upper bound wanted not only via command line option, but also via XEN_SYSCTL_pm_op_set_max_cstate. While decisions how to set up the system are okay this way as long as we deem the command line option a strict upper bound, what to do during S3 resume should not be based on that potentially varying value. Decisions there need to use solely the strict upper bound we may have enforced ourselves (or which was forced onto us via command line option). Rather than altering pit_broadcast_is_available(), drop the function altogether. It's pretty odd for acpi/cpu_idle.c to call into time.c, just for that to call into acpi/cpu_idle.c again. Fixes: 8d24303023ec ("x86: don't write_tsc() non-zero values on CPUs updating only the lower 32 bits") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/acpi/cpu_idle.c | 37 +++++++++++++++++++++---------------- xen/arch/x86/cpu/intel.c | 4 ++-- xen/arch/x86/cpu/mwait-idle.c | 17 +++++++++-------- xen/arch/x86/include/asm/time.h | 1 - xen/arch/x86/time.c | 11 +++-------- xen/include/xen/acpi.h | 34 +++++++++++++++++++--------------- xen/include/xen/cpuidle.h | 2 +- 7 files changed, 55 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 3001e98a6e..1a749fabd2 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -119,7 +119,7 @@ bool lapic_timer_init(void) lapic_timer_off = hpet_broadcast_enter; lapic_timer_on = hpet_broadcast_exit; } - else if ( pit_broadcast_is_available() ) + else if ( cpuidle_usable_deep_cstate() ) { lapic_timer_off = pit_broadcast_enter; lapic_timer_on = pit_broadcast_exit; @@ -131,12 +131,15 @@ bool lapic_timer_init(void) } void (*__read_mostly pm_idle_save)(void); -unsigned int max_cstate __read_mostly = UINT_MAX; + +unsigned int max_usable_cstate __read_mostly = UINT_MAX; +unsigned int max_allowed_cstate __read_mostly = UINT_MAX; unsigned int max_csubstate __read_mostly = UINT_MAX; static int __init cf_check parse_cstate(const char *s) { - max_cstate = simple_strtoul(s, &s, 0); + max_allowed_cstate = simple_strtoul(s, &s, 0); + max_usable_cstate = max_allowed_cstate; if ( *s == ',' ) max_csubstate = simple_strtoul(s + 1, NULL, 0); return 0; @@ -413,10 +416,11 @@ static void cf_check dump_cx(unsigned char key) unsigned int cpu; printk("'%c' pressed -> printing ACPI Cx structures\n", key); - if ( max_cstate < UINT_MAX ) + if ( max_cstate() < UINT_MAX ) { - printk("max state: C%u\n", max_cstate); - if ( max_csubstate < UINT_MAX ) + printk("max state: C%u\n", max_cstate()); + if ( max_allowed_cstate <= max_usable_cstate && + max_csubstate < UINT_MAX ) printk("max sub-state: %u\n", max_csubstate); else printk("max sub-state: unlimited\n"); @@ -690,18 +694,18 @@ static void cf_check acpi_processor_idle(void) u32 exp = 0, pred = 0; u32 irq_traced[4] = { 0 }; - if ( max_cstate > 0 && power && + if ( max_cstate() > 0 && power && (next_state = cpuidle_current_governor->select(power)) > 0 ) { unsigned int max_state = sched_has_urgent_vcpu() ? ACPI_STATE_C1 - : max_cstate; + : max_cstate(); do { cx = &power->states[next_state]; } while ( (cx->type > max_state || cx->entry_method == ACPI_CSTATE_EM_NONE || (cx->entry_method == ACPI_CSTATE_EM_FFH && - cx->type == max_cstate && + cx->type == max_allowed_cstate && (cx->address & MWAIT_SUBSTATE_MASK) > max_csubstate)) && --next_state ); if ( next_state ) @@ -1448,7 +1452,7 @@ static void amd_cpuidle_init(struct acpi_processor_power *power) for ( i = 0; i < nr; ++i ) { - if ( cx[i].type > max_cstate ) + if ( cx[i].type > max_cstate() ) break; power->states[i + 1] = cx[i]; power->states[i + 1].idx = i + 1; @@ -1611,21 +1615,22 @@ int pmstat_reset_cx_stat(unsigned int cpu) void cpuidle_disable_deep_cstate(void) { - if ( max_cstate > ACPI_STATE_C1 ) + if ( max_usable_cstate > ACPI_STATE_C1 ) { if ( local_apic_timer_c2_ok ) - max_cstate = ACPI_STATE_C2; + max_usable_cstate = ACPI_STATE_C2; else - max_cstate = ACPI_STATE_C1; + max_usable_cstate = ACPI_STATE_C1; } hpet_disable_legacy_broadcast(); } -bool cpuidle_using_deep_cstate(void) +bool cpuidle_usable_deep_cstate(void) { - return xen_cpuidle && max_cstate > (local_apic_timer_c2_ok ? ACPI_STATE_C2 - : ACPI_STATE_C1); + return xen_cpuidle && + max_usable_cstate > (local_apic_timer_c2_ok ? ACPI_STATE_C2 + : ACPI_STATE_C1); } static int cf_check cpu_callback( diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 18b3c79dc9..90c9d36186 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -384,12 +384,12 @@ static void probe_c3_errata(const struct cpuinfo_x86 *c) }; /* Serialized by the AP bringup code. */ - if ( max_cstate > 1 && (c->apicid & (c->x86_num_siblings - 1)) && + if ( max_usable_cstate > 1 && (c->apicid & (c->x86_num_siblings - 1)) && x86_match_cpu(models) ) { printk(XENLOG_WARNING "Disabling C-states C3 and C6 due to CPU errata\n"); - max_cstate = 1; + max_usable_cstate = 1; } } diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 48b7a1e721..c0d5767f87 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -1044,15 +1044,16 @@ static void cf_check mwait_idle(void) u64 before, after; u32 exp = 0, pred = 0, irq_traced[4] = { 0 }; - if (max_cstate > 0 && power && + if (max_cstate() > 0 && power && (next_state = cpuidle_current_governor->select(power)) > 0) { unsigned int max_state = sched_has_urgent_vcpu() ? ACPI_STATE_C1 - : max_cstate; + : max_cstate(); do { cx = &power->states[next_state]; - } while ((cx->type > max_state || (cx->type == max_cstate && - MWAIT_HINT2SUBSTATE(cx->address) > max_csubstate)) && + } while ((cx->type > max_state || + (cx->type == max_allowed_cstate && + MWAIT_HINT2SUBSTATE(cx->address) > max_csubstate)) && --next_state); if (!next_state) cx = NULL; @@ -1457,7 +1458,7 @@ static void __init sklh_idle_state_table_update(void) u64 msr; /* if PC10 disabled via cmdline max_cstate=7 or shallower */ - if (max_cstate <= 7) + if (max_cstate() <= 7) return; /* if PC10 not present in CPUID.MWAIT.EDX */ @@ -1622,7 +1623,7 @@ static int __init mwait_idle_probe(void) !mwait_substates) return -ENODEV; - if (!max_cstate || !opt_mwait_idle) { + if (!max_cstate() || !opt_mwait_idle) { pr_debug(PREFIX "disabled\n"); return -EPERM; } @@ -1710,8 +1711,8 @@ static int cf_check mwait_idle_cpu_init( hint = flg2MWAIT(cpuidle_state_table[cstate].flags); state = MWAIT_HINT2CSTATE(hint) + 1; - if (state > max_cstate) { - printk(PREFIX "max C-state %u reached\n", max_cstate); + if (state > max_cstate()) { + printk(PREFIX "max C-state %u reached\n", max_cstate()); break; } diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index 29e1888ffb..44f995ff05 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -31,7 +31,6 @@ int cpu_frequency_change(u64 freq); void cf_check pit_broadcast_enter(void); void cf_check pit_broadcast_exit(void); -int pit_broadcast_is_available(void); uint64_t cf_check acpi_pm_tick_to_ns(uint64_t ticks); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 008d9e97d9..8209d37d32 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -517,7 +517,7 @@ static int64_t __init cf_check init_hpet(struct platform_timesource *pts) bool disable_hpet = false; if ( hpet_address && strcmp(opt_clocksource, pts->id) && - cpuidle_using_deep_cstate() ) + cpuidle_usable_deep_cstate() ) { if ( pci_conf_read16(PCI_SBDF(0, 0, 0x1f, 0), PCI_VENDOR_ID) == PCI_VENDOR_ID_INTEL ) @@ -2663,7 +2663,7 @@ static int _disable_pit_irq(bool init) * XXX dom0 may rely on RTC interrupt delivery, so only enable * hpet_broadcast if FSB mode available or if force_hpet_broadcast. */ - if ( cpuidle_using_deep_cstate() && !boot_cpu_has(X86_FEATURE_XEN_ARAT) ) + if ( cpuidle_usable_deep_cstate() && !boot_cpu_has(X86_FEATURE_XEN_ARAT) ) { init ? hpet_broadcast_init() : hpet_broadcast_resume(); if ( !hpet_broadcast_is_available() ) @@ -2715,11 +2715,6 @@ void cf_check pit_broadcast_exit(void) reprogram_timer(this_cpu(timer_deadline)); } -int pit_broadcast_is_available(void) -{ - return cpuidle_using_deep_cstate(); -} - void send_timer_event(struct vcpu *v) { send_guest_vcpu_virq(v, VIRQ_TIMER); @@ -3007,7 +3002,7 @@ static void cf_check dump_softtsc(unsigned char key) else if ( boot_cpu_has(X86_FEATURE_CONSTANT_TSC ) ) { printk("TSC has constant rate, "); - if ( max_cstate <= ACPI_STATE_C2 && tsc_max_warp == 0 ) + if ( max_usable_cstate <= ACPI_STATE_C2 && tsc_max_warp == 0 ) printk("no deep Cstates, passed warp test, deemed reliable, "); else printk("deep Cstates possible, so not reliable, "); diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index ca87cd15a8..2fdf38cf74 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -142,30 +142,34 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); #ifdef CONFIG_ACPI_CSTATE /* - * max_cstate sets the highest legal C-state. - * max_cstate = 0: C0 okay, but not C1 - * max_cstate = 1: C1 okay, but not C2 - * max_cstate = 2: C2 okay, but not C3 etc. - - * max_csubstate sets the highest legal C-state sub-state. Only applies to the - * highest legal C-state. - * max_cstate = 1, max_csubstate = 0 ==> C0, C1 okay, but not C1E - * max_cstate = 1, max_csubstate = 1 ==> C0, C1 and C1E okay, but not C2 - * max_cstate = 2, max_csubstate = 0 ==> C0, C1, C1E, C2 okay, but not C3 - * max_cstate = 2, max_csubstate = 1 ==> C0, C1, C1E, C2 okay, but not C3 + * max_{allowed,usable}_cstate sets the highest allowed / usable C-state. + * max_usable_cstate, while affected by the command line, is internally driven, + * whereas max_allowed_cstate can be set from both command line and systcl. + * max_*_cstate = 0: C0 okay, but not C1 + * max_*_cstate = 1: C1 okay, but not C2 + * max_*_cstate = 2: C2 okay, but not C3 etc. + * + * max_csubstate sets the highest allowed C-state sub-state. Only applies to + * the highest allowed C-state. + * max_allowed_cstate = 1, max_csubstate = 0 ==> C0, C1 okay, but not C1E + * max_allowed_cstate = 1, max_csubstate = 1 ==> C0, C1 and C1E okay, but not C2 + * max_allowed_cstate = 2, max_csubstate = 0 ==> C0, C1, C1E, C2 okay, but not C3 + * max_allowed_cstate = 2, max_csubstate = 1 ==> C0, C1, C1E, C2 okay, but not C3 */ -extern unsigned int max_cstate; +extern unsigned int max_usable_cstate; +extern unsigned int max_allowed_cstate; extern unsigned int max_csubstate; +#define max_cstate() min(max_usable_cstate, max_allowed_cstate) + static inline unsigned int acpi_get_cstate_limit(void) { - return max_cstate; + return max_allowed_cstate; } static inline void acpi_set_cstate_limit(unsigned int new_limit) { - max_cstate = new_limit; - return; + max_allowed_cstate = new_limit; } static inline unsigned int acpi_get_csubstate_limit(void) diff --git a/xen/include/xen/cpuidle.h b/xen/include/xen/cpuidle.h index 120e354fe3..80b730cf02 100644 --- a/xen/include/xen/cpuidle.h +++ b/xen/include/xen/cpuidle.h @@ -89,7 +89,7 @@ struct cpuidle_governor extern int8_t xen_cpuidle; extern struct cpuidle_governor *cpuidle_current_governor; -bool cpuidle_using_deep_cstate(void); +bool cpuidle_usable_deep_cstate(void); void cpuidle_disable_deep_cstate(void); #define CPUIDLE_DRIVER_STATE_START 1 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:44:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300359.1574897 (Exim 4.92) (envelope-from ) id 1wKBOf-00051a-PJ; Tue, 05 May 2026 08:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300359.1574897; Tue, 05 May 2026 08:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOf-00051S-Mc; Tue, 05 May 2026 08:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1300359; Tue, 05 May 2026 08:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOe-00051L-2l for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBOe-000rnl-08 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBOe-00Fbfs-01 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u0VnquyuuGXC7DgE3cCU0uwJFrKOCTaUpt5gipEEIbE=; b=KzO/17PqSm6wVCGO02MqMm/B2a 9Jc1MA+jPJgfkmYs2ZSCqrz/4vVcz+2WxP3ADZGEZyM5AmwJayrwlkq3egXVvCowVElpu+81jFg2F v+pkI8VKtIaNJ3G2UPv2eeauwPs2MrN97ySymqLo1m+QxRn5YlmkZUPXJrrgHLf1FCdw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: drop dead code from HVM_PARAM_IDENT_PT setting Message-Id: Date: Tue, 05 May 2026 08:44:52 +0000 commit 76a79d86662053f1144133ecc7b6030c5577bee9 Author: Jan Beulich AuthorDate: Tue May 5 08:28:56 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:28:56 2026 +0200 x86/HVM: drop dead code from HVM_PARAM_IDENT_PT setting The setting of d->arch.hvm.params[] will uniformly happen at the bottom of hvm_set_param(), hence as per Misra's classification redundantly doing so earlier is "dead code". Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/hvm/hvm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4a81afce02..f759a397c5 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4242,10 +4242,7 @@ static int hvm_set_param(struct domain *d, uint32_t index, uint64_t value) * capabilities. Short circuit the pause if possible. */ if ( paging_mode_shadow(d) || !using_vmx() ) - { - d->arch.hvm.params[index] = value; break; - } /* * Update GUEST_CR3 in each VMCS to point at identity map. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:45:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300360.1574901 (Exim 4.92) (envelope-from ) id 1wKBOp-000547-QW; Tue, 05 May 2026 08:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300360.1574901; Tue, 05 May 2026 08:45:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOp-00053z-Ny; Tue, 05 May 2026 08:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1300360; Tue, 05 May 2026 08:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOo-00053S-5Z for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBOo-000roD-0T for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBOo-00Fbgc-0J for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uqqYy2R9cteLIxAOKwqndLXAOwfzMcWcc+v/YhZAoGo=; b=r5m603TuFN0pSjGQsnw+IRz4kL x0Ffv5bU+SJN5YjxMuPAsS/WsQqlFihVinR5g/UetmC6MDVn+4/hf0ai3+sA7/WDd2IsvC6XlJX0y N/LI+jwwECAYwp8+hntCFXI2HvbgKV/NLFGirCkOz9c8o0LMXAWXmVVzx6yh2sdAtXPs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/mm: normalize page count types to unsigned long Message-Id: Date: Tue, 05 May 2026 08:45:02 +0000 commit 48054287a840011bce4c07f3db47ea1a4c669155 Author: Bernhard Kaindl AuthorDate: Tue May 5 08:29:45 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:29:45 2026 +0200 xen/mm: normalize page count types to unsigned long The current use of long for total_avail_pages and outstanding_claims creates an unnecessary mix of signed and unsigned types during page allocation calculations. This necessitates awkward constructs like '+ 0UL' to satisfy type matching in macros such as min(). Address this by normalizing `total_avail_pages` and `outstanding_claims` from `long` to `unsigned long`. As a direct consequence of making `total_avail_pages` unsigned, the post-decrement assertions checking for `>= 0` are no longer logically sound. Adjust those assertions to pre-decrement checks. No functional change intended. Suggested-by: Jan Beulich Signed-off-by: Bernhard Kaindl Reviewed-by: Jan Beulich --- xen/common/page_alloc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b1edef8712..2c4ff2c34c 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -484,10 +484,11 @@ static heap_by_zone_and_order_t *_heap[MAX_NUMNODES]; static unsigned long node_need_scrub[MAX_NUMNODES]; static unsigned long *avail[MAX_NUMNODES]; -static long total_avail_pages; +static unsigned long total_avail_pages; static DEFINE_SPINLOCK(heap_lock); -static long outstanding_claims; /* total outstanding claims by all domains */ +/* Total outstanding claims by all domains */ +static unsigned long outstanding_claims; static unsigned long avail_heap_pages( unsigned int zone_lo, unsigned int zone_hi, unsigned int node) @@ -1047,8 +1048,8 @@ static struct page_info *alloc_heap_pages( ASSERT(avail[node][zone] >= request); avail[node][zone] -= request; + ASSERT(total_avail_pages >= request); total_avail_pages -= request; - ASSERT(total_avail_pages >= 0); if ( d && d->outstanding_pages && !(memflags & MEMF_no_refcount) ) { @@ -1240,8 +1241,8 @@ static int reserve_offlined_page(struct page_info *head) continue; avail[node][zone]--; + ASSERT(total_avail_pages > 0); total_avail_pages--; - ASSERT(total_avail_pages >= 0); page_list_add_tail(cur_head, test_bit(_PGC_broken, &cur_head->count_info) ? -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 08:45:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 08:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300361.1574905 (Exim 4.92) (envelope-from ) id 1wKBOz-00056e-Rw; Tue, 05 May 2026 08:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300361.1574905; Tue, 05 May 2026 08:45:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOz-00056W-PM; Tue, 05 May 2026 08:45:13 +0000 Received: by outflank-mailman (input) for mailman id 1300361; Tue, 05 May 2026 08:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKBOy-00056I-8R for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKBOy-000roL-0i for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKBOy-00Fbh4-0d for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 08:45:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=G9SmQmuJXWbflg4R0QKzTFkPNlljM/2Zuk++/e6Hk2c=; b=6RGrC5YFpTt6XYDZ8PqwXuhA2R 4OHU5Ki35xKm2MC2f9PhGK8Hn1EVG4g7q7gGXpnIiK+esD9XTuD3vBuU4iTzgZPADgXIKRQbESIWP YorYwtJAeqGLfaoVsqecw/VWeu/Fysfi7uyAdfjPLDYaP/C7KIEZQoQTrWSO7sZpjeK0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG: add xenstored watch depth feature Message-Id: Date: Tue, 05 May 2026 08:45:12 +0000 commit 07bff81a219a756309e1c75e967b9c432e59c6e4 Author: Juergen Gross AuthorDate: Tue May 5 08:30:20 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 5 08:30:20 2026 +0200 CHANGELOG: add xenstored watch depth feature Signed-off-by: Juergen Gross Acked-by: Oleksii Kurochko --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb41d89997..ce46020dbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added - Support for per-domain Xenstore quota in C xenstored (includes xenstore-stubdom), libxl and xl. + - Support for Xenstore watch depth feature in C xenstored (includes + xenstore-stubdom). - On x86: - Support for Bus Lock Threshold on AMD Zen5 and later CPUs, used by Xen to mitigate (by rate-limiting) the system wide impact of an HVM guest -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 10:55:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 10:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300560.1575089 (Exim 4.92) (envelope-from ) id 1wKDQd-0008Je-JT; Tue, 05 May 2026 10:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300560.1575089; Tue, 05 May 2026 10:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKDQd-0008JW-Gr; Tue, 05 May 2026 10:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1300560; Tue, 05 May 2026 10:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKDQc-0008JM-HM for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKDQc-000uNR-1V for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKDQc-00FiXu-1M for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Prd6xVTW9Wp6qlolDqyf5TQFKIbg2uIkzvz/UBTHgNM=; b=W6z3whz4Q5k2qhv6wz2+9x7Yjf p4uSBWleietolsVMnGod9ywjmLMFARl7pJEqLJStKibILpP2YGQQqv/xRu5fvqK2SF42b6j2lYDZA o9/PPZdEHJk/vDSUDAUMTFqwJj9AcpI2GnPQaTEH0p+6WvfRFhzFgY5tHbheVgNejcUM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ARM/vgic: Use for_each_set_bit() in vgic_sync_from_lrs() Message-Id: Date: Tue, 05 May 2026 10:55:02 +0000 commit b4fd29dfe1f8114f5b978a5f8307ba37f1d9595d Author: Andrew Cooper AuthorDate: Wed Feb 25 13:20:12 2026 +0000 Commit: Andrew Cooper CommitDate: Tue May 5 11:45:00 2026 +0100 ARM/vgic: Use for_each_set_bit() in vgic_sync_from_lrs() lr_mask doesn't have bits set beyond the hardware limit, with the upper bits remaining zero. Therefore, for_each_set_bit() is a better option. For ARM64, bloat-o-meter reports: Function old new delta vgic_sync_from_lrs 208 168 -40 but this doesn't highlight that it also removes a call to find_next_bit() from each loop iteration. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/gic-vgic.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/xen/arch/arm/gic-vgic.c b/xen/arch/arm/gic-vgic.c index ea48c5375a..fae80e6cd2 100644 --- a/xen/arch/arm/gic-vgic.c +++ b/xen/arch/arm/gic-vgic.c @@ -241,9 +241,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) void vgic_sync_from_lrs(struct vcpu *v) { - int i = 0; unsigned long flags; - unsigned int nr_lrs = gic_get_nr_lrs(); /* The idle domain has no LRs to be cleared. Since gic_restore_state * doesn't write any LR registers for the idle domain they could be @@ -255,11 +253,8 @@ void vgic_sync_from_lrs(struct vcpu *v) spin_lock_irqsave(&v->arch.vgic.lock, flags); - while ((i = find_next_bit((const unsigned long *) &this_cpu(lr_mask), - nr_lrs, i)) < nr_lrs ) { + for_each_set_bit ( i, this_cpu(lr_mask) ) gic_update_one_lr(v, i); - i++; - } spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 10:55:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 10:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300561.1575092 (Exim 4.92) (envelope-from ) id 1wKDQn-0008Lh-Kk; Tue, 05 May 2026 10:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300561.1575092; Tue, 05 May 2026 10:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKDQn-0008LZ-IC; Tue, 05 May 2026 10:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1300561; Tue, 05 May 2026 10:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKDQm-0008LR-Jc for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKDQm-000uNV-1o for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKDQm-00FiYZ-1g for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KV0ykAXnZyqkZ6/FV5y3vDM1PfE6P92HeNMAO6uUhow=; b=Ql/1N6JsQH8RC3MqDtMuNKduwi ha95rjdMArb/+oX93EYBJrto+QzgnCqqEAYjRw75WMSS3NtSj2+IARSzCxEUaHZqARVuErneZrHyw LETs1UOCyYNsvBohY5/iNn5Ey7fQi0KCPZ+BViXqmyEoFfI0HqWAaxHWfu3t9q34t8s8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Disable interrupts when establishing SSP Message-Id: Date: Tue, 05 May 2026 10:55:12 +0000 commit acfd2631b95e29fd68b98d902a1663e07474ed5f Author: Andrew Cooper AuthorDate: Fri May 1 17:50:44 2026 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 11:45:00 2026 +0100 x86/boot: Disable interrupts when establishing SSP Gitlab CI reported a crash on boot on Alder Lake hardware. The bug is years old, making it an incredibly rare occurance: (XEN) *** DOUBLE FAULT *** (XEN) ----[ Xen-4.22-unstable x86_64 debug=y ubsan=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] arch/x86/setup.c#reinit_bsp_stack+0xfa/0x160 (XEN) RFLAGS: 0000000000010202 CONTEXT: hypervisor (XEN) rax: 0000000000000007 rbx: ffff83049a4b0000 rcx: 00000000000006a2 (XEN) rdx: 0000000000000000 rsi: 0000000000000000 rdi: 0000000000000000 (XEN) rbp: ffff83049a4b7f00 rsp: ffff83049a4b7ef8 r8: ffff830497e47000 (XEN) r9: 00000000ffffffff r10: 00000000900c2121 r11: 000000009a392956 (XEN) r12: ffff830497e47000 r13: ffff830497e49f40 r14: 0000000000000000 (XEN) r15: ffff82d0407dad10 cr0: 0000000080050033 cr4: 0000000000f526e0 (XEN) cr3: 0000000043c16000 cr2: fffffffffffffffc (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (arch/x86/setup.c#reinit_bsp_stack+0xfa/0x160): (XEN) 00 b9 a2 06 00 00 0f 30 <80> 3d 71 26 f1 ff 00 74 3e 48 8d 93 f8 5f 00 00 (XEN) Valid stack range: ffff83049a4b6000-ffff83049a4b8000, sp=ffff83049a4b7ef8, tss.rsp0=ffff83049a4b7fb0 (XEN) No stack overflow detected. Skipping stack trace. (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) DOUBLE FAULT -- system shutdown (XEN) **************************************** This is on the instruction boundary after enabling CET (writing MSR_S_CET) and prior to establishing SSP. Despite identifying this as a critical window where any fault was deadly (the CPU tries to push a shadow stack frame at 0, hence the CR2 value wrapping around to the top of the address space), I clearly forgot that this meant interrupts too, which are enabled. Disable interrupts during the critical period. Fixes: b60ab42db2f0 ("x86/shstk: Activate Supervisor Shadow Stacks") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Teddy Astie --- xen/arch/x86/setup.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d041cbd5f6..19ee857abf 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -908,6 +908,13 @@ static void __init noreturn reinit_bsp_stack(void) if ( cpu_has_xen_shstk ) { + /* + * Immediately after enabling CET, SSP is 0 and most interrupts and + * exceptions are fatal. Like the SYSCALL/SYSENTER gaps, IST vectors + * (including NMI and #MC) are safe owing to IST switching the shstk. + */ + local_irq_disable(); + wrmsrl(MSR_S_CET, xen_msr_s_cet_value()); /* @@ -932,6 +939,8 @@ static void __init noreturn reinit_bsp_stack(void) } else asm volatile ( "setssbsy" ::: "memory" ); + + local_irq_enable(); } reset_stack_and_jump(init_done); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 10:55:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 10:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300563.1575096 (Exim 4.92) (envelope-from ) id 1wKDQx-0008OQ-NP; Tue, 05 May 2026 10:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300563.1575096; Tue, 05 May 2026 10:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKDQx-0008OJ-L0; Tue, 05 May 2026 10:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1300563; Tue, 05 May 2026 10:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKDQw-0008O7-M4 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKDQw-000uPg-26 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKDQw-00FiZ1-1z for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 10:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jig7kDNiN8KsnuSkp5T7J3lzCcfhOdqHwrbWAeIMuLA=; b=tfPI74LslagVe/HGo5PtKhudwb LaA0fVGCCuJwR9/etJHcQpzralLJEa5/IW+BmGy0KIcDQbhwbVANx5W6Zz37SFFmKAdF2MxTFFNg6 hySsMB9m5NprMvTTS/xrHw9hfIu2InTohnMyLSD8hwm4VJ0HIODj47I5QgTvSBwWYRaw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/svm: Always sync guest CR2 on VMExit Message-Id: Date: Tue, 05 May 2026 10:55:22 +0000 commit 3e6bca616b344aaa62602fcef0021255d467c2fd Author: Andrew Cooper AuthorDate: Fri May 1 20:17:29 2026 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 11:45:00 2026 +0100 x86/svm: Always sync guest CR2 on VMExit Under SVM, there are two copies of guest CR2. One is v->arch.hvm.guest_cr[2] and one is in the VMCB. Xen doesn't intercept CR2 accesses, so this mostly goes unnoticed; hardware loads and saves the guest CR2 in the VMCB across VMRUN/VMExit. For HAP guests (where #PF is not intercepted, and therefore we don't typically inject #PF either), this causes the guest CR2 value to be lost on migrate. As migration is cooperative and not done from the #PF handler, this also goes unnoticed by guests. It also means that an emulated MOV-from-CR2 reads a stale value. Reported-by: Stefano Stabellini Fixes: d1bd157fbc9b ("Big merge the HVM full-virtualisation abstractions.") Signed-off-by: Andrew Cooper Tested-by: Stefano Stabellini Reviewed-by: Teddy Astie Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index ced6166847..f49d2ebbfd 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2505,6 +2505,7 @@ void asmlinkage svm_vmexit_handler(void) hvm_sanitize_regs_fields( regs, !(vmcb_get_efer(vmcb) & EFER_LMA) || !(vmcb->cs.l)); + v->arch.hvm.guest_cr[2] = vmcb_get_cr2(vmcb); if ( paging_mode_hap(v->domain) ) v->arch.hvm.guest_cr[3] = v->arch.hvm.hw_cr[3] = vmcb_get_cr3(vmcb); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 11:55:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 11:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300608.1575137 (Exim 4.92) (envelope-from ) id 1wKEMg-0001jl-Q2; Tue, 05 May 2026 11:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300608.1575137; Tue, 05 May 2026 11:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKEMg-0001jd-NQ; Tue, 05 May 2026 11:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1300608; Tue, 05 May 2026 11:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKEMg-0001jX-Co for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKEMg-000vVe-13 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKEMg-00FlDq-0w for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JOgamnaJeqqAU33tFC84vGoT2BfinZQujHliqQ8bsis=; b=kxWbCEa4aNULy+6drLpCRILJcA 2h6Jym8HKQmHptxNHUXwkKyA1q421g4Kc9XyLMks8dbm95gx1/+SDdPZgrONP5eCpLQez870u/5ZL ND+N1GGM/wS0QpSbHcnKdjRQiPHRlBR+MpVgX4jiS+FUhkeqMmRM2cRZYeh9PIcFXFFM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ARM/vgic: Use for_each_set_bit() in vgic_sync_from_lrs() Message-Id: Date: Tue, 05 May 2026 11:55:02 +0000 commit b4fd29dfe1f8114f5b978a5f8307ba37f1d9595d Author: Andrew Cooper AuthorDate: Wed Feb 25 13:20:12 2026 +0000 Commit: Andrew Cooper CommitDate: Tue May 5 11:45:00 2026 +0100 ARM/vgic: Use for_each_set_bit() in vgic_sync_from_lrs() lr_mask doesn't have bits set beyond the hardware limit, with the upper bits remaining zero. Therefore, for_each_set_bit() is a better option. For ARM64, bloat-o-meter reports: Function old new delta vgic_sync_from_lrs 208 168 -40 but this doesn't highlight that it also removes a call to find_next_bit() from each loop iteration. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/gic-vgic.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/xen/arch/arm/gic-vgic.c b/xen/arch/arm/gic-vgic.c index ea48c5375a..fae80e6cd2 100644 --- a/xen/arch/arm/gic-vgic.c +++ b/xen/arch/arm/gic-vgic.c @@ -241,9 +241,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) void vgic_sync_from_lrs(struct vcpu *v) { - int i = 0; unsigned long flags; - unsigned int nr_lrs = gic_get_nr_lrs(); /* The idle domain has no LRs to be cleared. Since gic_restore_state * doesn't write any LR registers for the idle domain they could be @@ -255,11 +253,8 @@ void vgic_sync_from_lrs(struct vcpu *v) spin_lock_irqsave(&v->arch.vgic.lock, flags); - while ((i = find_next_bit((const unsigned long *) &this_cpu(lr_mask), - nr_lrs, i)) < nr_lrs ) { + for_each_set_bit ( i, this_cpu(lr_mask) ) gic_update_one_lr(v, i); - i++; - } spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 11:55:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 11:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300609.1575140 (Exim 4.92) (envelope-from ) id 1wKEMq-0001lx-RY; Tue, 05 May 2026 11:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300609.1575140; Tue, 05 May 2026 11:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKEMq-0001lp-Op; Tue, 05 May 2026 11:55:12 +0000 Received: by outflank-mailman (input) for mailman id 1300609; Tue, 05 May 2026 11:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKEMq-0001lh-FK for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKEMq-000vVi-1Q for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKEMq-00FlEI-1E for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e2pDavQhJBEe5zg+OJ72gBBbHTgNgmZg/zJrBG57Uec=; b=r0Zt2Y1/Xo33LbUvvOCWjVWs0j 9tOjpUkkk8fUgmQdWjaIoluC3RadczLYWLFEmek7Hpg7Aq5RLKbBXfswxpkn/gbB5HbqzwYa6Tk7g 5O0Vaz0SKpA/Pcix1jighyNcQsfbOT1x+CRmXbr71RZyZV9bjZ1iquCYD7rmS0xmwlBA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Disable interrupts when establishing SSP Message-Id: Date: Tue, 05 May 2026 11:55:12 +0000 commit acfd2631b95e29fd68b98d902a1663e07474ed5f Author: Andrew Cooper AuthorDate: Fri May 1 17:50:44 2026 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 11:45:00 2026 +0100 x86/boot: Disable interrupts when establishing SSP Gitlab CI reported a crash on boot on Alder Lake hardware. The bug is years old, making it an incredibly rare occurance: (XEN) *** DOUBLE FAULT *** (XEN) ----[ Xen-4.22-unstable x86_64 debug=y ubsan=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] arch/x86/setup.c#reinit_bsp_stack+0xfa/0x160 (XEN) RFLAGS: 0000000000010202 CONTEXT: hypervisor (XEN) rax: 0000000000000007 rbx: ffff83049a4b0000 rcx: 00000000000006a2 (XEN) rdx: 0000000000000000 rsi: 0000000000000000 rdi: 0000000000000000 (XEN) rbp: ffff83049a4b7f00 rsp: ffff83049a4b7ef8 r8: ffff830497e47000 (XEN) r9: 00000000ffffffff r10: 00000000900c2121 r11: 000000009a392956 (XEN) r12: ffff830497e47000 r13: ffff830497e49f40 r14: 0000000000000000 (XEN) r15: ffff82d0407dad10 cr0: 0000000080050033 cr4: 0000000000f526e0 (XEN) cr3: 0000000043c16000 cr2: fffffffffffffffc (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (arch/x86/setup.c#reinit_bsp_stack+0xfa/0x160): (XEN) 00 b9 a2 06 00 00 0f 30 <80> 3d 71 26 f1 ff 00 74 3e 48 8d 93 f8 5f 00 00 (XEN) Valid stack range: ffff83049a4b6000-ffff83049a4b8000, sp=ffff83049a4b7ef8, tss.rsp0=ffff83049a4b7fb0 (XEN) No stack overflow detected. Skipping stack trace. (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) DOUBLE FAULT -- system shutdown (XEN) **************************************** This is on the instruction boundary after enabling CET (writing MSR_S_CET) and prior to establishing SSP. Despite identifying this as a critical window where any fault was deadly (the CPU tries to push a shadow stack frame at 0, hence the CR2 value wrapping around to the top of the address space), I clearly forgot that this meant interrupts too, which are enabled. Disable interrupts during the critical period. Fixes: b60ab42db2f0 ("x86/shstk: Activate Supervisor Shadow Stacks") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Teddy Astie --- xen/arch/x86/setup.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d041cbd5f6..19ee857abf 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -908,6 +908,13 @@ static void __init noreturn reinit_bsp_stack(void) if ( cpu_has_xen_shstk ) { + /* + * Immediately after enabling CET, SSP is 0 and most interrupts and + * exceptions are fatal. Like the SYSCALL/SYSENTER gaps, IST vectors + * (including NMI and #MC) are safe owing to IST switching the shstk. + */ + local_irq_disable(); + wrmsrl(MSR_S_CET, xen_msr_s_cet_value()); /* @@ -932,6 +939,8 @@ static void __init noreturn reinit_bsp_stack(void) } else asm volatile ( "setssbsy" ::: "memory" ); + + local_irq_enable(); } reset_stack_and_jump(init_done); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 11:55:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 11:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1300610.1575145 (Exim 4.92) (envelope-from ) id 1wKEN1-0001oa-Sy; Tue, 05 May 2026 11:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1300610.1575145; Tue, 05 May 2026 11:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKEN1-0001oS-QF; Tue, 05 May 2026 11:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1300610; Tue, 05 May 2026 11:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKEN0-0001oK-Ij for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKEN0-000vXt-1k for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKEN0-00FlF0-1b for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 11:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BxFPG9jw7qiw46nOLq3HhX1cqiHaMFcC8D8+2KAvp2g=; b=EIjEE6heH0qW+h5tDZoSG9ymH4 deKXb3+gwvPAj7bjnnqhftgYIXcBPVSefIXUHlQKVDwIOEukoUOVuM2P8X0O+POea6e5dsmjKsdAz WQYCzeDA1Ef49N2ip5mj1gJf7X/YUkP9th9ivz6wx+7aRIfCHp0YzaUKblfYhZD5WtXk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/svm: Always sync guest CR2 on VMExit Message-Id: Date: Tue, 05 May 2026 11:55:22 +0000 commit 3e6bca616b344aaa62602fcef0021255d467c2fd Author: Andrew Cooper AuthorDate: Fri May 1 20:17:29 2026 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 11:45:00 2026 +0100 x86/svm: Always sync guest CR2 on VMExit Under SVM, there are two copies of guest CR2. One is v->arch.hvm.guest_cr[2] and one is in the VMCB. Xen doesn't intercept CR2 accesses, so this mostly goes unnoticed; hardware loads and saves the guest CR2 in the VMCB across VMRUN/VMExit. For HAP guests (where #PF is not intercepted, and therefore we don't typically inject #PF either), this causes the guest CR2 value to be lost on migrate. As migration is cooperative and not done from the #PF handler, this also goes unnoticed by guests. It also means that an emulated MOV-from-CR2 reads a stale value. Reported-by: Stefano Stabellini Fixes: d1bd157fbc9b ("Big merge the HVM full-virtualisation abstractions.") Signed-off-by: Andrew Cooper Tested-by: Stefano Stabellini Reviewed-by: Teddy Astie Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index ced6166847..f49d2ebbfd 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2505,6 +2505,7 @@ void asmlinkage svm_vmexit_handler(void) hvm_sanitize_regs_fields( regs, !(vmcb_get_efer(vmcb) & EFER_LMA) || !(vmcb->cs.l)); + v->arch.hvm.guest_cr[2] = vmcb_get_cr2(vmcb); if ( paging_mode_hap(v->domain) ) v->arch.hvm.guest_cr[3] = v->arch.hvm.hw_cr[3] = vmcb_get_cr3(vmcb); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 05 19:00:08 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 19:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301048.1575392 (Exim 4.92) (envelope-from ) id 1wKKzz-0006Rc-44; Tue, 05 May 2026 19:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301048.1575392; Tue, 05 May 2026 19:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKKzz-0006R7-16; Tue, 05 May 2026 19:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1301048; Tue, 05 May 2026 19:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKKzx-0006Aj-T6 for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 19:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKKzx-0014Y6-2d for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 19:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKKzx-00GAlf-2S for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 19:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QYxjgxEVYlzJVO6I8XJo5b7rlhyI8JD31IVsJp4lryI=; b=kjtt/7m5O9mZ1565D4gQLxMc39 CBvAHxnk3hTZvcuwowRVsQe1rzP7JK6C9vNThkFWliEEdjuHXT1QKXMNndyBG3cwLR5qk06TPDaaS 7a0hNRQN1x2Z6Z8bCcvY/7Qv5s0NMOGIC8cjF3+5/fNBgOXCibTVNGkBdXyGI1HDwT/8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/gitlab: introduce macOS build jobs Message-Id: Date: Tue, 05 May 2026 19:00:01 +0000 commit 278953f6c1551e392585b7f2229aa28086bb1f39 Author: Roger Pau Monne AuthorDate: Thu Apr 23 18:19:38 2026 +0200 Commit: Roger Pau Monne CommitDate: Tue May 5 20:52:48 2026 +0200 automation/gitlab: introduce macOS build jobs With the imminent decommission of CirrusCI we will lose the limited macOS build testing done there. Introduce two Gitlab macOS build jobs that reproduce the ones present on CirrusCI. According to the "Community programs" Gitlab documentation [0] we get 50,000 compute minutes per month. The arm64 job takes ~1m 15s, and the x86_64 one ~2m. I think it's likely enough given the amount of minutes we have available. We might need to reconsider if we add more tasks that consume compute minutes. [0] https://docs.gitlab.com/subscriptions/community_programs/#gitlab-for-open-source Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index eff96beaa5..463ed2f96d 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -815,3 +815,33 @@ debian-13-riscv64-gcc-randconfig: KBUILD_DEFCONFIG: tiny64_defconfig RANDCONFIG: y <<: *riscv-fixed-randconfig + +# macOS build jobs +.macos-26: + <<: *build + tags: + - saas-macos-medium-m1 + image: macos-26-xcode-26 + variables: + HOMEBREW_NO_AUTO_UPDATE: 1 + HOSTCC: clang + HYPERVISOR_ONLY: y + <<: *gcc + script: + - brew install ${CROSS_COMPILE}gcc ${CROSS_COMPILE}binutils + - alias nproc="sysctl -n hw.ncpu" + - ./automation/scripts/build 2>&1 | tee build.log + +macos-26-x86_64: + extends: + - .macos-26 + variables: + XEN_TARGET_ARCH: x86_64 + CROSS_COMPILE: x86_64-elf- + +macos-26-arm64: + extends: + - .macos-26 + variables: + XEN_TARGET_ARCH: arm64 + CROSS_COMPILE: aarch64-elf- -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 20:11:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2026 20:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301079.1575415 (Exim 4.92) (envelope-from ) id 1wKM6g-0001m6-Fd; Tue, 05 May 2026 20:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301079.1575415; Tue, 05 May 2026 20:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKM6g-0001ly-CR; Tue, 05 May 2026 20:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1301079; Tue, 05 May 2026 20:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKM6f-0001ls-LH for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 20:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKM6f-00161l-1t for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 20:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKM6f-00GE1X-1o for xen-changelog@lists.xenproject.org; Tue, 05 May 2026 20:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=41Qd6y2/EuWw6C2iOrWyGLu3Uzh/E3J+nro+EmjtC9o=; b=08e9ENduDe6LZaYtj4rHAuDdPI L5Atnzt3fcICVVA2ILjhd7CQT3IL6QQdAYDMcc38aXRdGJWXsWnuI0YvdsSizrF+H0xpUT/9rt4Fe CrzOdXppC4QssOAbHAxYAxM2hKjdrlsZzI77tBspcQEE2mWJVdwdgsZkt2AvKh+Ymqls=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/gitlab: introduce macOS build jobs Message-Id: Date: Tue, 05 May 2026 20:11:01 +0000 commit 278953f6c1551e392585b7f2229aa28086bb1f39 Author: Roger Pau Monne AuthorDate: Thu Apr 23 18:19:38 2026 +0200 Commit: Roger Pau Monne CommitDate: Tue May 5 20:52:48 2026 +0200 automation/gitlab: introduce macOS build jobs With the imminent decommission of CirrusCI we will lose the limited macOS build testing done there. Introduce two Gitlab macOS build jobs that reproduce the ones present on CirrusCI. According to the "Community programs" Gitlab documentation [0] we get 50,000 compute minutes per month. The arm64 job takes ~1m 15s, and the x86_64 one ~2m. I think it's likely enough given the amount of minutes we have available. We might need to reconsider if we add more tasks that consume compute minutes. [0] https://docs.gitlab.com/subscriptions/community_programs/#gitlab-for-open-source Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index eff96beaa5..463ed2f96d 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -815,3 +815,33 @@ debian-13-riscv64-gcc-randconfig: KBUILD_DEFCONFIG: tiny64_defconfig RANDCONFIG: y <<: *riscv-fixed-randconfig + +# macOS build jobs +.macos-26: + <<: *build + tags: + - saas-macos-medium-m1 + image: macos-26-xcode-26 + variables: + HOMEBREW_NO_AUTO_UPDATE: 1 + HOSTCC: clang + HYPERVISOR_ONLY: y + <<: *gcc + script: + - brew install ${CROSS_COMPILE}gcc ${CROSS_COMPILE}binutils + - alias nproc="sysctl -n hw.ncpu" + - ./automation/scripts/build 2>&1 | tee build.log + +macos-26-x86_64: + extends: + - .macos-26 + variables: + XEN_TARGET_ARCH: x86_64 + CROSS_COMPILE: x86_64-elf- + +macos-26-arm64: + extends: + - .macos-26 + variables: + XEN_TARGET_ARCH: arm64 + CROSS_COMPILE: aarch64-elf- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 06 12:22:09 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 12:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301682.1575904 (Exim 4.92) (envelope-from ) id 1wKbGO-00082o-Ez; Wed, 06 May 2026 12:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301682.1575904; Wed, 06 May 2026 12:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKbGO-00082f-Bw; Wed, 06 May 2026 12:22:04 +0000 Received: by outflank-mailman (input) for mailman id 1301682; Wed, 06 May 2026 12:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKbGM-00082Y-GT for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 12:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKbGM-002bQf-1I for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 12:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKbGM-00Gxxw-0z for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 12:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9AWMGvFIPY6FmsvKO48rz9oWBQcbnFJ4040pOQdjeus=; b=hVYxkhLGyAgjEGEgUDUfUY+SBy Ig3sbPc1gCa7LYa+3uRa/I9Dbg1MXy6WGLcwk8nI8HhfqkEr82dFqpjsDicaY+TYpDLMwNM6olAcb XmvWuzi1O4Sdv7r2YFU8rU6ae9Wm4cgXfp+l+dNLmD6d43dELFHGybnoOf0R7j9Y8QuM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Refresh the Debian 12 cppcheck container Message-Id: Date: Wed, 06 May 2026 12:22:02 +0000 commit e8c1feab33cb28ea066506fea998fc6733b3e9a2 Author: Javi Merino AuthorDate: Mon Oct 21 11:07:54 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 6 13:14:36 2026 +0100 CI: Refresh the Debian 12 cppcheck container Rework the container to derive from bookworm-slim, and to build and run cppcheck as a normal user. User heredocs for readability and use apt-get --no-install-recommends to keep the size down. Changed the libpcre3-dev dependency to libpcre3, as the -dev package is only needed for building, not for running. Signed-off-by: Javi Merino Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- .../build/debian/12-arm64v8-cppcheck.dockerfile | 86 ++++++++++++++++++++++ .../build/debian/bookworm-cppcheck.dockerfile | 54 -------------- automation/gitlab-ci/build.yaml | 12 +-- automation/scripts/containerize | 2 +- 4 files changed, 93 insertions(+), 61 deletions(-) diff --git a/automation/build/debian/12-arm64v8-cppcheck.dockerfile b/automation/build/debian/12-arm64v8-cppcheck.dockerfile new file mode 100644 index 0000000000..50d2614453 --- /dev/null +++ b/automation/build/debian/12-arm64v8-cppcheck.dockerfile @@ -0,0 +1,86 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm-slim AS builder + +ENV DEBIAN_FRONTEND=noninteractive +ENV CPPCHECK_VERSION=2.7 + +# dependencies for cppcheck build +RUN < Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 13:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301730.1575926 (Exim 4.92) (envelope-from ) id 1wKcCS-0008S6-0z; Wed, 06 May 2026 13:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301730.1575926; Wed, 06 May 2026 13:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKcCR-0008Ry-UW; Wed, 06 May 2026 13:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1301730; Wed, 06 May 2026 13:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKcCQ-0008Rs-I8 for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKcCQ-002cYK-1a for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKcCQ-00H1Fy-1O for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0u1EliWCUUudRgIBr6Htg0NjNHIij1dj0RFWqkhEQNA=; b=4dVrFejsSuFadnz5Xxb2KgJ9Ch f6IDNBiQaJ6+5d2DbRxUX99tLc2jKnaUoa92kTZNvw5gf9physjI7xGTIEfQ0ztMa70SRmHl4ZqHu owxFxcpFbXRAZTL7DaXclKs8eQ2Oh67rwkw8omQmKcN96e7toqkiTwnMFywpHHozFeSU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xvmalloc: adjust XVFREE() ordering Message-Id: Date: Wed, 06 May 2026 13:22:02 +0000 commit 96ffccef5a5f598ffbd263971b92132391f1606a Author: Jan Beulich AuthorDate: Wed May 6 13:59:37 2026 +0200 Commit: Jan Beulich CommitDate: Wed May 6 15:11:11 2026 +0200 xvmalloc: adjust XVFREE() ordering What c4f427ec879e ("xen: Swap order of actions in the FREE*() macros") did should have been done right away when XVFREE() was introduced. Fixes: 9102fcd9579f ("mm: introduce xvmalloc() et al and use for grant table allocations") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/include/xen/xvmalloc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/xvmalloc.h b/xen/include/xen/xvmalloc.h index 110b10e88c..83c9d4dea2 100644 --- a/xen/include/xen/xvmalloc.h +++ b/xen/include/xen/xvmalloc.h @@ -71,8 +71,9 @@ void *_xvrealloc(void *va, size_t size, unsigned int align); /* Free an allocation, and zero the pointer to it. */ #define XVFREE(p) do { \ - xvfree(p); \ + void *_ptr_ = (p); \ (p) = NULL; \ + xvfree(_ptr_); \ } while ( false ) static inline void *_xvmalloc_array( -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 06 13:22:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 13:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301732.1575930 (Exim 4.92) (envelope-from ) id 1wKcCc-0008U6-2C; Wed, 06 May 2026 13:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301732.1575930; Wed, 06 May 2026 13:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKcCb-0008Ty-Vu; Wed, 06 May 2026 13:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1301732; Wed, 06 May 2026 13:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKcCa-0008Tg-Me for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKcCa-002cYT-24 for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKcCa-00H1Gg-1m for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WHs2crix/i1/jyiTu73gnswroLKI9tXC36TJlhqLNT8=; b=ADGAOpeG0RASQKOw84kO2AEZl3 xcZK4vamu1t/gJhO35I/jM/g7XyUn+ObZvYCFX8iK8LlK+drnrIuZBdD7C643Wn8iKHQBI2HDj4Z0 5ajmyNeE6ZVzxDWSk4GniPmyYSYSCMoVzTqhWXcrCGYc+t1UKwCsjWOWh+hrTm8zMyLY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] EFI: adjust cfg file buffer freeing Message-Id: Date: Wed, 06 May 2026 13:22:12 +0000 commit 4ff927133ebc32498fd4af49a8025a846cfe1dc6 Author: Jan Beulich AuthorDate: Wed May 6 14:00:19 2026 +0200 Commit: Jan Beulich CommitDate: Wed May 6 15:11:11 2026 +0200 EFI: adjust cfg file buffer freeing The boot services FreePages() needs passing the size. Since we allocated one more byte to put a trailing nul there, we also need to bump the size passed there. Make a small helper function to centralize this. Note that there's no permanent memory leak because of the oversight: The allocation is done using EfiLoaderData, and all memory of that type is later reclaimed anyway. Fixes: df75f77092c1 ("EFI: avoid OOB config file reads") Reported-by: Bernhard Kaindl Signed-off-by: Jan Beulich Reviewed-by: Bernhard Kaindl Acked-by: Daniel P. Smith --- xen/common/efi/boot.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index b44762878b..9ea2183c0b 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -778,6 +778,16 @@ static void __init efi_relocate_esrt(EFI_SYSTEM_TABLE *SystemTable) */ #include "efi-boot.h" +static void __init free_cfg(void) +{ + if ( !cfg.need_to_free ) + return; + + /* One extra byte was allocated to put a nul character there. */ + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size + 1)); + cfg.need_to_free = false; +} + void __init noreturn blexit(const CHAR16 *str) { if ( str ) @@ -787,8 +797,7 @@ void __init noreturn blexit(const CHAR16 *str) if ( !efi_bs ) efi_arch_halt(); - if ( cfg.need_to_free ) - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + free_cfg(); if ( kernel.need_to_free ) efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size)); if ( ramdisk.need_to_free ) @@ -1557,11 +1566,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, name.s = get_value(&cfg, "global", "chain"); if ( !name.s ) break; - if ( cfg.need_to_free ) - { - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.need_to_free = false; - } + free_cfg(); if ( !read_file(dir_handle, s2w(&name), &cfg, NULL) ) { PrintStr(L"Chained configuration file '"); @@ -1631,11 +1636,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, efi_arch_cfg_file_late(loaded_image, dir_handle, section.s); - if ( cfg.need_to_free ) - { - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.need_to_free = false; - } + free_cfg(); if ( dir_handle ) dir_handle->Close(dir_handle); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 06 13:22:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 13:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301735.1575934 (Exim 4.92) (envelope-from ) id 1wKcCm-00006f-3b; Wed, 06 May 2026 13:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301735.1575934; Wed, 06 May 2026 13:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKcCm-00006X-15; Wed, 06 May 2026 13:22:24 +0000 Received: by outflank-mailman (input) for mailman id 1301735; Wed, 06 May 2026 13:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKcCk-00006P-Ov for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKcCk-002cYd-2O for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKcCk-00H1H2-2E for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 13:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MKJaYFPpQuSEVUnxh8ZbEO3cUvr2mOPtQuNeA02WQc4=; b=jMoEIV06rk1YZtpfTiZGUDvAte Nr6UH0H7dKaxBIueOYaNZzLxLOc4JW1ciPzAINKChkoDRv09kcmve0qlP1K0/bMFsJEiIqQx6tJ6c vDNA6RlhAL02ID4lXE96xBI+Fpb8NmONfva44ywYa3UXYVXBE9d/v90M0XY7z8pfvc1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xsm/flask: Fix undefined behaviour in avc_dump_av() Message-Id: Date: Wed, 06 May 2026 13:22:22 +0000 commit 4f9457ece11a6231b7a17a11a873b8b4b9376fdc Author: Dmytro Prokopchuk AuthorDate: Wed May 6 14:00:58 2026 +0200 Commit: Jan Beulich CommitDate: Wed May 6 15:11:18 2026 +0200 xsm/flask: Fix undefined behaviour in avc_dump_av() When booting Xen with CONFIG_USBAN=y and CONFIG_XSM_FLASK=y, UBSAN reports undefined behaviour in avc_dump_av() due to a left shift on a signed int: (XEN) [ 1.104348] ================================================================================ (XEN) [ 1.105096] UBSAN: Undefined behaviour in xsm/flask/avc.c:184:14 (XEN) [ 1.106052] left shift of 1073741824 by 1 places cannot be represented in type 'int' (XEN) [ 1.107546] Xen WARN at common/ubsan/ubsan.c:176 (XEN) [ 1.108295] ----[ Xen-4.21.1 arm64 debug=y ubsan=y Not tainted ]---- (XEN) [ 1.108848] CPU: 0 (XEN) [ 1.109147] PC: 00000a00002f64fc ubsan.c#ubsan_epilogue+0x10/0xd4 [...] (XEN) [ 1.146320] Xen call trace: (XEN) [ 1.146663] [<00000a00002f64fc>] ubsan.c#ubsan_epilogue+0x10/0xd4 (PC) (XEN) [ 1.147227] [<00000a00002f7bc4>] __ubsan_handle_shift_out_of_bounds+0x1a0/0x290 (LR) (XEN) [ 1.147868] (XEN) [ 1.148177] ================================================================================ This can be solved by making 'perm' an unsigned 32-bit type (u32). Signed-off-by: Dmytro Prokopchuk Acked-by: Daniel P. Smith --- xen/xsm/flask/avc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index 3d39e55cae..6e1972d21b 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -152,7 +152,8 @@ static void __attribute__ ((format (printf, 2, 3))) */ static void avc_dump_av(struct avc_dump_buf *buf, u16 tclass, u32 av) { - int i, i2, perm; + int i, i2; + uint32_t perm; if ( av == 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:22:06 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 15:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301870.1576018 (Exim 4.92) (envelope-from ) id 1wKe4Z-00047P-74; Wed, 06 May 2026 15:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301870.1576018; Wed, 06 May 2026 15:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKe4Z-00047H-48; Wed, 06 May 2026 15:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1301870; Wed, 06 May 2026 15:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKe4X-00047B-Qj for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 15:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKe4X-002f59-2S for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 15:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKe4X-00H8oB-29 for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 15:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ie5wES9PyXByqqfQOu+/+QYp7PniK1zhYN3PUMkM3gw=; b=yWI69Hwd6/pppe7MK0A2IOQpy7 VrtwYOhMCL6+ue3+1TpNfSE3plHDZCDboK7yWoRz75+E0vHjfNmlBIqzE0Nnsgxe2+46tpQUmCO+r tRztsHUZmSP/iIY1m1vWkOEitzOWmKioTD/IEHmLNYLnqeDuRrw1wPc7+MeU6Niw9O/w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Refresh the Debian 12 cppcheck container Message-Id: Date: Wed, 06 May 2026 15:22:01 +0000 commit e8c1feab33cb28ea066506fea998fc6733b3e9a2 Author: Javi Merino AuthorDate: Mon Oct 21 11:07:54 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 6 13:14:36 2026 +0100 CI: Refresh the Debian 12 cppcheck container Rework the container to derive from bookworm-slim, and to build and run cppcheck as a normal user. User heredocs for readability and use apt-get --no-install-recommends to keep the size down. Changed the libpcre3-dev dependency to libpcre3, as the -dev package is only needed for building, not for running. Signed-off-by: Javi Merino Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- .../build/debian/12-arm64v8-cppcheck.dockerfile | 86 ++++++++++++++++++++++ .../build/debian/bookworm-cppcheck.dockerfile | 54 -------------- automation/gitlab-ci/build.yaml | 12 +-- automation/scripts/containerize | 2 +- 4 files changed, 93 insertions(+), 61 deletions(-) diff --git a/automation/build/debian/12-arm64v8-cppcheck.dockerfile b/automation/build/debian/12-arm64v8-cppcheck.dockerfile new file mode 100644 index 0000000000..50d2614453 --- /dev/null +++ b/automation/build/debian/12-arm64v8-cppcheck.dockerfile @@ -0,0 +1,86 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm-slim AS builder + +ENV DEBIAN_FRONTEND=noninteractive +ENV CPPCHECK_VERSION=2.7 + +# dependencies for cppcheck build +RUN < Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 16:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301920.1576041 (Exim 4.92) (envelope-from ) id 1wKf0d-00053g-Mg; Wed, 06 May 2026 16:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301920.1576041; Wed, 06 May 2026 16:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKf0d-00053Y-K1; Wed, 06 May 2026 16:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1301920; Wed, 06 May 2026 16:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKf0c-00053Q-1a for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKf0c-002giG-00 for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKf0b-00HCOr-36 for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pNyQxDbjhv9pmYHKhs2hWMWndwH+UXJM/Cl4uqBfz6E=; b=OjA/l5HjBNIFP1N9eIzytnUrHi GPY3elfXPaKPrLkSKsXZ/hb1OgbYWjvgzArDJq/J6Uq0sGdIHX1uViD9rHXKgnNw3UH8/pDTXM3tQ Sx7qUGuGKAfGulZnXwlFyNQk8aw4seXm0ZD+RieSXfPWTxax0GUBNp8S8URDB0cbCQIM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xvmalloc: adjust XVFREE() ordering Message-Id: Date: Wed, 06 May 2026 16:22:01 +0000 commit 96ffccef5a5f598ffbd263971b92132391f1606a Author: Jan Beulich AuthorDate: Wed May 6 13:59:37 2026 +0200 Commit: Jan Beulich CommitDate: Wed May 6 15:11:11 2026 +0200 xvmalloc: adjust XVFREE() ordering What c4f427ec879e ("xen: Swap order of actions in the FREE*() macros") did should have been done right away when XVFREE() was introduced. Fixes: 9102fcd9579f ("mm: introduce xvmalloc() et al and use for grant table allocations") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/include/xen/xvmalloc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/xvmalloc.h b/xen/include/xen/xvmalloc.h index 110b10e88c..83c9d4dea2 100644 --- a/xen/include/xen/xvmalloc.h +++ b/xen/include/xen/xvmalloc.h @@ -71,8 +71,9 @@ void *_xvrealloc(void *va, size_t size, unsigned int align); /* Free an allocation, and zero the pointer to it. */ #define XVFREE(p) do { \ - xvfree(p); \ + void *_ptr_ = (p); \ (p) = NULL; \ + xvfree(_ptr_); \ } while ( false ) static inline void *_xvmalloc_array( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 06 16:22:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301921.1576045 (Exim 4.92) (envelope-from ) id 1wKf0n-00055S-OI; Wed, 06 May 2026 16:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301921.1576045; Wed, 06 May 2026 16:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKf0n-00055K-LM; Wed, 06 May 2026 16:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1301921; Wed, 06 May 2026 16:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKf0m-000554-4U for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKf0m-002giM-0M for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKf0m-00HCPZ-0B for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2jNh3BG1q/Otama/wZPkwqNsnRScjypNX6y49G742mw=; b=tmOLm0dTvjo9qDqEAaHtxC0rQV ezXJgjIQKnHZs+VLdQPzyL81CnTi+hHH3X/hh9XLq/AAna21B0gZYOKHcC+2G/i0qAHbykXdtMLm/ BnzpZaOcjzgs07nmYU+C5Uv7K0dwpQJw0/EtJ/+bnaKFj2xR3ym3R8bYIAQ0QOLdCQ6c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] EFI: adjust cfg file buffer freeing Message-Id: Date: Wed, 06 May 2026 16:22:12 +0000 commit 4ff927133ebc32498fd4af49a8025a846cfe1dc6 Author: Jan Beulich AuthorDate: Wed May 6 14:00:19 2026 +0200 Commit: Jan Beulich CommitDate: Wed May 6 15:11:11 2026 +0200 EFI: adjust cfg file buffer freeing The boot services FreePages() needs passing the size. Since we allocated one more byte to put a trailing nul there, we also need to bump the size passed there. Make a small helper function to centralize this. Note that there's no permanent memory leak because of the oversight: The allocation is done using EfiLoaderData, and all memory of that type is later reclaimed anyway. Fixes: df75f77092c1 ("EFI: avoid OOB config file reads") Reported-by: Bernhard Kaindl Signed-off-by: Jan Beulich Reviewed-by: Bernhard Kaindl Acked-by: Daniel P. Smith --- xen/common/efi/boot.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index b44762878b..9ea2183c0b 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -778,6 +778,16 @@ static void __init efi_relocate_esrt(EFI_SYSTEM_TABLE *SystemTable) */ #include "efi-boot.h" +static void __init free_cfg(void) +{ + if ( !cfg.need_to_free ) + return; + + /* One extra byte was allocated to put a nul character there. */ + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size + 1)); + cfg.need_to_free = false; +} + void __init noreturn blexit(const CHAR16 *str) { if ( str ) @@ -787,8 +797,7 @@ void __init noreturn blexit(const CHAR16 *str) if ( !efi_bs ) efi_arch_halt(); - if ( cfg.need_to_free ) - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + free_cfg(); if ( kernel.need_to_free ) efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size)); if ( ramdisk.need_to_free ) @@ -1557,11 +1566,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, name.s = get_value(&cfg, "global", "chain"); if ( !name.s ) break; - if ( cfg.need_to_free ) - { - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.need_to_free = false; - } + free_cfg(); if ( !read_file(dir_handle, s2w(&name), &cfg, NULL) ) { PrintStr(L"Chained configuration file '"); @@ -1631,11 +1636,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, efi_arch_cfg_file_late(loaded_image, dir_handle, section.s); - if ( cfg.need_to_free ) - { - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.need_to_free = false; - } + free_cfg(); if ( dir_handle ) dir_handle->Close(dir_handle); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 06 16:22:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 16:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1301923.1576049 (Exim 4.92) (envelope-from ) id 1wKf0x-00059J-PW; Wed, 06 May 2026 16:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1301923.1576049; Wed, 06 May 2026 16:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKf0x-00059B-Mu; Wed, 06 May 2026 16:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1301923; Wed, 06 May 2026 16:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKf0w-00058z-7p for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKf0w-002giY-0g for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKf0w-00HCSh-0X for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 16:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GVWahtYsDFOVQdHF+KzcBFHi4EIExvpCuOmewbMptIw=; b=e4UgOqijvOExKRYo/0X/XOmJaI FrXu0ro35e3ASNAPouGO3ZCOJyuTQxJY0AYEqytciPE4iWC9k2BUyXemj7QS0ltgV2OOnwCYHXt7E PIbXxFKQBW1KVg4nATI8oZqdluCMwVb7pSQuOAL6Cj66cJaNRmiT5ynKjy3EdDQiB1Tc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm/flask: Fix undefined behaviour in avc_dump_av() Message-Id: Date: Wed, 06 May 2026 16:22:22 +0000 commit 4f9457ece11a6231b7a17a11a873b8b4b9376fdc Author: Dmytro Prokopchuk AuthorDate: Wed May 6 14:00:58 2026 +0200 Commit: Jan Beulich CommitDate: Wed May 6 15:11:18 2026 +0200 xsm/flask: Fix undefined behaviour in avc_dump_av() When booting Xen with CONFIG_USBAN=y and CONFIG_XSM_FLASK=y, UBSAN reports undefined behaviour in avc_dump_av() due to a left shift on a signed int: (XEN) [ 1.104348] ================================================================================ (XEN) [ 1.105096] UBSAN: Undefined behaviour in xsm/flask/avc.c:184:14 (XEN) [ 1.106052] left shift of 1073741824 by 1 places cannot be represented in type 'int' (XEN) [ 1.107546] Xen WARN at common/ubsan/ubsan.c:176 (XEN) [ 1.108295] ----[ Xen-4.21.1 arm64 debug=y ubsan=y Not tainted ]---- (XEN) [ 1.108848] CPU: 0 (XEN) [ 1.109147] PC: 00000a00002f64fc ubsan.c#ubsan_epilogue+0x10/0xd4 [...] (XEN) [ 1.146320] Xen call trace: (XEN) [ 1.146663] [<00000a00002f64fc>] ubsan.c#ubsan_epilogue+0x10/0xd4 (PC) (XEN) [ 1.147227] [<00000a00002f7bc4>] __ubsan_handle_shift_out_of_bounds+0x1a0/0x290 (LR) (XEN) [ 1.147868] (XEN) [ 1.148177] ================================================================================ This can be solved by making 'perm' an unsigned 32-bit type (u32). Signed-off-by: Dmytro Prokopchuk Acked-by: Daniel P. Smith --- xen/xsm/flask/avc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index 3d39e55cae..6e1972d21b 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -152,7 +152,8 @@ static void __attribute__ ((format (printf, 2, 3))) */ static void avc_dump_av(struct avc_dump_buf *buf, u16 tclass, u32 av) { - int i, i2, perm; + int i, i2; + uint32_t perm; if ( av == 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 06 17:55:10 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 17:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302020.1576106 (Exim 4.92) (envelope-from ) id 1wKgSd-000499-AJ; Wed, 06 May 2026 17:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302020.1576106; Wed, 06 May 2026 17:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKgSd-000492-7T; Wed, 06 May 2026 17:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1302020; Wed, 06 May 2026 17:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKgSc-00048s-EZ for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 17:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKgSb-002iRV-2h for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 17:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKgSb-00HOGa-2X for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 17:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pxnARs1DGvpb6KdIZqpGNzbeYczPdrfbTxXbGNVqWQ4=; b=u9QwsZWSXFg9HqFcOz46RbZiDe wgm4E5yVyHnKk5alRtXhPegyl/sUVH2g+624L/64SQo3m0XLV050T9dO9n6qCkKcEcwb5cfvFzAmF vKXeX7KGX/0ci3/DAnF6PjimhLIlNQPqSuKfna6DQVYzFlc5r1MbQy+SdlgqJRrgyl0U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] iommu/amd-vi: do not zero IOMMU MMIO region Message-Id: Date: Wed, 06 May 2026 17:55:01 +0000 commit bdb30883f3528676f8b736e4ec0e475914289993 Author: Roger Pau Monne AuthorDate: Tue May 5 15:13:28 2026 +0200 Commit: Roger Pau Monne CommitDate: Wed May 6 18:56:59 2026 +0200 iommu/amd-vi: do not zero IOMMU MMIO region Attempting to memset the whole IOMMU MMIO region to zero is dangerous to say the least. We don't know which registers might be there, nor which values might be safe for those registers. On a forthcoming platform doing the zeroing of the MMIO region does put the IOMMU in a broken state, which is not recoverable by the IOMMU initialization procedure in Xen. Instead just zero the control register, which mimics the current behavior with regards to how the control register is handled, and ensures the IOMU setup is done with the unit disabled. This approach will need revisiting in order to support Preboot DMA Protection. Fold map_iommu_mmio_region() into its only caller, as the function body is just an ioremap() call after the removal of the memset(). Fixes: 0700c962ac2d ("Add AMD IOMMU support into hypervisor") Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/drivers/passthrough/amd/iommu_init.c | 33 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index d77dd85112..e0c8925c33 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -42,18 +42,6 @@ static bool iommu_has_ht_flag(struct amd_iommu *iommu, u8 mask) return iommu->ht_flags & mask; } -static int __init map_iommu_mmio_region(struct amd_iommu *iommu) -{ - iommu->mmio_base = ioremap(iommu->mmio_base_phys, - IOMMU_MMIO_REGION_LENGTH); - if ( !iommu->mmio_base ) - return -ENOMEM; - - memset(iommu->mmio_base, 0, IOMMU_MMIO_REGION_LENGTH); - - return 0; -} - static void __init unmap_iommu_mmio_region(struct amd_iommu *iommu) { if ( iommu->mmio_base ) @@ -1367,11 +1355,14 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) { int rc = alloc_ivrs_mappings(iommu->sbdf.seg); - if ( !rc ) - rc = map_iommu_mmio_region(iommu); if ( rc ) return rc; + iommu->mmio_base = ioremap(iommu->mmio_base_phys, + IOMMU_MMIO_REGION_LENGTH); + if ( !iommu->mmio_base ) + return -ENOMEM; + get_iommu_features(iommu); /* @@ -1381,6 +1372,20 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) if ( amd_iommu_max_paging_mode < amd_iommu_min_paging_mode ) return -ERANGE; + /* + * Check whether the IOMMU is already enabled and unconditionally disable + * it (zero the control register) ahead of Xen setup. Needs to be + * revisited to support Preboot DMA Protection. + */ + iommu->ctrl.raw = readq(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( iommu->ctrl.iommu_en ) + printk(XENLOG_WARNING + "AMD-Vi: IOMMU %pp enabled by firmware (ctrl %016lx)\n", + &iommu->sbdf, iommu->ctrl.raw); + + iommu->ctrl.raw = 0; + writeq(0, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 06 19:22:11 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2026 19:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302045.1576111 (Exim 4.92) (envelope-from ) id 1wKhop-00074R-49; Wed, 06 May 2026 19:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302045.1576111; Wed, 06 May 2026 19:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKhop-00074J-1X; Wed, 06 May 2026 19:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1302045; Wed, 06 May 2026 19:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKhon-00074D-RT for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 19:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKhon-002k9u-2S for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 19:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKhon-00HS8w-2K for xen-changelog@lists.xenproject.org; Wed, 06 May 2026 19:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BOlJrbA/ol3Id8X2RqYze5quHSCqmO806vGNEJEi4jk=; b=NETlYzyj04kYN56rDFcQ4N4OTW NRrYVaHGdk+XWOMJCWeM2dj+1AP4by9VHDZGhspHHyQ8kQgPKqmKl889BgI9TZDjn4c0S9t15zAvz 6dzPSmKMd+BiTfUQ1YqCrg+m+ESHfEeZsOpla0bvJAs/TGC1dmBMnXs/f2ww4aaK8PeU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/amd-vi: do not zero IOMMU MMIO region Message-Id: Date: Wed, 06 May 2026 19:22:01 +0000 commit bdb30883f3528676f8b736e4ec0e475914289993 Author: Roger Pau Monne AuthorDate: Tue May 5 15:13:28 2026 +0200 Commit: Roger Pau Monne CommitDate: Wed May 6 18:56:59 2026 +0200 iommu/amd-vi: do not zero IOMMU MMIO region Attempting to memset the whole IOMMU MMIO region to zero is dangerous to say the least. We don't know which registers might be there, nor which values might be safe for those registers. On a forthcoming platform doing the zeroing of the MMIO region does put the IOMMU in a broken state, which is not recoverable by the IOMMU initialization procedure in Xen. Instead just zero the control register, which mimics the current behavior with regards to how the control register is handled, and ensures the IOMU setup is done with the unit disabled. This approach will need revisiting in order to support Preboot DMA Protection. Fold map_iommu_mmio_region() into its only caller, as the function body is just an ioremap() call after the removal of the memset(). Fixes: 0700c962ac2d ("Add AMD IOMMU support into hypervisor") Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/drivers/passthrough/amd/iommu_init.c | 33 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index d77dd85112..e0c8925c33 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -42,18 +42,6 @@ static bool iommu_has_ht_flag(struct amd_iommu *iommu, u8 mask) return iommu->ht_flags & mask; } -static int __init map_iommu_mmio_region(struct amd_iommu *iommu) -{ - iommu->mmio_base = ioremap(iommu->mmio_base_phys, - IOMMU_MMIO_REGION_LENGTH); - if ( !iommu->mmio_base ) - return -ENOMEM; - - memset(iommu->mmio_base, 0, IOMMU_MMIO_REGION_LENGTH); - - return 0; -} - static void __init unmap_iommu_mmio_region(struct amd_iommu *iommu) { if ( iommu->mmio_base ) @@ -1367,11 +1355,14 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) { int rc = alloc_ivrs_mappings(iommu->sbdf.seg); - if ( !rc ) - rc = map_iommu_mmio_region(iommu); if ( rc ) return rc; + iommu->mmio_base = ioremap(iommu->mmio_base_phys, + IOMMU_MMIO_REGION_LENGTH); + if ( !iommu->mmio_base ) + return -ENOMEM; + get_iommu_features(iommu); /* @@ -1381,6 +1372,20 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) if ( amd_iommu_max_paging_mode < amd_iommu_min_paging_mode ) return -ERANGE; + /* + * Check whether the IOMMU is already enabled and unconditionally disable + * it (zero the control register) ahead of Xen setup. Needs to be + * revisited to support Preboot DMA Protection. + */ + iommu->ctrl.raw = readq(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( iommu->ctrl.iommu_en ) + printk(XENLOG_WARNING + "AMD-Vi: IOMMU %pp enabled by firmware (ctrl %016lx)\n", + &iommu->sbdf, iommu->ctrl.raw); + + iommu->ctrl.raw = 0; + writeq(0, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 13:22:06 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 13:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302740.1576529 (Exim 4.92) (envelope-from ) id 1wKyfy-0002T7-DK; Thu, 07 May 2026 13:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302740.1576529; Thu, 07 May 2026 13:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKyfy-0002Sz-Ah; Thu, 07 May 2026 13:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1302740; Thu, 07 May 2026 13:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKyfx-0002St-JO for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 13:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKyfx-004IU5-1h for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 13:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKyfx-000l8j-1X for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 13:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7vt4mVxkab3oxv4bFdUEIjRa2f4KZZQV+PX20ZzgYvw=; b=m1FyzyAHoPneIBjImTEu/3Uw64 LSAeDyHzW6KUor+Fp8RJ42aQqZKEA6zIwlns4RJhvri+HB9tXLjrhQ9GRzO9kCx4WtUVoiOmmQQnU /gB3wuk3fVGamcl1ke4yDNYstVtXEE+HxJ993vhTZIgLso/bgWmnMB95laoTzMTo2jzs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: introduce CONFIG_HAS_DOMAIN_TYPE Message-Id: Date: Thu, 07 May 2026 13:22:01 +0000 commit 9f976dec039c2a5ddeb389efbaae8d726e17e84a Author: Oleksii Kurochko AuthorDate: Thu May 7 10:58:23 2026 +0200 Commit: Michal Orzel CommitDate: Thu May 7 13:26:52 2026 +0200 xen: introduce CONFIG_HAS_DOMAIN_TYPE As domain type is part of common code now there is no any reason to have architecture-specific set_domain_type() functions so it is dropped. Change the guard around access of kinfo->type to CONFIG_HAS_DOMAIN_TYPE for consistency. Also, drop and add some parentheses to be aligned with the similar if() below. x86 with CONFIG_64BIT=y shouldn't use is_{32,64}bit_domain() as x86 doesn't have support of CONFIG_HAS_DOMAIN_TYPE. Since x86_32 Xen no longer builds, the fallback is currently only relevant for arm32. Signed-off-by: Oleksii Kurochko Reviewed-by: Michal Orzel Acked-by: Jan Beulich --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/arm64/domctl.c | 4 ++-- xen/arch/arm/dom0less-build.c | 14 -------------- xen/arch/arm/domain_build.c | 12 +++++------- xen/arch/arm/include/asm/domain.h | 16 ---------------- xen/arch/arm/include/asm/kernel.h | 4 ---- xen/arch/arm/kernel.c | 16 ++++++++-------- xen/common/Kconfig | 3 +++ xen/include/xen/dom0less-build.h | 2 -- xen/include/xen/domain.h | 13 +++++++++++++ xen/include/xen/fdt-domain-build.h | 10 ++++++++++ xen/include/xen/fdt-kernel.h | 5 +++++ xen/include/xen/sched.h | 4 ++++ 13 files changed, 51 insertions(+), 53 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 2f2b501fda..79622b46a1 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -7,6 +7,7 @@ config ARM_64 def_bool y depends on !ARM_32 select 64BIT + select HAS_DOMAIN_TYPE select HAS_FAST_MULTIPLY select HAS_VPCI_GUEST_SUPPORT if PCI_PASSTHROUGH diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c index 8720d126c9..9e9a29eb1e 100644 --- a/xen/arch/arm/arm64/domctl.c +++ b/xen/arch/arm/arm64/domctl.c @@ -21,10 +21,10 @@ static long switch_mode(struct domain *d, enum domain_type type) return -EINVAL; if ( domain_tot_pages(d) != 0 ) return -EBUSY; - if ( d->arch.type == type ) + if ( d->type == type ) return 0; - d->arch.type = type; + d->type = type; if ( is_64bit_domain(d) ) for_each_vcpu(d, v) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 4181c10538..6f73c65e51 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -237,20 +237,6 @@ int __init make_arch_nodes(struct kernel_info *kinfo) return 0; } -/* TODO: make arch.type generic ? */ -#ifdef CONFIG_ARM_64 -void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) -{ - /* type must be set before allocate memory */ - d->arch.type = kinfo->arch.type; -} -#else -void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) -{ - /* Nothing to do */ -} -#endif - int __init init_vuart(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a3ff701023..ad665cd3c0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1771,15 +1771,15 @@ int __init construct_domain(struct domain *d, struct kernel_info *kinfo) BUG_ON(d->vcpu[0] == NULL); BUG_ON(v->is_initialised); -#ifdef CONFIG_ARM_64 +#ifdef CONFIG_HAS_DOMAIN_TYPE /* if aarch32 mode is not supported at EL1 do not allow 32-bit domain */ - if ( !(cpu_has_el1_32) && kinfo->arch.type == DOMAIN_32BIT ) + if ( !cpu_has_el1_32 && (kinfo->type == DOMAIN_32BIT) ) { printk("Platform does not support 32-bit domain\n"); return -EINVAL; } - if ( is_sve_domain(d) && (kinfo->arch.type == DOMAIN_32BIT) ) + if ( is_sve_domain(d) && (kinfo->type == DOMAIN_32BIT) ) { printk("SVE is not available for 32-bit domain\n"); return -EINVAL; @@ -1893,10 +1893,8 @@ int __init construct_hwdom(struct kernel_info *kinfo, iommu_hwdom_init(d); -#ifdef CONFIG_ARM_64 - /* type must be set before allocate_memory */ - d->arch.type = kinfo->arch.type; -#endif + set_domain_type(d, kinfo); + find_gnttab_region(d, kinfo); if ( is_domain_direct_mapped(d) ) allocate_memory_11(d, kinfo); diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index ffe5d0d9f0..b24f02d269 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -18,18 +18,6 @@ struct hvm_domain uint64_t params[HVM_NR_PARAMS]; }; -#ifdef CONFIG_ARM_64 -enum domain_type { - DOMAIN_32BIT, - DOMAIN_64BIT, -}; -#define is_32bit_domain(d) ((d)->arch.type == DOMAIN_32BIT) -#define is_64bit_domain(d) ((d)->arch.type == DOMAIN_64BIT) -#else -#define is_32bit_domain(d) (1) -#define is_64bit_domain(d) (0) -#endif - /* * Is the domain using the host memory layout? * @@ -62,10 +50,6 @@ struct paging_domain { struct arch_domain { -#ifdef CONFIG_ARM_64 - enum domain_type type; -#endif - #ifdef CONFIG_ARM64_SVE /* max SVE encoded vector length */ uint8_t sve_vl; diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index 7c3b7fde5b..21f4273fa1 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -10,10 +10,6 @@ struct arch_kernel_info { -#ifdef CONFIG_ARM_64 - enum domain_type type; -#endif - /* Enable pl011 emulation */ bool vpl011; }; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 7544fd50a2..9395b5af87 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -100,8 +100,8 @@ static paddr_t __init kernel_zimage_place(struct kernel_info *info) const struct membanks *mem = kernel_info_get_mem(info); paddr_t load_addr; -#ifdef CONFIG_ARM_64 - if ( (info->arch.type == DOMAIN_64BIT) && (info->zimage.start == 0) ) +#ifdef CONFIG_HAS_DOMAIN_TYPE + if ( (info->type == DOMAIN_64BIT) && (info->zimage.start == 0) ) return mem->bank[0].start + info->zimage.text_offset; #endif @@ -268,14 +268,14 @@ int __init kernel_uimage_probe(struct kernel_info *info, info->load = kernel_zimage_load; -#ifdef CONFIG_ARM_64 +#ifdef CONFIG_HAS_DOMAIN_TYPE switch ( uimage.arch ) { case IH_ARCH_ARM: - info->arch.type = DOMAIN_32BIT; + info->type = DOMAIN_32BIT; break; case IH_ARCH_ARM64: - info->arch.type = DOMAIN_64BIT; + info->type = DOMAIN_64BIT; break; default: printk(XENLOG_ERR "Unsupported uImage arch type %d\n", uimage.arch); @@ -345,7 +345,7 @@ static int __init kernel_zimage64_probe(struct kernel_info *info, info->load = kernel_zimage_load; - info->arch.type = DOMAIN_64BIT; + info->type = DOMAIN_64BIT; return 0; } @@ -396,8 +396,8 @@ static int __init kernel_zimage32_probe(struct kernel_info *info, info->load = kernel_zimage_load; -#ifdef CONFIG_ARM_64 - info->arch.type = DOMAIN_32BIT; +#ifdef CONFIG_HAS_DOMAIN_TYPE + info->type = DOMAIN_32BIT; #endif return 0; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0a20aa0a12..5ff71480ee 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -128,6 +128,9 @@ config HAS_DEVICE_TREE_DISCOVERY config HAS_DOM0LESS bool +config HAS_DOMAIN_TYPE + bool + config HAS_DIT # Data Independent Timing bool diff --git a/xen/include/xen/dom0less-build.h b/xen/include/xen/dom0less-build.h index faaf660424..4118dec76c 100644 --- a/xen/include/xen/dom0less-build.h +++ b/xen/include/xen/dom0less-build.h @@ -57,8 +57,6 @@ int init_vuart(struct domain *d, struct kernel_info *kinfo, int make_intc_domU_node(struct kernel_info *kinfo); int make_arch_nodes(struct kernel_info *kinfo); -void set_domain_type(struct domain *d, struct kernel_info *kinfo); - int init_intc_phandle(struct kernel_info *kinfo, const char *name, const int node_next, const void *pfdt); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 93c0fd00c1..a095190fc7 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -13,6 +13,19 @@ struct guest_area { void *map; }; +#ifdef CONFIG_HAS_DOMAIN_TYPE +enum __packed domain_type { + DOMAIN_32BIT, + DOMAIN_64BIT, +}; +#define is_32bit_domain(d) ((d)->type == DOMAIN_32BIT) +#define is_64bit_domain(d) ((d)->type == DOMAIN_64BIT) +#elif !defined(CONFIG_64BIT) +/* At the moment on 32-bit-only platforms all domains are 32-bit. */ +#define is_32bit_domain(d) true +#define is_64bit_domain(d) false +#endif + #include typedef union { diff --git a/xen/include/xen/fdt-domain-build.h b/xen/include/xen/fdt-domain-build.h index 0d40d8cfa1..9465a1021f 100644 --- a/xen/include/xen/fdt-domain-build.h +++ b/xen/include/xen/fdt-domain-build.h @@ -7,6 +7,7 @@ #include #include #include +#include #include struct domain; @@ -69,6 +70,15 @@ static inline uint32_t alloc_phandle(struct kernel_info *kinfo) return kinfo->next_phandle >= GUEST_PHANDLE_GIC ? 0 : kinfo->next_phandle++; } +static inline void set_domain_type(struct domain *d, const struct kernel_info *kinfo) +{ +#ifdef CONFIG_HAS_DOMAIN_TYPE + /* Type must be set before allocating memory. */ + ASSERT(!domain_tot_pages(d)); + d->type = kinfo->type; +#endif +} + #endif /* __XEN_FDT_DOMAIN_BUILD_H__ */ /* diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 4d0467bb39..86a37a1304 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -9,6 +9,7 @@ #include #include +#include #include #if __has_include() @@ -65,6 +66,10 @@ struct kernel_info { } zimage; }; +#ifdef CONFIG_HAS_DOMAIN_TYPE + enum domain_type type; +#endif + #if __has_include() struct arch_kernel_info arch; #endif diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 212c7d765c..00db1da12f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -386,6 +386,10 @@ struct domain { domid_t domain_id; +#ifdef CONFIG_HAS_DOMAIN_TYPE + enum domain_type type; +#endif + unsigned int max_vcpus; uint64_t unique_id; /* Unique domain identifier */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 14:22:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 14:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302791.1576533 (Exim 4.92) (envelope-from ) id 1wKzc8-0001mt-Bt; Thu, 07 May 2026 14:22:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302791.1576533; Thu, 07 May 2026 14:22:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKzc8-0001ml-96; Thu, 07 May 2026 14:22:08 +0000 Received: by outflank-mailman (input) for mailman id 1302791; Thu, 07 May 2026 14:22:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKzc7-0001mf-AW for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKzc7-004JjT-0m for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKzc2-000o63-0i for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tLI1sJOfaX4R9Rm37jqdhbnNv5gaZJcLqbIvkHYlkMk=; b=BPnUuHdd4bOd6Y686ZzoC2a3kK xnQbPx0l+gZfcKLy/cvP6dnNxXTpWmmPAq+SpT9V/nhhyt2N9A+ZUoawkeYe0DRRBdROajC1dRWeC YEC+ocPId7f4FPoS2opY5PU5XEJivC/LYWyTC23ltzEYMMHqANvZ9r9RjqR5etxPlVew=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/time: make early NOW() uses slightly more precise Message-Id: Date: Thu, 07 May 2026 14:22:02 +0000 commit 4526d67634664bac3a441b37caa22d9b2e7a34d8 Author: Jan Beulich AuthorDate: Thu May 7 13:25:17 2026 +0200 Commit: Jan Beulich CommitDate: Thu May 7 16:10:52 2026 +0200 x86/time: make early NOW() uses slightly more precise For early NOW() uses to yield sufficiently precise results (scaling incurs some error, which grows with the delta being scaled), init_percpu_time() wants to have run as early as possible. With 93340297802b ("x86/time: calibrate TSC against platform timer") having moved the invocation of init_platform_timer() from init_xen_time() to early_time_init(), this other call could be moved as well. Moving, however, has the unwanted effect of then growing the gap until time calibration runs for the 1st time. Therefore keep the present invocation, and add another from early_time_init(). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/time.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 8209d37d32..c708c80be3 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -2597,6 +2597,11 @@ int __init init_xen_time(void) /* Finish platform timer initialization. */ try_platform_timer_tail(); + /* + * While early_time_init() called this already, call it again here to + * reduce the gap until local_time_calibration() gets to run for the + * first time. + */ init_percpu_time(); init_timer(&calibration_timer, time_calibration, NULL, 0); @@ -2642,6 +2647,8 @@ void __init early_time_init(void) set_time_scale(&t->tsc_scale, tmp); t->stamp.local_tsc = boot_tsc_stamp; + init_percpu_time(); + cpu_khz = DIV_ROUND(tmp, 1000); printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 14:22:18 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 14:22:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302793.1576537 (Exim 4.92) (envelope-from ) id 1wKzcI-0001qD-DL; Thu, 07 May 2026 14:22:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302793.1576537; Thu, 07 May 2026 14:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKzcI-0001q4-AQ; Thu, 07 May 2026 14:22:18 +0000 Received: by outflank-mailman (input) for mailman id 1302793; Thu, 07 May 2026 14:22:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKzcH-0001ps-Cd for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKzcH-004Jjj-17 for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKzcH-000o9Q-0y for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=awTYzEQoEwviPNqMj/7YZpkfaFIvFJyQGhO5QtDIg0g=; b=5fEzPdicS3kUj0c2h3QT3ziC7K N3Mv1w1cOZRl0LAZYbbMoAitx4pzDhyvTP4p4lsTkj5McI/EOylHX41bWQULO10SkGLfu/gEiYrRz bhjma4gyVBDa7lNADUcpiw62a7vncPMTIPk/EEdbPuJM6pDELmRrfCKxVgO8Gq7/WA+M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/time: make do_settime() uses more accurate Message-Id: Date: Thu, 07 May 2026 14:22:17 +0000 commit 54ca0aadc8219b19199703038205cd01c2611995 Author: Jan Beulich AuthorDate: Thu May 7 13:26:03 2026 +0200 Commit: Jan Beulich CommitDate: Thu May 7 16:10:52 2026 +0200 x86/time: make do_settime() uses more accurate As a comment next to one of the invocations states, get_wallclock_time() can take over a second. The order of evaluation of function arguments is in principle unspecified; in practice at least gcc looks to be evaluating them from last to first. Hence with NOW() invoked first, the respective value passed to do_settime() can be off by over a second (which is in contrast to __get_cmos_time() attempting to get the time exactly after an update, i.e. [pretty] precisely at a seconds boundary). This also addresses a Misra C:2012 rule 13.2 ("The value of an expression and its persistent side-effects shall be the same under all permitted evaluation orders") violation each. The violations aren't flagged because the entire file is (bogusly) excluded from scanning. Fixes: f64134cdb81c ("x86: Fix time_resume() to notify all domains of wallclock change") Fixes: 0bfcf984b727 ("x86: Reintroduce clocksource=tsc") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/time.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c708c80be3..98e8ef19e4 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -2575,6 +2575,8 @@ __initcall(verify_tsc_reliability); /* Late init function (after interrupts are enabled). */ int __init init_xen_time(void) { + unsigned long wc; + tsc_check_writability(); open_softirq(TIME_CALIBRATE_SOFTIRQ, local_time_calibration); @@ -2592,7 +2594,8 @@ int __init init_xen_time(void) printk(XENLOG_INFO "Wallclock source: %s\n", wallclock_type_to_string()); /* NB. get_wallclock_time() can take over one second to execute. */ - do_settime(get_wallclock_time(), 0, NOW()); + wc = get_wallclock_time(); + do_settime(wc, 0, NOW()); /* Finish platform timer initialization. */ try_platform_timer_tail(); @@ -2752,6 +2755,8 @@ int time_suspend(void) int time_resume(void) { + unsigned long wc; + preinit_pit(); resume_platform_timer(); @@ -2763,7 +2768,8 @@ int time_resume(void) set_timer(&calibration_timer, NOW() + EPOCH); - do_settime(get_wallclock_time() + cmos_utc_offset, 0, NOW()); + wc = get_wallclock_time(); + do_settime(wc + cmos_utc_offset, 0, NOW()); update_vcpu_system_time(current); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 14:22:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 14:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302794.1576541 (Exim 4.92) (envelope-from ) id 1wKzcX-0001sV-Es; Thu, 07 May 2026 14:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302794.1576541; Thu, 07 May 2026 14:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKzcX-0001sL-CA; Thu, 07 May 2026 14:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1302794; Thu, 07 May 2026 14:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKzcW-0001sF-Fq for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wKzcW-004Jjn-1T for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wKzcR-000o9s-1I for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 14:22:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5GKV+78I+dBXiCEjsbU3/YcTwMMz3d9Oyimq/b1dkzY=; b=GsTomdBXl4zXoS+TYdgsgzgYuG u3OHvrVbUMAbvI+/wNS09/VJHAGUbg2I3RWt6EG6hyLyBtsQKF5Y9SjN6gPJgXHag/1OwqaR7tKF1 swgH87SggMhnxKxspkLZSiVRY1dUzLSmjpzkB9Bfk6n2u4UEuHHGigGbXGnE6aFOAMrY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: fix MMIO alignment check in imsic_init() Message-Id: Date: Thu, 07 May 2026 14:22:27 +0000 commit 2611377cf9c92b43b04a33810f03fa07bf8ba954 Author: Oleksii Kurochko AuthorDate: Thu May 7 13:27:07 2026 +0200 Commit: Jan Beulich CommitDate: Thu May 7 16:11:03 2026 +0200 xen/riscv: fix MMIO alignment check in imsic_init() The MMIO alignment check in imsic_init() incorrectly uses cpu as the index into mmios[]. The loop index should be used instead. Otherwise, the alignment check may be performed on the wrong MMIO address. Fix the index used in the alignment check and corresponding printk. Fixes: c9bd8b322ecbb ("xen/riscv: imsic_init() implementation") Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/imsic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/riscv/imsic.c b/xen/arch/riscv/imsic.c index a4460576f6..f7b70a8da0 100644 --- a/xen/arch/riscv/imsic.c +++ b/xen/arch/riscv/imsic.c @@ -451,11 +451,11 @@ int __init imsic_init(const struct dt_device_node *node) continue; } - if ( !IS_ALIGNED(mmios[cpu].base_addr + reloff, - IMSIC_MMIO_PAGE_SZ) ) + if ( !IS_ALIGNED(mmios[index].base_addr + reloff, IMSIC_MMIO_PAGE_SZ) ) { printk(XENLOG_WARNING "%s: MMIO address %#lx is not aligned on a page\n", - node->name, msi[cpu].base_addr + reloff); + node->name, mmios[index].base_addr + reloff); + continue; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 16:22:09 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 16:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302890.1576554 (Exim 4.92) (envelope-from ) id 1wL1UA-0001KR-PH; Thu, 07 May 2026 16:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302890.1576554; Thu, 07 May 2026 16:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1UA-0001KK-MP; Thu, 07 May 2026 16:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1302890; Thu, 07 May 2026 16:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1U9-0001KE-UD for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wL1U9-004MaB-2p for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wL1U9-000vz0-2T for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZoIMBRNcbUMxUdc+unA7r9c/79P59Yid7mwaHyGVyO0=; b=kTMz9EAyZ1gqxkkl/cd0UqdkFb 2rNI+NiDZdZWHNCZ+XavDUmyNgbAgDYYo44xoE4nm/dqT3vrl1pop0gvaEn0eUWp5SePFnrJhy0gO l7pVBodl71IILVM5tDfDuFUqLhsnIdPsYz8bbBUd7D9CBl7VeAsJ3UqD8p0PIZ+beXZs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: introduce CONFIG_HAS_DOMAIN_TYPE Message-Id: Date: Thu, 07 May 2026 16:22:01 +0000 commit 9f976dec039c2a5ddeb389efbaae8d726e17e84a Author: Oleksii Kurochko AuthorDate: Thu May 7 10:58:23 2026 +0200 Commit: Michal Orzel CommitDate: Thu May 7 13:26:52 2026 +0200 xen: introduce CONFIG_HAS_DOMAIN_TYPE As domain type is part of common code now there is no any reason to have architecture-specific set_domain_type() functions so it is dropped. Change the guard around access of kinfo->type to CONFIG_HAS_DOMAIN_TYPE for consistency. Also, drop and add some parentheses to be aligned with the similar if() below. x86 with CONFIG_64BIT=y shouldn't use is_{32,64}bit_domain() as x86 doesn't have support of CONFIG_HAS_DOMAIN_TYPE. Since x86_32 Xen no longer builds, the fallback is currently only relevant for arm32. Signed-off-by: Oleksii Kurochko Reviewed-by: Michal Orzel Acked-by: Jan Beulich --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/arm64/domctl.c | 4 ++-- xen/arch/arm/dom0less-build.c | 14 -------------- xen/arch/arm/domain_build.c | 12 +++++------- xen/arch/arm/include/asm/domain.h | 16 ---------------- xen/arch/arm/include/asm/kernel.h | 4 ---- xen/arch/arm/kernel.c | 16 ++++++++-------- xen/common/Kconfig | 3 +++ xen/include/xen/dom0less-build.h | 2 -- xen/include/xen/domain.h | 13 +++++++++++++ xen/include/xen/fdt-domain-build.h | 10 ++++++++++ xen/include/xen/fdt-kernel.h | 5 +++++ xen/include/xen/sched.h | 4 ++++ 13 files changed, 51 insertions(+), 53 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 2f2b501fda..79622b46a1 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -7,6 +7,7 @@ config ARM_64 def_bool y depends on !ARM_32 select 64BIT + select HAS_DOMAIN_TYPE select HAS_FAST_MULTIPLY select HAS_VPCI_GUEST_SUPPORT if PCI_PASSTHROUGH diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c index 8720d126c9..9e9a29eb1e 100644 --- a/xen/arch/arm/arm64/domctl.c +++ b/xen/arch/arm/arm64/domctl.c @@ -21,10 +21,10 @@ static long switch_mode(struct domain *d, enum domain_type type) return -EINVAL; if ( domain_tot_pages(d) != 0 ) return -EBUSY; - if ( d->arch.type == type ) + if ( d->type == type ) return 0; - d->arch.type = type; + d->type = type; if ( is_64bit_domain(d) ) for_each_vcpu(d, v) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 4181c10538..6f73c65e51 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -237,20 +237,6 @@ int __init make_arch_nodes(struct kernel_info *kinfo) return 0; } -/* TODO: make arch.type generic ? */ -#ifdef CONFIG_ARM_64 -void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) -{ - /* type must be set before allocate memory */ - d->arch.type = kinfo->arch.type; -} -#else -void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) -{ - /* Nothing to do */ -} -#endif - int __init init_vuart(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a3ff701023..ad665cd3c0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1771,15 +1771,15 @@ int __init construct_domain(struct domain *d, struct kernel_info *kinfo) BUG_ON(d->vcpu[0] == NULL); BUG_ON(v->is_initialised); -#ifdef CONFIG_ARM_64 +#ifdef CONFIG_HAS_DOMAIN_TYPE /* if aarch32 mode is not supported at EL1 do not allow 32-bit domain */ - if ( !(cpu_has_el1_32) && kinfo->arch.type == DOMAIN_32BIT ) + if ( !cpu_has_el1_32 && (kinfo->type == DOMAIN_32BIT) ) { printk("Platform does not support 32-bit domain\n"); return -EINVAL; } - if ( is_sve_domain(d) && (kinfo->arch.type == DOMAIN_32BIT) ) + if ( is_sve_domain(d) && (kinfo->type == DOMAIN_32BIT) ) { printk("SVE is not available for 32-bit domain\n"); return -EINVAL; @@ -1893,10 +1893,8 @@ int __init construct_hwdom(struct kernel_info *kinfo, iommu_hwdom_init(d); -#ifdef CONFIG_ARM_64 - /* type must be set before allocate_memory */ - d->arch.type = kinfo->arch.type; -#endif + set_domain_type(d, kinfo); + find_gnttab_region(d, kinfo); if ( is_domain_direct_mapped(d) ) allocate_memory_11(d, kinfo); diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index ffe5d0d9f0..b24f02d269 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -18,18 +18,6 @@ struct hvm_domain uint64_t params[HVM_NR_PARAMS]; }; -#ifdef CONFIG_ARM_64 -enum domain_type { - DOMAIN_32BIT, - DOMAIN_64BIT, -}; -#define is_32bit_domain(d) ((d)->arch.type == DOMAIN_32BIT) -#define is_64bit_domain(d) ((d)->arch.type == DOMAIN_64BIT) -#else -#define is_32bit_domain(d) (1) -#define is_64bit_domain(d) (0) -#endif - /* * Is the domain using the host memory layout? * @@ -62,10 +50,6 @@ struct paging_domain { struct arch_domain { -#ifdef CONFIG_ARM_64 - enum domain_type type; -#endif - #ifdef CONFIG_ARM64_SVE /* max SVE encoded vector length */ uint8_t sve_vl; diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index 7c3b7fde5b..21f4273fa1 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -10,10 +10,6 @@ struct arch_kernel_info { -#ifdef CONFIG_ARM_64 - enum domain_type type; -#endif - /* Enable pl011 emulation */ bool vpl011; }; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 7544fd50a2..9395b5af87 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -100,8 +100,8 @@ static paddr_t __init kernel_zimage_place(struct kernel_info *info) const struct membanks *mem = kernel_info_get_mem(info); paddr_t load_addr; -#ifdef CONFIG_ARM_64 - if ( (info->arch.type == DOMAIN_64BIT) && (info->zimage.start == 0) ) +#ifdef CONFIG_HAS_DOMAIN_TYPE + if ( (info->type == DOMAIN_64BIT) && (info->zimage.start == 0) ) return mem->bank[0].start + info->zimage.text_offset; #endif @@ -268,14 +268,14 @@ int __init kernel_uimage_probe(struct kernel_info *info, info->load = kernel_zimage_load; -#ifdef CONFIG_ARM_64 +#ifdef CONFIG_HAS_DOMAIN_TYPE switch ( uimage.arch ) { case IH_ARCH_ARM: - info->arch.type = DOMAIN_32BIT; + info->type = DOMAIN_32BIT; break; case IH_ARCH_ARM64: - info->arch.type = DOMAIN_64BIT; + info->type = DOMAIN_64BIT; break; default: printk(XENLOG_ERR "Unsupported uImage arch type %d\n", uimage.arch); @@ -345,7 +345,7 @@ static int __init kernel_zimage64_probe(struct kernel_info *info, info->load = kernel_zimage_load; - info->arch.type = DOMAIN_64BIT; + info->type = DOMAIN_64BIT; return 0; } @@ -396,8 +396,8 @@ static int __init kernel_zimage32_probe(struct kernel_info *info, info->load = kernel_zimage_load; -#ifdef CONFIG_ARM_64 - info->arch.type = DOMAIN_32BIT; +#ifdef CONFIG_HAS_DOMAIN_TYPE + info->type = DOMAIN_32BIT; #endif return 0; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0a20aa0a12..5ff71480ee 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -128,6 +128,9 @@ config HAS_DEVICE_TREE_DISCOVERY config HAS_DOM0LESS bool +config HAS_DOMAIN_TYPE + bool + config HAS_DIT # Data Independent Timing bool diff --git a/xen/include/xen/dom0less-build.h b/xen/include/xen/dom0less-build.h index faaf660424..4118dec76c 100644 --- a/xen/include/xen/dom0less-build.h +++ b/xen/include/xen/dom0less-build.h @@ -57,8 +57,6 @@ int init_vuart(struct domain *d, struct kernel_info *kinfo, int make_intc_domU_node(struct kernel_info *kinfo); int make_arch_nodes(struct kernel_info *kinfo); -void set_domain_type(struct domain *d, struct kernel_info *kinfo); - int init_intc_phandle(struct kernel_info *kinfo, const char *name, const int node_next, const void *pfdt); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 93c0fd00c1..a095190fc7 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -13,6 +13,19 @@ struct guest_area { void *map; }; +#ifdef CONFIG_HAS_DOMAIN_TYPE +enum __packed domain_type { + DOMAIN_32BIT, + DOMAIN_64BIT, +}; +#define is_32bit_domain(d) ((d)->type == DOMAIN_32BIT) +#define is_64bit_domain(d) ((d)->type == DOMAIN_64BIT) +#elif !defined(CONFIG_64BIT) +/* At the moment on 32-bit-only platforms all domains are 32-bit. */ +#define is_32bit_domain(d) true +#define is_64bit_domain(d) false +#endif + #include typedef union { diff --git a/xen/include/xen/fdt-domain-build.h b/xen/include/xen/fdt-domain-build.h index 0d40d8cfa1..9465a1021f 100644 --- a/xen/include/xen/fdt-domain-build.h +++ b/xen/include/xen/fdt-domain-build.h @@ -7,6 +7,7 @@ #include #include #include +#include #include struct domain; @@ -69,6 +70,15 @@ static inline uint32_t alloc_phandle(struct kernel_info *kinfo) return kinfo->next_phandle >= GUEST_PHANDLE_GIC ? 0 : kinfo->next_phandle++; } +static inline void set_domain_type(struct domain *d, const struct kernel_info *kinfo) +{ +#ifdef CONFIG_HAS_DOMAIN_TYPE + /* Type must be set before allocating memory. */ + ASSERT(!domain_tot_pages(d)); + d->type = kinfo->type; +#endif +} + #endif /* __XEN_FDT_DOMAIN_BUILD_H__ */ /* diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 4d0467bb39..86a37a1304 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -9,6 +9,7 @@ #include #include +#include #include #if __has_include() @@ -65,6 +66,10 @@ struct kernel_info { } zimage; }; +#ifdef CONFIG_HAS_DOMAIN_TYPE + enum domain_type type; +#endif + #if __has_include() struct arch_kernel_info arch; #endif diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 212c7d765c..00db1da12f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -386,6 +386,10 @@ struct domain { domid_t domain_id; +#ifdef CONFIG_HAS_DOMAIN_TYPE + enum domain_type type; +#endif + unsigned int max_vcpus; uint64_t unique_id; /* Unique domain identifier */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 16:22:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302891.1576558 (Exim 4.92) (envelope-from ) id 1wL1UK-0001MK-Rx; Thu, 07 May 2026 16:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302891.1576558; Thu, 07 May 2026 16:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1UK-0001MC-PE; Thu, 07 May 2026 16:22:12 +0000 Received: by outflank-mailman (input) for mailman id 1302891; Thu, 07 May 2026 16:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1UK-0001M4-0I for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wL1UJ-004MaH-39 for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wL1UJ-000vzq-31 for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Nh7ft8pj0D2wJ4XZeRRh09wqtgA1Ulds4eJoDMoxd4A=; b=Ql61Sx88u9OSI5DTwayN7Xdkjl UdjQHCyV9LglWznQmObd3UrpqFiIOdAQO2Qanmr3ZW4RiwHnuTi4Vhd3Oqk/x4KJEYJoYSf7ODr/1 4DvUtW43YzxPEUjNhFxkw3F4JfVF34BGdSBRtsoNy4Mnpl1vK4Q7RxW+JVQuilMWcwEU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/time: make early NOW() uses slightly more precise Message-Id: Date: Thu, 07 May 2026 16:22:11 +0000 commit 4526d67634664bac3a441b37caa22d9b2e7a34d8 Author: Jan Beulich AuthorDate: Thu May 7 13:25:17 2026 +0200 Commit: Jan Beulich CommitDate: Thu May 7 16:10:52 2026 +0200 x86/time: make early NOW() uses slightly more precise For early NOW() uses to yield sufficiently precise results (scaling incurs some error, which grows with the delta being scaled), init_percpu_time() wants to have run as early as possible. With 93340297802b ("x86/time: calibrate TSC against platform timer") having moved the invocation of init_platform_timer() from init_xen_time() to early_time_init(), this other call could be moved as well. Moving, however, has the unwanted effect of then growing the gap until time calibration runs for the 1st time. Therefore keep the present invocation, and add another from early_time_init(). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/time.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 8209d37d32..c708c80be3 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -2597,6 +2597,11 @@ int __init init_xen_time(void) /* Finish platform timer initialization. */ try_platform_timer_tail(); + /* + * While early_time_init() called this already, call it again here to + * reduce the gap until local_time_calibration() gets to run for the + * first time. + */ init_percpu_time(); init_timer(&calibration_timer, time_calibration, NULL, 0); @@ -2642,6 +2647,8 @@ void __init early_time_init(void) set_time_scale(&t->tsc_scale, tmp); t->stamp.local_tsc = boot_tsc_stamp; + init_percpu_time(); + cpu_khz = DIV_ROUND(tmp, 1000); printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 16:22:22 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 16:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302892.1576562 (Exim 4.92) (envelope-from ) id 1wL1UU-0001QI-T6; Thu, 07 May 2026 16:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302892.1576562; Thu, 07 May 2026 16:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1UU-0001QA-Qa; Thu, 07 May 2026 16:22:22 +0000 Received: by outflank-mailman (input) for mailman id 1302892; Thu, 07 May 2026 16:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1UU-0001Q1-3I for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wL1UU-004MaR-0F for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wL1UU-000w0Y-06 for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J7P5YLIsbBPmWJSmzp8OOYU1rDWV/GiswusPFoQWb5A=; b=Yya/ORqrZmzj94k9PX/2CjHM3l 2TwIo7cQGXQ5xHKPCviuWLoNu6KqhoPRiILQu0BIQyd4So07muYbxdWOw0Lv9C7nOJYRURJl9NYTb AE8wz52vF0fd+YSInTaH57IqCC10XtrQI+1FzviKVYJt4XIt5nc1teqJq6Y/8qd4Rz6s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/time: make do_settime() uses more accurate Message-Id: Date: Thu, 07 May 2026 16:22:22 +0000 commit 54ca0aadc8219b19199703038205cd01c2611995 Author: Jan Beulich AuthorDate: Thu May 7 13:26:03 2026 +0200 Commit: Jan Beulich CommitDate: Thu May 7 16:10:52 2026 +0200 x86/time: make do_settime() uses more accurate As a comment next to one of the invocations states, get_wallclock_time() can take over a second. The order of evaluation of function arguments is in principle unspecified; in practice at least gcc looks to be evaluating them from last to first. Hence with NOW() invoked first, the respective value passed to do_settime() can be off by over a second (which is in contrast to __get_cmos_time() attempting to get the time exactly after an update, i.e. [pretty] precisely at a seconds boundary). This also addresses a Misra C:2012 rule 13.2 ("The value of an expression and its persistent side-effects shall be the same under all permitted evaluation orders") violation each. The violations aren't flagged because the entire file is (bogusly) excluded from scanning. Fixes: f64134cdb81c ("x86: Fix time_resume() to notify all domains of wallclock change") Fixes: 0bfcf984b727 ("x86: Reintroduce clocksource=tsc") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/time.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c708c80be3..98e8ef19e4 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -2575,6 +2575,8 @@ __initcall(verify_tsc_reliability); /* Late init function (after interrupts are enabled). */ int __init init_xen_time(void) { + unsigned long wc; + tsc_check_writability(); open_softirq(TIME_CALIBRATE_SOFTIRQ, local_time_calibration); @@ -2592,7 +2594,8 @@ int __init init_xen_time(void) printk(XENLOG_INFO "Wallclock source: %s\n", wallclock_type_to_string()); /* NB. get_wallclock_time() can take over one second to execute. */ - do_settime(get_wallclock_time(), 0, NOW()); + wc = get_wallclock_time(); + do_settime(wc, 0, NOW()); /* Finish platform timer initialization. */ try_platform_timer_tail(); @@ -2752,6 +2755,8 @@ int time_suspend(void) int time_resume(void) { + unsigned long wc; + preinit_pit(); resume_platform_timer(); @@ -2763,7 +2768,8 @@ int time_resume(void) set_timer(&calibration_timer, NOW() + EPOCH); - do_settime(get_wallclock_time() + cmos_utc_offset, 0, NOW()); + wc = get_wallclock_time(); + do_settime(wc + cmos_utc_offset, 0, NOW()); update_vcpu_system_time(current); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 16:22:32 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2026 16:22:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1302893.1576566 (Exim 4.92) (envelope-from ) id 1wL1Ue-0001SJ-Uf; Thu, 07 May 2026 16:22:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1302893.1576566; Thu, 07 May 2026 16:22:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1Ue-0001SB-Rw; Thu, 07 May 2026 16:22:32 +0000 Received: by outflank-mailman (input) for mailman id 1302893; Thu, 07 May 2026 16:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wL1Ue-0001S3-6W for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wL1Ue-004MaW-0W for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wL1Ue-000w15-0P for xen-changelog@lists.xenproject.org; Thu, 07 May 2026 16:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/A2Kha5p0chrVZ8IY/yc1+G3hnpglvyVekZoY2JNCRE=; b=Ncv08veuDK0ZNYwqBXqVXWXl94 LwluNqvGd20FxKGQVYKZBwmhHVVcVt7qe+rgumvVw0jtaK5WiTO1tLKFrSz6Y2ZE9KKXVQwC9RgYy 5KjRkf7triraXnlBSEqCmWi9+/NY0i/YfUbcF8Iw9JGVNFTFPa2YSW18TsmO5ZPTTeWM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: fix MMIO alignment check in imsic_init() Message-Id: Date: Thu, 07 May 2026 16:22:32 +0000 commit 2611377cf9c92b43b04a33810f03fa07bf8ba954 Author: Oleksii Kurochko AuthorDate: Thu May 7 13:27:07 2026 +0200 Commit: Jan Beulich CommitDate: Thu May 7 16:11:03 2026 +0200 xen/riscv: fix MMIO alignment check in imsic_init() The MMIO alignment check in imsic_init() incorrectly uses cpu as the index into mmios[]. The loop index should be used instead. Otherwise, the alignment check may be performed on the wrong MMIO address. Fix the index used in the alignment check and corresponding printk. Fixes: c9bd8b322ecbb ("xen/riscv: imsic_init() implementation") Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/imsic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/riscv/imsic.c b/xen/arch/riscv/imsic.c index a4460576f6..f7b70a8da0 100644 --- a/xen/arch/riscv/imsic.c +++ b/xen/arch/riscv/imsic.c @@ -451,11 +451,11 @@ int __init imsic_init(const struct dt_device_node *node) continue; } - if ( !IS_ALIGNED(mmios[cpu].base_addr + reloff, - IMSIC_MMIO_PAGE_SZ) ) + if ( !IS_ALIGNED(mmios[index].base_addr + reloff, IMSIC_MMIO_PAGE_SZ) ) { printk(XENLOG_WARNING "%s: MMIO address %#lx is not aligned on a page\n", - node->name, msi[cpu].base_addr + reloff); + node->name, mmios[index].base_addr + reloff); + continue; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 08 07:33:12 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2026 07:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1303245.1576723 (Exim 4.92) (envelope-from ) id 1wLFhm-0000gW-Nj; Fri, 08 May 2026 07:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1303245.1576723; Fri, 08 May 2026 07:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wLFhm-0000gO-Kq; Fri, 08 May 2026 07:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1303245; Fri, 08 May 2026 07:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wLFhm-0000gI-3m for xen-changelog@lists.xenproject.org; Fri, 08 May 2026 07:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wLFhm-005qYN-05 for xen-changelog@lists.xenproject.org; Fri, 08 May 2026 07:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wLFhl-001tbC-2z for xen-changelog@lists.xenproject.org; Fri, 08 May 2026 07:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D6EO51cza2zr/bw+AW0SLwuQGWtZtqNRpfx5qCASSqs=; b=RDIiDgvKyn8kyP4wJPcVLLESp5 SxOy0P5YO+f9hjxDAJ0wUFfAFNZY90eMPDJA0FO3KXINVRq6lM2OIhTFFt6N+/Nn3mrcmrPZ2NyGe r1D3CgqWl3nUIAz/EWxaokbF+iD2eOpQYsKeIwVfe35Ax+UlcGzjaI4m4ojKNv0Oa+x4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: skip holes in physical address space when setting up frametable Message-Id: Date: Fri, 08 May 2026 07:33:01 +0000 commit 10d417b8b62efa5093707c1dfe9bd48e0abeb331 Author: Michal Orzel AuthorDate: Wed May 6 10:41:37 2026 +0200 Commit: Michal Orzel CommitDate: Fri May 8 08:52:27 2026 +0200 xen/arm: skip holes in physical address space when setting up frametable Refactor setup_frametable_mappings() into init_frametable(), modeled after x86's implementation. Instead of mapping one contiguous frametable covering ram_start to ram_end (including holes), iterate the pdx_group_valid bitmap to allocate and map frametable memory only for valid PDX groups, skipping gaps in the physical address space. This reduces memory consumption on systems with sparse RAM layouts by not allocating frametable entries for non-existent memory regions. The chunk allocator rounds chunk_size up to PAGE_SIZE only, rather than to a larger mapping granularity, to avoid overshooting past chunk boundaries into subsequent gaps or valid regions. This rounding has no impact for in-loop chunks given that chunk size is a multiple of 14MB on Arm64 and 2MB on Arm32. The rounding matters only for the last out-of-loop chunk. Physical allocations prefer 32MB alignment so that map_pages_to_xen() can use the contiguous bit for larger TLB entries where virtual alignment also permits. Fall back to 2MB if the chunk is smaller than 32MB. Add a comment explaining why we don't use pdx_to_page(). For complete discussion see [1]. As ram_end is no longer needed by init_frametable(), drop the now-dead ram_end/bank_end computation from setup_mm(). Update the MPU implementation to match the new init_frametable() signature. Since MPU has no virtual address translation (ma == va), hole-skipping is not possible and the frametable remains a single contiguous allocation. [1] https://lore.kernel.org/xen-devel/20260430125103.401811-1-michal.orzel@amd.com/T/#m803025eb6720a1425443dd0f8e72be93ef02f344 Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Tested-by: Luca Fancellu Acked-by: Stefano Stabellini --- xen/arch/arm/arm32/mmu/mm.c | 3 +- xen/arch/arm/include/asm/mm.h | 4 +- xen/arch/arm/mm.c | 5 +-- xen/arch/arm/mmu/mm.c | 100 ++++++++++++++++++++++++++++++++---------- xen/arch/arm/mpu/mm.c | 23 +++++----- 5 files changed, 93 insertions(+), 42 deletions(-) diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index 5e4766ddcf..0b595baa11 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -178,8 +178,7 @@ void __init setup_mm(void) setup_directmap_mappings(mfn_x(directmap_mfn_start), xenheap_pages); - /* Frame table covers all of RAM region, including holes */ - setup_frametable_mappings(ram_start, ram_end); + init_frametable(ram_start); /* * The allocators may need to use map_domain_page() (such as for diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 72a6928624..2eb8465aa9 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -196,8 +196,8 @@ extern void *early_fdt_map(paddr_t fdt_paddr); extern void remove_early_mappings(void); /* Prepare the memory subystem to bring-up the given secondary CPU */ extern int prepare_secondary_mm(int cpu); -/* Map a frame table to cover physical addresses ps through pe */ -extern void setup_frametable_mappings(paddr_t ps, paddr_t pe); +/* Map a frame table */ +void init_frametable(paddr_t ram_start); /* Helper function to setup memory management */ void setup_mm_helper(void); /* map a physical range in virtual memory */ diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 6eddbcf912..65aea71c43 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -33,7 +33,6 @@ void __init setup_mm(void) { const struct membanks *banks = bootinfo_get_mem(); paddr_t ram_start = INVALID_PADDR; - paddr_t ram_end = 0; paddr_t ram_size = 0; unsigned int i; @@ -42,11 +41,9 @@ void __init setup_mm(void) for ( i = 0; i < banks->nr_banks; i++ ) { const struct membank *bank = &banks->bank[i]; - paddr_t bank_end = bank->start + bank->size; ram_size = ram_size + bank->size; ram_start = min(ram_start, bank->start); - ram_end = max(ram_end, bank_end); } total_pages = ram_size >> PAGE_SHIFT; @@ -62,7 +59,7 @@ void __init setup_mm(void) setup_mm_helper(); - setup_frametable_mappings(ram_start, ram_end); + init_frametable(ram_start); init_staticmem_pages(); init_sharedmem_pages(); diff --git a/xen/arch/arm/mmu/mm.c b/xen/arch/arm/mmu/mm.c index 6604f3bf4e..10c7dfb1ef 100644 --- a/xen/arch/arm/mmu/mm.c +++ b/xen/arch/arm/mmu/mm.c @@ -1,23 +1,61 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include #include #include #include #include #include #include +#include #include -/* Map a frame table to cover physical addresses ps through pe */ -void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) +static void __init init_frametable_chunk(unsigned long pdx_s, + unsigned long pdx_e) { - unsigned long nr_pdxs = mfn_to_pdx(mfn_add(maddr_to_mfn(pe), -1)) - - mfn_to_pdx(maddr_to_mfn(ps)) + 1; - unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); - mfn_t base_mfn; - const unsigned long mapping_size = frametable_size < MB(32) ? MB(2) - : MB(32); + unsigned long nr_pdxs = pdx_e - pdx_s; + unsigned long chunk_size = nr_pdxs * sizeof(struct page_info); + unsigned long pfn_align; + struct page_info *pg; int rc; + mfn_t base_mfn; + + /* + * In-loop chunks span whole PDX groups, which are always page-size + * aligned. The last chunk ending at max_pdx may not be, so round up. + */ + chunk_size = ROUNDUP(chunk_size, PAGE_SIZE); + + /* + * Try to align the allocation to the contiguous mapping size so that + * map_pages_to_xen() can use the contiguous bit. + */ + pfn_align = ((chunk_size >= MB(32)) ? MB(32) : MB(2)) >> PAGE_SHIFT; + + base_mfn = alloc_boot_pages(chunk_size >> PAGE_SHIFT, pfn_align); + + /* + * Resolve the frametable VA via mfn_to_page(pdx_to_mfn(...)) rather + * than pdx_to_page() because the generic pdx_to_page() does not subtract + * frametable_base_pdx. There's more work to be done to make it generic, so + * for now route through mfn_to_page(), which on Arm applies the + * frametable_base_pdx offset and yields the correct VA. + */ + pg = mfn_to_page(pdx_to_mfn(pdx_s)); + rc = map_pages_to_xen((unsigned long)pg, base_mfn, + chunk_size >> PAGE_SHIFT, + PAGE_HYPERVISOR_RW | _PAGE_BLOCK); + if ( rc ) + panic("Unable to setup the frametable mappings\n"); + + memset(pg, 0, nr_pdxs * sizeof(struct page_info)); + memset(pg + nr_pdxs, -1, + chunk_size - nr_pdxs * sizeof(struct page_info)); +} + +void __init init_frametable(paddr_t ram_start) +{ + unsigned int sidx, nidx, max_idx; /* * The size of paddr_t should be sufficient for the complete range of @@ -26,24 +64,40 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) BUILD_BUG_ON((sizeof(paddr_t) * BITS_PER_BYTE) < PADDR_BITS); BUILD_BUG_ON(sizeof(struct page_info) != PAGE_INFO_SIZE); - if ( frametable_size > FRAMETABLE_SIZE ) - panic("The frametable cannot cover the physical region %#"PRIpaddr" - %#"PRIpaddr"\n", - ps, pe); + /* init_frametable_chunk() allocation alignment assumes 4KB granule */ + BUILD_BUG_ON(PAGE_SIZE != SZ_4K); - frametable_base_pdx = mfn_to_pdx(maddr_to_mfn(ps)); - /* Round up to 2M or 32M boundary, as appropriate. */ - frametable_size = ROUNDUP(frametable_size, mapping_size); - base_mfn = alloc_boot_pages(frametable_size >> PAGE_SHIFT, 32<<(20-12)); + /* In-loop chunks must produce page-aligned frametable regions */ + BUILD_BUG_ON((PDX_GROUP_COUNT * sizeof(struct page_info)) % PAGE_SIZE); - rc = map_pages_to_xen(FRAMETABLE_VIRT_START, base_mfn, - frametable_size >> PAGE_SHIFT, - PAGE_HYPERVISOR_RW | _PAGE_BLOCK); - if ( rc ) - panic("Unable to setup the frametable mappings.\n"); + max_idx = DIV_ROUND_UP(max_pdx, PDX_GROUP_COUNT); + frametable_base_pdx = mfn_to_pdx(maddr_to_mfn(ram_start)); + + /* + * Mapping address in init_frametable_chunk must be page-aligned + * for map_pages_to_xen(). Aligning to PDX_GROUP_COUNT guarantees this + * because PDX_GROUP_COUNT * sizeof(page_info) is always a multiple of + * PAGE_SIZE by construction. + */ + frametable_base_pdx = ROUNDDOWN(frametable_base_pdx, PDX_GROUP_COUNT); + + if ( (max_pdx - frametable_base_pdx) > FRAMETABLE_NR ) + panic("Frametable too small\n"); + + for ( sidx = (frametable_base_pdx / PDX_GROUP_COUNT); ; sidx = nidx ) + { + unsigned int eidx; + + eidx = find_next_zero_bit(pdx_group_valid, max_idx, sidx); + nidx = find_next_bit(pdx_group_valid, max_idx, eidx); + + if ( nidx >= max_idx ) + break; + + init_frametable_chunk(sidx * PDX_GROUP_COUNT, eidx * PDX_GROUP_COUNT); + } - memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_info)); - memset(&frame_table[nr_pdxs], -1, - frametable_size - (nr_pdxs * sizeof(struct page_info))); + init_frametable_chunk(sidx * PDX_GROUP_COUNT, max_pdx); } /* diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index aff88bd3a9..9c568831c1 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -186,16 +186,15 @@ static int is_mm_attr_match(pr_t *region, unsigned int attributes) return 0; } -/* Map a frame table to cover physical addresses ps through pe */ -void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) +/* + * Allocate a contiguous frame table covering ram_start through max_pdx. + * Unlike the MMU version, MPU cannot skip holes because there is no virtual + * address translation (ma == va). + */ +void __init init_frametable(paddr_t ram_start) { + unsigned long nr_pdxs, frametable_size; mfn_t base_mfn; - paddr_t aligned_ps = ROUNDUP(ps, PAGE_SIZE); - paddr_t aligned_pe = ROUNDDOWN(pe, PAGE_SIZE); - - unsigned long nr_pdxs = mfn_to_pdx(mfn_add(maddr_to_mfn(aligned_pe), -1)) - - mfn_to_pdx(maddr_to_mfn(aligned_ps)) + 1; - unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); /* * The size of paddr_t should be sufficient for the complete range of @@ -204,11 +203,13 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) BUILD_BUG_ON((sizeof(paddr_t) * BITS_PER_BYTE) < PADDR_BITS); BUILD_BUG_ON(sizeof(struct page_info) != PAGE_INFO_SIZE); + frametable_base_pdx = mfn_to_pdx(maddr_to_mfn(ram_start)); + nr_pdxs = max_pdx - frametable_base_pdx; + frametable_size = nr_pdxs * sizeof(struct page_info); + if ( frametable_size > FRAMETABLE_SIZE ) - panic("The frametable cannot cover the physical region %#"PRIpaddr" - %#"PRIpaddr"\n", - ps, pe); + panic("Frametable too small\n"); - frametable_base_pdx = paddr_to_pdx(aligned_ps); frametable_size = ROUNDUP(frametable_size, PAGE_SIZE); base_mfn = alloc_boot_pages(frametable_size >> PAGE_SHIFT, 1); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:33:08 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2026 11:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1303524.1576871 (Exim 4.92) (envelope-from ) id 1wLJS4-0007AQ-16; Fri, 08 May 2026 11:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1303524.1576871; Fri, 08 May 2026 11:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wLJS3-0007AI-Ua; Fri, 08 May 2026 11:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1303524; Fri, 08 May 2026 11:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wLJS2-0007A7-B4 for xen-changelog@lists.xenproject.org; Fri, 08 May 2026 11:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wLJS2-005vss-0s for xen-changelog@lists.xenproject.org; Fri, 08 May 2026 11:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wLJS2-0025hI-0j for xen-changelog@lists.xenproject.org; Fri, 08 May 2026 11:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8DEGvF8e6jsDZ9IJ9Xsf6mMvsFnFiO+VNAYXyAFXZ2I=; b=i8fBYH/mDVwSpeBYbvUEDrJE8o MnPk1hg6IZfosQOFOpnFxHCPsVkPuLe4+W3aQmH2eAVO/T+bIzykHmo6j/WgucFiyUhUfyVYh7A8r nz3po1/7mT0WuARn6nSDF4zzvhaUt9RG8M8A/xX3ekPuZWNykJnICW/VNDU4NqHeNmC4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: skip holes in physical address space when setting up frametable Message-Id: Date: Fri, 08 May 2026 11:33:02 +0000 commit 10d417b8b62efa5093707c1dfe9bd48e0abeb331 Author: Michal Orzel AuthorDate: Wed May 6 10:41:37 2026 +0200 Commit: Michal Orzel CommitDate: Fri May 8 08:52:27 2026 +0200 xen/arm: skip holes in physical address space when setting up frametable Refactor setup_frametable_mappings() into init_frametable(), modeled after x86's implementation. Instead of mapping one contiguous frametable covering ram_start to ram_end (including holes), iterate the pdx_group_valid bitmap to allocate and map frametable memory only for valid PDX groups, skipping gaps in the physical address space. This reduces memory consumption on systems with sparse RAM layouts by not allocating frametable entries for non-existent memory regions. The chunk allocator rounds chunk_size up to PAGE_SIZE only, rather than to a larger mapping granularity, to avoid overshooting past chunk boundaries into subsequent gaps or valid regions. This rounding has no impact for in-loop chunks given that chunk size is a multiple of 14MB on Arm64 and 2MB on Arm32. The rounding matters only for the last out-of-loop chunk. Physical allocations prefer 32MB alignment so that map_pages_to_xen() can use the contiguous bit for larger TLB entries where virtual alignment also permits. Fall back to 2MB if the chunk is smaller than 32MB. Add a comment explaining why we don't use pdx_to_page(). For complete discussion see [1]. As ram_end is no longer needed by init_frametable(), drop the now-dead ram_end/bank_end computation from setup_mm(). Update the MPU implementation to match the new init_frametable() signature. Since MPU has no virtual address translation (ma == va), hole-skipping is not possible and the frametable remains a single contiguous allocation. [1] https://lore.kernel.org/xen-devel/20260430125103.401811-1-michal.orzel@amd.com/T/#m803025eb6720a1425443dd0f8e72be93ef02f344 Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Tested-by: Luca Fancellu Acked-by: Stefano Stabellini --- xen/arch/arm/arm32/mmu/mm.c | 3 +- xen/arch/arm/include/asm/mm.h | 4 +- xen/arch/arm/mm.c | 5 +-- xen/arch/arm/mmu/mm.c | 100 ++++++++++++++++++++++++++++++++---------- xen/arch/arm/mpu/mm.c | 23 +++++----- 5 files changed, 93 insertions(+), 42 deletions(-) diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index 5e4766ddcf..0b595baa11 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -178,8 +178,7 @@ void __init setup_mm(void) setup_directmap_mappings(mfn_x(directmap_mfn_start), xenheap_pages); - /* Frame table covers all of RAM region, including holes */ - setup_frametable_mappings(ram_start, ram_end); + init_frametable(ram_start); /* * The allocators may need to use map_domain_page() (such as for diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 72a6928624..2eb8465aa9 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -196,8 +196,8 @@ extern void *early_fdt_map(paddr_t fdt_paddr); extern void remove_early_mappings(void); /* Prepare the memory subystem to bring-up the given secondary CPU */ extern int prepare_secondary_mm(int cpu); -/* Map a frame table to cover physical addresses ps through pe */ -extern void setup_frametable_mappings(paddr_t ps, paddr_t pe); +/* Map a frame table */ +void init_frametable(paddr_t ram_start); /* Helper function to setup memory management */ void setup_mm_helper(void); /* map a physical range in virtual memory */ diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 6eddbcf912..65aea71c43 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -33,7 +33,6 @@ void __init setup_mm(void) { const struct membanks *banks = bootinfo_get_mem(); paddr_t ram_start = INVALID_PADDR; - paddr_t ram_end = 0; paddr_t ram_size = 0; unsigned int i; @@ -42,11 +41,9 @@ void __init setup_mm(void) for ( i = 0; i < banks->nr_banks; i++ ) { const struct membank *bank = &banks->bank[i]; - paddr_t bank_end = bank->start + bank->size; ram_size = ram_size + bank->size; ram_start = min(ram_start, bank->start); - ram_end = max(ram_end, bank_end); } total_pages = ram_size >> PAGE_SHIFT; @@ -62,7 +59,7 @@ void __init setup_mm(void) setup_mm_helper(); - setup_frametable_mappings(ram_start, ram_end); + init_frametable(ram_start); init_staticmem_pages(); init_sharedmem_pages(); diff --git a/xen/arch/arm/mmu/mm.c b/xen/arch/arm/mmu/mm.c index 6604f3bf4e..10c7dfb1ef 100644 --- a/xen/arch/arm/mmu/mm.c +++ b/xen/arch/arm/mmu/mm.c @@ -1,23 +1,61 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include #include #include #include #include #include #include +#include #include -/* Map a frame table to cover physical addresses ps through pe */ -void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) +static void __init init_frametable_chunk(unsigned long pdx_s, + unsigned long pdx_e) { - unsigned long nr_pdxs = mfn_to_pdx(mfn_add(maddr_to_mfn(pe), -1)) - - mfn_to_pdx(maddr_to_mfn(ps)) + 1; - unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); - mfn_t base_mfn; - const unsigned long mapping_size = frametable_size < MB(32) ? MB(2) - : MB(32); + unsigned long nr_pdxs = pdx_e - pdx_s; + unsigned long chunk_size = nr_pdxs * sizeof(struct page_info); + unsigned long pfn_align; + struct page_info *pg; int rc; + mfn_t base_mfn; + + /* + * In-loop chunks span whole PDX groups, which are always page-size + * aligned. The last chunk ending at max_pdx may not be, so round up. + */ + chunk_size = ROUNDUP(chunk_size, PAGE_SIZE); + + /* + * Try to align the allocation to the contiguous mapping size so that + * map_pages_to_xen() can use the contiguous bit. + */ + pfn_align = ((chunk_size >= MB(32)) ? MB(32) : MB(2)) >> PAGE_SHIFT; + + base_mfn = alloc_boot_pages(chunk_size >> PAGE_SHIFT, pfn_align); + + /* + * Resolve the frametable VA via mfn_to_page(pdx_to_mfn(...)) rather + * than pdx_to_page() because the generic pdx_to_page() does not subtract + * frametable_base_pdx. There's more work to be done to make it generic, so + * for now route through mfn_to_page(), which on Arm applies the + * frametable_base_pdx offset and yields the correct VA. + */ + pg = mfn_to_page(pdx_to_mfn(pdx_s)); + rc = map_pages_to_xen((unsigned long)pg, base_mfn, + chunk_size >> PAGE_SHIFT, + PAGE_HYPERVISOR_RW | _PAGE_BLOCK); + if ( rc ) + panic("Unable to setup the frametable mappings\n"); + + memset(pg, 0, nr_pdxs * sizeof(struct page_info)); + memset(pg + nr_pdxs, -1, + chunk_size - nr_pdxs * sizeof(struct page_info)); +} + +void __init init_frametable(paddr_t ram_start) +{ + unsigned int sidx, nidx, max_idx; /* * The size of paddr_t should be sufficient for the complete range of @@ -26,24 +64,40 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) BUILD_BUG_ON((sizeof(paddr_t) * BITS_PER_BYTE) < PADDR_BITS); BUILD_BUG_ON(sizeof(struct page_info) != PAGE_INFO_SIZE); - if ( frametable_size > FRAMETABLE_SIZE ) - panic("The frametable cannot cover the physical region %#"PRIpaddr" - %#"PRIpaddr"\n", - ps, pe); + /* init_frametable_chunk() allocation alignment assumes 4KB granule */ + BUILD_BUG_ON(PAGE_SIZE != SZ_4K); - frametable_base_pdx = mfn_to_pdx(maddr_to_mfn(ps)); - /* Round up to 2M or 32M boundary, as appropriate. */ - frametable_size = ROUNDUP(frametable_size, mapping_size); - base_mfn = alloc_boot_pages(frametable_size >> PAGE_SHIFT, 32<<(20-12)); + /* In-loop chunks must produce page-aligned frametable regions */ + BUILD_BUG_ON((PDX_GROUP_COUNT * sizeof(struct page_info)) % PAGE_SIZE); - rc = map_pages_to_xen(FRAMETABLE_VIRT_START, base_mfn, - frametable_size >> PAGE_SHIFT, - PAGE_HYPERVISOR_RW | _PAGE_BLOCK); - if ( rc ) - panic("Unable to setup the frametable mappings.\n"); + max_idx = DIV_ROUND_UP(max_pdx, PDX_GROUP_COUNT); + frametable_base_pdx = mfn_to_pdx(maddr_to_mfn(ram_start)); + + /* + * Mapping address in init_frametable_chunk must be page-aligned + * for map_pages_to_xen(). Aligning to PDX_GROUP_COUNT guarantees this + * because PDX_GROUP_COUNT * sizeof(page_info) is always a multiple of + * PAGE_SIZE by construction. + */ + frametable_base_pdx = ROUNDDOWN(frametable_base_pdx, PDX_GROUP_COUNT); + + if ( (max_pdx - frametable_base_pdx) > FRAMETABLE_NR ) + panic("Frametable too small\n"); + + for ( sidx = (frametable_base_pdx / PDX_GROUP_COUNT); ; sidx = nidx ) + { + unsigned int eidx; + + eidx = find_next_zero_bit(pdx_group_valid, max_idx, sidx); + nidx = find_next_bit(pdx_group_valid, max_idx, eidx); + + if ( nidx >= max_idx ) + break; + + init_frametable_chunk(sidx * PDX_GROUP_COUNT, eidx * PDX_GROUP_COUNT); + } - memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_info)); - memset(&frame_table[nr_pdxs], -1, - frametable_size - (nr_pdxs * sizeof(struct page_info))); + init_frametable_chunk(sidx * PDX_GROUP_COUNT, max_pdx); } /* diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index aff88bd3a9..9c568831c1 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -186,16 +186,15 @@ static int is_mm_attr_match(pr_t *region, unsigned int attributes) return 0; } -/* Map a frame table to cover physical addresses ps through pe */ -void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) +/* + * Allocate a contiguous frame table covering ram_start through max_pdx. + * Unlike the MMU version, MPU cannot skip holes because there is no virtual + * address translation (ma == va). + */ +void __init init_frametable(paddr_t ram_start) { + unsigned long nr_pdxs, frametable_size; mfn_t base_mfn; - paddr_t aligned_ps = ROUNDUP(ps, PAGE_SIZE); - paddr_t aligned_pe = ROUNDDOWN(pe, PAGE_SIZE); - - unsigned long nr_pdxs = mfn_to_pdx(mfn_add(maddr_to_mfn(aligned_pe), -1)) - - mfn_to_pdx(maddr_to_mfn(aligned_ps)) + 1; - unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); /* * The size of paddr_t should be sufficient for the complete range of @@ -204,11 +203,13 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) BUILD_BUG_ON((sizeof(paddr_t) * BITS_PER_BYTE) < PADDR_BITS); BUILD_BUG_ON(sizeof(struct page_info) != PAGE_INFO_SIZE); + frametable_base_pdx = mfn_to_pdx(maddr_to_mfn(ram_start)); + nr_pdxs = max_pdx - frametable_base_pdx; + frametable_size = nr_pdxs * sizeof(struct page_info); + if ( frametable_size > FRAMETABLE_SIZE ) - panic("The frametable cannot cover the physical region %#"PRIpaddr" - %#"PRIpaddr"\n", - ps, pe); + panic("Frametable too small\n"); - frametable_base_pdx = paddr_to_pdx(aligned_ps); frametable_size = ROUNDUP(frametable_size, PAGE_SIZE); base_mfn = alloc_boot_pages(frametable_size >> PAGE_SHIFT, 1); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 11 13:11:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 May 2026 13:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306170.1578235 (Exim 4.92) (envelope-from ) id 1wMQPX-0005Us-Df; Mon, 11 May 2026 13:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306170.1578235; Mon, 11 May 2026 13:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMQPX-0005Uk-As; Mon, 11 May 2026 13:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1306170; Mon, 11 May 2026 13:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMQPW-0005Ue-CI for xen-changelog@lists.xenproject.org; Mon, 11 May 2026 13:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMQPW-0005aG-1v for xen-changelog@lists.xenproject.org; Mon, 11 May 2026 13:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMQPW-000D7Y-0g for xen-changelog@lists.xenproject.org; Mon, 11 May 2026 13:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Kyt7W8B8z+BDLaiYamK7QzSuEvZP1jBs+VvSkQpmC4E=; b=OielHiT/bNP9RMA5NTYhAQVQAL ML681bVC+rmSR2C0Z4yFkmHMGERHao4OfjCnyj7GtEhfwgQshDkyfjYreLK6H0/P1ZwApcaXTixif ZNLm1biP427rsBaKb6fpq7iHoDkiXTKG6JYi20DFbryUTLSm85GMgOPFSw3pJWsvJxWU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] time: drop dead code from gmtime() Message-Id: Date: Mon, 11 May 2026 13:11:02 +0000 commit 4909438bc397b8d31d6b48a44498ca1ec242324b Author: Jan Beulich AuthorDate: Mon May 11 13:19:31 2026 +0200 Commit: Jan Beulich CommitDate: Mon May 11 13:19:31 2026 +0200 time: drop dead code from gmtime() "days", as calculated, can't be negative. Drop the respective loop and change its type. Similarly "rem" can't be negative and doesn't require more than 32 bits. Change its type, too. As a consequence, the tm_wday calculation also can't yield negative values, so the respective conditional can be dropped as well. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/time.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/xen/common/time.c b/xen/common/time.c index c873b5731b..04a65f00b3 100644 --- a/xen/common/time.c +++ b/xen/common/time.c @@ -45,7 +45,8 @@ static DEFINE_SPINLOCK(wc_lock); struct tm gmtime(unsigned long t) { struct tm tbuf; - long days, rem; + unsigned long days; + unsigned int rem; int y; const unsigned short int *ip; @@ -70,18 +71,11 @@ struct tm gmtime(unsigned long t) tbuf.tm_sec = rem % 60; /* January 1, 1970 was a Thursday. */ tbuf.tm_wday = (4 + days) % 7; - if ( tbuf.tm_wday < 0 ) - tbuf.tm_wday += 7; while ( days >= (rem = __isleap(y) ? 366 : 365) ) { ++y; days -= rem; } - while ( days < 0 ) - { - --y; - days += __isleap(y) ? 366 : 365; - } tbuf.tm_year = y - 1900; tbuf.tm_yday = days; /* SAF-14-safe use boolean as an array index */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 01:44:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 01:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306511.1578410 (Exim 4.92) (envelope-from ) id 1wMcAF-0000KT-8f; Tue, 12 May 2026 01:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306511.1578410; Tue, 12 May 2026 01:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMcAF-0000KK-5S; Tue, 12 May 2026 01:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1306511; Tue, 12 May 2026 01:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMcAE-0000KE-B9 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 01:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMcAE-001QhD-1n for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 01:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMcAE-000vGd-0V for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 01:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gIW4EPkqPWNQcIefKD1RCAGlOV1W/GUW4tnQNyGmDh4=; b=lcjvCWTd2ktu1Uem2cyzrbLRTU hQpmT9nz40KB6fAga7UP3E56/7YxbbeUkrDcwQAryPwJe0lryysAAWCtY99DC3q5YOahhEj1H9y80 bUDVydjAPPLeaPXXKikB0YONif7ad5aXWGHvLe8L1hRIwiNsQ1YeOir7VeijkTXCLOT4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: re-work Xen artifacts collection Message-Id: Date: Tue, 12 May 2026 01:44:02 +0000 commit 87dd994a3e98f86c3e29505c4b11b14b8eb7af1a Author: Jan Beulich AuthorDate: Mon May 11 15:04:32 2026 +0200 Commit: Stefano Stabellini CommitDate: Mon May 11 18:40:53 2026 -0700 CI: re-work Xen artifacts collection There's no need to do this separately from three places. Once moved to the bottom of the script, the need for this to be a function also disappears. While there also make sure xen-syms is collected. This is rather more useful for analysis of possible problems than its stripped counterpart. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- automation/scripts/build | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 359ee18444..2df154398d 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -44,30 +44,15 @@ cp xen/.config xen-config # Directory for the artefacts to be dumped into mkdir -p binaries -collect_xen_artefacts() -{ - local f - - for f in xen/xen xen/xen.efi; do - if [[ -f $f ]]; then - cp $f binaries/ - fi - done -} - if [[ "${CPPCHECK}" == "y" ]] && [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Cppcheck analysis invokes Xen-only build xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc) # Preserve artefacts - collect_xen_artefacts cp xen/cppcheck-report/xen-cppcheck.txt xen-cppcheck.txt elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Xen-only build make -j$(nproc) xen - - # Preserve artefacts - collect_xen_artefacts else # Full build. Figure out our ./configure options cfgargs=("--prefix=/usr") @@ -108,9 +93,16 @@ else make -j$(nproc) dist # Preserve artefacts - # Note: Some smoke tests depending on finding binaries/xen on a full build - # even though dist/ contains everything, while some containers don't even - # build Xen (cd dist/install; find | cpio -R 0:0 -o -H newc | gzip) > binaries/xen-tools.cpio.gz - collect_xen_artefacts fi + +# Preserve Xen artefacts +# +# Note: Some smoke tests depend on finding binaries/xen on a full build +# even though dist/ contains everything, while some containers don't even +# build Xen. +for f in xen/xen xen/xen-syms xen/xen.efi; do + if [[ -f $f ]]; then + cp $f binaries/ + fi +done -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 01:44:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 01:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306513.1578414 (Exim 4.92) (envelope-from ) id 1wMcAP-0000MU-9Y; Tue, 12 May 2026 01:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306513.1578414; Tue, 12 May 2026 01:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMcAP-0000MM-6s; Tue, 12 May 2026 01:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1306513; Tue, 12 May 2026 01:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMcAO-0000MG-Df for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 01:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMcAO-001QhH-2G for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 01:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMcAO-000vHv-0v for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 01:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TQzqRC5Xk6PN5JG9EixJps0z9yhhfEM01r4izV/LHzw=; b=k0jYSQXcTejk+6KIxv0e5ev4sO uyqnmrEzIaUNBDiExHSsVxmB4J0rWffjWkGhHGfutl1WdOrGahpPR49Uxp9oyvQzqA/JyEszLM0fE d6VwBtRR9LrQlONO+OCGdFDWWm17ZVVn2ZM/XDWerulkc89gKHFLIi9zTeNVGpiy+vOU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: collect certain intermediate files as artifacts Message-Id: Date: Tue, 12 May 2026 01:44:12 +0000 commit 2121f895036809fccaa5181aed25a16b13adf647 Author: Jan Beulich AuthorDate: Mon May 11 15:05:02 2026 +0200 Commit: Stefano Stabellini CommitDate: Mon May 11 18:40:58 2026 -0700 CI: collect certain intermediate files as artifacts When one of the linking passes fails, additional intermediate files are still in place. Having them available for analysis of the underlying problem can be pretty helpful. Collect some into a new intermediates/ directory. (Nothing new will be collected if linking succeeds.) As the script is run with -e passed to bash, defer exit if the main "make" (or substituent script thereof) failed. This way more artifacts are collected, potentially making it easier to analyze the failure. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 1 + automation/scripts/build | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index f058957291..7f5b5938e8 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -6,6 +6,7 @@ artifacts: paths: - binaries/ + - intermediates/ - xen-config - xen-cppcheck.txt - '*.log' diff --git a/automation/scripts/build b/automation/scripts/build index 2df154398d..bdaab11c37 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -37,22 +37,24 @@ else make -j$(nproc) -C xen olddefconfig fi -# Save the config file before building because build failure causes the script -# to exit early -- bash is invoked with -e. +# Save the config file before building, just in case. cp xen/.config xen-config -# Directory for the artefacts to be dumped into -mkdir -p binaries +# Directories for artefacts to be dumped into +mkdir -p binaries intermediates + +# Script exit status, to be overridden by the main make's status below. +ret=0 if [[ "${CPPCHECK}" == "y" ]] && [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Cppcheck analysis invokes Xen-only build - xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc) + xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc) || ret=$? # Preserve artefacts cp xen/cppcheck-report/xen-cppcheck.txt xen-cppcheck.txt elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Xen-only build - make -j$(nproc) xen + make -j$(nproc) xen || ret=$? else # Full build. Figure out our ./configure options cfgargs=("--prefix=/usr") @@ -90,7 +92,7 @@ else fi ./configure "${cfgargs[@]}" - make -j$(nproc) dist + make -j$(nproc) dist || ret=$? # Preserve artefacts (cd dist/install; find | cpio -R 0:0 -o -H newc | gzip) > binaries/xen-tools.cpio.gz @@ -106,3 +108,12 @@ for f in xen/xen xen/xen-syms xen/xen.efi; do cp $f binaries/ fi done + +# Preserve Xen intermediate files. Some may be there only upon build failure. +for f in xen/.xen-syms.* xen/.xen.efi.*; do + if [[ -f $f ]]; then + cp $f intermediates/ + fi +done + +exit $ret -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 02:55:09 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 02:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306543.1578418 (Exim 4.92) (envelope-from ) id 1wMdGx-0000s5-2L; Tue, 12 May 2026 02:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306543.1578418; Tue, 12 May 2026 02:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMdGw-0000rx-Vs; Tue, 12 May 2026 02:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1306543; Tue, 12 May 2026 02:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMdGv-0000rr-Km for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMdGv-001SPj-2w for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMdGv-000ys3-1i for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hhVGNiKTF+K+reh4BL9wN/y4EuVoPnf7I9ctuSU3yag=; b=SELbC3PKE68nVf+APuUaOgHdpf 8m4HMU/aSKODe+WXbYOYmVR1dDwkoCiIexMdFghoWEoJjEj2IvZICRRBH6KRXwu9lxaYDs0iM5sTH yzd7aiOtoDKpVEp7uiUD6JVpp38lDS/hzghq0ZkwaLqul/7PFBG2eo5Nx+3ZDjx1Ng2o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] time: drop dead code from gmtime() Message-Id: Date: Tue, 12 May 2026 02:55:01 +0000 commit 4909438bc397b8d31d6b48a44498ca1ec242324b Author: Jan Beulich AuthorDate: Mon May 11 13:19:31 2026 +0200 Commit: Jan Beulich CommitDate: Mon May 11 13:19:31 2026 +0200 time: drop dead code from gmtime() "days", as calculated, can't be negative. Drop the respective loop and change its type. Similarly "rem" can't be negative and doesn't require more than 32 bits. Change its type, too. As a consequence, the tm_wday calculation also can't yield negative values, so the respective conditional can be dropped as well. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/time.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/xen/common/time.c b/xen/common/time.c index c873b5731b..04a65f00b3 100644 --- a/xen/common/time.c +++ b/xen/common/time.c @@ -45,7 +45,8 @@ static DEFINE_SPINLOCK(wc_lock); struct tm gmtime(unsigned long t) { struct tm tbuf; - long days, rem; + unsigned long days; + unsigned int rem; int y; const unsigned short int *ip; @@ -70,18 +71,11 @@ struct tm gmtime(unsigned long t) tbuf.tm_sec = rem % 60; /* January 1, 1970 was a Thursday. */ tbuf.tm_wday = (4 + days) % 7; - if ( tbuf.tm_wday < 0 ) - tbuf.tm_wday += 7; while ( days >= (rem = __isleap(y) ? 366 : 365) ) { ++y; days -= rem; } - while ( days < 0 ) - { - --y; - days += __isleap(y) ? 366 : 365; - } tbuf.tm_year = y - 1900; tbuf.tm_yday = days; /* SAF-14-safe use boolean as an array index */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 02:55:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 02:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306544.1578422 (Exim 4.92) (envelope-from ) id 1wMdH7-0000td-3O; Tue, 12 May 2026 02:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306544.1578422; Tue, 12 May 2026 02:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMdH7-0000tV-0v; Tue, 12 May 2026 02:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1306544; Tue, 12 May 2026 02:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMdH5-0000tF-ND for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMdH6-001SRx-02 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMdH5-000ysR-24 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/lSW9CBXGZi516urgrBt5sCHv9VFImTWasQIkbKlmeA=; b=nmnBblX7oKLhSaFys9hP9ehQrW 64ltMSq3pO30ksJ43xXBSFnLRx153kK4GyYBrHOoK/kDwS5HO8fiGXVMpHs/lGbAqgUev5NPEN/nO eCwI2VrCYRg2DDv9TXB6EJcTI7wdFLMdDWj/TpsSdeGugwhtSycGk8W4dJVwJmtXpDYY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: re-work Xen artifacts collection Message-Id: Date: Tue, 12 May 2026 02:55:11 +0000 commit 87dd994a3e98f86c3e29505c4b11b14b8eb7af1a Author: Jan Beulich AuthorDate: Mon May 11 15:04:32 2026 +0200 Commit: Stefano Stabellini CommitDate: Mon May 11 18:40:53 2026 -0700 CI: re-work Xen artifacts collection There's no need to do this separately from three places. Once moved to the bottom of the script, the need for this to be a function also disappears. While there also make sure xen-syms is collected. This is rather more useful for analysis of possible problems than its stripped counterpart. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- automation/scripts/build | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 359ee18444..2df154398d 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -44,30 +44,15 @@ cp xen/.config xen-config # Directory for the artefacts to be dumped into mkdir -p binaries -collect_xen_artefacts() -{ - local f - - for f in xen/xen xen/xen.efi; do - if [[ -f $f ]]; then - cp $f binaries/ - fi - done -} - if [[ "${CPPCHECK}" == "y" ]] && [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Cppcheck analysis invokes Xen-only build xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc) # Preserve artefacts - collect_xen_artefacts cp xen/cppcheck-report/xen-cppcheck.txt xen-cppcheck.txt elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Xen-only build make -j$(nproc) xen - - # Preserve artefacts - collect_xen_artefacts else # Full build. Figure out our ./configure options cfgargs=("--prefix=/usr") @@ -108,9 +93,16 @@ else make -j$(nproc) dist # Preserve artefacts - # Note: Some smoke tests depending on finding binaries/xen on a full build - # even though dist/ contains everything, while some containers don't even - # build Xen (cd dist/install; find | cpio -R 0:0 -o -H newc | gzip) > binaries/xen-tools.cpio.gz - collect_xen_artefacts fi + +# Preserve Xen artefacts +# +# Note: Some smoke tests depend on finding binaries/xen on a full build +# even though dist/ contains everything, while some containers don't even +# build Xen. +for f in xen/xen xen/xen-syms xen/xen.efi; do + if [[ -f $f ]]; then + cp $f binaries/ + fi +done -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 02:55:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 02:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306545.1578425 (Exim 4.92) (envelope-from ) id 1wMdHH-0000vw-4o; Tue, 12 May 2026 02:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306545.1578425; Tue, 12 May 2026 02:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMdHH-0000vo-2E; Tue, 12 May 2026 02:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1306545; Tue, 12 May 2026 02:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMdHF-0000vh-QF for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMdHG-001SS4-0L for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMdHF-000yut-2N for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 02:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yEHBuOrOLdrfj41L94NA9mmXCuty+w5uX7c7XzcGenY=; b=sgztSSLGtHVDlR8U39yTU3uuOk urE0PjBMjs9hbUQySxLrmKknSSwgPxAuz73tYHBAzj2QmkNYTuofSaKCYaJgiAMHOG6FzXcKEcLGF 1ZXjX1fOcMWrla1eylrS/mHmQ81JX/KGrDqZtEp6Ca9tObgJHu2PuSXNktY+qqOrLl2M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: collect certain intermediate files as artifacts Message-Id: Date: Tue, 12 May 2026 02:55:21 +0000 commit 2121f895036809fccaa5181aed25a16b13adf647 Author: Jan Beulich AuthorDate: Mon May 11 15:05:02 2026 +0200 Commit: Stefano Stabellini CommitDate: Mon May 11 18:40:58 2026 -0700 CI: collect certain intermediate files as artifacts When one of the linking passes fails, additional intermediate files are still in place. Having them available for analysis of the underlying problem can be pretty helpful. Collect some into a new intermediates/ directory. (Nothing new will be collected if linking succeeds.) As the script is run with -e passed to bash, defer exit if the main "make" (or substituent script thereof) failed. This way more artifacts are collected, potentially making it easier to analyze the failure. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 1 + automation/scripts/build | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index f058957291..7f5b5938e8 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -6,6 +6,7 @@ artifacts: paths: - binaries/ + - intermediates/ - xen-config - xen-cppcheck.txt - '*.log' diff --git a/automation/scripts/build b/automation/scripts/build index 2df154398d..bdaab11c37 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -37,22 +37,24 @@ else make -j$(nproc) -C xen olddefconfig fi -# Save the config file before building because build failure causes the script -# to exit early -- bash is invoked with -e. +# Save the config file before building, just in case. cp xen/.config xen-config -# Directory for the artefacts to be dumped into -mkdir -p binaries +# Directories for artefacts to be dumped into +mkdir -p binaries intermediates + +# Script exit status, to be overridden by the main make's status below. +ret=0 if [[ "${CPPCHECK}" == "y" ]] && [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Cppcheck analysis invokes Xen-only build - xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc) + xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc) || ret=$? # Preserve artefacts cp xen/cppcheck-report/xen-cppcheck.txt xen-cppcheck.txt elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Xen-only build - make -j$(nproc) xen + make -j$(nproc) xen || ret=$? else # Full build. Figure out our ./configure options cfgargs=("--prefix=/usr") @@ -90,7 +92,7 @@ else fi ./configure "${cfgargs[@]}" - make -j$(nproc) dist + make -j$(nproc) dist || ret=$? # Preserve artefacts (cd dist/install; find | cpio -R 0:0 -o -H newc | gzip) > binaries/xen-tools.cpio.gz @@ -106,3 +108,12 @@ for f in xen/xen xen/xen-syms xen/xen.efi; do cp $f binaries/ fi done + +# Preserve Xen intermediate files. Some may be there only upon build failure. +for f in xen/.xen-syms.* xen/.xen.efi.*; do + if [[ -f $f ]]; then + cp $f intermediates/ + fi +done + +exit $ret -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 09:44:09 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 09:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306674.1578502 (Exim 4.92) (envelope-from ) id 1wMjem-00060x-5G; Tue, 12 May 2026 09:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306674.1578502; Tue, 12 May 2026 09:44:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMjem-00060p-25; Tue, 12 May 2026 09:44:04 +0000 Received: by outflank-mailman (input) for mailman id 1306674; Tue, 12 May 2026 09:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMjek-00060j-F3 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 09:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMjek-001aik-2H for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 09:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMjek-001Kke-0v for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 09:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Af9eCpz1O2feQddcxb0oosRHxqo7IAWwZUvBOu+Eqhw=; b=kDZi1ROAm2rFISodIPl0VvvRJ4 UhjyOEZqmg++uhESzQ3AOr8yGphut8+ITJfdus1Vwn6fORPD5kkkZ0A0gwrQjAC+V48jR8jrg1JLv 0KhKn6eH6GP+igMwoE1jbcgiuZw+DCVhirmPmkJhMfA9aRB2NiZ9GAfVfozbl2Tt2sxE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/MCE: adjust S3 resume handling Message-Id: Date: Tue, 12 May 2026 09:44:02 +0000 commit d9b3aceae1ebe859c3aa8413bf0d90cfa508be54 Author: Jan Beulich AuthorDate: Tue May 12 08:31:31 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 12 08:31:31 2026 +0200 x86/MCE: adjust S3 resume handling The BSP resume path calls mcheck_init() with the address of boot_cpu_data, thus rendering comparisons against that pointer ineffective. The additional "bsp" boolean needs to be used (and propagated as necessary) instead. While touching intel_init_thermal(), constify its 1st parameter, which in turn requires touching intel_thermal_supported() as well. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce_amd.c | 4 ++-- xen/arch/x86/cpu/mcheck/mce_intel.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c b/xen/arch/x86/cpu/mcheck/mce_amd.c index 25c29eb3d2..bf353c9a69 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd.c @@ -318,7 +318,7 @@ amd_mcheck_init(const struct cpuinfo_x86 *c, bool bsp) mcequirk_amd_apply(quirkflag); if ( cpu_has(c, X86_FEATURE_AMD_PPIN) && - (c == &boot_cpu_data || ppin_msr) ) + (bsp || ppin_msr) ) { uint64_t val; @@ -333,7 +333,7 @@ amd_mcheck_init(const struct cpuinfo_x86 *c, bool bsp) if ( !(val & PPIN_ENABLE) ) ppin_msr = 0; - else if ( c == &boot_cpu_data ) + else if ( bsp ) ppin_msr = MSR_AMD_PPIN; } diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 839a0e5ba9..673e608376 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -87,7 +87,7 @@ static void cf_check intel_thermal_interrupt(void) } /* Thermal monitoring depends on APIC, ACPI and clock modulation */ -static bool intel_thermal_supported(struct cpuinfo_x86 *c) +static bool intel_thermal_supported(const struct cpuinfo_x86 *c) { if ( !cpu_has_apic ) return false; @@ -110,7 +110,7 @@ static void __init mcheck_intel_therm_init(void) } /* P4/Xeon Thermal regulation detect and init */ -static void intel_init_thermal(struct cpuinfo_x86 *c) +static void intel_init_thermal(const struct cpuinfo_x86 *c, bool bsp) { uint64_t msr_content; uint32_t val; @@ -143,7 +143,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) if ( (msr_content & (1ULL<<3)) && (val & APIC_DM_MASK) == APIC_DM_SMI ) { - if ( c == &boot_cpu_data ) + if ( bsp ) printk(KERN_DEBUG "Thermal monitoring handled by SMI\n"); return; /* -EBUSY */ } @@ -154,7 +154,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) /* check whether a vector already exists, temporarily masked? */ if ( val & APIC_VECTOR_MASK ) { - if ( c == &boot_cpu_data ) + if ( bsp ) printk(KERN_DEBUG "Thermal LVT vector (%#x) already installed\n", val & APIC_VECTOR_MASK); return; /* -EBUSY */ @@ -852,7 +852,7 @@ static void intel_init_mce(bool bsp) mce_uhandler_num = ARRAY_SIZE(intel_mce_uhandlers); } -static void intel_init_ppin(const struct cpuinfo_x86 *c) +static void intel_init_ppin(const struct cpuinfo_x86 *c, bool bsp) { /* * Even if testing the presence of the MSR would be enough, we don't @@ -881,7 +881,7 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) case INTEL_SAPPHIRERAPIDS_X: case INTEL_EMERALDRAPIDS_X: - if ( (c != &boot_cpu_data && !ppin_msr) || + if ( (!bsp && !ppin_msr) || rdmsr_safe(MSR_PPIN_CTL, &val) ) return; @@ -894,7 +894,7 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) if ( !(val & PPIN_ENABLE) ) ppin_msr = 0; - else if ( c == &boot_cpu_data ) + else if ( bsp ) ppin_msr = MSR_PPIN; break; @@ -995,9 +995,9 @@ enum mcheck_type intel_mcheck_init(struct cpuinfo_x86 *c, bool bsp) intel_init_cmci(c); - intel_init_thermal(c); + intel_init_thermal(c, bsp); - intel_init_ppin(c); + intel_init_ppin(c, bsp); return mcheck_intel; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 09:44:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 09:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306675.1578506 (Exim 4.92) (envelope-from ) id 1wMjew-00063A-7X; Tue, 12 May 2026 09:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306675.1578506; Tue, 12 May 2026 09:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMjew-000632-4o; Tue, 12 May 2026 09:44:14 +0000 Received: by outflank-mailman (input) for mailman id 1306675; Tue, 12 May 2026 09:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMjeu-00062r-H7 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 09:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMjeu-001aio-2e for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 09:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMjeu-001KmN-1U for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 09:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gVzKpbOYVE/t9ZLnhwJ3PmnDB4qw1iJaalmVuLUoDc4=; b=zoGWUDaRDEvkW4jP0GY6TUTT1u mzRz+GKBqcZC+xJiV6Lp40wK2aCwMrk54jXmCIgbZRgdJk9l2PxXrhn0ei82ovGBgqI6Sx5nirz9z UsIZbqO5ALD9UCOzn91IA932LAD4wO5iuZx3nz5nOzdXbq4WLXVS8B/bgS2oDoeq8c0w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86emul: support LKGS Message-Id: Date: Tue, 12 May 2026 09:44:12 +0000 commit a6b143e5a3a5733c12b71e7e2f5b6e9300e5920a Author: Jan Beulich AuthorDate: Tue May 12 08:31:59 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 12 08:31:59 2026 +0200 x86emul: support LKGS Provide support for this insn, which is a prereq to FRED. CPUID-wise, while its and FRED's enumerators were already introduced, their dependency still needs adding. While adding a testcase, also add a SWAPGS one. In order to not affect the behavior of pre-existing tests, install write_{segment,msr} hooks only transiently. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/predicates.c | 1 + tools/tests/x86_emulator/test_x86_emulator.c | 96 ++++++++++++++++++++++++++++ tools/tests/x86_emulator/x86-emulate.c | 1 + xen/arch/x86/x86_emulate/decode.c | 6 +- xen/arch/x86/x86_emulate/private.h | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++++++++- xen/tools/gen-cpuid.py | 3 +- 7 files changed, 137 insertions(+), 4 deletions(-) diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 019c2ced8a..8ff2653895 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -326,6 +326,7 @@ static const struct { { { 0x00, 0x18 }, { 2, 2 }, T, R }, /* ltr */ { { 0x00, 0x20 }, { 2, 2 }, T, R }, /* verr */ { { 0x00, 0x28 }, { 2, 2 }, T, R }, /* verw */ + { { 0x00, 0x30 }, { 0, 2 }, T, R, pfx_f2 }, /* lkgs */ { { 0x01, 0x00 }, { 2, 2 }, F, W }, /* sgdt */ { { 0x01, 0x08 }, { 2, 2 }, F, W }, /* sidt */ { { 0x01, 0x10 }, { 2, 2 }, F, R }, /* lgdt */ diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 20929b80c6..af29b106f1 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -673,6 +673,10 @@ static int blk( return x86_emul_blk((void *)offset, p_data, bytes, eflags, state, ctxt); } +#ifdef __x86_64__ +static unsigned long gs_base, gs_base_shadow; +#endif + static int read_segment( enum x86_segment seg, struct segment_register *reg, @@ -682,9 +686,26 @@ static int read_segment( return X86EMUL_UNHANDLEABLE; memset(reg, 0, sizeof(*reg)); reg->p = 1; + return X86EMUL_OKAY; } +#ifdef __x86_64__ +static int write_segment( + enum x86_segment seg, + const struct segment_register *reg, + struct x86_emulate_ctxt *ctxt) +{ + if ( !is_x86_user_segment(seg) ) + return X86EMUL_UNHANDLEABLE; + + if ( seg == x86_seg_gs ) + gs_base = reg->base; + + return X86EMUL_OKAY; +} +#endif + static int read_msr( unsigned int reg, uint64_t *val, @@ -696,6 +717,20 @@ static int read_msr( *val = ctxt->addr_size > 32 ? EFER_LME | EFER_LMA : 0; return X86EMUL_OKAY; +#ifdef __x86_64__ + case MSR_GS_BASE: + if ( ctxt->addr_size < 64 ) + break; + *val = gs_base; + return X86EMUL_OKAY; + + case MSR_SHADOW_GS_BASE: + if ( ctxt->addr_size < 64 ) + break; + *val = gs_base_shadow; + return X86EMUL_OKAY; +#endif + case MSR_TSC_AUX: #define TSC_AUX_VALUE 0xCACACACA *val = TSC_AUX_VALUE; @@ -705,6 +740,32 @@ static int read_msr( return X86EMUL_UNHANDLEABLE; } +#ifdef __x86_64__ +static int write_msr( + unsigned int reg, + uint64_t val, + struct x86_emulate_ctxt *ctxt, + bool explicit) +{ + switch ( reg ) + { + case MSR_GS_BASE: + if ( ctxt->addr_size < 64 || !is_canonical_address(val) ) + break; + gs_base = val; + return X86EMUL_OKAY; + + case MSR_SHADOW_GS_BASE: + if ( ctxt->addr_size < 64 || !is_canonical_address(val) ) + break; + gs_base_shadow = val; + return X86EMUL_OKAY; + } + + return X86EMUL_UNHANDLEABLE; +} +#endif + #define INVPCID_ADDR 0x12345678 #define INVPCID_PCID 0x123 @@ -1339,6 +1400,41 @@ int main(int argc, char **argv) printf("%u bytes read - ", bytes_read); goto fail; } + printf("okay\n"); + + emulops.write_segment = write_segment; + emulops.write_msr = write_msr; + + printf("%-40s", "Testing swapgs..."); + instr[0] = 0x0f; instr[1] = 0x01; instr[2] = 0xf8; + regs.eip = (unsigned long)&instr[0]; + gs_base = 0xffffeeeecccc8888UL; + gs_base_shadow = 0x0000111122224444UL; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (regs.eip != (unsigned long)&instr[3]) || + (gs_base != 0x0000111122224444UL) || + (gs_base_shadow != 0xffffeeeecccc8888UL) ) + goto fail; + printf("okay\n"); + + printf("%-40s", "Testing lkgs 2(%rdx)..."); + instr[0] = 0xf2; instr[1] = 0x0f; instr[2] = 0x00; instr[3] = 0x72; instr[4] = 0x02; + regs.eip = (unsigned long)&instr[0]; + regs.edx = (unsigned long)res; + res[0] = 0x00004444; + res[1] = 0x8888cccc; + i = cpu_policy.extd.nscb; cpu_policy.extd.nscb = true; /* for AMD */ + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (regs.eip != (unsigned long)&instr[5]) || + (gs_base != 0x0000111122224444UL) || + gs_base_shadow ) + goto fail; + + cpu_policy.extd.nscb = i; + emulops.write_segment = NULL; + emulops.write_msr = NULL; #endif printf("okay\n"); diff --git a/tools/tests/x86_emulator/x86-emulate.c b/tools/tests/x86_emulator/x86-emulate.c index 379e206dd3..b22c7d6add 100644 --- a/tools/tests/x86_emulator/x86-emulate.c +++ b/tools/tests/x86_emulator/x86-emulate.c @@ -85,6 +85,7 @@ bool emul_test_init(void) cpu_policy.feat.invpcid = true; cpu_policy.feat.adx = true; cpu_policy.feat.rdpid = true; + cpu_policy.feat.lkgs = true; cpu_policy.feat.wrmsrns = true; cpu_policy.extd.clzero = true; diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 346777422b..2c13356c4d 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -745,8 +745,12 @@ decode_twobyte(struct x86_emulate_state *s, case 0: s->desc |= DstMem | SrcImplicit | Mov; break; + case 6: + if ( !(s->modrm_reg & 1) && mode_64bit() ) + { case 2: case 4: - s->desc |= SrcMem16; + s->desc |= SrcMem16; + } break; } break; diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index dfdc263f9c..6c96f72327 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -609,6 +609,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx_vnni() (ctxt->cpuid->feat.avx_vnni) #define vcpu_has_avx512_bf16() (ctxt->cpuid->feat.avx512_bf16) #define vcpu_has_cmpccxadd() (ctxt->cpuid->feat.cmpccxadd) +#define vcpu_has_lkgs() (ctxt->cpuid->feat.lkgs) #define vcpu_has_wrmsrns() (ctxt->cpuid->feat.wrmsrns) #define vcpu_has_avx_ifma() (ctxt->cpuid->feat.avx_ifma) #define vcpu_has_avx_vnni_int8() (ctxt->cpuid->feat.avx_vnni_int8) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e58735ee95..364e6c092d 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2899,8 +2899,37 @@ x86_emulate( break; } break; - default: - generate_exception_if(true, X86_EXC_UD); + + case 6: /* lkgs */ + generate_exception_if((modrm_reg & 1) || vex.pfx != vex_f2, + X86_EXC_UD); + generate_exception_if(!mode_64bit() || !mode_ring0(), X86_EXC_UD); + vcpu_must_have(lkgs); + fail_if(!ops->read_msr || !ops->write_segment || !ops->write_msr); + if ( (rc = ops->read_msr(MSR_SHADOW_GS_BASE, &msr_val, + ctxt)) != X86EMUL_OKAY || + (rc = ops->read_msr(MSR_GS_BASE, &sreg.base, + ctxt)) != X86EMUL_OKAY ) + goto done; + dst.orig_val = sreg.base; /* Preserve current GS Base. */ + if ( (rc = protmode_load_seg(x86_seg_gs, src.val, false, &sreg, + ctxt, ops)) != X86EMUL_OKAY ) + goto done; + /* Write new base into SHADOW_GS, zero extended from GDT/LDT. */ + if ( (rc = ops->write_msr(MSR_SHADOW_GS_BASE, sreg.base, + ctxt, false)) != X86EMUL_OKAY || + (sreg.base = dst.orig_val, /* Reinstate original GS Base. */ + (rc = ops->write_segment(x86_seg_gs, &sreg, + ctxt)) != X86EMUL_OKAY) ) + { + /* + * In real hardware, access to the registers cannot fail. It + * is an error in Xen if the writes fail. + */ + ASSERT_UNREACHABLE(); + x86_emul_reset_event(ctxt); + generate_exception(X86_EXC_DF, 0); + } break; } break; diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index b751dbab27..a30c68b40a 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -282,7 +282,8 @@ def crunch_numbers(state): # superpages, PCID and PKU are only available in 4 level paging. # NO_LMSL indicates the absense of Long Mode Segment Limits, which # have been dropped in hardware. - LM: [CX16, PCID, LAHF_LM, PAGE1GB, PKU, NO_LMSL, AMX_TILE, CMPCCXADD], + LM: [CX16, PCID, LAHF_LM, PAGE1GB, PKU, NO_LMSL, AMX_TILE, CMPCCXADD, + LKGS], # AMD K6-2+ and K6-III processors shipped with 3DNow+, beyond the # standard 3DNow in the earlier K6 processors. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 10:44:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 10:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306698.1578519 (Exim 4.92) (envelope-from ) id 1wMkap-0005ws-Ij; Tue, 12 May 2026 10:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306698.1578519; Tue, 12 May 2026 10:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMkap-0005wj-Fp; Tue, 12 May 2026 10:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1306698; Tue, 12 May 2026 10:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMkan-0005wd-Mm for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 10:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMkan-001btA-35 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 10:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMkan-001NlP-1k for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 10:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mp7FRUYtEFXJWs57eR70s4vw4CoxHBqSzoxptKUHuJE=; b=Of5Oputmnq3vTaNsTxNz5ubdw5 I+uaotxzItPTzDEgmG3yjf7vUv5M+nzRyTBip+VVYfrzVfAfr0+jY6ziA5YqVwibstKf9aircE1a5 tESs5oPebDCrHCe+gHHCvPBpLHPPorBu5IFKNJm/v0vO1Zn1mF5eGkwyfhNCxAH/rXmQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/MCE: adjust S3 resume handling Message-Id: Date: Tue, 12 May 2026 10:44:01 +0000 commit d9b3aceae1ebe859c3aa8413bf0d90cfa508be54 Author: Jan Beulich AuthorDate: Tue May 12 08:31:31 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 12 08:31:31 2026 +0200 x86/MCE: adjust S3 resume handling The BSP resume path calls mcheck_init() with the address of boot_cpu_data, thus rendering comparisons against that pointer ineffective. The additional "bsp" boolean needs to be used (and propagated as necessary) instead. While touching intel_init_thermal(), constify its 1st parameter, which in turn requires touching intel_thermal_supported() as well. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce_amd.c | 4 ++-- xen/arch/x86/cpu/mcheck/mce_intel.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c b/xen/arch/x86/cpu/mcheck/mce_amd.c index 25c29eb3d2..bf353c9a69 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd.c @@ -318,7 +318,7 @@ amd_mcheck_init(const struct cpuinfo_x86 *c, bool bsp) mcequirk_amd_apply(quirkflag); if ( cpu_has(c, X86_FEATURE_AMD_PPIN) && - (c == &boot_cpu_data || ppin_msr) ) + (bsp || ppin_msr) ) { uint64_t val; @@ -333,7 +333,7 @@ amd_mcheck_init(const struct cpuinfo_x86 *c, bool bsp) if ( !(val & PPIN_ENABLE) ) ppin_msr = 0; - else if ( c == &boot_cpu_data ) + else if ( bsp ) ppin_msr = MSR_AMD_PPIN; } diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 839a0e5ba9..673e608376 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -87,7 +87,7 @@ static void cf_check intel_thermal_interrupt(void) } /* Thermal monitoring depends on APIC, ACPI and clock modulation */ -static bool intel_thermal_supported(struct cpuinfo_x86 *c) +static bool intel_thermal_supported(const struct cpuinfo_x86 *c) { if ( !cpu_has_apic ) return false; @@ -110,7 +110,7 @@ static void __init mcheck_intel_therm_init(void) } /* P4/Xeon Thermal regulation detect and init */ -static void intel_init_thermal(struct cpuinfo_x86 *c) +static void intel_init_thermal(const struct cpuinfo_x86 *c, bool bsp) { uint64_t msr_content; uint32_t val; @@ -143,7 +143,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) if ( (msr_content & (1ULL<<3)) && (val & APIC_DM_MASK) == APIC_DM_SMI ) { - if ( c == &boot_cpu_data ) + if ( bsp ) printk(KERN_DEBUG "Thermal monitoring handled by SMI\n"); return; /* -EBUSY */ } @@ -154,7 +154,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) /* check whether a vector already exists, temporarily masked? */ if ( val & APIC_VECTOR_MASK ) { - if ( c == &boot_cpu_data ) + if ( bsp ) printk(KERN_DEBUG "Thermal LVT vector (%#x) already installed\n", val & APIC_VECTOR_MASK); return; /* -EBUSY */ @@ -852,7 +852,7 @@ static void intel_init_mce(bool bsp) mce_uhandler_num = ARRAY_SIZE(intel_mce_uhandlers); } -static void intel_init_ppin(const struct cpuinfo_x86 *c) +static void intel_init_ppin(const struct cpuinfo_x86 *c, bool bsp) { /* * Even if testing the presence of the MSR would be enough, we don't @@ -881,7 +881,7 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) case INTEL_SAPPHIRERAPIDS_X: case INTEL_EMERALDRAPIDS_X: - if ( (c != &boot_cpu_data && !ppin_msr) || + if ( (!bsp && !ppin_msr) || rdmsr_safe(MSR_PPIN_CTL, &val) ) return; @@ -894,7 +894,7 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) if ( !(val & PPIN_ENABLE) ) ppin_msr = 0; - else if ( c == &boot_cpu_data ) + else if ( bsp ) ppin_msr = MSR_PPIN; break; @@ -995,9 +995,9 @@ enum mcheck_type intel_mcheck_init(struct cpuinfo_x86 *c, bool bsp) intel_init_cmci(c); - intel_init_thermal(c); + intel_init_thermal(c, bsp); - intel_init_ppin(c); + intel_init_ppin(c, bsp); return mcheck_intel; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 10:44:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 10:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306699.1578525 (Exim 4.92) (envelope-from ) id 1wMkaz-0005ye-LB; Tue, 12 May 2026 10:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306699.1578525; Tue, 12 May 2026 10:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMkaz-0005yW-H8; Tue, 12 May 2026 10:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1306699; Tue, 12 May 2026 10:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMkax-0005yK-RP for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 10:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMkay-001btR-0S for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 10:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMkax-001Nmx-2I for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 10:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IHBL3PODPXZeN4k92+/TwdVEup/xu6GrNqucOKpwpgY=; b=HTq1fm9OhC4EyOTEGox7wz/fwM wbTyCybAbs1OCtiByGU3mvzz/U2NHgmp+pchvPPhEExXSsvRiVJZGu4Gh3zcqvNdfkszSRZjkwggv Z5YO6Ac2npmZotPjmJ/p8DRzKpA351eybWl7lDlA7gGu2UbW6GpITVC0vN1bGXRY5zFk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: support LKGS Message-Id: Date: Tue, 12 May 2026 10:44:11 +0000 commit a6b143e5a3a5733c12b71e7e2f5b6e9300e5920a Author: Jan Beulich AuthorDate: Tue May 12 08:31:59 2026 +0200 Commit: Jan Beulich CommitDate: Tue May 12 08:31:59 2026 +0200 x86emul: support LKGS Provide support for this insn, which is a prereq to FRED. CPUID-wise, while its and FRED's enumerators were already introduced, their dependency still needs adding. While adding a testcase, also add a SWAPGS one. In order to not affect the behavior of pre-existing tests, install write_{segment,msr} hooks only transiently. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/predicates.c | 1 + tools/tests/x86_emulator/test_x86_emulator.c | 96 ++++++++++++++++++++++++++++ tools/tests/x86_emulator/x86-emulate.c | 1 + xen/arch/x86/x86_emulate/decode.c | 6 +- xen/arch/x86/x86_emulate/private.h | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++++++++- xen/tools/gen-cpuid.py | 3 +- 7 files changed, 137 insertions(+), 4 deletions(-) diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 019c2ced8a..8ff2653895 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -326,6 +326,7 @@ static const struct { { { 0x00, 0x18 }, { 2, 2 }, T, R }, /* ltr */ { { 0x00, 0x20 }, { 2, 2 }, T, R }, /* verr */ { { 0x00, 0x28 }, { 2, 2 }, T, R }, /* verw */ + { { 0x00, 0x30 }, { 0, 2 }, T, R, pfx_f2 }, /* lkgs */ { { 0x01, 0x00 }, { 2, 2 }, F, W }, /* sgdt */ { { 0x01, 0x08 }, { 2, 2 }, F, W }, /* sidt */ { { 0x01, 0x10 }, { 2, 2 }, F, R }, /* lgdt */ diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 20929b80c6..af29b106f1 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -673,6 +673,10 @@ static int blk( return x86_emul_blk((void *)offset, p_data, bytes, eflags, state, ctxt); } +#ifdef __x86_64__ +static unsigned long gs_base, gs_base_shadow; +#endif + static int read_segment( enum x86_segment seg, struct segment_register *reg, @@ -682,9 +686,26 @@ static int read_segment( return X86EMUL_UNHANDLEABLE; memset(reg, 0, sizeof(*reg)); reg->p = 1; + return X86EMUL_OKAY; } +#ifdef __x86_64__ +static int write_segment( + enum x86_segment seg, + const struct segment_register *reg, + struct x86_emulate_ctxt *ctxt) +{ + if ( !is_x86_user_segment(seg) ) + return X86EMUL_UNHANDLEABLE; + + if ( seg == x86_seg_gs ) + gs_base = reg->base; + + return X86EMUL_OKAY; +} +#endif + static int read_msr( unsigned int reg, uint64_t *val, @@ -696,6 +717,20 @@ static int read_msr( *val = ctxt->addr_size > 32 ? EFER_LME | EFER_LMA : 0; return X86EMUL_OKAY; +#ifdef __x86_64__ + case MSR_GS_BASE: + if ( ctxt->addr_size < 64 ) + break; + *val = gs_base; + return X86EMUL_OKAY; + + case MSR_SHADOW_GS_BASE: + if ( ctxt->addr_size < 64 ) + break; + *val = gs_base_shadow; + return X86EMUL_OKAY; +#endif + case MSR_TSC_AUX: #define TSC_AUX_VALUE 0xCACACACA *val = TSC_AUX_VALUE; @@ -705,6 +740,32 @@ static int read_msr( return X86EMUL_UNHANDLEABLE; } +#ifdef __x86_64__ +static int write_msr( + unsigned int reg, + uint64_t val, + struct x86_emulate_ctxt *ctxt, + bool explicit) +{ + switch ( reg ) + { + case MSR_GS_BASE: + if ( ctxt->addr_size < 64 || !is_canonical_address(val) ) + break; + gs_base = val; + return X86EMUL_OKAY; + + case MSR_SHADOW_GS_BASE: + if ( ctxt->addr_size < 64 || !is_canonical_address(val) ) + break; + gs_base_shadow = val; + return X86EMUL_OKAY; + } + + return X86EMUL_UNHANDLEABLE; +} +#endif + #define INVPCID_ADDR 0x12345678 #define INVPCID_PCID 0x123 @@ -1339,6 +1400,41 @@ int main(int argc, char **argv) printf("%u bytes read - ", bytes_read); goto fail; } + printf("okay\n"); + + emulops.write_segment = write_segment; + emulops.write_msr = write_msr; + + printf("%-40s", "Testing swapgs..."); + instr[0] = 0x0f; instr[1] = 0x01; instr[2] = 0xf8; + regs.eip = (unsigned long)&instr[0]; + gs_base = 0xffffeeeecccc8888UL; + gs_base_shadow = 0x0000111122224444UL; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (regs.eip != (unsigned long)&instr[3]) || + (gs_base != 0x0000111122224444UL) || + (gs_base_shadow != 0xffffeeeecccc8888UL) ) + goto fail; + printf("okay\n"); + + printf("%-40s", "Testing lkgs 2(%rdx)..."); + instr[0] = 0xf2; instr[1] = 0x0f; instr[2] = 0x00; instr[3] = 0x72; instr[4] = 0x02; + regs.eip = (unsigned long)&instr[0]; + regs.edx = (unsigned long)res; + res[0] = 0x00004444; + res[1] = 0x8888cccc; + i = cpu_policy.extd.nscb; cpu_policy.extd.nscb = true; /* for AMD */ + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (regs.eip != (unsigned long)&instr[5]) || + (gs_base != 0x0000111122224444UL) || + gs_base_shadow ) + goto fail; + + cpu_policy.extd.nscb = i; + emulops.write_segment = NULL; + emulops.write_msr = NULL; #endif printf("okay\n"); diff --git a/tools/tests/x86_emulator/x86-emulate.c b/tools/tests/x86_emulator/x86-emulate.c index 379e206dd3..b22c7d6add 100644 --- a/tools/tests/x86_emulator/x86-emulate.c +++ b/tools/tests/x86_emulator/x86-emulate.c @@ -85,6 +85,7 @@ bool emul_test_init(void) cpu_policy.feat.invpcid = true; cpu_policy.feat.adx = true; cpu_policy.feat.rdpid = true; + cpu_policy.feat.lkgs = true; cpu_policy.feat.wrmsrns = true; cpu_policy.extd.clzero = true; diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 346777422b..2c13356c4d 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -745,8 +745,12 @@ decode_twobyte(struct x86_emulate_state *s, case 0: s->desc |= DstMem | SrcImplicit | Mov; break; + case 6: + if ( !(s->modrm_reg & 1) && mode_64bit() ) + { case 2: case 4: - s->desc |= SrcMem16; + s->desc |= SrcMem16; + } break; } break; diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index dfdc263f9c..6c96f72327 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -609,6 +609,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx_vnni() (ctxt->cpuid->feat.avx_vnni) #define vcpu_has_avx512_bf16() (ctxt->cpuid->feat.avx512_bf16) #define vcpu_has_cmpccxadd() (ctxt->cpuid->feat.cmpccxadd) +#define vcpu_has_lkgs() (ctxt->cpuid->feat.lkgs) #define vcpu_has_wrmsrns() (ctxt->cpuid->feat.wrmsrns) #define vcpu_has_avx_ifma() (ctxt->cpuid->feat.avx_ifma) #define vcpu_has_avx_vnni_int8() (ctxt->cpuid->feat.avx_vnni_int8) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e58735ee95..364e6c092d 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2899,8 +2899,37 @@ x86_emulate( break; } break; - default: - generate_exception_if(true, X86_EXC_UD); + + case 6: /* lkgs */ + generate_exception_if((modrm_reg & 1) || vex.pfx != vex_f2, + X86_EXC_UD); + generate_exception_if(!mode_64bit() || !mode_ring0(), X86_EXC_UD); + vcpu_must_have(lkgs); + fail_if(!ops->read_msr || !ops->write_segment || !ops->write_msr); + if ( (rc = ops->read_msr(MSR_SHADOW_GS_BASE, &msr_val, + ctxt)) != X86EMUL_OKAY || + (rc = ops->read_msr(MSR_GS_BASE, &sreg.base, + ctxt)) != X86EMUL_OKAY ) + goto done; + dst.orig_val = sreg.base; /* Preserve current GS Base. */ + if ( (rc = protmode_load_seg(x86_seg_gs, src.val, false, &sreg, + ctxt, ops)) != X86EMUL_OKAY ) + goto done; + /* Write new base into SHADOW_GS, zero extended from GDT/LDT. */ + if ( (rc = ops->write_msr(MSR_SHADOW_GS_BASE, sreg.base, + ctxt, false)) != X86EMUL_OKAY || + (sreg.base = dst.orig_val, /* Reinstate original GS Base. */ + (rc = ops->write_segment(x86_seg_gs, &sreg, + ctxt)) != X86EMUL_OKAY) ) + { + /* + * In real hardware, access to the registers cannot fail. It + * is an error in Xen if the writes fail. + */ + ASSERT_UNREACHABLE(); + x86_emul_reset_event(ctxt); + generate_exception(X86_EXC_DF, 0); + } break; } break; diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index b751dbab27..a30c68b40a 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -282,7 +282,8 @@ def crunch_numbers(state): # superpages, PCID and PKU are only available in 4 level paging. # NO_LMSL indicates the absense of Long Mode Segment Limits, which # have been dropped in hardware. - LM: [CX16, PCID, LAHF_LM, PAGE1GB, PKU, NO_LMSL, AMX_TILE, CMPCCXADD], + LM: [CX16, PCID, LAHF_LM, PAGE1GB, PKU, NO_LMSL, AMX_TILE, CMPCCXADD, + LKGS], # AMD K6-2+ and K6-III processors shipped with 3DNow+, beyond the # standard 3DNow in the earlier K6 processors. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 14:44:10 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 14:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1306830.1578581 (Exim 4.92) (envelope-from ) id 1wMoL5-0005Ht-6C; Tue, 12 May 2026 14:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1306830.1578581; Tue, 12 May 2026 14:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoL5-0005Hk-3V; Tue, 12 May 2026 14:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1306830; Tue, 12 May 2026 14:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoL4-0005He-B4 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 14:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMoL4-001gQy-1y for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 14:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMoL4-001bKx-0o for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 14:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EpANvxcUBje1vddJXaeqbkzp6YDHu7A9ISksUKHW74A=; b=jMgvqIXyKko8+aATBDHZhgO1W1 SR+aVghfIVeV1G65c6OK64+kLlEgFevW5DbFn4C1N2M/j0CRVPIV/sxPACiL/uXTs5967URz4/cGE +O4Qv2QwcJkaRhC+N3VnaUy7zPQNsKhV6lFh+2ntEAUanqoZ+Mjds415JsFZIvXy3olA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: sci: Don't create a domain with unsatisfied user requests Message-Id: Date: Tue, 12 May 2026 14:44:02 +0000 commit f7b9752dc88c626192d3115ace7585b20a025433 Author: Michal Orzel AuthorDate: Tue May 12 09:52:55 2026 +0200 Commit: Michal Orzel CommitDate: Tue May 12 13:31:01 2026 +0200 xen/arm: sci: Don't create a domain with unsatisfied user requests On Arm we stay on the safe side and refuse to create a domain on user requests (e.g. via xl.cfg, DT options) that cannot be satisfied due to the feature not being compiled in. SCI fall through the crack and does not adhere to that i.e. a user request for SCI type other than NONE when CONFIG_SCMI_SMC (and thus CONFIG_ARM_SCI) is not set would be silently ignored. Fix it by not allowing anything else other than NONE if the feature is not enabled. Fixes: 10e7473d6024 ("xen/arm: scmi-smc: passthrough SCMI SMC to domain, single agent") Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Bertrand Marquis --- xen/arch/arm/dom0less-build.c | 11 +++++++++-- xen/arch/arm/include/asm/firmware/sci.h | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 6f73c65e51..52cf788a45 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -273,8 +273,7 @@ static int __init domu_dt_sci_parse(struct dt_device_node *node, d_cfg->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_NONE; - if ( !IS_ENABLED(CONFIG_ARM_SCI) || - !dt_property_read_bool(node, "xen,sci_type") ) + if ( !dt_property_read_bool(node, "xen,sci_type") ) return 0; ret = dt_property_read_string(node, "xen,sci_type", &sci_type); @@ -284,7 +283,15 @@ static int __init domu_dt_sci_parse(struct dt_device_node *node, if ( !strcmp(sci_type, "none") ) d_cfg->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_NONE; else if ( !strcmp(sci_type, "scmi_smc") ) + { + if ( !IS_ENABLED(CONFIG_SCMI_SMC) ) + { + printk(XENLOG_ERR "xen,sci_type=scmi_smc requested, but CONFIG_SCMI_SMC not set\n"); + return -EINVAL; + } + d_cfg->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_SCMI_SMC; + } else { printk(XENLOG_ERR "xen,sci_type in not valid (%s) for domain %s\n", diff --git a/xen/arch/arm/include/asm/firmware/sci.h b/xen/arch/arm/include/asm/firmware/sci.h index 3500216bc2..485ce211c9 100644 --- a/xen/arch/arm/include/asm/firmware/sci.h +++ b/xen/arch/arm/include/asm/firmware/sci.h @@ -148,6 +148,8 @@ int sci_dt_finalize(struct domain *d, void *fdt); int sci_assign_dt_device(struct domain *d, struct dt_device_node *dev); #else +#include + static inline bool sci_domain_is_enabled(struct domain *d) { return false; @@ -162,6 +164,9 @@ static inline int sci_domain_init(struct domain *d, static inline int sci_domain_sanitise_config(struct xen_domctl_createdomain *config) { + if ( config->arch.arm_sci_type != XEN_DOMCTL_CONFIG_ARM_SCI_NONE ) + return -EINVAL; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:11:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307233.1578922 (Exim 4.92) (envelope-from ) id 1wMphH-00050P-4i; Tue, 12 May 2026 16:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307233.1578922; Tue, 12 May 2026 16:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMphH-00050F-20; Tue, 12 May 2026 16:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1307233; Tue, 12 May 2026 16:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMphF-000507-Vh for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMphG-001iWm-0l for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMphF-001gcq-2q for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GGEfOp2Ay/P33pptV1hFh34IK2LI1vTLUHRVr6SVFY4=; b=44O82w8mDn8n/Q/fsBUXHuMJX8 pW8ulmPC4XRlLsRqqWZKWLsu5s+dqgeedsRk5Gims7edjUXQFi7+F6QO08cjOJsqgqvn4dU33j3w8 MM3SZedY4WWubk1vU4w3HY9X/5NtNnleIWOEhstXmg3u/zexW4+pX1qYp/fi5tQQco2M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/dom0: enable pf-fixup by default for PVH dom0 Message-Id: Date: Tue, 12 May 2026 16:11:01 +0000 commit fa8687810af66ec37940ecc93e2ef4e9a47889a2 Author: Roger Pau Monne AuthorDate: Fri May 8 10:55:09 2026 +0200 Commit: Roger Pau Monne CommitDate: Tue May 12 18:02:44 2026 +0200 x86/dom0: enable pf-fixup by default for PVH dom0 A non-trivial amount of issues related to PVH dom0 are fixed by enabling the `pf-fixup` command line option, and no issues have been reported as a result of its usage. Enable the option by default to make PVH dom0 more robust in its default configuration. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Acked-by: Oleksii Kurochko Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 2 ++ docs/misc/xen-command-line.pandoc | 8 ++++++-- xen/arch/x86/hvm/emulate.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce46020dbd..25f5a192ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## [4.22.0 UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD ### Changed + - On x86: + - Enable pf-fixup option by default for PVH dom0. ### Added - Support for per-domain Xenstore quota in C xenstored (includes diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 6c77129732..2da90548d8 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -849,7 +849,7 @@ Controls for how dom0 is constructed on x86 systems. If using this option is necessary to fix an issue, please report a bug. * The `pf-fixup` boolean is only applicable when using a PVH dom0 and - defaults to false. + defaults to true. When running dom0 in PVH mode the dom0 kernel has no way to map MMIO regions into its physical memory map, such mode relies on Xen dom0 builder @@ -857,10 +857,14 @@ Controls for how dom0 is constructed on x86 systems. access. However Xen doesn't have a complete picture of the host memory map, due to not being able to process ACPI dynamic tables. - The `pf-fixup` option allows Xen to attempt to add missing MMIO regions + The `pf-fixup` option causes Xen to attempt to add missing MMIO regions to the dom0 physical memory map in response to page-faults generated by dom0 trying to access unpopulated entries in the memory map. + Users having to disable the feature to boot in PVH dom0 mode should report + it to the xen-devel mailing list, together with Xen and dom0 output with the + option enabled. + Enables features on dom0 on Arm systems. * The `sve` integer parameter enables Arm SVE usage for Dom0 and sets the diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index f3aae158e9..bb1bb03ac4 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -165,7 +165,7 @@ void hvmemul_cancel(struct vcpu *v) hvmemul_cache_disable(v); } -bool __ro_after_init opt_dom0_pf_fixup; +bool __ro_after_init opt_dom0_pf_fixup = true; static int hwdom_fixup_p2m(paddr_t addr) { unsigned long gfn = paddr_to_pfn(addr); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:11:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307235.1578926 (Exim 4.92) (envelope-from ) id 1wMphR-00052g-5t; Tue, 12 May 2026 16:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307235.1578926; Tue, 12 May 2026 16:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMphR-00052Y-3K; Tue, 12 May 2026 16:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1307235; Tue, 12 May 2026 16:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMphQ-00052H-13 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMphQ-001iWv-12 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMphP-001ge4-38 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0XRJrJySKTeaHkxOXuSL6FleZFKi4Ass6ekcjTnuXVg=; b=nohmWTZDOsvnxy18DOXGezZSGu N0sBWpsBI5KMsrT7jz/4nJMoRbeoJyTGbF64ijRrzt1XzIrIzT5vYEmJ+pCChMT3tIEJ82J44EhGV Sp2YgEOtSlNom1ukHI+FmKS7zDc9eOmAqNCEd29nwft7owq3TyU+hiBoB/LVQFDoX3ew=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 16:11:11 +0000 commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Tue May 12 17:05:30 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 712734a6e7..70783c9a0a 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1015,11 +1015,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.family == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.family == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.family == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:22:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:22:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307249.1578939 (Exim 4.92) (envelope-from ) id 1wMprv-0007HG-4F; Tue, 12 May 2026 16:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307249.1578939; Tue, 12 May 2026 16:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMprv-0007H8-1e; Tue, 12 May 2026 16:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1307249; Tue, 12 May 2026 16:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpru-0007H2-An for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMpru-001iih-1q for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMpru-001hPx-0h for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XXDn9tk0pxjptVsVFnr01eIBiXkmBF7rlCNXuofyUf4=; b=YUYONbUfZFfwKvNsn+KeU1syR+ 5Nk6CZhkM6GUMgyA79U6rVeZ2NNFqRsZ5aNYk2bC5wEfRwNKyHDOZKifeNz/T6NemOxZB+Foz3XiS v/9TxG/1bEfzF0EvUkuQINb0PZ4Q10E9jWUqvIwpatZ9uz5cjlsVyay0BMGofTxG5P44=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 16:22:02 +0000 commit 8af05b49176dc22db12d6743a927899561314ec8 Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 15:30:12 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb) --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 1bb0766ebf..b5bf2b732e 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1116,11 +1116,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.x86 == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:22:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307250.1578943 (Exim 4.92) (envelope-from ) id 1wMps6-0007Kh-5c; Tue, 12 May 2026 16:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307250.1578943; Tue, 12 May 2026 16:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMps6-0007KZ-33; Tue, 12 May 2026 16:22:14 +0000 Received: by outflank-mailman (input) for mailman id 1307250; Tue, 12 May 2026 16:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMps4-0007KI-Hm for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMps4-001iiq-2i for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMps4-001hRB-1Y for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KRFntS7fgSJf3Ye/+Tbhb939ou8HVHI0q6803prCBGI=; b=YD6pm1nFG89oCu42qF7TEEPSMd m7Nx7xLIHO/mZfX4DWOOoNR1bo20Xk8tvbIZyEWGERcZA0KKe2EbVQJKeHevQ3FERkB0VuF7CCqj+ vW4kJ/VEJDK2bgl+kI70rfvDkCIgzaeMskjg1fCIvO+ub8sYERVV3vEH8+3UAtuH5Tt0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 16:22:12 +0000 commit 3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4 Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 15:31:11 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb) --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 43883e04db..3914032269 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1050,11 +1050,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.x86 == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:22:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307251.1578947 (Exim 4.92) (envelope-from ) id 1wMpsG-0007Mk-70; Tue, 12 May 2026 16:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307251.1578947; Tue, 12 May 2026 16:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsG-0007Mb-4L; Tue, 12 May 2026 16:22:24 +0000 Received: by outflank-mailman (input) for mailman id 1307251; Tue, 12 May 2026 16:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsE-0007MV-QD for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMpsF-001iiw-0L for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMpsE-001hS4-2P for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+srcKVGIIXkzYxcjQXMkC2sZpklCykF+r9nJMQYQYIk=; b=4VjQCv6Da00jXh3GoX4hfMLhjs moisj7IelhHzSp3r8DfNMB5W5zGIXyAFrtfmVUlPF2eG1MKt/WVDEuST7x4qW30C5VHYx8Rp6DTw6 tmGRB1iI5PQ30W9ueVjdMnCAoJcHAspgEgJa8mrpzgrtwcPqekYeLd8scOmfYlJLDsSA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 16:22:22 +0000 commit 8056c4032f2956041b0c0a3d31a12b474caa61de Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 15:32:52 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb) --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 12876de1df..3416fb1a93 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1050,11 +1050,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.x86 == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:22:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307252.1578950 (Exim 4.92) (envelope-from ) id 1wMpsQ-0007Oj-8L; Tue, 12 May 2026 16:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307252.1578950; Tue, 12 May 2026 16:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsQ-0007Ob-5k; Tue, 12 May 2026 16:22:34 +0000 Received: by outflank-mailman (input) for mailman id 1307252; Tue, 12 May 2026 16:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsP-0007OT-23 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMpsP-001ij0-1A for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMpsP-001hSt-00 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3Tu1S7gz9/eXctyMLZ4l26AhwwbW+i+sJfsvUxT+hoI=; b=HGydwhEfunR6G1zQRi0Aaal9VO YsFbjM50llB9g45zPMuB3nvnfIY4XxMXZMl9PtxvZpCDr9VW7fZJAKAvALLiEYcGn+Q1w2RlGFloq kxUvbZFBDO2n7bT3OiwQF/a/MjlaOl/w8aUShEtP4AlYClUgKWKaISblzdd2OgknNPoQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 16:22:33 +0000 commit 581a10f8846768920e7f809e1c51cf2a9f13cbce Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 15:32:57 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb) --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 43cd3ae9ba..89284b740b 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1049,11 +1049,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.x86 == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:22:45 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:22:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307253.1578955 (Exim 4.92) (envelope-from ) id 1wMpsb-0007Qm-9s; Tue, 12 May 2026 16:22:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307253.1578955; Tue, 12 May 2026 16:22:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsb-0007Qe-76; Tue, 12 May 2026 16:22:45 +0000 Received: by outflank-mailman (input) for mailman id 1307253; Tue, 12 May 2026 16:22:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsZ-0007QY-Fm for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMpsZ-001ij6-2W for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMpsZ-001hUL-1M for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jLh+8tSjwA0akvnzGHI5/XdHdfQcfSxncShuBqUdjas=; b=1YaiTNlcL+YSBqLX7SCGfIudc2 Ln23+2vr1Bq/FS8vaGocPHLfeWeFk8FgKtv67TTF85H8w3Sbnp7njITPVUFKj8cx3F5Dp29o/iUzY cIrWDp6yZUxoAH2n8LGD5kvXGZgA5+M8W8EZrfUcsWd//kspCOe6qMJPTvm2wuTF+NtE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/spec-ctrl: Support for SRSO_U/S_NO and SRSO_MSR_FIX Message-Id: Date: Tue, 12 May 2026 16:22:43 +0000 commit 550d632f9b7e2599b8485246aa33d7d01cb95d47 Author: Andrew Cooper AuthorDate: Mon Mar 25 15:14:46 2024 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 16:07:05 2026 +0100 x86/spec-ctrl: Support for SRSO_U/S_NO and SRSO_MSR_FIX AMD have updated the SRSO whitepaper[1] with further information. These features exist on AMD Zen5 CPUs and are necessary for Xen to use. The two features are in principle unrelated: * SRSO_U/S_NO is an enumeration saying that SRSO attacks can't cross the User(CPL3) / Supervisor(CPL<3) boundary. i.e. Xen don't need to use IBPB-on-entry for PV64. PV32 guests are explicitly unsupported for speculative issues, and excluded from consideration for simplicity. * SRSO_MSR_FIX is an enumeration identifying that the BP_SPEC_REDUCE bit is available in MSR_BP_CFG. When set, SRSO attacks can't cross the host/guest boundary. i.e. Xen don't need to use IBPB-on-entry for HVM. Extend ibpb_calculations() to account for these when calculating opt_ibpb_entry_{pv,hvm} defaults. Add a `bp-spec-reduce=` option to control the use of BP_SPEC_REDUCE, with it active by default. Because MSR_BP_CFG is core-scoped with a race condition updating it, repurpose amd_check_erratum_1485() into amd_check_bp_cfg() and calculate all updates at once. Xen also needs to to advertise SRSO_U/S_NO to guests to allow the guest kernel to skip SRSO mitigations too: * This is trivial for HVM guests. It is also is accurate for PV32 guests too, but we have already excluded them from consideration, and do so again here to simplify the policy logic. * As written, SRSO_U/S_NO does not help for the PV64 user->kernel boundary. However, after discussing with AMD, an implementation detail of having BP_SPEC_REDUCE active causes the PV64 user->kernel boundary to have the property described by SRSO_U/S_NO, so we can advertise SRSO_U/S_NO to guests when the BP_SPEC_REDUCE precondition is met. Finally, fix a typo in the SRSO_NO's comment. [1] https://www.amd.com/content/dam/amd/en/documents/corporate/cr/speculative-return-stack-overflow-whitepaper.pdf Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit a1746cd4434dd27ca2da8430dfb10edc76264bb3) --- docs/misc/xen-command-line.pandoc | 9 +++++- xen/arch/x86/cpu-policy.c | 21 +++++++++++++ xen/arch/x86/cpu/amd.c | 29 ++++++++++++++---- xen/arch/x86/include/asm/msr-index.h | 1 + xen/arch/x86/include/asm/spec_ctrl.h | 1 + xen/arch/x86/spec_ctrl.c | 47 +++++++++++++++++++++++------ xen/include/public/arch-x86/cpufeatureset.h | 4 ++- 7 files changed, 94 insertions(+), 18 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 4f2907eb67..ad80277326 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2330,7 +2330,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). > {ibrs,ibpb,ssbd,psfd, > eager-fpu,l1d-flush,branch-harden,srb-lock, > unpriv-mmio,gds-mit,div-scrub,lock-harden, -> bhi-dis-s}= ]` +> bhi-dis-s,bp-spec-reduce}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2479,6 +2479,13 @@ boolean can be used to force or prevent Xen from using speculation barriers to protect lock critical regions. This mitigation won't be engaged by default, and needs to be explicitly enabled on the command line. +On hardware supporting SRSO_MSR_FIX, the `bp-spec-reduce=` option can be used +to force or prevent Xen from using MSR_BP_CFG.BP_SPEC_REDUCE to mitigate the +SRSO (Speculative Return Stack Overflow) vulnerability. Xen will use +bp-spec-reduce when available, as it is preferable to using `ibpb-entry=hvm` +to mitigate SRSO for HVM guests, and because it is a prerequisite to advertise +SRSO_U/S_NO to PV guests. + ### sync_console > `= ` diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index f259c77435..9224c36d81 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -14,6 +14,7 @@ #include #include #include +#include #include struct cpu_policy __ro_after_init raw_cpu_policy; @@ -650,6 +651,26 @@ static void __init calculate_pv_max_policy(void) __clear_bit(X86_FEATURE_IBRS, fs); } + /* + * SRSO_U/S_NO means that the CPU is not vulnerable to SRSO attacks across + * the User (CPL3) / Supervisor (CPL<3) boundary. + * + * PV32 guests are unsupported for speculative issues, and excluded from + * consideration for simplicity. + * + * The PV64 user/kernel boundary is CPL3 on both sides, so SRSO_U/S_NO + * won't convey the meaning that a PV kernel expects. + * + * After discussions with AMD, an implementation detail of having + * BP_SPEC_REDUCE active causes the PV64 user/kernel boundary to have a + * property compatible with the meaning of SRSO_U/S_NO. + * + * If BP_SPEC_REDUCE isn't active, remove SRSO_U/S_NO from the PV max + * policy, which will cause it to filter out of PV default too. + */ + if ( !boot_cpu_has(X86_FEATURE_SRSO_MSR_FIX) || !opt_bp_spec_reduce ) + __clear_bit(X86_FEATURE_SRSO_US_NO, fs); + guest_common_max_feature_adjustments(fs); guest_common_feature_adjustments(fs); diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3312d896dd..8c4e50de45 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1018,16 +1018,33 @@ static void amd_init_fp_cfg(const struct cpuinfo_x86 *c) wrmsrl(MSR_AMD64_FP_CFG, val | new); } -static void amd_check_erratum_1485(void) +static void amd_check_bp_cfg(void) { - uint64_t val, chickenbit = (1 << 5); + uint64_t val, new = 0; - if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x19 || !is_zen4_uarch()) + /* + * AMD Erratum #1485. Set bit 5, as instructed. + */ + if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by + * default. This lets us do two things: + * + * 1) Avoid IBPB-on-entry to mitigate SRSO attacks from HVM guests. + * 2) Advertise SRSO_US_NO to PV guests. + */ + if (boot_cpu_has(X86_FEATURE_SRSO_MSR_FIX) && opt_bp_spec_reduce) + new |= BP_CFG_SPEC_REDUCE; + + /* Avoid reading BP_CFG if we don't intend to change anything. */ + if (!new) return; rdmsrl(MSR_AMD64_BP_CFG, val); - if (val & chickenbit) + if ((val & new) == new) return; /* @@ -1036,7 +1053,7 @@ static void amd_check_erratum_1485(void) * same time before the chickenbit is set. It's benign because the * value being written is the same on both. */ - wrmsrl(MSR_AMD64_BP_CFG, val | chickenbit); + wrmsrl(MSR_AMD64_BP_CFG, val | new); } static void cf_check init_amd(struct cpuinfo_x86 *c) @@ -1314,7 +1331,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) disable_c1_ramping(); amd_check_zenbleed(); - amd_check_erratum_1485(); + amd_check_bp_cfg(); if (fam17_c6_disabled) fam17_disable_c6(NULL); diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index bed0ab7b21..db3db08a54 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -391,6 +391,7 @@ #define AMD64_DE_CFG_LFENCE_SERIALISE (_AC(1, ULL) << 1) #define MSR_AMD64_EX_CFG 0xc001102c #define MSR_AMD64_BP_CFG 0xc001102e +#define BP_CFG_SPEC_REDUCE (_AC(1, ULL) << 4) #define MSR_AMD64_DE_CFG2 0xc00110e3 #define MSR_AMD64_DR0_ADDRESS_MASK 0xc0011027 diff --git a/xen/arch/x86/include/asm/spec_ctrl.h b/xen/arch/x86/include/asm/spec_ctrl.h index 60844b755d..b7349ac898 100644 --- a/xen/arch/x86/include/asm/spec_ctrl.h +++ b/xen/arch/x86/include/asm/spec_ctrl.h @@ -102,6 +102,7 @@ extern int8_t opt_xpti_hwdom, opt_xpti_domu; extern bool cpu_has_bug_l1tf; extern int8_t opt_pv_l1tf_hwdom, opt_pv_l1tf_domu; +extern bool opt_bp_spec_reduce; /* * The L1D address mask, which might be wider than reported in CPUID, and the diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 5005f0acdd..b71fe0a4ec 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -95,6 +95,7 @@ static bool __initdata opt_unpriv_mmio; static bool __ro_after_init opt_verw_mmio; static int8_t __initdata opt_gds_mit = -1; static int8_t __initdata opt_div_scrub = -1; +bool __ro_after_init opt_bp_spec_reduce = true; static int __init cf_check parse_spec_ctrl(const char *s) { @@ -155,6 +156,7 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_unpriv_mmio = false; opt_gds_mit = 0; opt_div_scrub = 0; + opt_bp_spec_reduce = false; } else if ( val > 0 ) rc = -EINVAL; @@ -375,6 +377,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_gds_mit = val; else if ( (val = parse_boolean("div-scrub", s, ss)) >= 0 ) opt_div_scrub = val; + else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) + opt_bp_spec_reduce = val; else rc = -EINVAL; @@ -517,7 +521,7 @@ static void __init print_details(enum ind_thunk thunk) * Hardware read-only information, stating immunity to certain issues, or * suggestions of which mitigation to use. */ - printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_EIBRS) ? " EIBRS" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", @@ -542,11 +546,12 @@ static void __init print_details(enum ind_thunk thunk) (e8b & cpufeat_mask(X86_FEATURE_IBPB_RET)) ? " IBPB_RET" : "", (e21a & cpufeat_mask(X86_FEATURE_IBPB_BRTYPE)) ? " IBPB_BRTYPE" : "", (e21a & cpufeat_mask(X86_FEATURE_SRSO_NO)) ? " SRSO_NO" : "", + (e21a & cpufeat_mask(X86_FEATURE_SRSO_US_NO)) ? " SRSO_US_NO" : "", (e21c & cpufeat_mask(X86_FEATURE_TSA_SQ_NO)) ? " TSA_SQ_NO" : "", (e21c & cpufeat_mask(X86_FEATURE_TSA_L1_NO)) ? " TSA_L1_NO" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", (e8b & cpufeat_mask(X86_FEATURE_IBRS)) || @@ -566,6 +571,7 @@ static void __init print_details(enum ind_thunk thunk) (caps & ARCH_CAPS_GDS_CTRL) ? " GDS_CTRL" : "", (caps & ARCH_CAPS_RFDS_CLEAR) ? " RFDS_CLEAR" : "", (e21a & cpufeat_mask(X86_FEATURE_SBPB)) ? " SBPB" : "", + (e21a & cpufeat_mask(X86_FEATURE_SRSO_MSR_FIX)) ? " SRSO_MSR_FIX" : "", (e21a & cpufeat_mask(X86_FEATURE_VERW_CLEAR)) ? " VERW_CLEAR" : ""); /* Compiled-in support which pertains to mitigations. */ @@ -1138,7 +1144,7 @@ static void __init div_calculations(bool hw_smt_enabled) static void __init ibpb_calculations(void) { - bool def_ibpb_entry = false; + bool def_ibpb_entry_pv = false, def_ibpb_entry_hvm = false; /* Check we have hardware IBPB support before using it... */ if ( !boot_cpu_has(X86_FEATURE_IBRSB) && !boot_cpu_has(X86_FEATURE_IBPB) ) @@ -1163,22 +1169,43 @@ static void __init ibpb_calculations(void) * Confusion. Mitigate with IBPB-on-entry. */ if ( !boot_cpu_has(X86_FEATURE_BTC_NO) ) - def_ibpb_entry = true; + def_ibpb_entry_pv = def_ibpb_entry_hvm = true; /* - * Further to BTC, Zen3/4 CPUs suffer from Speculative Return Stack - * Overflow in most configurations. Mitigate with IBPB-on-entry if we - * have the microcode that makes this an effective option. + * In addition to BTC, Zen3 and later CPUs suffer from Speculative + * Return Stack Overflow in most configurations. If we have microcode + * that makes IBPB-on-entry an effective mitigation, see about using + * it. */ if ( !boot_cpu_has(X86_FEATURE_SRSO_NO) && boot_cpu_has(X86_FEATURE_IBPB_BRTYPE) ) - def_ibpb_entry = true; + { + /* + * SRSO_U/S_NO is a subset of SRSO_NO, identifying that SRSO isn't + * possible across the User (CPL3) / Supervisor (CPL<3) boundary. + * + * Ignoring PV32 (not security supported for speculative issues), + * this means we only need to use IBPB-on-entry for PV guests on + * hardware which doesn't enumerate SRSO_US_NO. + */ + if ( !boot_cpu_has(X86_FEATURE_SRSO_US_NO) ) + def_ibpb_entry_pv = true; + + /* + * SRSO_MSR_FIX enumerates that we can use MSR_BP_CFG.SPEC_REDUCE + * to mitigate SRSO across the host/guest boundary. We only need + * to use IBPB-on-entry for HVM guests if we haven't enabled this + * control. + */ + if ( !boot_cpu_has(X86_FEATURE_SRSO_MSR_FIX) || !opt_bp_spec_reduce ) + def_ibpb_entry_hvm = true; + } } if ( opt_ibpb_entry_pv == -1 ) - opt_ibpb_entry_pv = IS_ENABLED(CONFIG_PV) && def_ibpb_entry; + opt_ibpb_entry_pv = IS_ENABLED(CONFIG_PV) && def_ibpb_entry_pv; if ( opt_ibpb_entry_hvm == -1 ) - opt_ibpb_entry_hvm = IS_ENABLED(CONFIG_HVM) && def_ibpb_entry; + opt_ibpb_entry_hvm = IS_ENABLED(CONFIG_HVM) && def_ibpb_entry_hvm; if ( opt_ibpb_entry_pv ) { diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 42db132b4c..12ca3efc5c 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -289,7 +289,9 @@ XEN_CPUFEATURE(NSCB, 11*32+ 6) /*A Null Selector Clears Base (and XEN_CPUFEATURE(AUTO_IBRS, 11*32+ 8) /* Automatic IBRS */ XEN_CPUFEATURE(SBPB, 11*32+27) /*A Selective Branch Predictor Barrier */ XEN_CPUFEATURE(IBPB_BRTYPE, 11*32+28) /*A IBPB flushes Branch Type predictions too */ -XEN_CPUFEATURE(SRSO_NO, 11*32+29) /*A Hardware not vulenrable to Speculative Return Stack Overflow */ +XEN_CPUFEATURE(SRSO_NO, 11*32+29) /*A Hardware not vulnerable to Speculative Return Stack Overflow */ +XEN_CPUFEATURE(SRSO_US_NO, 11*32+30) /*A! Hardware not vulnerable to SRSO across the User/Supervisor boundary */ +XEN_CPUFEATURE(SRSO_MSR_FIX, 11*32+31) /* MSR_BP_CFG.BP_SPEC_REDUCE available */ /* Intel-defined CPU features, CPUID level 0x00000007:1.ebx, word 12 */ XEN_CPUFEATURE(INTEL_PPIN, 12*32+ 0) /* Protected Processor Inventory Number */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:22:55 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:22:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307254.1578959 (Exim 4.92) (envelope-from ) id 1wMpsl-0007TC-CL; Tue, 12 May 2026 16:22:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307254.1578959; Tue, 12 May 2026 16:22:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsl-0007T3-9o; Tue, 12 May 2026 16:22:55 +0000 Received: by outflank-mailman (input) for mailman id 1307254; Tue, 12 May 2026 16:22:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMpsj-0007Sv-Ij for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMpsj-001ijU-2o for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMpsj-001hVe-1e for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:22:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ms2xlLo3Ls8QaJXzZLZggiqkfyVAyK6vMyORHW7t6qE=; b=CyMzB0jVNAWfZnIqrhibNxGEu4 LzPFrtecVfYYXGNnT7CQkAoO1I2yRhNTx0HEQdi8vQXzVYOs1aonyb66zK6l0iaY0Hgf8MvabKKEF 51s8Q2dQpdZozFCHeHXz33EUtS4FtNJVONuCOG4q1c1GnDH3/dn20NiJ7oq+fKDb8qx8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 16:22:53 +0000 commit caf651fdbcad3b3ae798172b46953ea1aa08a646 Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 16:07:50 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb) --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 8c4e50de45..86268e8619 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1022,11 +1022,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.x86 == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:44:06 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307260.1578962 (Exim 4.92) (envelope-from ) id 1wMqDD-00024u-Qu; Tue, 12 May 2026 16:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307260.1578962; Tue, 12 May 2026 16:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMqDD-00024m-OO; Tue, 12 May 2026 16:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1307260; Tue, 12 May 2026 16:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMqDC-00024f-IV for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMqDC-001j5L-2f for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMqDC-001jEo-1K for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eegrUbQuwxAgkKtEy8pQ771X8QWi/p6hIxy+nS14yAw=; b=GPtP8OdCFW3CsiTW2pGSpIgxoY efFQjX+VmVfQV5fgn7u47Wzo7zZeRFCiiDC9cq4IpdUBfHZZg49l9Hrt49t3t2i35mBVWHaMLbd6X IlCDXXTSJ/bEzWpX3Xdq+vXVqyUsCLgykZzzyD0KovtWrkzvS5W8AaruUYlTVcxUrYjQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/spec-ctrl: Support for SRSO_U/S_NO and SRSO_MSR_FIX Message-Id: Date: Tue, 12 May 2026 16:44:02 +0000 commit 550d632f9b7e2599b8485246aa33d7d01cb95d47 Author: Andrew Cooper AuthorDate: Mon Mar 25 15:14:46 2024 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 16:07:05 2026 +0100 x86/spec-ctrl: Support for SRSO_U/S_NO and SRSO_MSR_FIX AMD have updated the SRSO whitepaper[1] with further information. These features exist on AMD Zen5 CPUs and are necessary for Xen to use. The two features are in principle unrelated: * SRSO_U/S_NO is an enumeration saying that SRSO attacks can't cross the User(CPL3) / Supervisor(CPL<3) boundary. i.e. Xen don't need to use IBPB-on-entry for PV64. PV32 guests are explicitly unsupported for speculative issues, and excluded from consideration for simplicity. * SRSO_MSR_FIX is an enumeration identifying that the BP_SPEC_REDUCE bit is available in MSR_BP_CFG. When set, SRSO attacks can't cross the host/guest boundary. i.e. Xen don't need to use IBPB-on-entry for HVM. Extend ibpb_calculations() to account for these when calculating opt_ibpb_entry_{pv,hvm} defaults. Add a `bp-spec-reduce=` option to control the use of BP_SPEC_REDUCE, with it active by default. Because MSR_BP_CFG is core-scoped with a race condition updating it, repurpose amd_check_erratum_1485() into amd_check_bp_cfg() and calculate all updates at once. Xen also needs to to advertise SRSO_U/S_NO to guests to allow the guest kernel to skip SRSO mitigations too: * This is trivial for HVM guests. It is also is accurate for PV32 guests too, but we have already excluded them from consideration, and do so again here to simplify the policy logic. * As written, SRSO_U/S_NO does not help for the PV64 user->kernel boundary. However, after discussing with AMD, an implementation detail of having BP_SPEC_REDUCE active causes the PV64 user->kernel boundary to have the property described by SRSO_U/S_NO, so we can advertise SRSO_U/S_NO to guests when the BP_SPEC_REDUCE precondition is met. Finally, fix a typo in the SRSO_NO's comment. [1] https://www.amd.com/content/dam/amd/en/documents/corporate/cr/speculative-return-stack-overflow-whitepaper.pdf Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit a1746cd4434dd27ca2da8430dfb10edc76264bb3) --- docs/misc/xen-command-line.pandoc | 9 +++++- xen/arch/x86/cpu-policy.c | 21 +++++++++++++ xen/arch/x86/cpu/amd.c | 29 ++++++++++++++---- xen/arch/x86/include/asm/msr-index.h | 1 + xen/arch/x86/include/asm/spec_ctrl.h | 1 + xen/arch/x86/spec_ctrl.c | 47 +++++++++++++++++++++++------ xen/include/public/arch-x86/cpufeatureset.h | 4 ++- 7 files changed, 94 insertions(+), 18 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 4f2907eb67..ad80277326 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2330,7 +2330,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). > {ibrs,ibpb,ssbd,psfd, > eager-fpu,l1d-flush,branch-harden,srb-lock, > unpriv-mmio,gds-mit,div-scrub,lock-harden, -> bhi-dis-s}= ]` +> bhi-dis-s,bp-spec-reduce}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2479,6 +2479,13 @@ boolean can be used to force or prevent Xen from using speculation barriers to protect lock critical regions. This mitigation won't be engaged by default, and needs to be explicitly enabled on the command line. +On hardware supporting SRSO_MSR_FIX, the `bp-spec-reduce=` option can be used +to force or prevent Xen from using MSR_BP_CFG.BP_SPEC_REDUCE to mitigate the +SRSO (Speculative Return Stack Overflow) vulnerability. Xen will use +bp-spec-reduce when available, as it is preferable to using `ibpb-entry=hvm` +to mitigate SRSO for HVM guests, and because it is a prerequisite to advertise +SRSO_U/S_NO to PV guests. + ### sync_console > `= ` diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index f259c77435..9224c36d81 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -14,6 +14,7 @@ #include #include #include +#include #include struct cpu_policy __ro_after_init raw_cpu_policy; @@ -650,6 +651,26 @@ static void __init calculate_pv_max_policy(void) __clear_bit(X86_FEATURE_IBRS, fs); } + /* + * SRSO_U/S_NO means that the CPU is not vulnerable to SRSO attacks across + * the User (CPL3) / Supervisor (CPL<3) boundary. + * + * PV32 guests are unsupported for speculative issues, and excluded from + * consideration for simplicity. + * + * The PV64 user/kernel boundary is CPL3 on both sides, so SRSO_U/S_NO + * won't convey the meaning that a PV kernel expects. + * + * After discussions with AMD, an implementation detail of having + * BP_SPEC_REDUCE active causes the PV64 user/kernel boundary to have a + * property compatible with the meaning of SRSO_U/S_NO. + * + * If BP_SPEC_REDUCE isn't active, remove SRSO_U/S_NO from the PV max + * policy, which will cause it to filter out of PV default too. + */ + if ( !boot_cpu_has(X86_FEATURE_SRSO_MSR_FIX) || !opt_bp_spec_reduce ) + __clear_bit(X86_FEATURE_SRSO_US_NO, fs); + guest_common_max_feature_adjustments(fs); guest_common_feature_adjustments(fs); diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3312d896dd..8c4e50de45 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1018,16 +1018,33 @@ static void amd_init_fp_cfg(const struct cpuinfo_x86 *c) wrmsrl(MSR_AMD64_FP_CFG, val | new); } -static void amd_check_erratum_1485(void) +static void amd_check_bp_cfg(void) { - uint64_t val, chickenbit = (1 << 5); + uint64_t val, new = 0; - if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x19 || !is_zen4_uarch()) + /* + * AMD Erratum #1485. Set bit 5, as instructed. + */ + if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by + * default. This lets us do two things: + * + * 1) Avoid IBPB-on-entry to mitigate SRSO attacks from HVM guests. + * 2) Advertise SRSO_US_NO to PV guests. + */ + if (boot_cpu_has(X86_FEATURE_SRSO_MSR_FIX) && opt_bp_spec_reduce) + new |= BP_CFG_SPEC_REDUCE; + + /* Avoid reading BP_CFG if we don't intend to change anything. */ + if (!new) return; rdmsrl(MSR_AMD64_BP_CFG, val); - if (val & chickenbit) + if ((val & new) == new) return; /* @@ -1036,7 +1053,7 @@ static void amd_check_erratum_1485(void) * same time before the chickenbit is set. It's benign because the * value being written is the same on both. */ - wrmsrl(MSR_AMD64_BP_CFG, val | chickenbit); + wrmsrl(MSR_AMD64_BP_CFG, val | new); } static void cf_check init_amd(struct cpuinfo_x86 *c) @@ -1314,7 +1331,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) disable_c1_ramping(); amd_check_zenbleed(); - amd_check_erratum_1485(); + amd_check_bp_cfg(); if (fam17_c6_disabled) fam17_disable_c6(NULL); diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index bed0ab7b21..db3db08a54 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -391,6 +391,7 @@ #define AMD64_DE_CFG_LFENCE_SERIALISE (_AC(1, ULL) << 1) #define MSR_AMD64_EX_CFG 0xc001102c #define MSR_AMD64_BP_CFG 0xc001102e +#define BP_CFG_SPEC_REDUCE (_AC(1, ULL) << 4) #define MSR_AMD64_DE_CFG2 0xc00110e3 #define MSR_AMD64_DR0_ADDRESS_MASK 0xc0011027 diff --git a/xen/arch/x86/include/asm/spec_ctrl.h b/xen/arch/x86/include/asm/spec_ctrl.h index 60844b755d..b7349ac898 100644 --- a/xen/arch/x86/include/asm/spec_ctrl.h +++ b/xen/arch/x86/include/asm/spec_ctrl.h @@ -102,6 +102,7 @@ extern int8_t opt_xpti_hwdom, opt_xpti_domu; extern bool cpu_has_bug_l1tf; extern int8_t opt_pv_l1tf_hwdom, opt_pv_l1tf_domu; +extern bool opt_bp_spec_reduce; /* * The L1D address mask, which might be wider than reported in CPUID, and the diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 5005f0acdd..b71fe0a4ec 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -95,6 +95,7 @@ static bool __initdata opt_unpriv_mmio; static bool __ro_after_init opt_verw_mmio; static int8_t __initdata opt_gds_mit = -1; static int8_t __initdata opt_div_scrub = -1; +bool __ro_after_init opt_bp_spec_reduce = true; static int __init cf_check parse_spec_ctrl(const char *s) { @@ -155,6 +156,7 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_unpriv_mmio = false; opt_gds_mit = 0; opt_div_scrub = 0; + opt_bp_spec_reduce = false; } else if ( val > 0 ) rc = -EINVAL; @@ -375,6 +377,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_gds_mit = val; else if ( (val = parse_boolean("div-scrub", s, ss)) >= 0 ) opt_div_scrub = val; + else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) + opt_bp_spec_reduce = val; else rc = -EINVAL; @@ -517,7 +521,7 @@ static void __init print_details(enum ind_thunk thunk) * Hardware read-only information, stating immunity to certain issues, or * suggestions of which mitigation to use. */ - printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_EIBRS) ? " EIBRS" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", @@ -542,11 +546,12 @@ static void __init print_details(enum ind_thunk thunk) (e8b & cpufeat_mask(X86_FEATURE_IBPB_RET)) ? " IBPB_RET" : "", (e21a & cpufeat_mask(X86_FEATURE_IBPB_BRTYPE)) ? " IBPB_BRTYPE" : "", (e21a & cpufeat_mask(X86_FEATURE_SRSO_NO)) ? " SRSO_NO" : "", + (e21a & cpufeat_mask(X86_FEATURE_SRSO_US_NO)) ? " SRSO_US_NO" : "", (e21c & cpufeat_mask(X86_FEATURE_TSA_SQ_NO)) ? " TSA_SQ_NO" : "", (e21c & cpufeat_mask(X86_FEATURE_TSA_L1_NO)) ? " TSA_L1_NO" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", (e8b & cpufeat_mask(X86_FEATURE_IBRS)) || @@ -566,6 +571,7 @@ static void __init print_details(enum ind_thunk thunk) (caps & ARCH_CAPS_GDS_CTRL) ? " GDS_CTRL" : "", (caps & ARCH_CAPS_RFDS_CLEAR) ? " RFDS_CLEAR" : "", (e21a & cpufeat_mask(X86_FEATURE_SBPB)) ? " SBPB" : "", + (e21a & cpufeat_mask(X86_FEATURE_SRSO_MSR_FIX)) ? " SRSO_MSR_FIX" : "", (e21a & cpufeat_mask(X86_FEATURE_VERW_CLEAR)) ? " VERW_CLEAR" : ""); /* Compiled-in support which pertains to mitigations. */ @@ -1138,7 +1144,7 @@ static void __init div_calculations(bool hw_smt_enabled) static void __init ibpb_calculations(void) { - bool def_ibpb_entry = false; + bool def_ibpb_entry_pv = false, def_ibpb_entry_hvm = false; /* Check we have hardware IBPB support before using it... */ if ( !boot_cpu_has(X86_FEATURE_IBRSB) && !boot_cpu_has(X86_FEATURE_IBPB) ) @@ -1163,22 +1169,43 @@ static void __init ibpb_calculations(void) * Confusion. Mitigate with IBPB-on-entry. */ if ( !boot_cpu_has(X86_FEATURE_BTC_NO) ) - def_ibpb_entry = true; + def_ibpb_entry_pv = def_ibpb_entry_hvm = true; /* - * Further to BTC, Zen3/4 CPUs suffer from Speculative Return Stack - * Overflow in most configurations. Mitigate with IBPB-on-entry if we - * have the microcode that makes this an effective option. + * In addition to BTC, Zen3 and later CPUs suffer from Speculative + * Return Stack Overflow in most configurations. If we have microcode + * that makes IBPB-on-entry an effective mitigation, see about using + * it. */ if ( !boot_cpu_has(X86_FEATURE_SRSO_NO) && boot_cpu_has(X86_FEATURE_IBPB_BRTYPE) ) - def_ibpb_entry = true; + { + /* + * SRSO_U/S_NO is a subset of SRSO_NO, identifying that SRSO isn't + * possible across the User (CPL3) / Supervisor (CPL<3) boundary. + * + * Ignoring PV32 (not security supported for speculative issues), + * this means we only need to use IBPB-on-entry for PV guests on + * hardware which doesn't enumerate SRSO_US_NO. + */ + if ( !boot_cpu_has(X86_FEATURE_SRSO_US_NO) ) + def_ibpb_entry_pv = true; + + /* + * SRSO_MSR_FIX enumerates that we can use MSR_BP_CFG.SPEC_REDUCE + * to mitigate SRSO across the host/guest boundary. We only need + * to use IBPB-on-entry for HVM guests if we haven't enabled this + * control. + */ + if ( !boot_cpu_has(X86_FEATURE_SRSO_MSR_FIX) || !opt_bp_spec_reduce ) + def_ibpb_entry_hvm = true; + } } if ( opt_ibpb_entry_pv == -1 ) - opt_ibpb_entry_pv = IS_ENABLED(CONFIG_PV) && def_ibpb_entry; + opt_ibpb_entry_pv = IS_ENABLED(CONFIG_PV) && def_ibpb_entry_pv; if ( opt_ibpb_entry_hvm == -1 ) - opt_ibpb_entry_hvm = IS_ENABLED(CONFIG_HVM) && def_ibpb_entry; + opt_ibpb_entry_hvm = IS_ENABLED(CONFIG_HVM) && def_ibpb_entry_hvm; if ( opt_ibpb_entry_pv ) { diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 42db132b4c..12ca3efc5c 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -289,7 +289,9 @@ XEN_CPUFEATURE(NSCB, 11*32+ 6) /*A Null Selector Clears Base (and XEN_CPUFEATURE(AUTO_IBRS, 11*32+ 8) /* Automatic IBRS */ XEN_CPUFEATURE(SBPB, 11*32+27) /*A Selective Branch Predictor Barrier */ XEN_CPUFEATURE(IBPB_BRTYPE, 11*32+28) /*A IBPB flushes Branch Type predictions too */ -XEN_CPUFEATURE(SRSO_NO, 11*32+29) /*A Hardware not vulenrable to Speculative Return Stack Overflow */ +XEN_CPUFEATURE(SRSO_NO, 11*32+29) /*A Hardware not vulnerable to Speculative Return Stack Overflow */ +XEN_CPUFEATURE(SRSO_US_NO, 11*32+30) /*A! Hardware not vulnerable to SRSO across the User/Supervisor boundary */ +XEN_CPUFEATURE(SRSO_MSR_FIX, 11*32+31) /* MSR_BP_CFG.BP_SPEC_REDUCE available */ /* Intel-defined CPU features, CPUID level 0x00000007:1.ebx, word 12 */ XEN_CPUFEATURE(INTEL_PPIN, 12*32+ 0) /* Protected Processor Inventory Number */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 12 16:44:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 16:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307261.1578967 (Exim 4.92) (envelope-from ) id 1wMqDN-00026Y-Su; Tue, 12 May 2026 16:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307261.1578967; Tue, 12 May 2026 16:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMqDN-00026Q-Px; Tue, 12 May 2026 16:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1307261; Tue, 12 May 2026 16:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMqDM-00026I-KM for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMqDM-001j5P-2y for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMqDM-001jGW-1n for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 16:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E8qWVeaREdJ2gqzmOCwxz00mL+AhDbAqLyLJB04F2Js=; b=M8DOvdszHijUZV4E7Dn29zW71I sAe9nRppfnhh3v6IPSswWVzoQ7/FkXmSDmHg69Bn1364J0MyFMVb9IT7TSBDllF5tMzzHAqvPp/HU j+EOH6begMyb1p/RKmZKRi9njbv3Jbnc+p0jhhHeKu9eOXFaBryhHSvcwUZtVgaE9YZQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 16:44:12 +0000 commit caf651fdbcad3b3ae798172b46953ea1aa08a646 Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Wed May 6 16:07:50 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb) --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 8c4e50de45..86268e8619 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1022,11 +1022,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.x86 == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.x86 == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 12 18:55:10 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 18:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307431.1579142 (Exim 4.92) (envelope-from ) id 1wMsFz-0004oS-Pw; Tue, 12 May 2026 18:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307431.1579142; Tue, 12 May 2026 18:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMsFz-0004oJ-N9; Tue, 12 May 2026 18:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1307431; Tue, 12 May 2026 18:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMsFy-0004oD-Dw for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMsFy-001lfq-26 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMsFy-001x00-0n for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tId8ig2BtpbfwlAqEKXpFk9AU7qglxPec0nxp24pTPs=; b=4Guk310MFJvINung1B7NfgqeHR yg60upMAkCA82LrTyWx3B0hBFymcMkIgXLNVQp/5dWHEncRLH1itqWKiTUFN0bDFWW0kLojylJYnh QESuhz0DjENmhrye4bHTlZGkdpl646P3AsPHVRq/oOH5ATV+vWkEih32EbtYpu3BJkhM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: sci: Don't create a domain with unsatisfied user requests Message-Id: Date: Tue, 12 May 2026 18:55:02 +0000 commit f7b9752dc88c626192d3115ace7585b20a025433 Author: Michal Orzel AuthorDate: Tue May 12 09:52:55 2026 +0200 Commit: Michal Orzel CommitDate: Tue May 12 13:31:01 2026 +0200 xen/arm: sci: Don't create a domain with unsatisfied user requests On Arm we stay on the safe side and refuse to create a domain on user requests (e.g. via xl.cfg, DT options) that cannot be satisfied due to the feature not being compiled in. SCI fall through the crack and does not adhere to that i.e. a user request for SCI type other than NONE when CONFIG_SCMI_SMC (and thus CONFIG_ARM_SCI) is not set would be silently ignored. Fix it by not allowing anything else other than NONE if the feature is not enabled. Fixes: 10e7473d6024 ("xen/arm: scmi-smc: passthrough SCMI SMC to domain, single agent") Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Bertrand Marquis --- xen/arch/arm/dom0less-build.c | 11 +++++++++-- xen/arch/arm/include/asm/firmware/sci.h | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 6f73c65e51..52cf788a45 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -273,8 +273,7 @@ static int __init domu_dt_sci_parse(struct dt_device_node *node, d_cfg->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_NONE; - if ( !IS_ENABLED(CONFIG_ARM_SCI) || - !dt_property_read_bool(node, "xen,sci_type") ) + if ( !dt_property_read_bool(node, "xen,sci_type") ) return 0; ret = dt_property_read_string(node, "xen,sci_type", &sci_type); @@ -284,7 +283,15 @@ static int __init domu_dt_sci_parse(struct dt_device_node *node, if ( !strcmp(sci_type, "none") ) d_cfg->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_NONE; else if ( !strcmp(sci_type, "scmi_smc") ) + { + if ( !IS_ENABLED(CONFIG_SCMI_SMC) ) + { + printk(XENLOG_ERR "xen,sci_type=scmi_smc requested, but CONFIG_SCMI_SMC not set\n"); + return -EINVAL; + } + d_cfg->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_SCMI_SMC; + } else { printk(XENLOG_ERR "xen,sci_type in not valid (%s) for domain %s\n", diff --git a/xen/arch/arm/include/asm/firmware/sci.h b/xen/arch/arm/include/asm/firmware/sci.h index 3500216bc2..485ce211c9 100644 --- a/xen/arch/arm/include/asm/firmware/sci.h +++ b/xen/arch/arm/include/asm/firmware/sci.h @@ -148,6 +148,8 @@ int sci_dt_finalize(struct domain *d, void *fdt); int sci_assign_dt_device(struct domain *d, struct dt_device_node *dev); #else +#include + static inline bool sci_domain_is_enabled(struct domain *d) { return false; @@ -162,6 +164,9 @@ static inline int sci_domain_init(struct domain *d, static inline int sci_domain_sanitise_config(struct xen_domctl_createdomain *config) { + if ( config->arch.arm_sci_type != XEN_DOMCTL_CONFIG_ARM_SCI_NONE ) + return -EINVAL; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 18:55:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 18:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307432.1579146 (Exim 4.92) (envelope-from ) id 1wMsG9-0004qY-SQ; Tue, 12 May 2026 18:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307432.1579146; Tue, 12 May 2026 18:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMsG9-0004qQ-Pg; Tue, 12 May 2026 18:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1307432; Tue, 12 May 2026 18:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMsG8-0004qE-GP for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMsG8-001lhv-2P for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMsG8-001x0S-1F for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+6u7Hr+YoRKjRXJtGXHpPDefZUQFJ45ybrRaI9sY3lM=; b=PhWJvLmur8Qduy6O/Xu1VePpIh 8lFMtb/16BmTmoXx2ZKoapvkJydRASPDCykM669xwLZ6A8EW/GfdfMFFT3HEbP17sDjI0mO9CaBT6 bY6fJ+Hm21vYjkBOtZrr2HxHA7kBnvZ8HT99cxhE7uwdyOpIqa7Z5+xc4gQtgwOnc7/E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/dom0: enable pf-fixup by default for PVH dom0 Message-Id: Date: Tue, 12 May 2026 18:55:12 +0000 commit fa8687810af66ec37940ecc93e2ef4e9a47889a2 Author: Roger Pau Monne AuthorDate: Fri May 8 10:55:09 2026 +0200 Commit: Roger Pau Monne CommitDate: Tue May 12 18:02:44 2026 +0200 x86/dom0: enable pf-fixup by default for PVH dom0 A non-trivial amount of issues related to PVH dom0 are fixed by enabling the `pf-fixup` command line option, and no issues have been reported as a result of its usage. Enable the option by default to make PVH dom0 more robust in its default configuration. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Acked-by: Oleksii Kurochko Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 2 ++ docs/misc/xen-command-line.pandoc | 8 ++++++-- xen/arch/x86/hvm/emulate.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce46020dbd..25f5a192ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## [4.22.0 UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD ### Changed + - On x86: + - Enable pf-fixup option by default for PVH dom0. ### Added - Support for per-domain Xenstore quota in C xenstored (includes diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 6c77129732..2da90548d8 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -849,7 +849,7 @@ Controls for how dom0 is constructed on x86 systems. If using this option is necessary to fix an issue, please report a bug. * The `pf-fixup` boolean is only applicable when using a PVH dom0 and - defaults to false. + defaults to true. When running dom0 in PVH mode the dom0 kernel has no way to map MMIO regions into its physical memory map, such mode relies on Xen dom0 builder @@ -857,10 +857,14 @@ Controls for how dom0 is constructed on x86 systems. access. However Xen doesn't have a complete picture of the host memory map, due to not being able to process ACPI dynamic tables. - The `pf-fixup` option allows Xen to attempt to add missing MMIO regions + The `pf-fixup` option causes Xen to attempt to add missing MMIO regions to the dom0 physical memory map in response to page-faults generated by dom0 trying to access unpopulated entries in the memory map. + Users having to disable the feature to boot in PVH dom0 mode should report + it to the xen-devel mailing list, together with Xen and dom0 output with the + option enabled. + Enables features on dom0 on Arm systems. * The `sve` integer parameter enables Arm SVE usage for Dom0 and sets the diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index f3aae158e9..bb1bb03ac4 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -165,7 +165,7 @@ void hvmemul_cancel(struct vcpu *v) hvmemul_cache_disable(v); } -bool __ro_after_init opt_dom0_pf_fixup; +bool __ro_after_init opt_dom0_pf_fixup = true; static int hwdom_fixup_p2m(paddr_t addr) { unsigned long gfn = paddr_to_pfn(addr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 18:55:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2026 18:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1307433.1579149 (Exim 4.92) (envelope-from ) id 1wMsGJ-0004sm-Td; Tue, 12 May 2026 18:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307433.1579149; Tue, 12 May 2026 18:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMsGJ-0004se-R4; Tue, 12 May 2026 18:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1307433; Tue, 12 May 2026 18:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMsGI-0004sX-J1 for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1wMsGI-001li2-2g for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1wMsGI-001x2n-1X for xen-changelog@lists.xenproject.org; Tue, 12 May 2026 18:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ic0n0+RkYelC2SLvvUPIoG/U+D8LSHo03N9wBVtYrxQ=; b=xdN0VIhpL8tut8qeggn5s5RroQ 4HPa/FZoHp5eNdXXbo8ysSCr+aQO8TMhV3ge11Bhl6aCj7QeEW18uOgornrBX7jARmIcxfyeu9/4j rJqDapaJpGRKzqTs1ASctA9EpkfM0hg9lRagFRKU21GE/TqDQBQPf9DWcrThNpdUy20k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/amd: Mitigate AMD-SN-7052 Message-Id: Date: Tue, 12 May 2026 18:55:22 +0000 commit 8070bdfa7220e772fae248abd3cbf5e87fc0fefb Author: Andrew Cooper AuthorDate: Tue Nov 4 18:08:07 2025 +0000 Commit: Andrew Cooper CommitDate: Tue May 12 17:05:30 2026 +0100 x86/amd: Mitigate AMD-SN-7052 This is XSA-490 / CVE-2025-54518. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/amd.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 712734a6e7..70783c9a0a 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1015,11 +1015,25 @@ static void amd_check_bp_cfg(void) { uint64_t val, new = 0; - /* - * AMD Erratum #1485. Set bit 5, as instructed. - */ - if (!cpu_has_hypervisor && boot_cpu_data.family == 0x19 && is_zen4_uarch()) - new |= (1 << 5); + if (!cpu_has_hypervisor) { + /* + * AMD Erratum #1485. If SMT is enabled and STIBP disabled, + * the CPU may fetch incorrect instruction bytes. + * + * Set bit 5, as instructed. + */ + if (boot_cpu_data.family == 0x19 && is_zen4_uarch()) + new |= (1 << 5); + + /* + * AMD SB-7052. CPU OP Cache corruption, causing instructions + * to be executed at a higher privilege. + * + * Set bit 33, as instructed. + */ + if (boot_cpu_data.family == 0x17 && is_zen2_uarch()) + new |= (1UL << 33); + } /* * On hardware supporting SRSO_MSR_FIX, activate BP_SPEC_REDUCE by -- generated by git-patchbot for /home/xen/git/xen.git#master