From xen-changelog-bounces@lists.xenproject.org Thu May 01 19:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 19:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974302.1362192 (Exim 4.92) (envelope-from ) id 1uAZea-0005Lu-9d; Thu, 01 May 2025 19:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974302.1362192; Thu, 01 May 2025 19: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 1uAZea-0005Ln-6e; Thu, 01 May 2025 19:33:04 +0000 Received: by outflank-mailman (input) for mailman id 974302; Thu, 01 May 2025 19:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAZeY-0005Lf-JB for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 19:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAZeY-001D4w-15 for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 19:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAZeY-000bFV-0v for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 19: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=qtvB5d+8J2OjujjFNgpXSJZHwKI2im1zDG0DGJRJrJg=; b=6CLo0QSuAxKeHInnRtvcwydH/x LWQ76lNTu7Qm9NHQGbXhX10RDSr/4dIkUmkoPDkUEe7TpWfQT/VcpxcqtjllJL2LBXJnS8/3nqiKt t+TVd5qnr40yQWDwu+DnBPuS6an2tpnwfYcowVK0MZa8Vqf4aOtl30luSlA8wGrFHQ3M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] misra: update list of GCC extensions used by Xen Message-Id: Date: Thu, 01 May 2025 19:33:02 +0000 commit b229623019dddb47cdd8eb4f4e5c9869a073f06e Author: Nicola Vetrini AuthorDate: Thu May 1 12:24:24 2025 -0700 Commit: Stefano Stabellini CommitDate: Thu May 1 12:28:52 2025 -0700 misra: update list of GCC extensions used by Xen __inline and __inline__ are already handled by ECLAIR but C-language-toolchain.rst doesn't reflect that. Update the doc. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- docs/misra/C-language-toolchain.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-toolchain.rst index 5ddfe7bdbe..3a1ce651d7 100644 --- a/docs/misra/C-language-toolchain.rst +++ b/docs/misra/C-language-toolchain.rst @@ -86,6 +86,8 @@ The table columns are as follows: see Sections "6.48 Alternate Keywords" and "6.47.2.1 Volatile" of GCC_MANUAL. __const__: see Section "6.48 Alternate Keywords" of GCC_MANUAL. + __inline, __inline__: + see Section "6.48 Alternate Keywords" of GCC_MANUAL. typeof, __typeof__: see Section "6.7 Referring to a Type with typeof" of GCC_MANUAL. __alignof__, __alignof: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 01 23:00:10 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 23:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974343.1362216 (Exim 4.92) (envelope-from ) id 1uAcst-0006bX-Id; Thu, 01 May 2025 23:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974343.1362216; Thu, 01 May 2025 23: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 1uAcst-0006b6-Fy; Thu, 01 May 2025 23:00:03 +0000 Received: by outflank-mailman (input) for mailman id 974343; Thu, 01 May 2025 23:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAcss-0006MY-Ew for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAcss-001JEa-0n for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAcss-00151U-0W for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:00: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=ZlRc2dCpW+FBnjx+tK2wthSVf3HuIsRXS8odcqMGmlc=; b=hlmO6BlK1FX8ix4RP+cj6GxIuU 54xWJ4qJhzyYOInGsY1F5bb6tSk12BJuAughxgy95TAUN58BtxAa2Hu0yTDyMphHl9WAO3PjgYvbP EOZcy5N8U377eIcIYxLEaAwZdxk2CBRxNGXLRyjE68JTprEOHIwnR8K3g7tZvwn9xoEc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] misra: update list of GCC extensions used by Xen Message-Id: Date: Thu, 01 May 2025 23:00:02 +0000 commit b229623019dddb47cdd8eb4f4e5c9869a073f06e Author: Nicola Vetrini AuthorDate: Thu May 1 12:24:24 2025 -0700 Commit: Stefano Stabellini CommitDate: Thu May 1 12:28:52 2025 -0700 misra: update list of GCC extensions used by Xen __inline and __inline__ are already handled by ECLAIR but C-language-toolchain.rst doesn't reflect that. Update the doc. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- docs/misra/C-language-toolchain.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-toolchain.rst index 5ddfe7bdbe..3a1ce651d7 100644 --- a/docs/misra/C-language-toolchain.rst +++ b/docs/misra/C-language-toolchain.rst @@ -86,6 +86,8 @@ The table columns are as follows: see Sections "6.48 Alternate Keywords" and "6.47.2.1 Volatile" of GCC_MANUAL. __const__: see Section "6.48 Alternate Keywords" of GCC_MANUAL. + __inline, __inline__: + see Section "6.48 Alternate Keywords" of GCC_MANUAL. typeof, __typeof__: see Section "6.7 Referring to a Type with typeof" of GCC_MANUAL. __alignof__, __alignof: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 01 23:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 23:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974355.1362232 (Exim 4.92) (envelope-from ) id 1uAd3X-0000jO-IG; Thu, 01 May 2025 23:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974355.1362232; Thu, 01 May 2025 23: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 1uAd3X-0000jG-FC; Thu, 01 May 2025 23:11:03 +0000 Received: by outflank-mailman (input) for mailman id 974355; Thu, 01 May 2025 23:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAd3V-0000jA-UO for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAd3V-001Je9-2X for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAd3V-00173V-2M for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23: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=x4ncr2YI5j/tKtcCYhadE1AKi4vHqAFzw9JSQSTa/jA=; b=3V68OEgf38fFMQGoSzvOXpGJ+Y zImBmj3fTn4DCy5h8+nDhF8CIQpG98+vTg0WPdeX9eg7q/lkB8lLVooIsLoCUoGNSzk0dKteBsUrn Z79bDbJ+KApdBCQMedASAaLKWFsUJkYCOfxDAzLqms5jbyFJjwkHzFfE43aSf4Reqd0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/alternative: Drop unused includes of asm/alternative.h Message-Id: Date: Thu, 01 May 2025 23:11:01 +0000 commit 2ad413f031f061c72a170f8822158133aab40328 Author: Andrew Cooper AuthorDate: Sat Apr 19 22:22:52 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 00:02:42 2025 +0100 arm/alternative: Drop unused includes of asm/alternative.h No functional change. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/arch/arm/arm64/cache.S | 2 -- xen/arch/arm/domain.c | 1 - 2 files changed, 3 deletions(-) diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S index 66ed85f735..c0a8ca163a 100644 --- a/xen/arch/arm/arm64/cache.S +++ b/xen/arch/arm/arm64/cache.S @@ -19,8 +19,6 @@ * along with this program. If not, see . */ -#include - /* * dcache_line_size - get the minimum D-cache line size from the CTR register. */ diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index dc4b4e84c1..23cf8729f1 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 01 23:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 23:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974356.1362235 (Exim 4.92) (envelope-from ) id 1uAd3h-0000lY-JB; Thu, 01 May 2025 23:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974356.1362235; Thu, 01 May 2025 23: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 1uAd3h-0000lQ-Gc; Thu, 01 May 2025 23:11:13 +0000 Received: by outflank-mailman (input) for mailman id 974356; Thu, 01 May 2025 23:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAd3g-0000lG-1K for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAd3g-001JeD-02 for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAd3f-001765-2r for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23: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=xMqKOx3/LUwF1VuGtiW/TSHVvQuQui3KHsJ5Ef1529c=; b=J4dxQwBIsfhGnOIIRFyu7Kn93P x04YPL6Rpbc+ioOzA7MRCOrEuyqZV4LyZne1cM0voCW2I5vp6tcRYgz7igozJXpY1ACnzaNgQQuvx EBHNkwQv4KjNR5xd82b5fCUDK2oyz3wYmMs/0cttL6skfGP7VSVuaL8mztQguysIkf4o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/mm: Introduce mm-types.h Message-Id: Date: Thu, 01 May 2025 23:11:11 +0000 commit 08d03e12d3ab5b00ac3e0e0add695659e1c879b3 Author: Andrew Cooper AuthorDate: Fri Apr 25 11:20:09 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 00:02:42 2025 +0100 xen/mm: Introduce mm-types.h The type used for pagetable attributes/permissions is currently unsigned int, but needs to become architecture dependent as PPC needs unsigned long. Introduce mm-types.h to house pte_attr_t. Given the new toolchain baseline, we can use __has_include() now to remove the need for boilerplate on most architectures. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/include/xen/mm-types.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/xen/include/xen/mm-types.h b/xen/include/xen/mm-types.h new file mode 100644 index 0000000000..19f692e9aa --- /dev/null +++ b/xen/include/xen/mm-types.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef XEN_MM_TYPES_H +#define XEN_MM_TYPES_H + +/* + * Types used to abstract away architecture-specific details in the memory + * management code. + * + * Architectures need only provide their own asm/mm-types.h if they want to + * override the defaults given here. + */ +#if __has_include() +# include +#else /* !__has_include() */ + +typedef unsigned int pte_attr_t; + +#endif /* !__has_include() */ +#endif /* XEN_MM_TYPES_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 01 23:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 23:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974357.1362238 (Exim 4.92) (envelope-from ) id 1uAd3r-0000oH-KJ; Thu, 01 May 2025 23:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974357.1362238; Thu, 01 May 2025 23: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 1uAd3r-0000oA-Hj; Thu, 01 May 2025 23:11:23 +0000 Received: by outflank-mailman (input) for mailman id 974357; Thu, 01 May 2025 23:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAd3q-0000o0-5x for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAd3q-001JeK-0V for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAd3q-00177y-0J for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23: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=yN84hWIfwdkQUIMoXkWmvnVwb4wOfdTTkq+zFgfVSQ0=; b=D6VGi8+os+HzpU+qJM18ULqsDu zse11QPxA0dscVxWQfNccESITd+Tn4mhM95x973ROW1UcxwXytKAZWUWKRux0M+ZWDZvw2M78IrZ/ SklL/sqhamu6dEJFKZ3o6PWGDy6K0UkLBAtjCohSWW68vka37YYOciJE6mAvePFL577A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/mm: Switch some APIs over to pte_attr_t Message-Id: Date: Thu, 01 May 2025 23:11:22 +0000 commit 19772b670426f6466b922b42017e818c837a172c Author: Shawn Anastasio AuthorDate: Fri Apr 25 11:29:56 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 00:02:42 2025 +0100 xen/mm: Switch some APIs over to pte_attr_t Several APIs take an architecture-dependent set of flags in an unsigned int, but this needs to be a wider type to support PPC. The new type pte_attr_t has been introduced for this purpose, so switch to it in map_pages_to_xen(), __vmap() and modify_xen_mappings{,_lite}(). No functional change. Suggested-by: Andrew Cooper Signed-off-by: Shawn Anastasio Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/mmu/pt.c | 4 ++-- xen/arch/ppc/mm-radix.c | 2 +- xen/arch/riscv/pt.c | 2 +- xen/arch/x86/mm.c | 6 +++--- xen/common/efi/boot.c | 4 ++-- xen/common/vmap.c | 2 +- xen/include/xen/mm.h | 7 ++++--- xen/include/xen/vmap.h | 3 ++- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/mmu/pt.c b/xen/arch/arm/mmu/pt.c index 11cb1c66da..4726e713ef 100644 --- a/xen/arch/arm/mmu/pt.c +++ b/xen/arch/arm/mmu/pt.c @@ -696,7 +696,7 @@ static int xen_pt_update(unsigned long virt, int map_pages_to_xen(unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { return xen_pt_update(virt, mfn, nr_mfns, flags); } @@ -714,7 +714,7 @@ int destroy_xen_mappings(unsigned long s, unsigned long e) return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, 0); } -int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) +int modify_xen_mappings(unsigned long s, unsigned long e, pte_attr_t nf) { ASSERT(IS_ALIGNED(s, PAGE_SIZE)); ASSERT(IS_ALIGNED(e, PAGE_SIZE)); diff --git a/xen/arch/ppc/mm-radix.c b/xen/arch/ppc/mm-radix.c index 9a00ae416a..d5385ec9dd 100644 --- a/xen/arch/ppc/mm-radix.c +++ b/xen/arch/ppc/mm-radix.c @@ -265,7 +265,7 @@ int destroy_xen_mappings(unsigned long s, unsigned long e) int map_pages_to_xen(unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { BUG_ON("unimplemented"); } diff --git a/xen/arch/riscv/pt.c b/xen/arch/riscv/pt.c index 857619d48d..918b1b91ab 100644 --- a/xen/arch/riscv/pt.c +++ b/xen/arch/riscv/pt.c @@ -504,7 +504,7 @@ static int pt_update(vaddr_t virt, mfn_t mfn, int map_pages_to_xen(unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { /* * Ensure that flags has PTE_VALID bit as map_pages_to_xen() is supposed diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ac855f998..0b787ba553 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5385,7 +5385,7 @@ int map_pages_to_xen( unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { bool locking = system_state > SYS_STATE_boot; l3_pgentry_t *pl3e = NULL, ol3e; @@ -5803,7 +5803,7 @@ int __init populate_pt_range(unsigned long virt, unsigned long nr_mfns) * * It is an error to call with present flags over an unpopulated range. */ -int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) +int modify_xen_mappings(unsigned long s, unsigned long e, pte_attr_t nf) { bool locking = system_state > SYS_STATE_boot; l3_pgentry_t *pl3e = NULL; @@ -6099,7 +6099,7 @@ int destroy_xen_mappings(unsigned long s, unsigned long e) * the non-inclusive boundary will be updated. */ void init_or_livepatch modify_xen_mappings_lite( - unsigned long s, unsigned long e, unsigned int nf) + unsigned long s, unsigned long e, pte_attr_t nf) { unsigned long v = s, fm, flags; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 143b5681ba..e39fbc3529 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1676,7 +1676,7 @@ void __init efi_init_memory(void) struct rt_extra { struct rt_extra *next; unsigned long smfn, emfn; - unsigned int prot; + pte_attr_t prot; } *extra, *extra_head = NULL; free_ebmalloc_unused_mem(); @@ -1691,7 +1691,7 @@ void __init efi_init_memory(void) EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; unsigned long smfn, emfn; - unsigned int prot = PAGE_HYPERVISOR_RWX; + pte_attr_t prot = PAGE_HYPERVISOR_RWX; paddr_t mem_base; unsigned long mem_npages; diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 47225fecc0..d6991421f3 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -222,7 +222,7 @@ static void vm_free(const void *va) } void *__vmap(const mfn_t *mfn, unsigned int granularity, - unsigned int nr, unsigned int align, unsigned int flags, + unsigned int nr, unsigned int align, pte_attr_t flags, enum vmap_region type) { void *va = vm_alloc(nr * granularity, align, type); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index ae1c48a615..e89942b87d 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -113,11 +114,11 @@ int map_pages_to_xen( unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags); + pte_attr_t flags); /* Alter the permissions of a range of Xen virtual address space. */ -int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf); +int modify_xen_mappings(unsigned long s, unsigned long e, pte_attr_t nf); void modify_xen_mappings_lite(unsigned long s, unsigned long e, - unsigned int nf); + pte_attr_t nf); int destroy_xen_mappings(unsigned long s, unsigned long e); /* Retrieve the MFN mapped by VA in Xen virtual address space. */ mfn_t xen_map_to_mfn(unsigned long va); diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 26c831757a..327a259782 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -9,6 +9,7 @@ #define __XEN_VMAP_H__ #include +#include #include /* Identifiers for the linear ranges tracked by vmap */ @@ -57,7 +58,7 @@ void vm_init_type(enum vmap_region type, void *start, void *end); * @return Pointer to the mapped area on success; NULL otherwise. */ void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr, - unsigned int align, unsigned int flags, enum vmap_region type); + unsigned int align, pte_attr_t flags, enum vmap_region type); /* * Map an array of pages contiguously into the VMAP_DEFAULT vmap region -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 01 23:44:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 23:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974374.1362253 (Exim 4.92) (envelope-from ) id 1uAdZS-0005DD-VW; Thu, 01 May 2025 23:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974374.1362253; Thu, 01 May 2025 23: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 1uAdZS-0005D4-Sb; Thu, 01 May 2025 23:44:02 +0000 Received: by outflank-mailman (input) for mailman id 974374; Thu, 01 May 2025 23:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAdZR-0005Cy-Ux for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAdZR-001KW7-21 for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAdZR-001CAx-1s for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23: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=3wFTh3Hpvot8r+yybxZM0/Rpo+TFh1CmS3Autl9i25o=; b=DU81rFOeAAvOXIgk7RKwoBmKbi AOOExeCrpMNpfntqlhmYtT56RqilxqZDgxHajN5H7jTHW882PtoIPqGs7ifPrhi/VCY7N7sqO9yyf M9iBGEvba2weiLhEm8J7qboK09a2wfBMcIpP+rmkdK3p9Wfz6gpLRjTvly2e9QBY0mxQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/alternative: Drop unused includes of asm/alternative.h Message-Id: Date: Thu, 01 May 2025 23:44:01 +0000 commit 2ad413f031f061c72a170f8822158133aab40328 Author: Andrew Cooper AuthorDate: Sat Apr 19 22:22:52 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 00:02:42 2025 +0100 arm/alternative: Drop unused includes of asm/alternative.h No functional change. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/arch/arm/arm64/cache.S | 2 -- xen/arch/arm/domain.c | 1 - 2 files changed, 3 deletions(-) diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S index 66ed85f735..c0a8ca163a 100644 --- a/xen/arch/arm/arm64/cache.S +++ b/xen/arch/arm/arm64/cache.S @@ -19,8 +19,6 @@ * along with this program. If not, see . */ -#include - /* * dcache_line_size - get the minimum D-cache line size from the CTR register. */ diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index dc4b4e84c1..23cf8729f1 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 01 23:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 23:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974375.1362257 (Exim 4.92) (envelope-from ) id 1uAdZd-0005FB-0Y; Thu, 01 May 2025 23:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974375.1362257; Thu, 01 May 2025 23: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 1uAdZc-0005F3-UA; Thu, 01 May 2025 23:44:12 +0000 Received: by outflank-mailman (input) for mailman id 974375; Thu, 01 May 2025 23:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAdZb-0005Es-OD for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAdZb-001KWG-2J for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAdZb-001CCg-2B for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23: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=Jmzgy01fr1J/q8k99epJWsOD6El+RJLMcsGC1e960pU=; b=aMZZDgwAFsm38TUBFS4yjzEZ7/ n4uJd9X8szasrhZKDol/S02UGBrGZZjq6RAWfVreMRVrZJiwNP7FctxGZgOL5b8fAVqdDtSMcTppk MH5sOowh/H+2iLyJlybHRSBllwR4C5QN/CKEV/PampQ34JG/+IMJlJhDCyvX3HhW/bDo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/mm: Introduce mm-types.h Message-Id: Date: Thu, 01 May 2025 23:44:11 +0000 commit 08d03e12d3ab5b00ac3e0e0add695659e1c879b3 Author: Andrew Cooper AuthorDate: Fri Apr 25 11:20:09 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 00:02:42 2025 +0100 xen/mm: Introduce mm-types.h The type used for pagetable attributes/permissions is currently unsigned int, but needs to become architecture dependent as PPC needs unsigned long. Introduce mm-types.h to house pte_attr_t. Given the new toolchain baseline, we can use __has_include() now to remove the need for boilerplate on most architectures. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/include/xen/mm-types.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/xen/include/xen/mm-types.h b/xen/include/xen/mm-types.h new file mode 100644 index 0000000000..19f692e9aa --- /dev/null +++ b/xen/include/xen/mm-types.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef XEN_MM_TYPES_H +#define XEN_MM_TYPES_H + +/* + * Types used to abstract away architecture-specific details in the memory + * management code. + * + * Architectures need only provide their own asm/mm-types.h if they want to + * override the defaults given here. + */ +#if __has_include() +# include +#else /* !__has_include() */ + +typedef unsigned int pte_attr_t; + +#endif /* !__has_include() */ +#endif /* XEN_MM_TYPES_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 01 23:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 May 2025 23:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974376.1362260 (Exim 4.92) (envelope-from ) id 1uAdZn-0005IT-3I; Thu, 01 May 2025 23:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974376.1362260; Thu, 01 May 2025 23: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 1uAdZn-0005IL-0l; Thu, 01 May 2025 23:44:23 +0000 Received: by outflank-mailman (input) for mailman id 974376; Thu, 01 May 2025 23:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAdZl-0005IB-RX for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAdZl-001KWK-2f for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAdZl-001CDh-2X for xen-changelog@lists.xenproject.org; Thu, 01 May 2025 23: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=sronZaN5oobCLKlu1ktoixGe9NjywPE1i8R8x2L1RSw=; b=gtsr3HVjCQTCxuFBKBMN4zpjiH 8t2i3vQ/H8E0WjBjGfF4blAtqruRuN2E+yPSIfit8SaFjJ4Pl2CmcNZeAbESXhcxrCi67R/4bNDYz KowqxJghMqJH/rgO5+KV1jjVSomiER06Zop3eGDMoi77awgL9sOCXNwgKb4LCxGZW6j0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/mm: Switch some APIs over to pte_attr_t Message-Id: Date: Thu, 01 May 2025 23:44:21 +0000 commit 19772b670426f6466b922b42017e818c837a172c Author: Shawn Anastasio AuthorDate: Fri Apr 25 11:29:56 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 00:02:42 2025 +0100 xen/mm: Switch some APIs over to pte_attr_t Several APIs take an architecture-dependent set of flags in an unsigned int, but this needs to be a wider type to support PPC. The new type pte_attr_t has been introduced for this purpose, so switch to it in map_pages_to_xen(), __vmap() and modify_xen_mappings{,_lite}(). No functional change. Suggested-by: Andrew Cooper Signed-off-by: Shawn Anastasio Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/mmu/pt.c | 4 ++-- xen/arch/ppc/mm-radix.c | 2 +- xen/arch/riscv/pt.c | 2 +- xen/arch/x86/mm.c | 6 +++--- xen/common/efi/boot.c | 4 ++-- xen/common/vmap.c | 2 +- xen/include/xen/mm.h | 7 ++++--- xen/include/xen/vmap.h | 3 ++- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/mmu/pt.c b/xen/arch/arm/mmu/pt.c index 11cb1c66da..4726e713ef 100644 --- a/xen/arch/arm/mmu/pt.c +++ b/xen/arch/arm/mmu/pt.c @@ -696,7 +696,7 @@ static int xen_pt_update(unsigned long virt, int map_pages_to_xen(unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { return xen_pt_update(virt, mfn, nr_mfns, flags); } @@ -714,7 +714,7 @@ int destroy_xen_mappings(unsigned long s, unsigned long e) return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, 0); } -int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) +int modify_xen_mappings(unsigned long s, unsigned long e, pte_attr_t nf) { ASSERT(IS_ALIGNED(s, PAGE_SIZE)); ASSERT(IS_ALIGNED(e, PAGE_SIZE)); diff --git a/xen/arch/ppc/mm-radix.c b/xen/arch/ppc/mm-radix.c index 9a00ae416a..d5385ec9dd 100644 --- a/xen/arch/ppc/mm-radix.c +++ b/xen/arch/ppc/mm-radix.c @@ -265,7 +265,7 @@ int destroy_xen_mappings(unsigned long s, unsigned long e) int map_pages_to_xen(unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { BUG_ON("unimplemented"); } diff --git a/xen/arch/riscv/pt.c b/xen/arch/riscv/pt.c index 857619d48d..918b1b91ab 100644 --- a/xen/arch/riscv/pt.c +++ b/xen/arch/riscv/pt.c @@ -504,7 +504,7 @@ static int pt_update(vaddr_t virt, mfn_t mfn, int map_pages_to_xen(unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { /* * Ensure that flags has PTE_VALID bit as map_pages_to_xen() is supposed diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ac855f998..0b787ba553 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5385,7 +5385,7 @@ int map_pages_to_xen( unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags) + pte_attr_t flags) { bool locking = system_state > SYS_STATE_boot; l3_pgentry_t *pl3e = NULL, ol3e; @@ -5803,7 +5803,7 @@ int __init populate_pt_range(unsigned long virt, unsigned long nr_mfns) * * It is an error to call with present flags over an unpopulated range. */ -int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) +int modify_xen_mappings(unsigned long s, unsigned long e, pte_attr_t nf) { bool locking = system_state > SYS_STATE_boot; l3_pgentry_t *pl3e = NULL; @@ -6099,7 +6099,7 @@ int destroy_xen_mappings(unsigned long s, unsigned long e) * the non-inclusive boundary will be updated. */ void init_or_livepatch modify_xen_mappings_lite( - unsigned long s, unsigned long e, unsigned int nf) + unsigned long s, unsigned long e, pte_attr_t nf) { unsigned long v = s, fm, flags; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 143b5681ba..e39fbc3529 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1676,7 +1676,7 @@ void __init efi_init_memory(void) struct rt_extra { struct rt_extra *next; unsigned long smfn, emfn; - unsigned int prot; + pte_attr_t prot; } *extra, *extra_head = NULL; free_ebmalloc_unused_mem(); @@ -1691,7 +1691,7 @@ void __init efi_init_memory(void) EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; unsigned long smfn, emfn; - unsigned int prot = PAGE_HYPERVISOR_RWX; + pte_attr_t prot = PAGE_HYPERVISOR_RWX; paddr_t mem_base; unsigned long mem_npages; diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 47225fecc0..d6991421f3 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -222,7 +222,7 @@ static void vm_free(const void *va) } void *__vmap(const mfn_t *mfn, unsigned int granularity, - unsigned int nr, unsigned int align, unsigned int flags, + unsigned int nr, unsigned int align, pte_attr_t flags, enum vmap_region type) { void *va = vm_alloc(nr * granularity, align, type); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index ae1c48a615..e89942b87d 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -113,11 +114,11 @@ int map_pages_to_xen( unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int flags); + pte_attr_t flags); /* Alter the permissions of a range of Xen virtual address space. */ -int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf); +int modify_xen_mappings(unsigned long s, unsigned long e, pte_attr_t nf); void modify_xen_mappings_lite(unsigned long s, unsigned long e, - unsigned int nf); + pte_attr_t nf); int destroy_xen_mappings(unsigned long s, unsigned long e); /* Retrieve the MFN mapped by VA in Xen virtual address space. */ mfn_t xen_map_to_mfn(unsigned long va); diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 26c831757a..327a259782 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -9,6 +9,7 @@ #define __XEN_VMAP_H__ #include +#include #include /* Identifiers for the linear ranges tracked by vmap */ @@ -57,7 +58,7 @@ void vm_init_type(enum vmap_region type, void *start, void *end); * @return Pointer to the mapped area on success; NULL otherwise. */ void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr, - unsigned int align, unsigned int flags, enum vmap_region type); + unsigned int align, pte_attr_t flags, enum vmap_region type); /* * Map an array of pages contiguously into the VMAP_DEFAULT vmap region -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 02 07:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 07:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974480.1362325 (Exim 4.92) (envelope-from ) id 1uAlEd-0004uj-2X; Fri, 02 May 2025 07:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974480.1362325; Fri, 02 May 2025 07: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 1uAlEc-0004uc-WD; Fri, 02 May 2025 07:55:03 +0000 Received: by outflank-mailman (input) for mailman id 974480; Fri, 02 May 2025 07:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAlEc-0004uW-4y for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAlEb-003CIK-38 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAlEb-002N0w-30 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07: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=cUGK4oLGuOQXjzNGXfQoncslJPQCDgU3AS8iX/7BUVE=; b=yt/kJU/j13EVEFmr33SCqn0Kec W8vfd13q+lIVl/03iBZKz7cUNs2dSvKTd7ROp43P9Y1zc0QDmT0ysQkFSBXJn+MnlfDDNyhUoo0tH 2/Sb3KjYzxgvQPBH9f8J4r8Pb0HJ+mF86JcByNPDTGQuLAVODHtu5weDxQ0RQ6qqNc1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] {hyper,multi}call: further limit arguments to just 5 Message-Id: Date: Fri, 02 May 2025 07:55:01 +0000 commit e81baffaff115c88f33097d171e5e7262e581c2d Author: Jan Beulich AuthorDate: Fri May 2 09:43:23 2025 +0200 Commit: Jan Beulich CommitDate: Fri May 2 09:43:23 2025 +0200 {hyper,multi}call: further limit arguments to just 5 Multicall compat translation and hypercall continuation handling can also be shrunk to the processing of just (up to) 5 arguments. Take the opportunity to - make exceeding the limit noisy in hypercall_create_continuation(), - use speculation-safe array access in hypercall_create_continuation(), - avoid a Misra C:2012 Rule 19.1 violation in xlat_multicall_entry(), - further tidy xlat_multicall_entry() and __trace_multicall_call() style-wise. Amends: 2f531c122e95 ("x86: limit number of hypercall parameters to 5") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Stefano Stabellini # arm --- xen/arch/arm/domain.c | 10 +++++++--- xen/arch/x86/hypercall.c | 11 +++++++---- xen/common/compat/multicall.c | 14 +++++++++----- xen/include/public/xen.h | 4 ++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 23cf8729f1..45aeb8bddc 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -391,7 +391,11 @@ unsigned long hypercall_create_continuation( if ( mcs->flags & MCSF_in_multicall ) { for ( i = 0; *p != '\0'; i++ ) - mcs->call.args[i] = NEXT_ARG(p, args); + { + if ( i >= ARRAY_SIZE(mcs->call.args) ) + goto bad_fmt; + array_access_nospec(mcs->call.args, i) = NEXT_ARG(p, args); + } /* Return value gets written back to mcs->call.result */ rc = mcs->call.result; @@ -416,7 +420,7 @@ unsigned long hypercall_create_continuation( case 2: regs->x2 = arg; break; case 3: regs->x3 = arg; break; case 4: regs->x4 = arg; break; - case 5: regs->x5 = arg; break; + default: goto bad_fmt; } } @@ -439,7 +443,7 @@ unsigned long hypercall_create_continuation( case 2: regs->r2 = arg; break; case 3: regs->r3 = arg; break; case 4: regs->r4 = arg; break; - case 5: regs->r5 = arg; break; + default: goto bad_fmt; } } diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index d292376b19..dc0a90ca09 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -41,7 +41,11 @@ unsigned long hypercall_create_continuation( if ( mcs->flags & MCSF_in_multicall ) { for ( i = 0; *p != '\0'; i++ ) - mcs->call.args[i] = NEXT_ARG(p, args); + { + if ( i >= ARRAY_SIZE(mcs->call.args) ) + goto bad_fmt; + array_access_nospec(mcs->call.args, i) = NEXT_ARG(p, args); + } } else { @@ -65,7 +69,7 @@ unsigned long hypercall_create_continuation( case 2: regs->rdx = arg; break; case 3: regs->r10 = arg; break; case 4: regs->r8 = arg; break; - case 5: regs->r9 = arg; break; + default: goto bad_fmt; } } } @@ -81,7 +85,7 @@ unsigned long hypercall_create_continuation( case 2: regs->rdx = arg; break; case 3: regs->rsi = arg; break; case 4: regs->rdi = arg; break; - case 5: regs->rbp = arg; break; + default: goto bad_fmt; } } } @@ -177,7 +181,6 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, case 2: reg = ®s->rdx; break; case 3: reg = ®s->rsi; break; case 4: reg = ®s->rdi; break; - case 5: reg = ®s->rbp; break; default: BUG(); reg = NULL; break; } if ( (mask & 1) ) diff --git a/xen/common/compat/multicall.c b/xen/common/compat/multicall.c index b17739d218..26ea82e1ea 100644 --- a/xen/common/compat/multicall.c +++ b/xen/common/compat/multicall.c @@ -14,9 +14,13 @@ typedef int ret_t; static inline void xlat_multicall_entry(struct mc_state *mcs) { - int i; - for (i=0; i<6; i++) - mcs->compat_call.args[i] = mcs->call.args[i]; + unsigned int i; + typeof(mcs->compat_call.args[0]) args[ARRAY_SIZE(mcs->call.args)]; + + for ( i = 0; i < ARRAY_SIZE(args); i++ ) + args[i] = mcs->call.args[i]; + + memcpy(mcs->compat_call.args, args, sizeof(args)); } #define multicall_entry compat_multicall_entry @@ -29,8 +33,8 @@ static inline void xlat_multicall_entry(struct mc_state *mcs) static void __trace_multicall_call(multicall_entry_t *call) { - xen_ulong_t args[6]; - int i; + xen_ulong_t args[ARRAY_SIZE(call->args)]; + unsigned int i; for ( i = 0; i < ARRAY_SIZE(args); i++ ) args[i] = call->args[i]; diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 75b1c1d597..82b9c05a76 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -640,7 +640,11 @@ DEFINE_XEN_GUEST_HANDLE(mmu_update_t); */ struct multicall_entry { xen_ulong_t op, result; +#ifndef __XEN__ xen_ulong_t args[6]; +#else /* Only 5 arguments are supported in reality. */ + xen_ulong_t args[5], unused; +#endif }; typedef struct multicall_entry multicall_entry_t; DEFINE_XEN_GUEST_HANDLE(multicall_entry_t); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 02 07:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 07:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974481.1362329 (Exim 4.92) (envelope-from ) id 1uAlEn-0004wb-4A; Fri, 02 May 2025 07:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974481.1362329; Fri, 02 May 2025 07: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 1uAlEn-0004wT-1Y; Fri, 02 May 2025 07:55:13 +0000 Received: by outflank-mailman (input) for mailman id 974481; Fri, 02 May 2025 07:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAlEm-0004wF-3F for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAlEm-003CIR-0E for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAlEm-002N3i-06 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07: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=xocJASxSc1Nzps+VNg8qNGxmoGOm8fz3sVMkNtbnD1M=; b=OsaQoepIhD3bruJy2bqWCD1aIE o6f9ecCq5Sq8n9PxezCwGw5XH9cFUWYaUaTYZh4aXIiivwH+/3WyvX/XQJQeGXEEeCOOHXk6hPWli yclPiXSOJQDlr4ep2S/6kxLPURw0QIJN9ZdHwFSwdncxhX6E4MBoG0aMetc2pbclvQyQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] mm: move paddr_to_pdx() Message-Id: Date: Fri, 02 May 2025 07:55:12 +0000 commit 3120e479a0e55768eccb5e8e7c3c81fd809501a0 Author: Jan Beulich AuthorDate: Fri May 2 09:44:03 2025 +0200 Commit: Jan Beulich CommitDate: Fri May 2 09:44:03 2025 +0200 mm: move paddr_to_pdx() There's nothing arch-specific about it. While there, on x86 visually separate the vmap_to_*() macros from those covered by the earlier comment. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Julien Grall Reviewed-by: Oleksii Kurochko --- xen/arch/arm/include/asm/mm.h | 1 - xen/arch/ppc/include/asm/mm.h | 1 - xen/arch/riscv/include/asm/mm.h | 1 - xen/arch/x86/include/asm/page.h | 3 ++- xen/include/xen/pdx.h | 2 ++ 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 5b67c0f8bb..011bc1fd30 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -237,7 +237,6 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) /* Convert between frame number and address formats. */ #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) -#define paddr_to_pdx(pa) mfn_to_pdx(maddr_to_mfn(pa)) #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) diff --git a/xen/arch/ppc/include/asm/mm.h b/xen/arch/ppc/include/asm/mm.h index a433936076..a33eeec43b 100644 --- a/xen/arch/ppc/include/asm/mm.h +++ b/xen/arch/ppc/include/asm/mm.h @@ -13,7 +13,6 @@ void setup_initial_pagetables(void); #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) -#define paddr_to_pdx(pa) mfn_to_pdx(maddr_to_mfn(pa)) #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/mm.h index ef8b35d7c2..01bbd92a06 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -19,7 +19,6 @@ extern vaddr_t directmap_virt_start; #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) -#define paddr_to_pdx(pa) mfn_to_pdx(maddr_to_mfn(pa)) #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) diff --git a/xen/arch/x86/include/asm/page.h b/xen/arch/x86/include/asm/page.h index 24135f5968..8b5a9f77d0 100644 --- a/xen/arch/x86/include/asm/page.h +++ b/xen/arch/x86/include/asm/page.h @@ -258,7 +258,8 @@ void copy_page_sse2(void *to, const void *from); #define mfn_to_virt(mfn) __mfn_to_virt(mfn) #define pfn_to_paddr(pfn) __pfn_to_paddr(pfn) #define paddr_to_pfn(pa) __paddr_to_pfn(pa) -#define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) + +/* Specialized forms acting on vmap() addresses. */ #define vmap_to_mfn(va) xen_map_to_mfn((unsigned long)(va)) #define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 23f3956db8..9faeea3ac9 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -98,6 +98,8 @@ bool __mfn_valid(unsigned long mfn); #define mfn_to_pdx(mfn) pfn_to_pdx(mfn_x(mfn)) #define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) +#define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) + #ifdef CONFIG_PDX_COMPRESSION extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 02 07:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 07:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974482.1362333 (Exim 4.92) (envelope-from ) id 1uAlEx-0004zV-5e; Fri, 02 May 2025 07:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974482.1362333; Fri, 02 May 2025 07: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 1uAlEx-0004zN-2u; Fri, 02 May 2025 07:55:23 +0000 Received: by outflank-mailman (input) for mailman id 974482; Fri, 02 May 2025 07:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAlEw-0004zC-7r for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAlEw-003CIV-0g for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAlEw-002N5Q-0N for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 07: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=Xu7b6SVB9QoxhyhHH/dOPdgQJpfKikg/uTcR5psmTWI=; b=IQqowXCIg1BXL8P2V67LOjr03K C+/WF9IqdohdSevlDpBHFYyjmAHrYAFLJGNhKBXoI5uO3InobIlKXYJYiSo2c0y1tjoiDXT2nOfRp 4DaB0z2RKWVClr2neRLZuVAn5U2aTO5TlJ4dDHNqBGUb4ehyzkuR00VXFEIM7CbPoq/4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/alternatives: allow replacement code snippets to be re-used Message-Id: Date: Fri, 02 May 2025 07:55:22 +0000 commit b458596ac3b2ac3c365769d4fd278ae17aa76d22 Author: Jan Beulich AuthorDate: Fri May 2 09:44:49 2025 +0200 Commit: Jan Beulich CommitDate: Fri May 2 09:44:49 2025 +0200 x86/alternatives: allow replacement code snippets to be re-used In a number of cases we use ALTERNATIVE_2 with both replacement insns / insn sequences being identical. Avoid emitting the same code twice, and instead alias the necessary helper labels to the existing ones. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/alternative-asm.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/include/asm/alternative-asm.h b/xen/arch/x86/include/asm/alternative-asm.h index 83e8594f0e..22da9f89f1 100644 --- a/xen/arch/x86/include/asm/alternative-asm.h +++ b/xen/arch/x86/include/asm/alternative-asm.h @@ -51,6 +51,8 @@ #define decl_repl(insn, nr) .L\@_repl_s\()nr: insn; .L\@_repl_e\()nr: #define repl_len(nr) (.L\@_repl_e\()nr - .L\@_repl_s\()nr) +#define clone_repl(new, old) .equiv .L\@_repl_s\()new, .L\@_repl_s\()old; \ + .equiv .L\@_repl_e\()new, .L\@_repl_e\()old #define as_max(a, b) ((a) ^ (((a) ^ (b)) & -as_true((a) < (b)))) @@ -100,7 +102,11 @@ .section .altinstr_replacement, "ax", @progbits decl_repl(\newinstr1, 1) + .ifnes "\newinstr2", "\newinstr1" decl_repl(\newinstr2, 2) + .else + clone_repl(2, 1) + .endif .popsection .endm -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 02 09:11:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 09:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974562.1362387 (Exim 4.92) (envelope-from ) id 1uAmQB-0002ZV-Hj; Fri, 02 May 2025 09:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974562.1362387; Fri, 02 May 2025 09: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 1uAmQB-0002ZO-F2; Fri, 02 May 2025 09:11:03 +0000 Received: by outflank-mailman (input) for mailman id 974562; Fri, 02 May 2025 09:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAmQA-0002Ws-Eq for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAmQA-003FDR-0r for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAmQA-002XpA-0c for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09: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=90MqAmAdFtXZEnpEkyQ+o5+/wclvUWK/Egx08bDqBsU=; b=WYZZNBdlND8SNaOIQs7du2Zk7y xfzlY5TIOqZZi75X0K+QQEACh+Wt4snk5/1e+hvmenCTfZHckO/3/qRaXnhlPMhAHqki0bOPhZndm sE3osXNK+eAOLopQgyExsATeLt2OaQWmOr8qXvVz1OUd+ZRj5PPbkl+ymHKwM1xq3Xyc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] {hyper,multi}call: further limit arguments to just 5 Message-Id: Date: Fri, 02 May 2025 09:11:02 +0000 commit e81baffaff115c88f33097d171e5e7262e581c2d Author: Jan Beulich AuthorDate: Fri May 2 09:43:23 2025 +0200 Commit: Jan Beulich CommitDate: Fri May 2 09:43:23 2025 +0200 {hyper,multi}call: further limit arguments to just 5 Multicall compat translation and hypercall continuation handling can also be shrunk to the processing of just (up to) 5 arguments. Take the opportunity to - make exceeding the limit noisy in hypercall_create_continuation(), - use speculation-safe array access in hypercall_create_continuation(), - avoid a Misra C:2012 Rule 19.1 violation in xlat_multicall_entry(), - further tidy xlat_multicall_entry() and __trace_multicall_call() style-wise. Amends: 2f531c122e95 ("x86: limit number of hypercall parameters to 5") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Stefano Stabellini # arm --- xen/arch/arm/domain.c | 10 +++++++--- xen/arch/x86/hypercall.c | 11 +++++++---- xen/common/compat/multicall.c | 14 +++++++++----- xen/include/public/xen.h | 4 ++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 23cf8729f1..45aeb8bddc 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -391,7 +391,11 @@ unsigned long hypercall_create_continuation( if ( mcs->flags & MCSF_in_multicall ) { for ( i = 0; *p != '\0'; i++ ) - mcs->call.args[i] = NEXT_ARG(p, args); + { + if ( i >= ARRAY_SIZE(mcs->call.args) ) + goto bad_fmt; + array_access_nospec(mcs->call.args, i) = NEXT_ARG(p, args); + } /* Return value gets written back to mcs->call.result */ rc = mcs->call.result; @@ -416,7 +420,7 @@ unsigned long hypercall_create_continuation( case 2: regs->x2 = arg; break; case 3: regs->x3 = arg; break; case 4: regs->x4 = arg; break; - case 5: regs->x5 = arg; break; + default: goto bad_fmt; } } @@ -439,7 +443,7 @@ unsigned long hypercall_create_continuation( case 2: regs->r2 = arg; break; case 3: regs->r3 = arg; break; case 4: regs->r4 = arg; break; - case 5: regs->r5 = arg; break; + default: goto bad_fmt; } } diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index d292376b19..dc0a90ca09 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -41,7 +41,11 @@ unsigned long hypercall_create_continuation( if ( mcs->flags & MCSF_in_multicall ) { for ( i = 0; *p != '\0'; i++ ) - mcs->call.args[i] = NEXT_ARG(p, args); + { + if ( i >= ARRAY_SIZE(mcs->call.args) ) + goto bad_fmt; + array_access_nospec(mcs->call.args, i) = NEXT_ARG(p, args); + } } else { @@ -65,7 +69,7 @@ unsigned long hypercall_create_continuation( case 2: regs->rdx = arg; break; case 3: regs->r10 = arg; break; case 4: regs->r8 = arg; break; - case 5: regs->r9 = arg; break; + default: goto bad_fmt; } } } @@ -81,7 +85,7 @@ unsigned long hypercall_create_continuation( case 2: regs->rdx = arg; break; case 3: regs->rsi = arg; break; case 4: regs->rdi = arg; break; - case 5: regs->rbp = arg; break; + default: goto bad_fmt; } } } @@ -177,7 +181,6 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, case 2: reg = ®s->rdx; break; case 3: reg = ®s->rsi; break; case 4: reg = ®s->rdi; break; - case 5: reg = ®s->rbp; break; default: BUG(); reg = NULL; break; } if ( (mask & 1) ) diff --git a/xen/common/compat/multicall.c b/xen/common/compat/multicall.c index b17739d218..26ea82e1ea 100644 --- a/xen/common/compat/multicall.c +++ b/xen/common/compat/multicall.c @@ -14,9 +14,13 @@ typedef int ret_t; static inline void xlat_multicall_entry(struct mc_state *mcs) { - int i; - for (i=0; i<6; i++) - mcs->compat_call.args[i] = mcs->call.args[i]; + unsigned int i; + typeof(mcs->compat_call.args[0]) args[ARRAY_SIZE(mcs->call.args)]; + + for ( i = 0; i < ARRAY_SIZE(args); i++ ) + args[i] = mcs->call.args[i]; + + memcpy(mcs->compat_call.args, args, sizeof(args)); } #define multicall_entry compat_multicall_entry @@ -29,8 +33,8 @@ static inline void xlat_multicall_entry(struct mc_state *mcs) static void __trace_multicall_call(multicall_entry_t *call) { - xen_ulong_t args[6]; - int i; + xen_ulong_t args[ARRAY_SIZE(call->args)]; + unsigned int i; for ( i = 0; i < ARRAY_SIZE(args); i++ ) args[i] = call->args[i]; diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 75b1c1d597..82b9c05a76 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -640,7 +640,11 @@ DEFINE_XEN_GUEST_HANDLE(mmu_update_t); */ struct multicall_entry { xen_ulong_t op, result; +#ifndef __XEN__ xen_ulong_t args[6]; +#else /* Only 5 arguments are supported in reality. */ + xen_ulong_t args[5], unused; +#endif }; typedef struct multicall_entry multicall_entry_t; DEFINE_XEN_GUEST_HANDLE(multicall_entry_t); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 02 09:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 09:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974563.1362390 (Exim 4.92) (envelope-from ) id 1uAmQL-0002d6-KA; Fri, 02 May 2025 09:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974563.1362390; Fri, 02 May 2025 09: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 1uAmQL-0002cz-Hl; Fri, 02 May 2025 09:11:13 +0000 Received: by outflank-mailman (input) for mailman id 974563; Fri, 02 May 2025 09:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAmQK-0002cp-Dg for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAmQK-003FDV-1D for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAmQK-002Xr2-13 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09: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=5hEeIHvzCOMZArx4mufdB8aPrm+x1wWfqxOQruUpvNI=; b=mR0c8LodjehT88udTINohaIGkS VPNWWfNp/e9dtUhupgw0DfNfI64/PvtpkVWivBdYRFHNnwXtJwFdhlqBzxjteFCJHj+/VTOREmGfJ FHO7EUGN+2LZZEL7IBn2t9rbhQqIGdiycrRk84TZz4ILJn4+QpVUciduyyr5O6dUMZq8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] mm: move paddr_to_pdx() Message-Id: Date: Fri, 02 May 2025 09:11:12 +0000 commit 3120e479a0e55768eccb5e8e7c3c81fd809501a0 Author: Jan Beulich AuthorDate: Fri May 2 09:44:03 2025 +0200 Commit: Jan Beulich CommitDate: Fri May 2 09:44:03 2025 +0200 mm: move paddr_to_pdx() There's nothing arch-specific about it. While there, on x86 visually separate the vmap_to_*() macros from those covered by the earlier comment. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Julien Grall Reviewed-by: Oleksii Kurochko --- xen/arch/arm/include/asm/mm.h | 1 - xen/arch/ppc/include/asm/mm.h | 1 - xen/arch/riscv/include/asm/mm.h | 1 - xen/arch/x86/include/asm/page.h | 3 ++- xen/include/xen/pdx.h | 2 ++ 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 5b67c0f8bb..011bc1fd30 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -237,7 +237,6 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) /* Convert between frame number and address formats. */ #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) -#define paddr_to_pdx(pa) mfn_to_pdx(maddr_to_mfn(pa)) #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) diff --git a/xen/arch/ppc/include/asm/mm.h b/xen/arch/ppc/include/asm/mm.h index a433936076..a33eeec43b 100644 --- a/xen/arch/ppc/include/asm/mm.h +++ b/xen/arch/ppc/include/asm/mm.h @@ -13,7 +13,6 @@ void setup_initial_pagetables(void); #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) -#define paddr_to_pdx(pa) mfn_to_pdx(maddr_to_mfn(pa)) #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/mm.h index ef8b35d7c2..01bbd92a06 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -19,7 +19,6 @@ extern vaddr_t directmap_virt_start; #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) -#define paddr_to_pdx(pa) mfn_to_pdx(maddr_to_mfn(pa)) #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) diff --git a/xen/arch/x86/include/asm/page.h b/xen/arch/x86/include/asm/page.h index 24135f5968..8b5a9f77d0 100644 --- a/xen/arch/x86/include/asm/page.h +++ b/xen/arch/x86/include/asm/page.h @@ -258,7 +258,8 @@ void copy_page_sse2(void *to, const void *from); #define mfn_to_virt(mfn) __mfn_to_virt(mfn) #define pfn_to_paddr(pfn) __pfn_to_paddr(pfn) #define paddr_to_pfn(pa) __paddr_to_pfn(pa) -#define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) + +/* Specialized forms acting on vmap() addresses. */ #define vmap_to_mfn(va) xen_map_to_mfn((unsigned long)(va)) #define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 23f3956db8..9faeea3ac9 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -98,6 +98,8 @@ bool __mfn_valid(unsigned long mfn); #define mfn_to_pdx(mfn) pfn_to_pdx(mfn_x(mfn)) #define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) +#define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) + #ifdef CONFIG_PDX_COMPRESSION extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 02 09:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 09:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974565.1362395 (Exim 4.92) (envelope-from ) id 1uAmQV-0002kq-M8; Fri, 02 May 2025 09:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974565.1362395; Fri, 02 May 2025 09: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 1uAmQV-0002kh-JA; Fri, 02 May 2025 09:11:23 +0000 Received: by outflank-mailman (input) for mailman id 974565; Fri, 02 May 2025 09:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAmQU-0002kb-GH for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAmQU-003FDZ-1W for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAmQU-002XsU-1O for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 09: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=FM45YQMiBM0cslMEnO4/aOGyL8qeeGKx2cmwtpSA0sw=; b=lEH6hLdbhH8ID6JCgHsvjggPJK TvsBJGn5IS8TgfsL/+4t/t10tZJ2bqosXEgW01FFxFZK2h38QvKoJgMro1dgODk5qS6NxIdAQl/Fg bB9W5vVm2NI1DIkbxKTDo1ErmyZOukcyIxM1JHvETgWniAqnp6TilKq7yDDlzJTJzUG0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/alternatives: allow replacement code snippets to be re-used Message-Id: Date: Fri, 02 May 2025 09:11:22 +0000 commit b458596ac3b2ac3c365769d4fd278ae17aa76d22 Author: Jan Beulich AuthorDate: Fri May 2 09:44:49 2025 +0200 Commit: Jan Beulich CommitDate: Fri May 2 09:44:49 2025 +0200 x86/alternatives: allow replacement code snippets to be re-used In a number of cases we use ALTERNATIVE_2 with both replacement insns / insn sequences being identical. Avoid emitting the same code twice, and instead alias the necessary helper labels to the existing ones. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/alternative-asm.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/include/asm/alternative-asm.h b/xen/arch/x86/include/asm/alternative-asm.h index 83e8594f0e..22da9f89f1 100644 --- a/xen/arch/x86/include/asm/alternative-asm.h +++ b/xen/arch/x86/include/asm/alternative-asm.h @@ -51,6 +51,8 @@ #define decl_repl(insn, nr) .L\@_repl_s\()nr: insn; .L\@_repl_e\()nr: #define repl_len(nr) (.L\@_repl_e\()nr - .L\@_repl_s\()nr) +#define clone_repl(new, old) .equiv .L\@_repl_s\()new, .L\@_repl_s\()old; \ + .equiv .L\@_repl_e\()new, .L\@_repl_e\()old #define as_max(a, b) ((a) ^ (((a) ^ (b)) & -as_true((a) < (b)))) @@ -100,7 +102,11 @@ .section .altinstr_replacement, "ax", @progbits decl_repl(\newinstr1, 1) + .ifnes "\newinstr2", "\newinstr1" decl_repl(\newinstr2, 2) + .else + clone_repl(2, 1) + .endif .popsection .endm -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 02 16:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 16:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974778.1362529 (Exim 4.92) (envelope-from ) id 1uAsye-0004RE-69; Fri, 02 May 2025 16:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974778.1362529; Fri, 02 May 2025 16:11: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 1uAsye-0004R6-3W; Fri, 02 May 2025 16:11:04 +0000 Received: by outflank-mailman (input) for mailman id 974778; Fri, 02 May 2025 16:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAsyd-0004R0-1f for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAsyc-003SDq-38 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAsyc-003yOt-2s for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16: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=ChndcdywyS7XCR7IZrDdq1986DSUe+PtIXpLZl1Zw+s=; b=YtsxeshLGhB8FAJeJntYF4zdZ4 h9mc3HmD0E+fFVXO236m0fIpY8xAwXWVNyrmhPo5KLWn2ysSsB1f/n8V/vY2350/vAuzB5p9yJ2YW 13LIkrUfKYFTv2zGJxR1ZGtspLxY4XEb5XRNFgytZMwcqAIBTSP6IXYJ0fRSwjjhV+WA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/thunk: Don't opencode TSX instructions in clear_bhb_tsx() Message-Id: Date: Fri, 02 May 2025 16:11:02 +0000 commit 3f182352c50cc3df17adf25d15ef9b96b1e7cb13 Author: Andrew Cooper AuthorDate: Thu May 1 19:05:53 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 14:12:10 2025 +0100 x86/thunk: Don't opencode TSX instructions in clear_bhb_tsx() The new toolchain baseline understands the RTM instructions. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/bhb-thunk.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 678c00c5d0..f5ac41834b 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -19,8 +19,8 @@ * disabled for e.g. TAA mitigation reasons. */ FUNC(clear_bhb_tsx) - .byte 0xc7, 0xf8; .long 1f - 0f /* xbegin 1f */ -0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ + xbegin 1f + xabort $0 int3 1: ret -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 02 16:11:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 16:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974779.1362534 (Exim 4.92) (envelope-from ) id 1uAsyo-0004St-86; Fri, 02 May 2025 16:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974779.1362534; Fri, 02 May 2025 16:11: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 1uAsyo-0004Sk-4s; Fri, 02 May 2025 16:11:14 +0000 Received: by outflank-mailman (input) for mailman id 974779; Fri, 02 May 2025 16:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAsyn-0004Sa-5d for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAsyn-003SDu-0H for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAsyn-003ykP-09 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:13 +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=M/BnUUziQaC/iLdMz+yjNMBu2BFj8+bEmzGq6JbC4QM=; b=Ok6ckkxz4BWr5kInLoP+vSHLgw Ndsjnt3gSRjTUZxfVcyQsJ/hVM4/Yjn525Gvk5T3LOVahfYhCdyl/wQiLzmofYF1Nl0COE+1wvTVc +rr2G5HuyFvq5UV3mzg9ik7xcajpcMF6I7lzn43y/b207zH20jxa8m3Imqin++EeZVm8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vmx: Fix label name in vmwrite_safe() Message-Id: Date: Fri, 02 May 2025 16:11:13 +0000 commit 251015a40c6262038faadda49ec77ebb5ad97742 Author: Andrew Cooper AuthorDate: Mon Apr 28 17:39:18 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 14:12:10 2025 +0100 x86/vmx: Fix label name in vmwrite_safe() This condition is called VMFail(valid) in the SDM. No functional change. Fixes: fc3db01db6fb ("x86/vmx: Rework VMX wrappers using `asm goto()`") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index cc8c53fab1..d85b52b9d5 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -382,17 +382,17 @@ static inline enum vmx_insn_errno vmwrite_safe(unsigned long field, { asm goto ( "vmwrite %[value], %[field]\n\t" "jc %l[vmfail_invalid]\n\t" - "jz %l[vmfail_error]" + "jz %l[vmfail_valid]" : : [field] "r" (field), [value] "rm" (value) : - : vmfail_invalid, vmfail_error ); + : vmfail_invalid, vmfail_valid ); return VMX_INSN_SUCCEED; vmfail_invalid: return VMX_INSN_FAIL_INVALID; - vmfail_error: + vmfail_valid: return vmread(VM_INSTRUCTION_ERROR); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 02 16:11:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 16:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974780.1362537 (Exim 4.92) (envelope-from ) id 1uAsyy-0004Vd-8m; Fri, 02 May 2025 16:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974780.1362537; Fri, 02 May 2025 16:11: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 1uAsyy-0004VV-6E; Fri, 02 May 2025 16:11:24 +0000 Received: by outflank-mailman (input) for mailman id 974780; Fri, 02 May 2025 16:11:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAsyx-0004VF-7e for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAsyx-003SDy-0e for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAsyx-003z6X-0V for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:23 +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=pCb47zYjdF8xlpbROFf/ZXc6eUMMiOI3zH+EVsoOiEM=; b=62h9AaGXtHKim8vzigEkbfrtoE POAlV4qqTsKrMR6JnrAerZXCvHMOaqw03Zz16GGqsRhShI3A8k7q55CPUdN23v8BDoK6Cb9A8cE1O x4pW/qren7u9oP8C+tT4u77s4tBtZQDa5V1/iZlwCdqDIiKoIExdbgOIP40R1TOh+pBY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vpic: Improve bitops usage Message-Id: Date: Fri, 02 May 2025 16:11:23 +0000 commit ebd53a74924b4a56819d44e765c945a485fb4393 Author: Andrew Cooper AuthorDate: Tue Apr 29 14:52:08 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 14:12:10 2025 +0100 x86/vpic: Improve bitops usage * For vpic_get_priority(), introduce a common ror8() helper in plain C. One thing that I can't persuade the compiler to realise is that a non-zero value rotated is still non-zero, so use __builtin_clz() to help the optimiser out. * vpic_ioport_write() can be simplified to just for_each_set_bit(), which avoids spilling pending to the stack each loop iteration. Changing pending from unsigned int to uint8_t isn't even strictly necessary given the underlying types of vpic->isr and vpic->irr, but done so clarity. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vpic.c | 21 +++++++-------------- xen/include/xen/bitops.h | 6 ++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 22020322fb..30ce367c08 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -47,17 +47,16 @@ #define VPIC_PRIO_NONE 8 static int vpic_get_priority(struct hvm_hw_vpic *vpic, uint8_t mask) { - int prio; - ASSERT(vpic_is_locked(vpic)); if ( mask == 0 ) return VPIC_PRIO_NONE; - /* prio = ffs(mask ROR vpic->priority_add); */ - asm ( "ror %%cl,%b1 ; rep; bsf %1,%0" - : "=r" (prio) : "q" ((uint32_t)mask), "c" (vpic->priority_add) ); - return prio; + /* + * We use __builtin_ctz() rather than ffs() because the compiler can't + * reason that a nonzero mask rotated is still nonzero. + */ + return __builtin_ctz(ror8(mask, vpic->priority_add)); } /* Return the PIC's highest priority pending interrupt. Return -1 if none. */ @@ -196,7 +195,7 @@ static void vpic_ioport_write( { if ( val & 0x10 ) { - unsigned int pending = vpic->isr | (vpic->irr & ~vpic->elcr); + uint8_t pending = vpic->isr | (vpic->irr & ~vpic->elcr); /* ICW1 */ /* Clear edge-sensing logic. */ @@ -229,15 +228,9 @@ static void vpic_ioport_write( * been cleared from IRR or ISR, or else the dpci logic will get * out of sync with the state of the interrupt controller. */ - while ( pending ) - { - unsigned int pin = __scanbit(pending, 8); - - ASSERT(pin < 8); + for_each_set_bit ( pin, pending ) hvm_dpci_eoi(current->domain, hvm_isa_irq_to_gsi((addr >> 7) ? (pin | 8) : pin)); - __clear_bit(pin, &pending); - } return; } else if ( val & 0x08 ) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 448b2d3e09..a4d31ec02a 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -418,6 +418,12 @@ static inline uint32_t rol32(uint32_t word, unsigned int shift) return (word << shift) | (word >> (32 - shift)); } +/* ror8 - rotate an 8-bit value right */ +static inline uint8_t ror8(uint8_t value, unsigned int shift) +{ + return (value >> shift) | (value << (8 - shift)); +} + /* * ror32 - rotate a 32-bit value right * -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 02 16:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 16:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974781.1362541 (Exim 4.92) (envelope-from ) id 1uAsz8-0004YO-AU; Fri, 02 May 2025 16:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974781.1362541; Fri, 02 May 2025 16:11: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 1uAsz8-0004YH-7X; Fri, 02 May 2025 16:11:34 +0000 Received: by outflank-mailman (input) for mailman id 974781; Fri, 02 May 2025 16:11:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAsz7-0004YB-Cv for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAsz7-003SE4-1C for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAsz7-003zQO-0r for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 16:11: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=pwdXcWWERjW/IfdKDquM4tqFZ10bZIFwXmWbYxGDK2M=; b=CSKbq0XJuymD4jdG2XS/trDLgo oY9uc3YLGTM/YSbT6ayBK5OddSmAqd3EwEqMNaSZn7CsAb7mXzFjJTvtsEaqvyy8WNgCiAi2LBWCU 6hafEbdaFpZIR8GKOggMfaeP+DRLY1GhLdVsMQcYmTMhV0D7LkT++UaEKhbZiv/hTWq4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mm: Improve bitops in vcpumask_to_pcpumask() Message-Id: Date: Fri, 02 May 2025 16:11:33 +0000 commit 78ce2be733b1e45e2e190c1765fe31da318d435f Author: Andrew Cooper AuthorDate: Wed May 29 14:58:57 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 15:04:41 2025 +0100 x86/mm: Improve bitops in vcpumask_to_pcpumask() This loop is for_each_set_bit() in disguise. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/mm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 0b787ba553..66c15a3c86 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3411,7 +3411,7 @@ int new_guest_cr3(mfn_t mfn) static int vcpumask_to_pcpumask( struct domain *d, XEN_GUEST_HANDLE_PARAM(const_void) bmap, cpumask_t *pmask) { - unsigned int vcpu_id, vcpu_bias, offs; + unsigned int vcpu_bias, offs; unsigned long vmask; struct vcpu *v; bool is_native = !is_pv_32bit_domain(d); @@ -3432,12 +3432,10 @@ static int vcpumask_to_pcpumask( return -EFAULT; } - while ( vmask ) + for_each_set_bit ( vcpu_id, vmask ) { unsigned int cpu; - vcpu_id = ffsl(vmask) - 1; - vmask &= ~(1UL << vcpu_id); vcpu_id += vcpu_bias; if ( (vcpu_id >= d->max_vcpus) ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 02 17:00:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 17:00:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974929.1362645 (Exim 4.92) (envelope-from ) id 1uAtk4-0008Mi-0w; Fri, 02 May 2025 17:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974929.1362645; Fri, 02 May 2025 17: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 1uAtk3-0008MO-UO; Fri, 02 May 2025 17:00:03 +0000 Received: by outflank-mailman (input) for mailman id 974929; Fri, 02 May 2025 17:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAtk2-0007w7-70 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAtk2-003Tbl-09 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAtk1-005hOL-3D for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17: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=QVXVdElTH4aHer8bg6JbgrhKicfL17GRbK+6Zu+NAyU=; b=THgy6qHtGAKKjyg8fAySI5h73p MURqWXflVAAp66/7zPfFRU/ZAhUEdyRvw/U2ihv/vQipJe8wqjUGGuYCywgj5HkZsxLN6G0gLCE7p 2ITnan110RHM/YDYTOmksGLJ2r+imNU7KejvdbnN0t5LXHDPR3qB18B9pdvQG7uMGgYw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/thunk: Don't opencode TSX instructions in clear_bhb_tsx() Message-Id: Date: Fri, 02 May 2025 17:00:01 +0000 commit 3f182352c50cc3df17adf25d15ef9b96b1e7cb13 Author: Andrew Cooper AuthorDate: Thu May 1 19:05:53 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 14:12:10 2025 +0100 x86/thunk: Don't opencode TSX instructions in clear_bhb_tsx() The new toolchain baseline understands the RTM instructions. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/bhb-thunk.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 678c00c5d0..f5ac41834b 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -19,8 +19,8 @@ * disabled for e.g. TAA mitigation reasons. */ FUNC(clear_bhb_tsx) - .byte 0xc7, 0xf8; .long 1f - 0f /* xbegin 1f */ -0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ + xbegin 1f + xabort $0 int3 1: ret -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 02 17:00:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 17:00:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974930.1362649 (Exim 4.92) (envelope-from ) id 1uAtkE-0000QF-2J; Fri, 02 May 2025 17:00:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974930.1362649; Fri, 02 May 2025 17:00: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 1uAtkD-0000Q6-Vr; Fri, 02 May 2025 17:00:13 +0000 Received: by outflank-mailman (input) for mailman id 974930; Fri, 02 May 2025 17:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAtkC-0000Pn-5O for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAtkC-003Tbp-0R for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAtkC-005hda-0K for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00: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=3vCrNO73YO+IgPYx7Z9u6xXuvMr+x8eYfpHFNMKlBTg=; b=y1QrJ34bX0NA5cl5xcsq3XvXpk KNcvpTxmDQal9KrczIUiOrrkGWAnvTuugYyiBKDY1pm/x2Ahjk0tposZazAS2SCLEy2f1PjU2ifpy 6XBfNWifHaQl6QDMnHJ4Lrwvqy//FkxVp0CEnGmDWCp9+l2Hufrws1VOK1XrDOqplUS8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vmx: Fix label name in vmwrite_safe() Message-Id: Date: Fri, 02 May 2025 17:00:12 +0000 commit 251015a40c6262038faadda49ec77ebb5ad97742 Author: Andrew Cooper AuthorDate: Mon Apr 28 17:39:18 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 14:12:10 2025 +0100 x86/vmx: Fix label name in vmwrite_safe() This condition is called VMFail(valid) in the SDM. No functional change. Fixes: fc3db01db6fb ("x86/vmx: Rework VMX wrappers using `asm goto()`") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index cc8c53fab1..d85b52b9d5 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -382,17 +382,17 @@ static inline enum vmx_insn_errno vmwrite_safe(unsigned long field, { asm goto ( "vmwrite %[value], %[field]\n\t" "jc %l[vmfail_invalid]\n\t" - "jz %l[vmfail_error]" + "jz %l[vmfail_valid]" : : [field] "r" (field), [value] "rm" (value) : - : vmfail_invalid, vmfail_error ); + : vmfail_invalid, vmfail_valid ); return VMX_INSN_SUCCEED; vmfail_invalid: return VMX_INSN_FAIL_INVALID; - vmfail_error: + vmfail_valid: return vmread(VM_INSTRUCTION_ERROR); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 02 17:00:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 17:00:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974931.1362653 (Exim 4.92) (envelope-from ) id 1uAtkO-0000SW-3e; Fri, 02 May 2025 17:00:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974931.1362653; Fri, 02 May 2025 17:00: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 1uAtkO-0000SP-14; Fri, 02 May 2025 17:00:24 +0000 Received: by outflank-mailman (input) for mailman id 974931; Fri, 02 May 2025 17:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAtkM-0000SD-Ad for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAtkM-003Tbt-0u for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAtkM-005hs2-0c for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00: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=ubV5+6BW0ZBUF5GLfKYFeGsdtYXY/tgXBiYurE/a3E0=; b=xiQKWJlZrlhKtYyaiB6y43dQ54 ZtJ+sxuYghYPdLNmizJangNDAeMIqwHo6oLtppCORLKUuBAyeVxFNWAWs1986UAKrqnnaTcRfsQgA sDR8l2KZOep3AZzvgc5tJs0G4b942enh7iSwLwun03uJ68hhcGJr5evMhP7D6Bt2P2K4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vpic: Improve bitops usage Message-Id: Date: Fri, 02 May 2025 17:00:22 +0000 commit ebd53a74924b4a56819d44e765c945a485fb4393 Author: Andrew Cooper AuthorDate: Tue Apr 29 14:52:08 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 14:12:10 2025 +0100 x86/vpic: Improve bitops usage * For vpic_get_priority(), introduce a common ror8() helper in plain C. One thing that I can't persuade the compiler to realise is that a non-zero value rotated is still non-zero, so use __builtin_clz() to help the optimiser out. * vpic_ioport_write() can be simplified to just for_each_set_bit(), which avoids spilling pending to the stack each loop iteration. Changing pending from unsigned int to uint8_t isn't even strictly necessary given the underlying types of vpic->isr and vpic->irr, but done so clarity. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vpic.c | 21 +++++++-------------- xen/include/xen/bitops.h | 6 ++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 22020322fb..30ce367c08 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -47,17 +47,16 @@ #define VPIC_PRIO_NONE 8 static int vpic_get_priority(struct hvm_hw_vpic *vpic, uint8_t mask) { - int prio; - ASSERT(vpic_is_locked(vpic)); if ( mask == 0 ) return VPIC_PRIO_NONE; - /* prio = ffs(mask ROR vpic->priority_add); */ - asm ( "ror %%cl,%b1 ; rep; bsf %1,%0" - : "=r" (prio) : "q" ((uint32_t)mask), "c" (vpic->priority_add) ); - return prio; + /* + * We use __builtin_ctz() rather than ffs() because the compiler can't + * reason that a nonzero mask rotated is still nonzero. + */ + return __builtin_ctz(ror8(mask, vpic->priority_add)); } /* Return the PIC's highest priority pending interrupt. Return -1 if none. */ @@ -196,7 +195,7 @@ static void vpic_ioport_write( { if ( val & 0x10 ) { - unsigned int pending = vpic->isr | (vpic->irr & ~vpic->elcr); + uint8_t pending = vpic->isr | (vpic->irr & ~vpic->elcr); /* ICW1 */ /* Clear edge-sensing logic. */ @@ -229,15 +228,9 @@ static void vpic_ioport_write( * been cleared from IRR or ISR, or else the dpci logic will get * out of sync with the state of the interrupt controller. */ - while ( pending ) - { - unsigned int pin = __scanbit(pending, 8); - - ASSERT(pin < 8); + for_each_set_bit ( pin, pending ) hvm_dpci_eoi(current->domain, hvm_isa_irq_to_gsi((addr >> 7) ? (pin | 8) : pin)); - __clear_bit(pin, &pending); - } return; } else if ( val & 0x08 ) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 448b2d3e09..a4d31ec02a 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -418,6 +418,12 @@ static inline uint32_t rol32(uint32_t word, unsigned int shift) return (word << shift) | (word >> (32 - shift)); } +/* ror8 - rotate an 8-bit value right */ +static inline uint8_t ror8(uint8_t value, unsigned int shift) +{ + return (value >> shift) | (value << (8 - shift)); +} + /* * ror32 - rotate a 32-bit value right * -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 02 17:00:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 May 2025 17:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.974932.1362656 (Exim 4.92) (envelope-from ) id 1uAtkY-0000V6-5M; Fri, 02 May 2025 17:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 974932.1362656; Fri, 02 May 2025 17:00: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 1uAtkY-0000Uz-2T; Fri, 02 May 2025 17:00:34 +0000 Received: by outflank-mailman (input) for mailman id 974932; Fri, 02 May 2025 17:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uAtkW-0000Up-DE for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uAtkW-003Tbz-1D for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uAtkW-005i5b-16 for xen-changelog@lists.xenproject.org; Fri, 02 May 2025 17:00: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=D2/UsqGW2E7d6ng0BFLVButM1waNnudh+7s21t/bxlk=; b=7KwU/pNfyZ8NyQzcfW35qWW94d s0ifp7jy6++TFH3bNiinvA7vHNjdyu2QB9LYaTsgdJ4A2FT6KxRyg39eqI5epNEMyaiSliCNbikkA ZZTP5n33PZE1BzidcAgITNw37pBYiZJH45a7MA+/rANl3qfehVG2Vqvv/k6S8VHgoANE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: Improve bitops in vcpumask_to_pcpumask() Message-Id: Date: Fri, 02 May 2025 17:00:32 +0000 commit 78ce2be733b1e45e2e190c1765fe31da318d435f Author: Andrew Cooper AuthorDate: Wed May 29 14:58:57 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 2 15:04:41 2025 +0100 x86/mm: Improve bitops in vcpumask_to_pcpumask() This loop is for_each_set_bit() in disguise. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/mm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 0b787ba553..66c15a3c86 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3411,7 +3411,7 @@ int new_guest_cr3(mfn_t mfn) static int vcpumask_to_pcpumask( struct domain *d, XEN_GUEST_HANDLE_PARAM(const_void) bmap, cpumask_t *pmask) { - unsigned int vcpu_id, vcpu_bias, offs; + unsigned int vcpu_bias, offs; unsigned long vmask; struct vcpu *v; bool is_native = !is_pv_32bit_domain(d); @@ -3432,12 +3432,10 @@ static int vcpumask_to_pcpumask( return -EFAULT; } - while ( vmask ) + for_each_set_bit ( vcpu_id, vmask ) { unsigned int cpu; - vcpu_id = ffsl(vmask) - 1; - vmask &= ~(1UL << vcpu_id); vcpu_id += vcpu_bias; if ( (vcpu_id >= d->max_vcpus) ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:22:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976614.1363730 (Exim 4.92) (envelope-from ) id 1uC64R-0007qZ-Av; Tue, 06 May 2025 00:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976614.1363730; Tue, 06 May 2025 00: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 1uC64R-0007qR-8G; Tue, 06 May 2025 00:22:03 +0000 Received: by outflank-mailman (input) for mailman id 976614; Tue, 06 May 2025 00:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC64Q-0007qL-1c for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC64P-00AitR-2n for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC64P-002i0d-2I for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00: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=yfFozUX5zEKavHguVF8+nhzikb8iYqd4ONfC9lA+oT8=; b=OIIoxjLtGqKBFj05tU0tqYnHAi 6ScTrpAlax8eG3fxkeDEH1y+Dwm6+aLaPLCPkFQ7wcDys9b7cMWi0uKqlRVi7F/YjCxlQ98rUamxL yQUrZwXuAt43Edfn5c8f+lTP+avXxxZnB0uDRiB5qsT0OgTJz7YykyBjx9Dl2+EXLJVc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: drop declaration of handle_device_interrupts() Message-Id: Date: Tue, 06 May 2025 00:22:01 +0000 commit 07107633b3455ed9dc22498708e01e4aea1d6527 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:31 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 13:13:04 2025 -0700 xen/arm: drop declaration of handle_device_interrupts() There is no definition of handle_device_interrupts() thereby it could be dropped. Signed-off-by: Oleksii Kurochko Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/domain_build.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 17619c875d..378c10cc98 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -28,17 +28,6 @@ void evtchn_allocate(struct domain *d); unsigned int get_allocation_size(paddr_t size); -/* - * handle_device_interrupts retrieves the interrupts configuration from - * a device tree node and maps those interrupts to the target domain. - * - * Returns: - * < 0 error - * 0 success - */ -int handle_device_interrupts(struct domain *d, struct dt_device_node *dev, - bool need_mapping); - /* * Helper to write an interrupts with the GIC format * This code is assuming the irq is an PPI. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:22:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976615.1363734 (Exim 4.92) (envelope-from ) id 1uC64a-0007tc-CC; Tue, 06 May 2025 00:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976615.1363734; Tue, 06 May 2025 00: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 1uC64a-0007tV-9d; Tue, 06 May 2025 00:22:12 +0000 Received: by outflank-mailman (input) for mailman id 976615; Tue, 06 May 2025 00:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC64a-0007tP-2C for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC64Z-00AitY-3A for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC64Z-002i2Q-30 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00: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=L5xd5KClbjIvMHUIeu80v5nuo+wnC3qTx7/ERJEGJnM=; b=dMIDEKLrsuFIP19kMn8jzKajQr lG433gwDMzpkadzZ53du/Ph19dtAy9Xkj3q9R1JeIT10SZRqWvJ5aBskMkerBhKR1wBKM4PT7o7og 0yR5yUW0xLeN5qIlUn9akgzc2XOp9+4HnIQrGZ/i4flKM4tDVD7uSKQFnWjvSEL7jW/U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/common: dom0less: make some parts of Arm's CONFIG_DOM0LESS common Message-Id: Date: Tue, 06 May 2025 00:22:11 +0000 commit ad03faa942b953752a1e2083430be23033a3a5c3 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:32 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:17 2025 -0700 xen/common: dom0less: make some parts of Arm's CONFIG_DOM0LESS common Move some parts of Arm's Dom0Less code to be reused by other architectures. At the moment, RISC-V is going to reuse these parts. Move dom0less-build.h from the Arm-specific directory to asm-generic as these header is expected to be the same across acrhictectures with some updates: add the following declaration of construct_domU(), and arch_create_domUs() as there are some parts which are still architecture-specific. Introduce HAS_DOM0LESS to provide ability to enable generic Dom0less code for an architecture. Relocate the CONFIG_DOM0LESS configuration to the common with adding "depends on HAS_DOM0LESS" to not break builds for architectures which don't support CONFIG_DOM0LESS config, especically it would be useful to not provide stubs for construct_domU(), arch_create_domUs() in case of *-randconfig which may set CONFIG_DOM0LESS=y. Move is_dom0less_mode() function to the common code, as it depends on boot modules that are already part of the common code. Move create_domUs() function to the common code with some updates: - Add arch_create_domUs() to cover parsing of arch-specific features, for example, SVE (Scalar Vector Extension ) exists only in Arm. Signed-off-by: Oleksii Kurochko [stefano: fix arch_create_domUs to only modify flags] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/arm/Kconfig | 9 +- xen/arch/arm/dom0less-build.c | 371 +++++------------------------- xen/arch/arm/include/asm/Makefile | 1 + xen/arch/arm/include/asm/dom0less-build.h | 34 --- xen/common/Kconfig | 12 + xen/common/device-tree/Makefile | 1 + xen/common/device-tree/dom0less-build.c | 294 +++++++++++++++++++++++ xen/include/asm-generic/dom0less-build.h | 50 ++++ 8 files changed, 415 insertions(+), 357 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index da8a406f5a..d0e0a7753c 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -15,6 +15,7 @@ config ARM select GENERIC_UART_INIT select HAS_ALTERNATIVE if HAS_VMAP select HAS_DEVICE_TREE + select HAS_DOM0LESS select HAS_STACK_PROTECTOR select HAS_UBSAN @@ -120,14 +121,6 @@ config GICV2 Driver for the ARM Generic Interrupt Controller v2. If unsure, say Y -config DOM0LESS_BOOT - bool "Dom0less boot support" if EXPERT - default y - help - Dom0less boot support enables Xen to create and start domU guests during - Xen boot without the need of a control domain (Dom0), which could be - present anyway. - config GICV3 bool "GICv3 driver" depends on !NEW_VGIC diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a356fc94fc..a731fdc653 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -22,48 +22,7 @@ #include #include -#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX - -static domid_t __initdata xs_domid = DOMID_INVALID; -static bool __initdata need_xenstore; - -void __init set_xs_domain(struct domain *d) -{ - xs_domid = d->domain_id; - set_global_virq_handler(d, VIRQ_DOM_EXC); -} - -bool __init is_dom0less_mode(void) -{ - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; - unsigned int i; - bool dom0found = false; - bool domUfound = false; - - /* Look into the bootmodules */ - for ( i = 0 ; i < mods->nr_mods ; i++ ) - { - mod = &mods->module[i]; - /* Find if dom0 and domU kernels are present */ - if ( mod->kind == BOOTMOD_KERNEL ) - { - if ( mod->domU == false ) - { - dom0found = true; - break; - } - else - domUfound = true; - } - } - - /* - * If there is no dom0 kernel but at least one domU, then we are in - * dom0less mode - */ - return ( !dom0found && domUfound ); -} +bool __initdata need_xenstore; #ifdef CONFIG_VGICV2 static int __init make_gicv2_domU_node(struct kernel_info *kinfo) @@ -686,25 +645,6 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) return -EINVAL; } -static int __init alloc_xenstore_evtchn(struct domain *d) -{ - evtchn_alloc_unbound_t alloc; - int rc; - - alloc.dom = d->domain_id; - alloc.remote_dom = xs_domid; - rc = evtchn_alloc_unbound(&alloc, 0); - if ( rc ) - { - printk("Failed allocating event channel for domain\n"); - return rc; - } - - d->arch.hvm.params[HVM_PARAM_STORE_EVTCHN] = alloc.port; - - return 0; -} - #define XENSTORE_PFN_OFFSET 1 static int __init alloc_xenstore_page(struct domain *d) { @@ -771,36 +711,6 @@ static int __init alloc_xenstore_params(struct kernel_info *kinfo) return rc; } -static void __init initialize_domU_xenstore(void) -{ - struct domain *d; - - if ( xs_domid == DOMID_INVALID ) - return; - - for_each_domain( d ) - { - uint64_t gfn = d->arch.hvm.params[HVM_PARAM_STORE_PFN]; - int rc; - - if ( gfn == 0 ) - continue; - - if ( is_xenstore_domain(d) ) - continue; - - rc = alloc_xenstore_evtchn(d); - if ( rc < 0 ) - panic("%pd: Failed to allocate xenstore_evtchn\n", d); - - if ( gfn != XENSTORE_PFN_LATE_ALLOC && IS_ENABLED(CONFIG_GRANT_TABLE) ) - { - ASSERT(gfn < UINT32_MAX); - gnttab_seed_entry(d, GNTTAB_RESERVED_XENSTORE, xs_domid, gfn); - } - } -} - static void __init domain_vcpu_affinity(struct domain *d, const struct dt_device_node *node) { @@ -906,8 +816,8 @@ static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, } #endif /* CONFIG_ARCH_PAGING_MEMPOOL */ -static int __init construct_domU(struct domain *d, - const struct dt_device_node *node) +int __init construct_domU(struct domain *d, + const struct dt_device_node *node) { struct kernel_info kinfo = KERNEL_INFO_INIT; const char *dom0less_enhanced; @@ -1009,246 +919,77 @@ static int __init construct_domU(struct domain *d, return alloc_xenstore_params(&kinfo); } -void __init create_domUs(void) +void __init arch_create_domUs(struct dt_device_node *node, + struct xen_domctl_createdomain *d_cfg, + unsigned int flags) { - struct dt_device_node *node; - const char *dom0less_iommu; - bool iommu = false; - const struct dt_device_node *cpupool_node, - *chosen = dt_find_node_by_path("/chosen"); - const char *llc_colors_str = NULL; - - BUG_ON(chosen == NULL); - dt_for_each_child_node(chosen, node) - { - struct domain *d; - struct xen_domctl_createdomain d_cfg = { - .arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE, - .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, - /* - * The default of 1023 should be sufficient for guests because - * on ARM we don't bind physical interrupts to event channels. - * The only use of the evtchn port is inter-domain communications. - * 1023 is also the default value used in libxl. - */ - .max_evtchn_port = 1023, - .max_grant_frames = -1, - .max_maptrack_frames = -1, - .grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version), - }; - unsigned int flags = 0U; - bool has_dtb = false; - uint32_t val; - int rc; - - if ( !dt_device_is_compatible(node, "xen,domain") ) - continue; - - if ( (max_init_domid + 1) >= DOMID_FIRST_RESERVED ) - panic("No more domain IDs available\n"); + uint32_t val; - if ( dt_property_read_u32(node, "capabilities", &val) ) - { - if ( val & ~DOMAIN_CAPS_MASK ) - panic("Invalid capabilities (%"PRIx32")\n", val); - - if ( val & DOMAIN_CAPS_CONTROL ) - flags |= CDF_privileged; - - if ( val & DOMAIN_CAPS_HARDWARE ) - { - if ( hardware_domain ) - panic("Only 1 hardware domain can be specified! (%pd)\n", - hardware_domain); - - d_cfg.max_grant_frames = gnttab_dom0_frames(); - d_cfg.max_evtchn_port = -1; - flags |= CDF_hardware; - iommu = true; - } - - if ( val & DOMAIN_CAPS_XENSTORE ) - { - if ( xs_domid != DOMID_INVALID ) - panic("Only 1 xenstore domain can be specified! (%u)\n", - xs_domid); + d_cfg->arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE; + d_cfg->flags |= XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap; - d_cfg.flags |= XEN_DOMCTL_CDF_xs_domain; - d_cfg.max_evtchn_port = -1; - } - } - - if ( dt_find_property(node, "xen,static-mem", NULL) ) - { - if ( llc_coloring_enabled ) - panic("LLC coloring and static memory are incompatible\n"); - - flags |= CDF_staticmem; - } - - if ( dt_property_read_bool(node, "direct-map") ) - { - if ( !(flags & CDF_staticmem) ) - panic("direct-map is not valid for domain %s without static allocation.\n", - dt_node_name(node)); - - flags |= CDF_directmap; - } - - if ( !dt_property_read_u32(node, "cpus", &d_cfg.max_vcpus) ) - panic("Missing property 'cpus' for domain %s\n", - dt_node_name(node)); - - if ( !dt_property_read_string(node, "passthrough", &dom0less_iommu) ) - { - if ( flags & CDF_hardware ) - panic("Don't specify passthrough for hardware domain\n"); - - if ( !strcmp(dom0less_iommu, "enabled") ) - iommu = true; - } - - if ( (flags & CDF_hardware) && !(flags & CDF_directmap) && - !iommu_enabled ) - panic("non-direct mapped hardware domain requires iommu\n"); - - if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") ) - { - if ( flags & CDF_hardware ) - panic("\"multiboot,device-tree\" incompatible with hardware domain\n"); - - has_dtb = true; - } - - if ( iommu_enabled && (iommu || has_dtb) ) - d_cfg.flags |= XEN_DOMCTL_CDF_iommu; - - if ( !dt_property_read_u32(node, "nr_spis", &d_cfg.arch.nr_spis) ) - { - int vpl011_virq = GUEST_VPL011_SPI; - - d_cfg.arch.nr_spis = VGIC_DEF_NR_SPIS; - - /* - * The VPL011 virq is GUEST_VPL011_SPI, unless direct-map is - * set, in which case it'll match the hardware. - * - * Since the domain is not yet created, we can't use - * d->arch.vpl011.irq. So the logic to find the vIRQ has to - * be hardcoded. - * The logic here shall be consistent with the one in - * domain_vpl011_init(). - */ - if ( flags & CDF_directmap ) - { - vpl011_virq = serial_irq(SERHND_DTUART); - if ( vpl011_virq < 0 ) - panic("Error getting IRQ number for this serial port %d\n", - SERHND_DTUART); - } + if ( !dt_property_read_u32(node, "nr_spis", &d_cfg->arch.nr_spis) ) + { + int vpl011_virq = GUEST_VPL011_SPI; - /* - * vpl011 uses one emulated SPI. If vpl011 is requested, make - * sure that we allocate enough SPIs for it. - */ - if ( dt_property_read_bool(node, "vpl011") ) - d_cfg.arch.nr_spis = MAX(d_cfg.arch.nr_spis, - vpl011_virq - 32 + 1); - } - else if ( flags & CDF_hardware ) - panic("nr_spis cannot be specified for hardware domain\n"); + d_cfg->arch.nr_spis = VGIC_DEF_NR_SPIS; - /* Get the optional property domain-cpupool */ - cpupool_node = dt_parse_phandle(node, "domain-cpupool", 0); - if ( cpupool_node ) + /* + * The VPL011 virq is GUEST_VPL011_SPI, unless direct-map is + * set, in which case it'll match the hardware. + * + * Since the domain is not yet created, we can't use + * d->arch.vpl011.irq. So the logic to find the vIRQ has to + * be hardcoded. + * The logic here shall be consistent with the one in + * domain_vpl011_init(). + */ + if ( flags & CDF_directmap ) { - int pool_id = btcpupools_get_domain_pool_id(cpupool_node); - if ( pool_id < 0 ) - panic("Error getting cpupool id from domain-cpupool (%d)\n", - pool_id); - d_cfg.cpupool_id = pool_id; + vpl011_virq = serial_irq(SERHND_DTUART); + if ( vpl011_virq < 0 ) + panic("Error getting IRQ number for this serial port %d\n", + SERHND_DTUART); } - if ( dt_property_read_u32(node, "max_grant_version", &val) ) - d_cfg.grant_opts = XEN_DOMCTL_GRANT_version(val); + /* + * vpl011 uses one emulated SPI. If vpl011 is requested, make + * sure that we allocate enough SPIs for it. + */ + if ( dt_property_read_bool(node, "vpl011") ) + d_cfg->arch.nr_spis = MAX(d_cfg->arch.nr_spis, + vpl011_virq - 32 + 1); + } + else if ( flags & CDF_hardware ) + panic("nr_spis cannot be specified for hardware domain\n"); - if ( dt_property_read_u32(node, "max_grant_frames", &val) ) - { - if ( val > INT32_MAX ) - panic("max_grant_frames (%"PRIu32") overflow\n", val); - d_cfg.max_grant_frames = val; - } + if ( dt_get_property(node, "sve", &val) ) + { +#ifdef CONFIG_ARM64_SVE + unsigned int sve_vl_bits; + bool ret = false; - if ( dt_property_read_u32(node, "max_maptrack_frames", &val) ) + if ( !val ) { - if ( val > INT32_MAX ) - panic("max_maptrack_frames (%"PRIu32") overflow\n", val); - d_cfg.max_maptrack_frames = val; + /* Property found with no value, means max HW VL supported */ + ret = sve_domctl_vl_param(-1, &sve_vl_bits); } - - if ( dt_get_property(node, "sve", &val) ) + else { -#ifdef CONFIG_ARM64_SVE - unsigned int sve_vl_bits; - bool ret = false; - - if ( !val ) - { - /* Property found with no value, means max HW VL supported */ - ret = sve_domctl_vl_param(-1, &sve_vl_bits); - } + if ( dt_property_read_u32(node, "sve", &val) ) + ret = sve_domctl_vl_param(val, &sve_vl_bits); else - { - if ( dt_property_read_u32(node, "sve", &val) ) - ret = sve_domctl_vl_param(val, &sve_vl_bits); - else - panic("Error reading 'sve' property\n"); - } + panic("Error reading 'sve' property\n"); + } - if ( ret ) - d_cfg.arch.sve_vl = sve_encode_vl(sve_vl_bits); - else - panic("SVE vector length error\n"); + if ( ret ) + d_cfg->arch.sve_vl = sve_encode_vl(sve_vl_bits); + else + panic("SVE vector length error\n"); #else - panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); + panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); #endif - } - - dt_property_read_string(node, "llc-colors", &llc_colors_str); - if ( !llc_coloring_enabled && llc_colors_str ) - panic("'llc-colors' found, but LLC coloring is disabled\n"); - - /* - * The variable max_init_domid is initialized with zero, so here it's - * very important to use the pre-increment operator to call - * domain_create() with a domid > 0. (domid == 0 is reserved for Dom0) - */ - d = domain_create(++max_init_domid, &d_cfg, flags); - if ( IS_ERR(d) ) - panic("Error creating domain %s (rc = %ld)\n", - dt_node_name(node), PTR_ERR(d)); - - if ( llc_coloring_enabled && - (rc = domain_set_llc_colors_from_str(d, llc_colors_str)) ) - panic("Error initializing LLC coloring for domain %s (rc = %d)\n", - dt_node_name(node), rc); - - d->is_console = true; - dt_device_set_used_by(node, d->domain_id); - - rc = construct_domU(d, node); - if ( rc ) - panic("Could not set up domain %s (rc = %d)\n", - dt_node_name(node), rc); - - if ( d_cfg.flags & XEN_DOMCTL_CDF_xs_domain ) - set_xs_domain(d); } - - if ( need_xenstore && xs_domid == DOMID_INVALID ) - panic("xenstore requested, but xenstore domain not present\n"); - - initialize_domU_xenstore(); } /* diff --git a/xen/arch/arm/include/asm/Makefile b/xen/arch/arm/include/asm/Makefile index 4a4036c951..831c914cce 100644 --- a/xen/arch/arm/include/asm/Makefile +++ b/xen/arch/arm/include/asm/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only generic-y += altp2m.h generic-y += device.h +generic-y += dom0less-build.h generic-y += hardirq.h generic-y += iocap.h generic-y += paging.h diff --git a/xen/arch/arm/include/asm/dom0less-build.h b/xen/arch/arm/include/asm/dom0less-build.h deleted file mode 100644 index b0e41a1954..0000000000 --- a/xen/arch/arm/include/asm/dom0less-build.h +++ /dev/null @@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_DOM0LESS_BUILD_H_ -#define __ASM_DOM0LESS_BUILD_H_ - -#include - -#ifdef CONFIG_DOM0LESS_BOOT - -void create_domUs(void); -bool is_dom0less_mode(void); -void set_xs_domain(struct domain *d); - -#else /* !CONFIG_DOM0LESS_BOOT */ - -static inline void create_domUs(void) {} -static inline bool is_dom0less_mode(void) -{ - return false; -} -static inline void set_xs_domain(struct domain *d) {} - -#endif /* CONFIG_DOM0LESS_BOOT */ - -#endif /* __ASM_DOM0LESS_BUILD_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/Kconfig b/xen/common/Kconfig index be28060716..f291a5c1c7 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -12,6 +12,15 @@ config CORE_PARKING bool depends on NR_CPUS > 1 +config DOM0LESS_BOOT + bool "Dom0less boot support" if EXPERT + depends on HAS_DOM0LESS && HAS_DEVICE_TREE + default y + help + Dom0less boot support enables Xen to create and start domU guests during + Xen boot without the need of a control domain (Dom0), which could be + present anyway. + config GRANT_TABLE bool "Grant table support" if EXPERT default y @@ -74,6 +83,9 @@ config HAS_DEVICE_TREE bool select LIBFDT +config HAS_DOM0LESS + bool + config HAS_DIT # Data Independent Timing bool diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index 7c549be38a..f3dafc9b81 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -1,5 +1,6 @@ obj-y += bootfdt.init.o obj-y += bootinfo.init.o obj-y += device-tree.o +obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c new file mode 100644 index 0000000000..203b762e2c --- /dev/null +++ b/xen/common/device-tree/dom0less-build.c @@ -0,0 +1,294 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +static domid_t __initdata xs_domid = DOMID_INVALID; + +void __init set_xs_domain(struct domain *d) +{ + xs_domid = d->domain_id; + set_global_virq_handler(d, VIRQ_DOM_EXC); +} + +bool __init is_dom0less_mode(void) +{ + struct bootmodules *mods = &bootinfo.modules; + struct bootmodule *mod; + unsigned int i; + bool dom0found = false; + bool domUfound = false; + + /* Look into the bootmodules */ + for ( i = 0 ; i < mods->nr_mods ; i++ ) + { + mod = &mods->module[i]; + /* Find if dom0 and domU kernels are present */ + if ( mod->kind == BOOTMOD_KERNEL ) + { + if ( mod->domU == false ) + { + dom0found = true; + break; + } + else + domUfound = true; + } + } + + /* + * If there is no dom0 kernel but at least one domU, then we are in + * dom0less mode + */ + return ( !dom0found && domUfound ); +} + +static int __init alloc_xenstore_evtchn(struct domain *d) +{ + evtchn_alloc_unbound_t alloc; + int rc; + + alloc.dom = d->domain_id; + alloc.remote_dom = xs_domid; + rc = evtchn_alloc_unbound(&alloc, 0); + if ( rc ) + { + printk("Failed allocating event channel for domain\n"); + return rc; + } + + d->arch.hvm.params[HVM_PARAM_STORE_EVTCHN] = alloc.port; + + return 0; +} + +static void __init initialize_domU_xenstore(void) +{ + struct domain *d; + + if ( xs_domid == DOMID_INVALID ) + return; + + for_each_domain( d ) + { + uint64_t gfn = d->arch.hvm.params[HVM_PARAM_STORE_PFN]; + int rc; + + if ( gfn == 0 ) + continue; + + if ( is_xenstore_domain(d) ) + continue; + + rc = alloc_xenstore_evtchn(d); + if ( rc < 0 ) + panic("%pd: Failed to allocate xenstore_evtchn\n", d); + + if ( gfn != XENSTORE_PFN_LATE_ALLOC && IS_ENABLED(CONFIG_GRANT_TABLE) ) + { + ASSERT(gfn < UINT32_MAX); + gnttab_seed_entry(d, GNTTAB_RESERVED_XENSTORE, xs_domid, gfn); + } + } +} + +void __init create_domUs(void) +{ + struct dt_device_node *node; + const char *dom0less_iommu; + bool iommu = false; + const struct dt_device_node *cpupool_node, + *chosen = dt_find_node_by_path("/chosen"); + const char *llc_colors_str = NULL; + + BUG_ON(chosen == NULL); + dt_for_each_child_node(chosen, node) + { + struct domain *d; + struct xen_domctl_createdomain d_cfg = {0}; + unsigned int flags = 0U; + bool has_dtb = false; + uint32_t val; + int rc; + + if ( !dt_device_is_compatible(node, "xen,domain") ) + continue; + + if ( (max_init_domid + 1) >= DOMID_FIRST_RESERVED ) + panic("No more domain IDs available\n"); + + d_cfg.max_evtchn_port = 1023; + d_cfg.max_grant_frames = -1; + d_cfg.max_maptrack_frames = -1; + d_cfg.grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version); + + if ( dt_property_read_u32(node, "capabilities", &val) ) + { + if ( val & ~DOMAIN_CAPS_MASK ) + panic("Invalid capabilities (%"PRIx32")\n", val); + + if ( val & DOMAIN_CAPS_CONTROL ) + flags |= CDF_privileged; + + if ( val & DOMAIN_CAPS_HARDWARE ) + { + if ( hardware_domain ) + panic("Only 1 hardware domain can be specified! (%pd)\n", + hardware_domain); + +#ifdef CONFIG_GRANT_TABLE + d_cfg.max_grant_frames = gnttab_dom0_frames(); +#endif + d_cfg.max_evtchn_port = -1; + flags |= CDF_hardware; + iommu = true; + } + + if ( val & DOMAIN_CAPS_XENSTORE ) + { + if ( xs_domid != DOMID_INVALID ) + panic("Only 1 xenstore domain can be specified! (%u)\n", + xs_domid); + + d_cfg.flags |= XEN_DOMCTL_CDF_xs_domain; + d_cfg.max_evtchn_port = -1; + } + } + + if ( dt_find_property(node, "xen,static-mem", NULL) ) + { + if ( llc_coloring_enabled ) + panic("LLC coloring and static memory are incompatible\n"); + + flags |= CDF_staticmem; + } + + if ( dt_property_read_bool(node, "direct-map") ) + { + if ( !(flags & CDF_staticmem) ) + panic("direct-map is not valid for domain %s without static allocation.\n", + dt_node_name(node)); + + flags |= CDF_directmap; + } + + if ( !dt_property_read_u32(node, "cpus", &d_cfg.max_vcpus) ) + panic("Missing property 'cpus' for domain %s\n", + dt_node_name(node)); + + if ( !dt_property_read_string(node, "passthrough", &dom0less_iommu) ) + { + if ( flags & CDF_hardware ) + panic("Don't specify passthrough for hardware domain\n"); + + if ( !strcmp(dom0less_iommu, "enabled") ) + iommu = true; + } + + if ( (flags & CDF_hardware) && !(flags & CDF_directmap) && + !iommu_enabled ) + panic("non-direct mapped hardware domain requires iommu\n"); + + if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") ) + { + if ( flags & CDF_hardware ) + panic("\"multiboot,device-tree\" incompatible with hardware domain\n"); + + has_dtb = true; + } + + if ( iommu_enabled && (iommu || has_dtb) ) + d_cfg.flags |= XEN_DOMCTL_CDF_iommu; + + /* Get the optional property domain-cpupool */ + cpupool_node = dt_parse_phandle(node, "domain-cpupool", 0); + if ( cpupool_node ) + { + int pool_id = btcpupools_get_domain_pool_id(cpupool_node); + if ( pool_id < 0 ) + panic("Error getting cpupool id from domain-cpupool (%d)\n", + pool_id); + d_cfg.cpupool_id = pool_id; + } + + if ( dt_property_read_u32(node, "max_grant_version", &val) ) + d_cfg.grant_opts = XEN_DOMCTL_GRANT_version(val); + + if ( dt_property_read_u32(node, "max_grant_frames", &val) ) + { + if ( val > INT32_MAX ) + panic("max_grant_frames (%"PRIu32") overflow\n", val); + d_cfg.max_grant_frames = val; + } + + if ( dt_property_read_u32(node, "max_maptrack_frames", &val) ) + { + if ( val > INT32_MAX ) + panic("max_maptrack_frames (%"PRIu32") overflow\n", val); + d_cfg.max_maptrack_frames = val; + } + + dt_property_read_string(node, "llc-colors", &llc_colors_str); + if ( !llc_coloring_enabled && llc_colors_str ) + panic("'llc-colors' found, but LLC coloring is disabled\n"); + + arch_create_domUs(node, &d_cfg, flags); + + /* + * The variable max_init_domid is initialized with zero, so here it's + * very important to use the pre-increment operator to call + * domain_create() with a domid > 0. (domid == 0 is reserved for Dom0) + */ + d = domain_create(++max_init_domid, &d_cfg, flags); + if ( IS_ERR(d) ) + panic("Error creating domain %s (rc = %ld)\n", + dt_node_name(node), PTR_ERR(d)); + + if ( llc_coloring_enabled && + (rc = domain_set_llc_colors_from_str(d, llc_colors_str)) ) + panic("Error initializing LLC coloring for domain %s (rc = %d)\n", + dt_node_name(node), rc); + + d->is_console = true; + dt_device_set_used_by(node, d->domain_id); + + rc = construct_domU(d, node); + if ( rc ) + panic("Could not set up domain %s (rc = %d)\n", + dt_node_name(node), rc); + + if ( d_cfg.flags & XEN_DOMCTL_CDF_xs_domain ) + set_xs_domain(d); + } + + if ( need_xenstore && xs_domid == DOMID_INVALID ) + panic("xenstore requested, but xenstore domain not present\n"); + + initialize_domU_xenstore(); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-generic/dom0less-build.h b/xen/include/asm-generic/dom0less-build.h new file mode 100644 index 0000000000..ef2073d802 --- /dev/null +++ b/xen/include/asm-generic/dom0less-build.h @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_GENERIC_DOM0LESS_BUILD_H__ +#define __ASM_GENERIC_DOM0LESS_BUILD_H__ + +#include + +struct domain; + +#ifdef CONFIG_DOM0LESS_BOOT + +#include + +struct dt_device_node; + +/* TODO: remove both when construct_domU() will be moved to common. */ +#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX +extern bool need_xenstore; + +void create_domUs(void); +bool is_dom0less_mode(void); +void set_xs_domain(struct domain *d); + +int construct_domU(struct domain *d, const struct dt_device_node *node); + +void arch_create_domUs(struct dt_device_node *node, + struct xen_domctl_createdomain *d_cfg, + unsigned int flags); + +#else /* !CONFIG_DOM0LESS_BOOT */ + +static inline void create_domUs(void) {} +static inline bool is_dom0less_mode(void) +{ + return false; +} +static inline void set_xs_domain(struct domain *d) {} + +#endif /* CONFIG_DOM0LESS_BOOT */ + +#endif /* __ASM_GENERIC_DOM0LESS_BUILD_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:22:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976616.1363739 (Exim 4.92) (envelope-from ) id 1uC64k-0007wt-FA; Tue, 06 May 2025 00:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976616.1363739; Tue, 06 May 2025 00: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 1uC64k-0007wm-Ce; Tue, 06 May 2025 00:22:22 +0000 Received: by outflank-mailman (input) for mailman id 976616; Tue, 06 May 2025 00:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC64k-0007wg-4W for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC64k-00Aitc-0L for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC64k-002i3k-09 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00: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=8btIMdDWoc8Omch7LPnFw/WXSiVn5bSzXID460ukwDk=; b=rGfs9xx4Ct8ThhMAfhYo4pLciD 2Ob2Ig2tW/e570g5n2k29nPVMctNCd7F/bb1EyJxZ0hVq1fifdGICKx7ZTwtVTkJBHMa0zb558Q76 U9sKJzYtBS3FFPbXGVHILZZcgMMjiPHYzn7R417A3ogNQi/5IkQZ3BC7r9r46qgUjHvs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] asm-generic: move parts of Arm's asm/kernel.h to common code Message-Id: Date: Tue, 06 May 2025 00:22:22 +0000 commit 02ac109aa5d9c42a5859e0b46d44844536abd4dd Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:33 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 asm-generic: move parts of Arm's asm/kernel.h to common code Move the following parts to common with the following changes: - struct kernel_info: - Create arch_kernel_info for arch specific kernel information. At the moment, it contains domain_type for Arm. - s/phandle_gic/phandle_intc to have more generic name suitable for other archs. - Make text_offset of zimage structure available for RISCV_64. - Wrap by `#ifdef KERNEL_INFO_SHM_MEM_INIT` definition of KERNEL_SHM_MEM_INIT and wrap by `#ifndef KERNEL_INFO_INIT` definition of KERNEL_INFO_INIT to have ability to override KERNEL_INFO_SHM_MEM_INIT for arch in case it doesn't want to use generic one. - Move DOM0LESS_* macros to dom0less-build.h. - Move all others parts of Arm's kernel.h to xen/fdt-kernel.h. Because of the changes in struct kernel_info the correspondent parts of Arm's code are updated. As part of this patch the following clean up happens: - Drop asm/setup.h from asm/kernel.h as nothing depends from it. Add inclusion of asm/setup.h for a code which uses device_tree_get_reg() to avoid compilation issues for CONFIG_STATIC_MEMORY and CONFIG_STATIC_SHM. - Drop inclusion of asm/kernel.h everywhere except xen/fdt-kernel.h. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/acpi/domain_build.c | 2 +- xen/arch/arm/dom0less-build.c | 31 ++++---- xen/arch/arm/domain_build.c | 12 +-- xen/arch/arm/include/asm/domain_build.h | 2 +- xen/arch/arm/include/asm/kernel.h | 123 +--------------------------- xen/arch/arm/include/asm/static-memory.h | 2 +- xen/arch/arm/include/asm/static-shmem.h | 2 +- xen/arch/arm/kernel.c | 13 +-- xen/arch/arm/static-memory.c | 1 + xen/arch/arm/static-shmem.c | 1 + xen/common/device-tree/dt-overlay.c | 2 +- xen/include/asm-generic/dom0less-build.h | 28 +++++++ xen/include/xen/fdt-kernel.h | 132 +++++++++++++++++++++++++++++++ 13 files changed, 198 insertions(+), 153 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index 2ce75543d0..f9ca8b47e5 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -18,7 +19,6 @@ #include #include #include -#include #include /* Override macros from asm/page.h to make them work with mfn_t */ diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a731fdc653..22ac73ab8f 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include @@ -64,11 +65,11 @@ static int __init make_gicv2_domU_node(struct kernel_info *kinfo) if (res) return res; - res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_intc); if (res) return res; - res = fdt_property_cell(fdt, "phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "phandle", kinfo->phandle_intc); if (res) return res; @@ -135,11 +136,11 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo) if (res) return res; - res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_intc); if (res) return res; - res = fdt_property_cell(fdt, "phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "phandle", kinfo->phandle_intc); if (res) return res; @@ -200,7 +201,7 @@ static int __init make_vpl011_uart_node(struct kernel_info *kinfo) return res; res = fdt_property_cell(fdt, "interrupt-parent", - kinfo->phandle_gic); + kinfo->phandle_intc); if ( res ) return res; @@ -486,10 +487,10 @@ static int __init domain_handle_dtb_bootmodule(struct domain *d, */ if ( dt_node_cmp(name, "gic") == 0 ) { - uint32_t phandle_gic = fdt_get_phandle(pfdt, node_next); + uint32_t phandle_intc = fdt_get_phandle(pfdt, node_next); - if ( phandle_gic != 0 ) - kinfo->phandle_gic = phandle_gic; + if ( phandle_intc != 0 ) + kinfo->phandle_intc = phandle_intc; continue; } @@ -532,7 +533,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) int addrcells, sizecells; int ret, fdt_size = DOMU_DTB_SIZE; - kinfo->phandle_gic = GUEST_PHANDLE_GIC; + kinfo->phandle_intc = GUEST_PHANDLE_GIC; kinfo->gnttab_start = GUEST_GNTTAB_BASE; kinfo->gnttab_size = GUEST_GNTTAB_SIZE; @@ -594,7 +595,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) /* * domain_handle_dtb_bootmodule has to be called before the rest of * the device tree is generated because it depends on the value of - * the field phandle_gic. + * the field phandle_intc. */ if ( kinfo->dtb_bootmodule ) { @@ -611,7 +612,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) if ( ret ) goto err; - if ( kinfo->vpl011 ) + if ( kinfo->arch.vpl011 ) { ret = -EINVAL; #ifdef CONFIG_SBSA_VUART_CONSOLE @@ -839,8 +840,8 @@ int __init construct_domU(struct domain *d, printk("*** LOADING DOMU cpus=%u memory=%#"PRIx64"KB ***\n", d->max_vcpus, mem); - kinfo.vpl011 = dt_property_read_bool(node, "vpl011"); - if ( kinfo.vpl011 && is_hardware_domain(d) ) + kinfo.arch.vpl011 = dt_property_read_bool(node, "vpl011"); + if ( kinfo.arch.vpl011 && is_hardware_domain(d) ) panic("hardware domain cannot specify vpl011\n"); rc = dt_property_read_string(node, "xen,enhanced", &dom0less_enhanced); @@ -872,7 +873,7 @@ int __init construct_domU(struct domain *d, #ifdef CONFIG_ARM_64 /* type must be set before allocate memory */ - d->arch.type = kinfo.type; + d->arch.type = kinfo.arch.type; #endif if ( is_hardware_domain(d) ) { @@ -898,7 +899,7 @@ int __init construct_domU(struct domain *d, * tree node in prepare_dtb_domU, so initialization on related variables * shall be done first. */ - if ( kinfo.vpl011 ) + if ( kinfo.arch.vpl011 ) { rc = domain_vpl011_init(d, NULL); if ( rc < 0 ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 270a6b97e4..8c7a054718 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -747,7 +747,7 @@ static int __init fdt_property_interrupts(const struct kernel_info *kinfo, return res; res = fdt_property_cell(kinfo->fdt, "interrupt-parent", - kinfo->phandle_gic); + kinfo->phandle_intc); return res; } @@ -2026,7 +2026,7 @@ static int __init prepare_dtb_hwdom(struct domain *d, struct kernel_info *kinfo) ASSERT(dt_host && (dt_host->sibling == NULL)); - kinfo->phandle_gic = dt_interrupt_controller->phandle; + kinfo->phandle_intc = dt_interrupt_controller->phandle; fdt = device_tree_flattened; new_size = fdt_totalsize(fdt) + DOM0_FDT_EXTRA_SIZE; @@ -2196,13 +2196,13 @@ int __init construct_domain(struct domain *d, struct kernel_info *kinfo) #ifdef CONFIG_ARM_64 /* if aarch32 mode is not supported at EL1 do not allow 32-bit domain */ - if ( !(cpu_has_el1_32) && kinfo->type == DOMAIN_32BIT ) + if ( !(cpu_has_el1_32) && kinfo->arch.type == DOMAIN_32BIT ) { printk("Platform does not support 32-bit domain\n"); return -EINVAL; } - if ( is_sve_domain(d) && (kinfo->type == DOMAIN_32BIT) ) + if ( is_sve_domain(d) && (kinfo->arch.type == DOMAIN_32BIT) ) { printk("SVE is not available for 32-bit domain\n"); return -EINVAL; @@ -2318,7 +2318,7 @@ int __init construct_hwdom(struct kernel_info *kinfo, #ifdef CONFIG_ARM_64 /* type must be set before allocate_memory */ - d->arch.type = kinfo->type; + d->arch.type = kinfo->arch.type; #endif find_gnttab_region(d, kinfo); if ( is_domain_direct_mapped(d) ) diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 378c10cc98..df1c0fe301 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -1,8 +1,8 @@ #ifndef __ASM_DOMAIN_BUILD_H__ #define __ASM_DOMAIN_BUILD_H__ +#include #include -#include typedef __be32 gic_interrupt_t[3]; typedef bool (*alloc_domheap_mem_cb)(struct domain *d, struct page_info *pg, diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index bdc96f4c18..7c3b7fde5b 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -6,137 +6,18 @@ #ifndef __ARCH_ARM_KERNEL_H__ #define __ARCH_ARM_KERNEL_H__ -#include #include -#include -/* - * List of possible features for dom0less domUs - * - * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All the - * default features (excluding Xenstore) will be - * available. Note that an OS *must* not rely on the - * availability of Xen features if this is not set. - * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. The - * xenstore page allocation is done by Xen at - * domain creation. This feature can't be - * enabled without the DOM0LESS_ENHANCED_NO_XS. - * DOM0LESS_XS_LEGACY Xenstore will be enabled for the VM, the - * xenstore page allocation will happen in - * init-dom0less. This feature can't be enabled - * without the DOM0LESS_ENHANCED_NO_XS. - * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All the - * default features (including Xenstore) will be - * available. Note that an OS *must* not rely on the - * availability of Xen features if this is not set. - * DOM0LESS_ENHANCED_LEGACY: Same as before, but using DOM0LESS_XS_LEGACY. - */ -#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) -#define DOM0LESS_XENSTORE BIT(1, U) -#define DOM0LESS_XS_LEGACY BIT(2, U) -#define DOM0LESS_ENHANCED_LEGACY (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XS_LEGACY) -#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENSTORE) - -struct kernel_info { +struct arch_kernel_info +{ #ifdef CONFIG_ARM_64 enum domain_type type; #endif - struct domain *d; - - void *fdt; /* flat device tree */ - paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ - struct meminfo mem; -#ifdef CONFIG_STATIC_SHM - struct shared_meminfo shm_mem; -#endif - - /* kernel entry point */ - paddr_t entry; - - /* grant table region */ - paddr_t gnttab_start; - paddr_t gnttab_size; - - /* boot blob load addresses */ - const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_bootmodule; - const char* cmdline; - paddr_t dtb_paddr; - paddr_t initrd_paddr; - /* Enable pl011 emulation */ bool vpl011; - - /* Enable/Disable PV drivers interfaces */ - uint16_t dom0less_feature; - - /* GIC phandle */ - uint32_t phandle_gic; - - /* loader to use for this kernel */ - void (*load)(struct kernel_info *info); - /* loader specific state */ - union { - struct { - paddr_t kernel_addr; - paddr_t len; -#ifdef CONFIG_ARM_64 - paddr_t text_offset; /* 64-bit Image only */ -#endif - paddr_t start; /* Must be 0 for 64-bit Image */ - } zimage; - }; }; -static inline struct membanks *kernel_info_get_mem(struct kernel_info *kinfo) -{ - return container_of(&kinfo->mem.common, struct membanks, common); -} - -static inline const struct membanks * -kernel_info_get_mem_const(const struct kernel_info *kinfo) -{ - return container_of(&kinfo->mem.common, const struct membanks, common); -} - -#ifdef CONFIG_STATIC_SHM -#define KERNEL_INFO_SHM_MEM_INIT \ - .shm_mem.common.max_banks = NR_SHMEM_BANKS, \ - .shm_mem.common.type = STATIC_SHARED_MEMORY, -#else -#define KERNEL_INFO_SHM_MEM_INIT -#endif - -#define KERNEL_INFO_INIT \ -{ \ - .mem.common.max_banks = NR_MEM_BANKS, \ - .mem.common.type = MEMORY, \ - KERNEL_INFO_SHM_MEM_INIT \ -} - -/* - * Probe the kernel to detemine its type and select a loader. - * - * Sets in info: - * ->type - * ->load hook, and sets loader specific variables ->zimage - */ -int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); - -/* - * Loads the kernel into guest RAM. - * - * Expects to be set in info when called: - * ->mem - * ->fdt - * - * Sets in info: - * ->entry - * ->dtb_paddr - * ->initrd_paddr - */ -void kernel_load(struct kernel_info *info); - #endif /* #ifdef __ARCH_ARM_KERNEL_H__ */ /* diff --git a/xen/arch/arm/include/asm/static-memory.h b/xen/arch/arm/include/asm/static-memory.h index 804166e541..a32a3c6553 100644 --- a/xen/arch/arm/include/asm/static-memory.h +++ b/xen/arch/arm/include/asm/static-memory.h @@ -3,8 +3,8 @@ #ifndef __ASM_STATIC_MEMORY_H_ #define __ASM_STATIC_MEMORY_H_ +#include #include -#include #ifdef CONFIG_STATIC_MEMORY diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index 94eaa9d500..a4f853805a 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -3,8 +3,8 @@ #ifndef __ASM_STATIC_SHMEM_H_ #define __ASM_STATIC_SHMEM_H_ +#include #include -#include #include #ifdef CONFIG_STATIC_SHM diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 2647812e8e..34c8233853 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -16,7 +17,7 @@ #include #include -#include +#include #include #define UIMAGE_MAGIC 0x27051956 @@ -101,7 +102,7 @@ static paddr_t __init kernel_zimage_place(struct kernel_info *info) paddr_t load_addr; #ifdef CONFIG_ARM_64 - if ( (info->type == DOMAIN_64BIT) && (info->zimage.start == 0) ) + if ( (info->arch.type == DOMAIN_64BIT) && (info->zimage.start == 0) ) return mem->bank[0].start + info->zimage.text_offset; #endif @@ -371,10 +372,10 @@ static int __init kernel_uimage_probe(struct kernel_info *info, switch ( uimage.arch ) { case IH_ARCH_ARM: - info->type = DOMAIN_32BIT; + info->arch.type = DOMAIN_32BIT; break; case IH_ARCH_ARM64: - info->type = DOMAIN_64BIT; + info->arch.type = DOMAIN_64BIT; break; default: printk(XENLOG_ERR "Unsupported uImage arch type %d\n", uimage.arch); @@ -444,7 +445,7 @@ static int __init kernel_zimage64_probe(struct kernel_info *info, info->load = kernel_zimage_load; - info->type = DOMAIN_64BIT; + info->arch.type = DOMAIN_64BIT; return 0; } @@ -496,7 +497,7 @@ static int __init kernel_zimage32_probe(struct kernel_info *info, info->load = kernel_zimage_load; #ifdef CONFIG_ARM_64 - info->type = DOMAIN_32BIT; + info->arch.type = DOMAIN_32BIT; #endif return 0; diff --git a/xen/arch/arm/static-memory.c b/xen/arch/arm/static-memory.c index d4585c5a06..e0f76afcd8 100644 --- a/xen/arch/arm/static-memory.c +++ b/xen/arch/arm/static-memory.c @@ -2,6 +2,7 @@ #include +#include #include static bool __init append_static_memory_to_bank(struct domain *d, diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index e8d4ca3ba3..14ae48fb1e 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -6,6 +6,7 @@ #include #include +#include #include #include diff --git a/xen/common/device-tree/dt-overlay.c b/xen/common/device-tree/dt-overlay.c index 97fb99eaaa..81107cb48d 100644 --- a/xen/common/device-tree/dt-overlay.c +++ b/xen/common/device-tree/dt-overlay.c @@ -6,8 +6,8 @@ * Written by Vikram Garhwal * */ -#include #include +#include #include #include #include diff --git a/xen/include/asm-generic/dom0less-build.h b/xen/include/asm-generic/dom0less-build.h index ef2073d802..2003be743f 100644 --- a/xen/include/asm-generic/dom0less-build.h +++ b/xen/include/asm-generic/dom0less-build.h @@ -17,6 +17,34 @@ struct dt_device_node; #define XENSTORE_PFN_LATE_ALLOC UINT64_MAX extern bool need_xenstore; +/* + * List of possible features for dom0less domUs + * + * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All the + * default features (excluding Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. The + * xenstore page allocation is done by Xen at + * domain creation. This feature can't be + * enabled without the DOM0LESS_ENHANCED_NO_XS. + * DOM0LESS_XS_LEGACY Xenstore will be enabled for the VM, the + * xenstore page allocation will happen in + * init-dom0less. This feature can't be enabled + * without the DOM0LESS_ENHANCED_NO_XS. + * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All the + * default features (including Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + * DOM0LESS_ENHANCED_LEGACY: Same as before, but using DOM0LESS_XS_LEGACY. + + */ +#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) +#define DOM0LESS_XENSTORE BIT(1, U) +#define DOM0LESS_XS_LEGACY BIT(2, U) +#define DOM0LESS_ENHANCED_LEGACY (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XS_LEGACY) +#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENSTORE) + void create_domUs(void); bool is_dom0less_mode(void); void set_xs_domain(struct domain *d); diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h new file mode 100644 index 0000000000..516cc68e90 --- /dev/null +++ b/xen/include/xen/fdt-kernel.h @@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * For Kernel image loading. + * + * Copyright (C) 2011 Citrix Systems, Inc. + */ +#ifndef __XEN_FDT_KERNEL_H__ +#define __XEN_FDT_KERNEL_H__ + +#include +#include +#include + +#if __has_include() +# include +#endif + +struct kernel_info { + struct domain *d; + + void *fdt; /* flat device tree */ + paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ + struct meminfo mem; +#ifdef CONFIG_STATIC_SHM + struct shared_meminfo shm_mem; +#endif + + /* kernel entry point */ + paddr_t entry; + + /* grant table region */ + paddr_t gnttab_start; + paddr_t gnttab_size; + + /* boot blob load addresses */ + const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_bootmodule; + const char* cmdline; + paddr_t dtb_paddr; + paddr_t initrd_paddr; + + /* Enable/Disable PV drivers interfaces */ + uint16_t dom0less_feature; + + /* Interrupt controller phandle */ + uint32_t phandle_intc; + + /* loader to use for this kernel */ + void (*load)(struct kernel_info *info); + + /* loader specific state */ + union { + struct { + paddr_t kernel_addr; + paddr_t len; +#if defined(CONFIG_ARM_64) || defined(CONFIG_RISCV_64) + paddr_t text_offset; /* 64-bit Image only */ +#endif + paddr_t start; /* Must be 0 for 64-bit Image */ + } zimage; + }; + +#if __has_include() + struct arch_kernel_info arch; +#endif +}; + +static inline struct membanks *kernel_info_get_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, const struct membanks, common); +} + +#ifndef KERNEL_INFO_SHM_MEM_INIT + +#ifdef CONFIG_STATIC_SHM +#define KERNEL_INFO_SHM_MEM_INIT \ + .shm_mem.common.max_banks = NR_SHMEM_BANKS, \ + .shm_mem.common.type = STATIC_SHARED_MEMORY, +#else +#define KERNEL_INFO_SHM_MEM_INIT +#endif + +#endif /* KERNEL_INFO_SHM_MEM_INIT */ + +#ifndef KERNEL_INFO_INIT + +#define KERNEL_INFO_INIT \ +{ \ + .mem.common.max_banks = NR_MEM_BANKS, \ + .mem.common.type = MEMORY, \ + KERNEL_INFO_SHM_MEM_INIT \ +} + +#endif /* KERNEL_INFO_INIT */ + +/* + * Probe the kernel to detemine its type and select a loader. + * + * Sets in info: + * ->load hook, and sets loader specific variables ->zimage + */ +int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); + +/* + * Loads the kernel into guest RAM. + * + * Expects to be set in info when called: + * ->mem + * ->fdt + * + * Sets in info: + * ->entry + * ->dtb_paddr + * ->initrd_paddr + */ +void kernel_load(struct kernel_info *info); + +#endif /* __XEN_FDT_KERNEL_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976617.1363743 (Exim 4.92) (envelope-from ) id 1uC64v-0007ze-Gy; Tue, 06 May 2025 00:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976617.1363743; Tue, 06 May 2025 00: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 1uC64v-0007zX-EB; Tue, 06 May 2025 00:22:33 +0000 Received: by outflank-mailman (input) for mailman id 976617; Tue, 06 May 2025 00:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC64u-0007zM-9I for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC64u-00Aitg-0e for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC64u-002i6O-0X for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00: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=Z8cC3PLB4aaZ6BVw/2Gr0GBjFge/b4tk6dDE2ETWQPE=; b=v8+1lHT32MJeuOzehhlkNLu3df ydIJXM7bqJjtjQ3F9aa/N0GcuhQnr2nkIBdDG5Gn05U2W935VUEUFE6gzO3RrJhvlCItvFlAETc3D 0bfpnMhXcznM5GxOqIqhXPdYVlTnx/we7QkFErSA53X0ELDVAP/2vWcDmUHirhzQJBvI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/static-shmem.h: drop inclusion of asm/setup.h Message-Id: Date: Tue, 06 May 2025 00:22:32 +0000 commit f92533a9d5cadad6cb739fd4016730ef2161d89a Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:34 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 arm/static-shmem.h: drop inclusion of asm/setup.h Nothing is dependent from asm/setup.h in asm/static-shmem.h so inclusion of asm/setup.h is droped. After this drop the following compilation error related to impicit declaration of the following functions device_tree_get_reg and map_device_irqs_to_domain, device_tree_get_u32 occur during compilation of dom0less-build.c ( as they are declared in asm/setup.h ). Add inclusion of in dt-overlay.c as it is using handle_device() declared in . Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/dom0less-build.c | 1 + xen/arch/arm/include/asm/static-shmem.h | 1 - xen/common/device-tree/dt-overlay.c | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 22ac73ab8f..7ea639525d 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index a4f853805a..4034cec32f 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -5,7 +5,6 @@ #include #include -#include #ifdef CONFIG_STATIC_SHM diff --git a/xen/common/device-tree/dt-overlay.c b/xen/common/device-tree/dt-overlay.c index 81107cb48d..d184186c01 100644 --- a/xen/common/device-tree/dt-overlay.c +++ b/xen/common/device-tree/dt-overlay.c @@ -13,6 +13,8 @@ #include #include +#include + #define DT_OVERLAY_MAX_SIZE KB(500) static LIST_HEAD(overlay_tracker); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976618.1363747 (Exim 4.92) (envelope-from ) id 1uC655-00082E-IB; Tue, 06 May 2025 00:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976618.1363747; Tue, 06 May 2025 00:22: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 1uC655-000827-Fa; Tue, 06 May 2025 00:22:43 +0000 Received: by outflank-mailman (input) for mailman id 976618; Tue, 06 May 2025 00:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC654-00081v-BG for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC654-00Aito-11 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC654-002i8t-0r for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22: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=0aadSxzB8EduQyncMDH6uPAUGYr3KHyQBA93MvSt9TU=; b=cjaPNz085pO2hpNVSGaG/kBNKG eZ0cy+2V7/iBWT3vHZ439VvNF6qVmB5kc/WPU8G6Y6hXAUdr28lEKXq/T4ftFg2O8EAjtNRoeq3os ohOcMmNBr1d18jfzdsb1yc2+JkhrhYUaZl9tvuxN+Q4sqkrDwSL6mvdDYiVy6yydjWwI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] asm-generic: move some parts of Arm's domain_build.h to common Message-Id: Date: Tue, 06 May 2025 00:22:42 +0000 commit a03848f23b91905e764bfce37e10ae7c4dfcd512 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:35 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 asm-generic: move some parts of Arm's domain_build.h to common Nothing changed. Only some functions declaration are moved to xen/include/ headers as they are expected to be used by common code of domain builing or dom0less. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/acpi/domain_build.c | 1 + xen/arch/arm/dom0less-build.c | 1 + xen/arch/arm/domain_build.c | 1 + xen/arch/arm/include/asm/domain_build.h | 10 ---------- xen/arch/arm/kernel.c | 1 + xen/arch/arm/static-shmem.c | 1 + xen/include/xen/fdt-domain-build.h | 35 +++++++++++++++++++++++++++++++++ 7 files changed, 40 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index f9ca8b47e5..1c3555d814 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 7ea639525d..0adeec7b94 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 8c7a054718..9d649b06b3 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index df1c0fe301..ebe3724d89 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -12,18 +12,8 @@ bool allocate_domheap_memory(struct domain *d, paddr_t tot_size, bool allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, paddr_t tot_size); void allocate_memory(struct domain *d, struct kernel_info *kinfo); -int construct_domain(struct domain *d, struct kernel_info *kinfo); -int construct_hwdom(struct kernel_info *kinfo, - const struct dt_device_node *node); int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); -int make_chosen_node(const struct kernel_info *kinfo); -int make_cpus_node(const struct domain *d, void *fdt); -int make_hypervisor_node(struct domain *d, const struct kernel_info *kinfo, - int addrcells, int sizecells); -int make_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells, const struct membanks *mem); int make_psci_node(void *fdt); -int make_timer_node(const struct kernel_info *kinfo); void evtchn_allocate(struct domain *d); unsigned int get_allocation_size(paddr_t size); diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 34c8233853..aea8f44413 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 14ae48fb1e..1f8441d920 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include +#include #include #include #include diff --git a/xen/include/xen/fdt-domain-build.h b/xen/include/xen/fdt-domain-build.h new file mode 100644 index 0000000000..30d5358a0f --- /dev/null +++ b/xen/include/xen/fdt-domain-build.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __XEN_FDT_DOMAIN_BUILD_H__ +#define __XEN_FDT_DOMAIN_BUILD_H__ + +#include +#include +#include +#include + +struct domain; +struct page_info; +struct membanks; + +int construct_domain(struct domain *d, struct kernel_info *kinfo); +int construct_hwdom(struct kernel_info *kinfo, + const struct dt_device_node *node); +int make_chosen_node(const struct kernel_info *kinfo); +int make_cpus_node(const struct domain *d, void *fdt); +int make_hypervisor_node(struct domain *d, const struct kernel_info *kinfo, + int addrcells, int sizecells); +int make_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells, const struct membanks *mem); +int make_timer_node(const struct kernel_info *kinfo); + +#endif /* __XEN_FDT_DOMAIN_BUILD_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:22:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976619.1363751 (Exim 4.92) (envelope-from ) id 1uC65F-00085F-Lu; Tue, 06 May 2025 00:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976619.1363751; Tue, 06 May 2025 00:22: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 1uC65F-000855-In; Tue, 06 May 2025 00:22:53 +0000 Received: by outflank-mailman (input) for mailman id 976619; Tue, 06 May 2025 00:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC65E-00084q-EF for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC65E-00AiuA-1K for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC65E-002i9v-1C for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:22: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=w+JKLGgm7t0rEw35izry3JO8D+VkxjzjGgksVZpkJys=; b=2Tc1dUfqV4MOswloQoDqWcN3iK nzK4WNGtx0vR39UcLIkzycDItZLO739kYLA+E1h53YEcwNuQDvbZAOSo85r56E/JxKCv/HCxfWroa V6axkjY4h+DTphmoYwgZgkzmZpbzGZKzL0U28Vb5AP3J3F/7nnEbnMfJArThd2hh9ZYg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/common: dom0less: introduce common kernel.c Message-Id: Date: Tue, 06 May 2025 00:22:52 +0000 commit a7ee73f581575d29098140a0ae32da1755262de1 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:36 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/common: dom0less: introduce common kernel.c The following functions don't have arch specific things so it is moved to common: - kernel_prboe() - kernel_load() - output_length() Functions necessary for dom0less are only moved. The following changes are done: - Swap __init and return type of kernel_decompress() function to be consistent with defintions of functions in other files. The same for output_length(). - Wrap by "ifdef CONFIG_ARM" the call of kernel_uimage_probe() in kernel_probe() as uImage isn't really used nowadays thereby leave kernel_uimage_probe() call here just for compatability with Arm code. - Introduce kernel_zimage_probe() to cover the case that arch can have different zimage header. - Add ASSERT() for kernel_load() to check that it argument isn't NULL. - Make kernel_uimage_probe() non-static in Arm's code as it is used in common/kernel.c. Introduce CONFIG_DOMAIN_BUILD_HELPERS to not provide stubs for archs which don't provide enough functionality to enable it. Select CONFIG_DOMAIN_BUILD_HELPERS for CONFIG_ARM as only Arm supports it, at the moment. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/kernel.c | 221 +----------------------------------- xen/common/Kconfig | 5 +- xen/common/device-tree/Makefile | 1 + xen/common/device-tree/kernel.c | 242 ++++++++++++++++++++++++++++++++++++++++ xen/include/xen/fdt-kernel.h | 13 +++ 6 files changed, 267 insertions(+), 216 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index d0e0a7753c..3321d89068 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -11,6 +11,7 @@ config ARM_64 config ARM def_bool y + select DOMAIN_BUILD_HELPERS select FUNCTION_ALIGNMENT_4B select GENERIC_UART_INIT select HAS_ALTERNATIVE if HAS_VMAP diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index aea8f44413..cb1efb19e7 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -162,105 +162,6 @@ static void __init kernel_zimage_load(struct kernel_info *info) iounmap(kernel); } -static __init uint32_t output_length(char *image, unsigned long image_len) -{ - return *(uint32_t *)&image[image_len - 4]; -} - -static __init int kernel_decompress(struct bootmodule *mod, uint32_t offset) -{ - char *output, *input; - char magic[2]; - int rc; - unsigned int kernel_order_out; - paddr_t output_size; - struct page_info *pages; - mfn_t mfn; - int i; - paddr_t addr = mod->start; - paddr_t size = mod->size; - - if ( size < offset ) - return -EINVAL; - - /* - * It might be that gzip header does not appear at the start address - * (e.g. in case of compressed uImage) so take into account offset to - * gzip header. - */ - addr += offset; - size -= offset; - - if ( size < 2 ) - return -EINVAL; - - copy_from_paddr(magic, addr, sizeof(magic)); - - /* only gzip is supported */ - if ( !gzip_check(magic, size) ) - return -EINVAL; - - input = ioremap_cache(addr, size); - if ( input == NULL ) - return -EFAULT; - - output_size = output_length(input, size); - kernel_order_out = get_order_from_bytes(output_size); - pages = alloc_domheap_pages(NULL, kernel_order_out, 0); - if ( pages == NULL ) - { - iounmap(input); - return -ENOMEM; - } - mfn = page_to_mfn(pages); - output = vmap_contig(mfn, 1 << kernel_order_out); - - rc = perform_gunzip(output, input, size); - clean_dcache_va_range(output, output_size); - iounmap(input); - vunmap(output); - - if ( rc ) - { - free_domheap_pages(pages, kernel_order_out); - return rc; - } - - mod->start = page_to_maddr(pages); - mod->size = output_size; - - /* - * Need to free pages after output_size here because they won't be - * freed by discard_initial_modules - */ - i = PFN_UP(output_size); - for ( ; i < (1 << kernel_order_out); i++ ) - free_domheap_page(pages + i); - - /* - * When using static heap feature, don't give bootmodules memory back to - * the heap allocator - */ - if ( using_static_heap ) - return 0; - - /* - * When freeing the kernel, we need to pass the module start address and - * size as they were before taking an offset to gzip header into account, - * so that the entire region will be freed. - */ - addr -= offset; - size += offset; - - /* - * Free the original kernel, update the pointers to the - * decompressed kernel - */ - fw_unreserved_regions(addr, addr + size, init_domheap_pages, 0); - - return 0; -} - /* * Uimage CPU Architecture Codes */ @@ -273,8 +174,8 @@ static __init int kernel_decompress(struct bootmodule *mod, uint32_t offset) /* * Check if the image is a uImage and setup kernel_info */ -static int __init kernel_uimage_probe(struct kernel_info *info, - struct bootmodule *mod) +int __init kernel_uimage_probe(struct kernel_info *info, + struct bootmodule *mod) { struct { __be32 magic; /* Image Header Magic Number */ @@ -504,130 +405,20 @@ static int __init kernel_zimage32_probe(struct kernel_info *info, return 0; } -int __init kernel_probe(struct kernel_info *info, - const struct dt_device_node *domain) +int __init kernel_zimage_probe(struct kernel_info *info, paddr_t addr, + paddr_t size) { - struct bootmodule *mod = NULL; - struct bootcmdline *cmd = NULL; - struct dt_device_node *node; - u64 kernel_addr, initrd_addr, dtb_addr, size; int rc; - /* - * We need to initialize start to 0. This field may be populated during - * kernel_xxx_probe() if the image has a fixed entry point (for e.g. - * uimage.ep). - * We will use this to determine if the image has a fixed entry point or - * the load address should be used as the start address. - */ - info->entry = 0; - - /* domain is NULL only for the hardware domain */ - if ( domain == NULL ) - { - ASSERT(is_hardware_domain(info->d)); - - mod = boot_module_find_by_kind(BOOTMOD_KERNEL); - - info->kernel_bootmodule = mod; - info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); - - cmd = boot_cmdline_find_by_kind(BOOTMOD_KERNEL); - if ( cmd ) - info->cmdline = &cmd->cmdline[0]; - } - else - { - const char *name = NULL; - - dt_for_each_child_node(domain, node) - { - if ( dt_device_is_compatible(node, "multiboot,kernel") ) - { - u32 len; - const __be32 *val; - - val = dt_get_property(node, "reg", &len); - dt_get_range(&val, node, &kernel_addr, &size); - mod = boot_module_find_by_addr_and_kind( - BOOTMOD_KERNEL, kernel_addr); - info->kernel_bootmodule = mod; - } - else if ( dt_device_is_compatible(node, "multiboot,ramdisk") ) - { - u32 len; - const __be32 *val; - - val = dt_get_property(node, "reg", &len); - dt_get_range(&val, node, &initrd_addr, &size); - info->initrd_bootmodule = boot_module_find_by_addr_and_kind( - BOOTMOD_RAMDISK, initrd_addr); - } - else if ( dt_device_is_compatible(node, "multiboot,device-tree") ) - { - uint32_t len; - const __be32 *val; - - val = dt_get_property(node, "reg", &len); - if ( val == NULL ) - continue; - dt_get_range(&val, node, &dtb_addr, &size); - info->dtb_bootmodule = boot_module_find_by_addr_and_kind( - BOOTMOD_GUEST_DTB, dtb_addr); - } - else - continue; - } - name = dt_node_name(domain); - cmd = boot_cmdline_find_by_name(name); - if ( cmd ) - info->cmdline = &cmd->cmdline[0]; - } - if ( !mod || !mod->size ) - { - printk(XENLOG_ERR "Missing kernel boot module?\n"); - return -ENOENT; - } - - printk("Loading %pd kernel from boot module @ %"PRIpaddr"\n", - info->d, info->kernel_bootmodule->start); - if ( info->initrd_bootmodule ) - printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", - info->initrd_bootmodule->start); - - /* - * uImage header always appears at the top of the image (even compressed), - * so it needs to be probed first. Note that in case of compressed uImage, - * kernel_decompress is called from kernel_uimage_probe making the function - * self-containing (i.e. fall through only in case of a header not found). - */ - rc = kernel_uimage_probe(info, mod); - if ( rc != -ENOENT ) - return rc; - - /* - * If it is a gzip'ed image, 32bit or 64bit, uncompress it. - * At this point, gzip header appears (if at all) at the top of the image, - * so pass 0 as an offset. - */ - rc = kernel_decompress(mod, 0); - if ( rc && rc != -EINVAL ) - return rc; - #ifdef CONFIG_ARM_64 - rc = kernel_zimage64_probe(info, mod->start, mod->size); + rc = kernel_zimage64_probe(info, addr, size); if (rc < 0) #endif - rc = kernel_zimage32_probe(info, mod->start, mod->size); + rc = kernel_zimage32_probe(info, addr, size); return rc; } -void __init kernel_load(struct kernel_info *info) -{ - info->load(info); -} - /* * Local variables: * mode: C diff --git a/xen/common/Kconfig b/xen/common/Kconfig index f291a5c1c7..4bec78c6f2 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -14,13 +14,16 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE + depends on HAS_DOM0LESS && HAS_DEVICE_TREE && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests during Xen boot without the need of a control domain (Dom0), which could be present anyway. +config DOMAIN_BUILD_HELPERS + bool + config GRANT_TABLE bool "Grant table support" if EXPERT default y diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index f3dafc9b81..e88a4d5799 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -4,3 +4,4 @@ obj-y += device-tree.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o +obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o diff --git a/xen/common/device-tree/kernel.c b/xen/common/device-tree/kernel.c new file mode 100644 index 0000000000..1bf3bbf64e --- /dev/null +++ b/xen/common/device-tree/kernel.c @@ -0,0 +1,242 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +static uint32_t __init output_length(char *image, unsigned long image_len) +{ + return *(uint32_t *)&image[image_len - 4]; +} + +int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) +{ + char *output, *input; + char magic[2]; + int rc; + unsigned int kernel_order_out; + paddr_t output_size; + struct page_info *pages; + mfn_t mfn; + int i; + paddr_t addr = mod->start; + paddr_t size = mod->size; + + if ( size < offset ) + return -EINVAL; + + /* + * It might be that gzip header does not appear at the start address + * (e.g. in case of compressed uImage) so take into account offset to + * gzip header. + */ + addr += offset; + size -= offset; + + if ( size < 2 ) + return -EINVAL; + + copy_from_paddr(magic, addr, sizeof(magic)); + + /* only gzip is supported */ + if ( !gzip_check(magic, size) ) + return -EINVAL; + + input = ioremap_cache(addr, size); + if ( input == NULL ) + return -EFAULT; + + output_size = output_length(input, size); + kernel_order_out = get_order_from_bytes(output_size); + pages = alloc_domheap_pages(NULL, kernel_order_out, 0); + if ( pages == NULL ) + { + iounmap(input); + return -ENOMEM; + } + mfn = page_to_mfn(pages); + output = vmap_contig(mfn, 1 << kernel_order_out); + + rc = perform_gunzip(output, input, size); + clean_dcache_va_range(output, output_size); + iounmap(input); + vunmap(output); + + if ( rc ) + { + free_domheap_pages(pages, kernel_order_out); + return rc; + } + + mod->start = page_to_maddr(pages); + mod->size = output_size; + + /* + * Need to free pages after output_size here because they won't be + * freed by discard_initial_modules + */ + i = PFN_UP(output_size); + for ( ; i < (1 << kernel_order_out); i++ ) + free_domheap_page(pages + i); + + /* + * When using static heap feature, don't give bootmodules memory back to + * the heap allocator + */ + if ( using_static_heap ) + return 0; + + /* + * When freeing the kernel, we need to pass the module start address and + * size as they were before taking an offset to gzip header into account, + * so that the entire region will be freed. + */ + addr -= offset; + size += offset; + + /* + * Free the original kernel, update the pointers to the + * decompressed kernel + */ + fw_unreserved_regions(addr, addr + size, init_domheap_pages, 0); + + return 0; +} + +int __init kernel_probe(struct kernel_info *info, + const struct dt_device_node *domain) +{ + struct bootmodule *mod = NULL; + struct bootcmdline *cmd = NULL; + struct dt_device_node *node; + u64 kernel_addr, initrd_addr, dtb_addr, size; + int rc; + + /* + * We need to initialize start to 0. This field may be populated during + * kernel_xxx_probe() if the image has a fixed entry point (for e.g. + * uimage.ep). + * We will use this to determine if the image has a fixed entry point or + * the load address should be used as the start address. + */ + info->entry = 0; + + /* domain is NULL only for the hardware domain */ + if ( domain == NULL ) + { + ASSERT(is_hardware_domain(info->d)); + + mod = boot_module_find_by_kind(BOOTMOD_KERNEL); + + info->kernel_bootmodule = mod; + info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); + + cmd = boot_cmdline_find_by_kind(BOOTMOD_KERNEL); + if ( cmd ) + info->cmdline = &cmd->cmdline[0]; + } + else + { + const char *name = NULL; + + dt_for_each_child_node(domain, node) + { + if ( dt_device_is_compatible(node, "multiboot,kernel") ) + { + u32 len; + const __be32 *val; + + val = dt_get_property(node, "reg", &len); + dt_get_range(&val, node, &kernel_addr, &size); + mod = boot_module_find_by_addr_and_kind( + BOOTMOD_KERNEL, kernel_addr); + info->kernel_bootmodule = mod; + } + else if ( dt_device_is_compatible(node, "multiboot,ramdisk") ) + { + u32 len; + const __be32 *val; + + val = dt_get_property(node, "reg", &len); + dt_get_range(&val, node, &initrd_addr, &size); + info->initrd_bootmodule = boot_module_find_by_addr_and_kind( + BOOTMOD_RAMDISK, initrd_addr); + } + else if ( dt_device_is_compatible(node, "multiboot,device-tree") ) + { + uint32_t len; + const __be32 *val; + + val = dt_get_property(node, "reg", &len); + if ( val == NULL ) + continue; + dt_get_range(&val, node, &dtb_addr, &size); + info->dtb_bootmodule = boot_module_find_by_addr_and_kind( + BOOTMOD_GUEST_DTB, dtb_addr); + } + else + continue; + } + name = dt_node_name(domain); + cmd = boot_cmdline_find_by_name(name); + if ( cmd ) + info->cmdline = &cmd->cmdline[0]; + } + if ( !mod || !mod->size ) + { + printk(XENLOG_ERR "Missing kernel boot module?\n"); + return -ENOENT; + } + + printk("Loading %pd kernel from boot module @ %"PRIpaddr"\n", + info->d, info->kernel_bootmodule->start); + if ( info->initrd_bootmodule ) + printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", + info->initrd_bootmodule->start); + + /* + * uImage isn't really used nowadays thereby leave kernel_uimage_probe() + * call here just for compatability with Arm code. + */ +#ifdef CONFIG_ARM + /* + * uImage header always appears at the top of the image (even compressed), + * so it needs to be probed first. Note that in case of compressed uImage, + * kernel_decompress is called from kernel_uimage_probe making the function + * self-containing (i.e. fall through only in case of a header not found). + */ + rc = kernel_uimage_probe(info, mod); + if ( rc != -ENOENT ) + return rc; +#endif + + /* + * If it is a gzip'ed image, 32bit or 64bit, uncompress it. + * At this point, gzip header appears (if at all) at the top of the image, + * so pass 0 as an offset. + */ + rc = kernel_decompress(mod, 0); + if ( rc && rc != -EINVAL ) + return rc; + + rc = kernel_zimage_probe(info, mod->start, mod->size); + + return rc; +} + +void __init kernel_load(struct kernel_info *info) +{ + ASSERT(info && info->load); + + info->load(info); +} diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 516cc68e90..7a6cd67c22 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -120,6 +120,19 @@ int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); */ void kernel_load(struct kernel_info *info); +int kernel_decompress(struct bootmodule *mod, uint32_t offset); + +int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t size); + +/* + * uImage isn't really used nowadays thereby leave kernel_uimage_probe() + * call here just for compatability with Arm code. + */ +#ifdef CONFIG_ARM +struct bootmodule; +int kernel_uimage_probe(struct kernel_info *info, struct bootmodule *mod); +#endif + #endif /* __XEN_FDT_KERNEL_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:23:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976620.1363754 (Exim 4.92) (envelope-from ) id 1uC65P-00087T-Mu; Tue, 06 May 2025 00:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976620.1363754; Tue, 06 May 2025 00:23: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 1uC65P-00087M-KM; Tue, 06 May 2025 00:23:03 +0000 Received: by outflank-mailman (input) for mailman id 976620; Tue, 06 May 2025 00:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC65O-00087C-HB for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC65O-00AiuS-1c for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC65O-002iBL-1W for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23: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=lbQjUmjEunlwXvWiUWIno+PsHBbnmIM1oaPn+CZZ1E8=; b=oevP9F6FHpqfse/KpCOSE/VRFf u76jr+PbkGkgbW6jDg6iHVeaQd2PS84Ra9DFfs1X5VqVlE5axXzBYDzLT7o+p5010+L734ca2k7uv ekQmicjF8aac/Ph14877DgMn69M/9+Xpr266FyN8TH3iFPE4hGSd1LbfMlPmxWbXQ8LU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/common: dom0less: introduce common domain-build.c Message-Id: Date: Tue, 06 May 2025 00:23:02 +0000 commit d07b7369aa65b0ac78bb6264a832cbb3c9716855 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:37 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/common: dom0less: introduce common domain-build.c Some functions of Arm's domain_build.c could be reused by dom0less or other features connected to domain construction/build. The following functions are moved to common: - get_allocation_size(). - allocate_domheap_memory(). - guest_map_pages(). - allocate_bank_memory(). - add_hwdom_free_regions(). - find_unallocated_memory(). - allocate_memory(). - dtb_load(). - initrd_load(). Prototype of dtb_load() and initrd_load() is updated to recieve a pointer to copy_to_guest_phys() as some archs require copy_to_guest_phys_fluch_dcache(). Update arm/include/asm/Makefile to generate domain-build.h for Arm as it is used by domain-build.c. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 397 +------------------------------- xen/arch/arm/include/asm/domain_build.h | 9 - xen/common/device-tree/Makefile | 1 + xen/common/device-tree/domain-build.c | 395 +++++++++++++++++++++++++++++++ xen/include/xen/fdt-domain-build.h | 40 ++++ 5 files changed, 438 insertions(+), 404 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9d649b06b3..df29619c40 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -120,18 +120,6 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) return vcpu_create(dom0, 0); } -unsigned int __init get_allocation_size(paddr_t size) -{ - /* - * get_order_from_bytes returns the order greater than or equal to - * the given size, but we need less than or equal. Adding one to - * the size pushes an evenly aligned size into the next order, so - * we can then unconditionally subtract 1 from the order which is - * returned. - */ - return get_order_from_bytes(size + 1) - 1; -} - /* * Insert the given pages into a memory bank, banks are ordered by address. * @@ -418,98 +406,6 @@ static void __init allocate_memory_11(struct domain *d, } } -bool __init allocate_domheap_memory(struct domain *d, paddr_t tot_size, - alloc_domheap_mem_cb cb, void *extra) -{ - unsigned int max_order = UINT_MAX; - - while ( tot_size > 0 ) - { - unsigned int order = get_allocation_size(tot_size); - struct page_info *pg; - - order = min(max_order, order); - - pg = alloc_domheap_pages(d, order, 0); - if ( !pg ) - { - /* - * If we can't allocate one page, then it is unlikely to - * succeed in the next iteration. So bail out. - */ - if ( !order ) - return false; - - /* - * If we can't allocate memory with order, then it is - * unlikely to succeed in the next iteration. - * Record the order - 1 to avoid re-trying. - */ - max_order = order - 1; - continue; - } - - if ( !cb(d, pg, order, extra) ) - return false; - - tot_size -= (1ULL << (PAGE_SHIFT + order)); - } - - return true; -} - -static bool __init guest_map_pages(struct domain *d, struct page_info *pg, - unsigned int order, void *extra) -{ - gfn_t *sgfn = (gfn_t *)extra; - int res; - - BUG_ON(!sgfn); - res = guest_physmap_add_page(d, *sgfn, page_to_mfn(pg), order); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed map pages to DOMU: %d", res); - return false; - } - - *sgfn = gfn_add(*sgfn, 1UL << order); - - return true; -} - -bool __init allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, - paddr_t tot_size) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - struct domain *d = kinfo->d; - struct membank *bank; - - /* - * allocate_bank_memory can be called with a tot_size of zero for - * the second memory bank. It is not an error and we can safely - * avoid creating a zero-size memory bank. - */ - if ( tot_size == 0 ) - return true; - - bank = &mem->bank[mem->nr_banks]; - bank->start = gfn_to_gaddr(sgfn); - bank->size = tot_size; - - /* - * Allocate pages from the heap until tot_size is zero and map them to the - * guest using guest_map_pages, passing the starting gfn as extra parameter - * for the map operation. - */ - if ( !allocate_domheap_memory(d, tot_size, guest_map_pages, &sgfn) ) - return false; - - mem->nr_banks++; - kinfo->unassigned_mem -= bank->size; - - return true; -} - /* * When PCI passthrough is available we want to keep the * "linux,pci-domain" in sync for every host bridge. @@ -900,226 +796,6 @@ int __init add_ext_regions(unsigned long s_gfn, unsigned long e_gfn, return 0; } -static int __init add_hwdom_free_regions(unsigned long s_gfn, - unsigned long e_gfn, void *data) -{ - struct membanks *free_regions = data; - paddr_t start, size; - paddr_t s = pfn_to_paddr(s_gfn); - paddr_t e = pfn_to_paddr(e_gfn); - unsigned int i, j; - - if ( free_regions->nr_banks >= free_regions->max_banks ) - return 0; - - /* - * Both start and size of the free region should be 2MB aligned to - * potentially allow superpage mapping. - */ - start = (s + SZ_2M - 1) & ~(SZ_2M - 1); - if ( start > e ) - return 0; - - /* - * e is actually "end-1" because it is called by rangeset functions - * which are inclusive of the last address. - */ - e += 1; - size = (e - start) & ~(SZ_2M - 1); - - /* Find the insert position (descending order). */ - for ( i = 0; i < free_regions->nr_banks ; i++ ) - if ( size > free_regions->bank[i].size ) - break; - - /* Move the other banks to make space. */ - for ( j = free_regions->nr_banks; j > i ; j-- ) - { - free_regions->bank[j].start = free_regions->bank[j - 1].start; - free_regions->bank[j].size = free_regions->bank[j - 1].size; - } - - free_regions->bank[i].start = start; - free_regions->bank[i].size = size; - free_regions->nr_banks++; - - return 0; -} - -/* - * Find unused regions of Host address space which can be exposed to domain - * using the host memory layout. In order to calculate regions we exclude every - * region passed in mem_banks from the Host RAM. - */ -static int __init find_unallocated_memory(const struct kernel_info *kinfo, - const struct membanks *mem_banks[], - unsigned int nr_mem_banks, - struct membanks *free_regions, - int (*cb)(unsigned long s_gfn, - unsigned long e_gfn, - void *data)) -{ - const struct membanks *mem = bootinfo_get_mem(); - struct rangeset *unalloc_mem; - paddr_t start, end; - unsigned int i, j; - int res; - - ASSERT(domain_use_host_layout(kinfo->d)); - - unalloc_mem = rangeset_new(NULL, NULL, 0); - if ( !unalloc_mem ) - return -ENOMEM; - - /* Start with all available RAM */ - for ( i = 0; i < mem->nr_banks; i++ ) - { - start = mem->bank[i].start; - end = mem->bank[i].start + mem->bank[i].size; - res = rangeset_add_range(unalloc_mem, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", - start, end); - goto out; - } - } - - /* Remove all regions listed in mem_banks */ - for ( i = 0; i < nr_mem_banks; i++ ) - for ( j = 0; j < mem_banks[i]->nr_banks; j++ ) - { - start = mem_banks[i]->bank[j].start; - - /* Shared memory banks can contain INVALID_PADDR as start */ - if ( INVALID_PADDR == start ) - continue; - - end = mem_banks[i]->bank[j].start + mem_banks[i]->bank[j].size; - res = rangeset_remove_range(unalloc_mem, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR - "Failed to add: %#"PRIpaddr"->%#"PRIpaddr", error %d\n", - start, end, res); - goto out; - } - } - - start = 0; - end = (1ULL << p2m_ipa_bits) - 1; - res = rangeset_report_ranges(unalloc_mem, PFN_DOWN(start), PFN_DOWN(end), - cb, free_regions); - if ( res ) - free_regions->nr_banks = 0; - else if ( !free_regions->nr_banks ) - res = -ENOENT; - -out: - rangeset_destroy(unalloc_mem); - - return res; -} - -void __init allocate_memory(struct domain *d, struct kernel_info *kinfo) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - unsigned int i, nr_banks = GUEST_RAM_BANKS; - struct membanks *hwdom_free_mem = NULL; - - printk(XENLOG_INFO "Allocating mappings totalling %ldMB for %pd:\n", - /* Don't want format this as PRIpaddr (16 digit hex) */ - (unsigned long)(kinfo->unassigned_mem >> 20), d); - - mem->nr_banks = 0; - /* - * Use host memory layout for hwdom. Only case for this is when LLC coloring - * is enabled. - */ - if ( is_hardware_domain(d) ) - { - struct membanks *gnttab = membanks_xzalloc(1, MEMORY); - /* - * Exclude the following regions: - * 1) Remove reserved memory - * 2) Grant table assigned to hwdom - */ - const struct membanks *mem_banks[] = { - bootinfo_get_reserved_mem(), - gnttab, - }; - - if ( !gnttab ) - goto fail; - - gnttab->nr_banks = 1; - gnttab->bank[0].start = kinfo->gnttab_start; - gnttab->bank[0].size = kinfo->gnttab_size; - - hwdom_free_mem = membanks_xzalloc(NR_MEM_BANKS, MEMORY); - if ( !hwdom_free_mem ) - goto fail; - - if ( find_unallocated_memory(kinfo, mem_banks, ARRAY_SIZE(mem_banks), - hwdom_free_mem, add_hwdom_free_regions) ) - goto fail; - - nr_banks = hwdom_free_mem->nr_banks; - xfree(gnttab); - } - - for ( i = 0; kinfo->unassigned_mem > 0 && nr_banks > 0; i++, nr_banks-- ) - { - paddr_t bank_start, bank_size; - - if ( is_hardware_domain(d) ) - { - bank_start = hwdom_free_mem->bank[i].start; - bank_size = hwdom_free_mem->bank[i].size; - } - else - { - const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; - const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; - - if ( i >= GUEST_RAM_BANKS ) - goto fail; - - bank_start = bankbase[i]; - bank_size = banksize[i]; - } - - bank_size = MIN(bank_size, kinfo->unassigned_mem); - if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(bank_start), bank_size) ) - goto fail; - } - - if ( kinfo->unassigned_mem ) - goto fail; - - for( i = 0; i < mem->nr_banks; i++ ) - { - printk(XENLOG_INFO "%pd BANK[%d] %#"PRIpaddr"-%#"PRIpaddr" (%ldMB)\n", - d, - i, - mem->bank[i].start, - mem->bank[i].start + mem->bank[i].size, - /* Don't want format this as PRIpaddr (16 digit hex) */ - (unsigned long)(mem->bank[i].size >> 20)); - } - - xfree(hwdom_free_mem); - return; - - fail: - panic("Failed to allocate requested domain memory." - /* Don't want format this as PRIpaddr (16 digit hex) */ - " %ldKB unallocated. Fix the VMs configurations.\n", - (unsigned long)kinfo->unassigned_mem >> 10); -} - static int __init handle_pci_range(const struct dt_device_node *dev, uint64_t addr, uint64_t len, void *data) { @@ -2059,75 +1735,6 @@ static int __init prepare_dtb_hwdom(struct domain *d, struct kernel_info *kinfo) return -EINVAL; } -static void __init dtb_load(struct kernel_info *kinfo) -{ - unsigned long left; - - printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - kinfo->d, kinfo->dtb_paddr, - kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); - - left = copy_to_guest_phys_flush_dcache(kinfo->d, kinfo->dtb_paddr, - kinfo->fdt, - fdt_totalsize(kinfo->fdt)); - - if ( left != 0 ) - panic("Unable to copy the DTB to %pd memory (left = %lu bytes)\n", - kinfo->d, left); - xfree(kinfo->fdt); -} - -static void __init initrd_load(struct kernel_info *kinfo) -{ - const struct bootmodule *mod = kinfo->initrd_bootmodule; - paddr_t load_addr = kinfo->initrd_paddr; - paddr_t paddr, len; - int node; - int res; - __be32 val[2]; - __be32 *cellp; - void __iomem *initrd; - - if ( !mod || !mod->size ) - return; - - paddr = mod->start; - len = mod->size; - - printk("Loading %pd initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - kinfo->d, paddr, load_addr, load_addr + len); - - /* Fix up linux,initrd-start and linux,initrd-end in /chosen */ - node = fdt_path_offset(kinfo->fdt, "/chosen"); - if ( node < 0 ) - panic("Cannot find the /chosen node\n"); - - cellp = (__be32 *)val; - dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr); - res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-start", - val, sizeof(val)); - if ( res ) - panic("Cannot fix up \"linux,initrd-start\" property\n"); - - cellp = (__be32 *)val; - dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr + len); - res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-end", - val, sizeof(val)); - if ( res ) - panic("Cannot fix up \"linux,initrd-end\" property\n"); - - initrd = ioremap_wc(paddr, len); - if ( !initrd ) - panic("Unable to map the %pd initrd\n", kinfo->d); - - res = copy_to_guest_phys_flush_dcache(kinfo->d, load_addr, - initrd, len); - if ( res != 0 ) - panic("Unable to copy the initrd in the %pd memory\n", kinfo->d); - - iounmap(initrd); -} - /* * Allocate the event channel PPIs and setup the HVM_PARAM_CALLBACK_IRQ. * The allocated IRQ will be found in d->arch.evtchn_irq. @@ -2220,8 +1827,8 @@ int __init construct_domain(struct domain *d, struct kernel_info *kinfo) */ kernel_load(kinfo); /* initrd_load will fix up the fdt, so call it before dtb_load */ - initrd_load(kinfo); - dtb_load(kinfo); + initrd_load(kinfo, copy_to_guest_phys_flush_dcache); + dtb_load(kinfo, copy_to_guest_phys_flush_dcache); memset(regs, 0, sizeof(*regs)); diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index ebe3724d89..9655e9d453 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -5,19 +5,10 @@ #include typedef __be32 gic_interrupt_t[3]; -typedef bool (*alloc_domheap_mem_cb)(struct domain *d, struct page_info *pg, - unsigned int order, void *extra); -bool allocate_domheap_memory(struct domain *d, paddr_t tot_size, - alloc_domheap_mem_cb cb, void *extra); -bool allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, - paddr_t tot_size); -void allocate_memory(struct domain *d, struct kernel_info *kinfo); int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); int make_psci_node(void *fdt); void evtchn_allocate(struct domain *d); -unsigned int get_allocation_size(paddr_t size); - /* * Helper to write an interrupts with the GIC format * This code is assuming the irq is an PPI. diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index e88a4d5799..831b91399b 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -1,6 +1,7 @@ obj-y += bootfdt.init.o obj-y += bootinfo.init.o obj-y += device-tree.o +obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c new file mode 100644 index 0000000000..762b63e2b0 --- /dev/null +++ b/xen/common/device-tree/domain-build.c @@ -0,0 +1,395 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +bool __init allocate_domheap_memory(struct domain *d, paddr_t tot_size, + alloc_domheap_mem_cb cb, void *extra) +{ + unsigned int max_order = UINT_MAX; + + while ( tot_size > 0 ) + { + unsigned int order = get_allocation_size(tot_size); + struct page_info *pg; + + order = min(max_order, order); + + pg = alloc_domheap_pages(d, order, 0); + if ( !pg ) + { + /* + * If we can't allocate one page, then it is unlikely to + * succeed in the next iteration. So bail out. + */ + if ( !order ) + return false; + + /* + * If we can't allocate memory with order, then it is + * unlikely to succeed in the next iteration. + * Record the order - 1 to avoid re-trying. + */ + max_order = order - 1; + continue; + } + + if ( !cb(d, pg, order, extra) ) + return false; + + tot_size -= (1ULL << (PAGE_SHIFT + order)); + } + + return true; +} + +static bool __init guest_map_pages(struct domain *d, struct page_info *pg, + unsigned int order, void *extra) +{ + gfn_t *sgfn = (gfn_t *)extra; + int res; + + BUG_ON(!sgfn); + res = guest_physmap_add_page(d, *sgfn, page_to_mfn(pg), order); + if ( res ) + { + dprintk(XENLOG_ERR, "Failed map pages to DOMU: %d", res); + return false; + } + + *sgfn = gfn_add(*sgfn, 1UL << order); + + return true; +} + +bool __init allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, + paddr_t tot_size) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + struct domain *d = kinfo->d; + struct membank *bank; + + /* + * allocate_bank_memory can be called with a tot_size of zero for + * the second memory bank. It is not an error and we can safely + * avoid creating a zero-size memory bank. + */ + if ( tot_size == 0 ) + return true; + + bank = &mem->bank[mem->nr_banks]; + bank->start = gfn_to_gaddr(sgfn); + bank->size = tot_size; + + /* + * Allocate pages from the heap until tot_size is zero and map them to the + * guest using guest_map_pages, passing the starting gfn as extra parameter + * for the map operation. + */ + if ( !allocate_domheap_memory(d, tot_size, guest_map_pages, &sgfn) ) + return false; + + mem->nr_banks++; + kinfo->unassigned_mem -= bank->size; + + return true; +} + +static int __init add_hwdom_free_regions(unsigned long s_gfn, + unsigned long e_gfn, void *data) +{ + struct membanks *free_regions = data; + paddr_t start, size; + paddr_t s = pfn_to_paddr(s_gfn); + paddr_t e = pfn_to_paddr(e_gfn); + unsigned int i, j; + + if ( free_regions->nr_banks >= free_regions->max_banks ) + return 0; + + /* + * Both start and size of the free region should be 2MB aligned to + * potentially allow superpage mapping. + */ + start = (s + SZ_2M - 1) & ~(SZ_2M - 1); + if ( start > e ) + return 0; + + /* + * e is actually "end-1" because it is called by rangeset functions + * which are inclusive of the last address. + */ + e += 1; + size = (e - start) & ~(SZ_2M - 1); + + /* Find the insert position (descending order). */ + for ( i = 0; i < free_regions->nr_banks ; i++ ) + if ( size > free_regions->bank[i].size ) + break; + + /* Move the other banks to make space. */ + for ( j = free_regions->nr_banks; j > i ; j-- ) + { + free_regions->bank[j].start = free_regions->bank[j - 1].start; + free_regions->bank[j].size = free_regions->bank[j - 1].size; + } + + free_regions->bank[i].start = start; + free_regions->bank[i].size = size; + free_regions->nr_banks++; + + return 0; +} + +/* + * Find unused regions of Host address space which can be exposed to domain + * using the host memory layout. In order to calculate regions we exclude every + * region passed in mem_banks from the Host RAM. + */ +int __init find_unallocated_memory(const struct kernel_info *kinfo, + const struct membanks *mem_banks[], + unsigned int nr_mem_banks, + struct membanks *free_regions, + int (*cb)(unsigned long s_gfn, + unsigned long e_gfn, + void *data)) +{ + const struct membanks *mem = bootinfo_get_mem(); + struct rangeset *unalloc_mem; + paddr_t start, end; + unsigned int i, j; + int res; + + ASSERT(domain_use_host_layout(kinfo->d)); + + unalloc_mem = rangeset_new(NULL, NULL, 0); + if ( !unalloc_mem ) + return -ENOMEM; + + /* Start with all available RAM */ + for ( i = 0; i < mem->nr_banks; i++ ) + { + start = mem->bank[i].start; + end = mem->bank[i].start + mem->bank[i].size; + res = rangeset_add_range(unalloc_mem, PFN_DOWN(start), + PFN_DOWN(end - 1)); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", + start, end); + goto out; + } + } + + /* Remove all regions listed in mem_banks */ + for ( i = 0; i < nr_mem_banks; i++ ) + for ( j = 0; j < mem_banks[i]->nr_banks; j++ ) + { + start = mem_banks[i]->bank[j].start; + + /* Shared memory banks can contain INVALID_PADDR as start */ + if ( INVALID_PADDR == start ) + continue; + + end = mem_banks[i]->bank[j].start + mem_banks[i]->bank[j].size; + res = rangeset_remove_range(unalloc_mem, PFN_DOWN(start), + PFN_DOWN(end - 1)); + if ( res ) + { + printk(XENLOG_ERR + "Failed to add: %#"PRIpaddr"->%#"PRIpaddr", error %d\n", + start, end, res); + goto out; + } + } + + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_report_ranges(unalloc_mem, PFN_DOWN(start), PFN_DOWN(end), + cb, free_regions); + if ( res ) + free_regions->nr_banks = 0; + else if ( !free_regions->nr_banks ) + res = -ENOENT; + +out: + rangeset_destroy(unalloc_mem); + + return res; +} + +void __init allocate_memory(struct domain *d, struct kernel_info *kinfo) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + unsigned int i, nr_banks = GUEST_RAM_BANKS; + struct membanks *hwdom_free_mem = NULL; + + printk(XENLOG_INFO "Allocating mappings totalling %ldMB for %pd:\n", + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->unassigned_mem >> 20), d); + + mem->nr_banks = 0; + /* + * Use host memory layout for hwdom. Only case for this is when LLC coloring + * is enabled. + */ + if ( is_hardware_domain(d) ) + { + struct membanks *gnttab = membanks_xzalloc(1, MEMORY); + /* + * Exclude the following regions: + * 1) Remove reserved memory + * 2) Grant table assigned to hwdom + */ + const struct membanks *mem_banks[] = { + bootinfo_get_reserved_mem(), + gnttab, + }; + + if ( !gnttab ) + goto fail; + + gnttab->nr_banks = 1; + gnttab->bank[0].start = kinfo->gnttab_start; + gnttab->bank[0].size = kinfo->gnttab_size; + + hwdom_free_mem = membanks_xzalloc(NR_MEM_BANKS, MEMORY); + if ( !hwdom_free_mem ) + goto fail; + + if ( find_unallocated_memory(kinfo, mem_banks, ARRAY_SIZE(mem_banks), + hwdom_free_mem, add_hwdom_free_regions) ) + goto fail; + + nr_banks = hwdom_free_mem->nr_banks; + xfree(gnttab); + } + + for ( i = 0; kinfo->unassigned_mem > 0 && nr_banks > 0; i++, nr_banks-- ) + { + paddr_t bank_start, bank_size; + + if ( is_hardware_domain(d) ) + { + bank_start = hwdom_free_mem->bank[i].start; + bank_size = hwdom_free_mem->bank[i].size; + } + else + { + const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; + const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; + + if ( i >= GUEST_RAM_BANKS ) + goto fail; + + bank_start = bankbase[i]; + bank_size = banksize[i]; + } + + bank_size = MIN(bank_size, kinfo->unassigned_mem); + if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(bank_start), bank_size) ) + goto fail; + } + + if ( kinfo->unassigned_mem ) + goto fail; + + for( i = 0; i < mem->nr_banks; i++ ) + { + printk(XENLOG_INFO "%pd BANK[%d] %#"PRIpaddr"-%#"PRIpaddr" (%ldMB)\n", + d, + i, + mem->bank[i].start, + mem->bank[i].start + mem->bank[i].size, + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(mem->bank[i].size >> 20)); + } + + xfree(hwdom_free_mem); + return; + + fail: + panic("Failed to allocate requested domain memory." + /* Don't want format this as PRIpaddr (16 digit hex) */ + " %ldKB unallocated. Fix the VMs configurations.\n", + (unsigned long)kinfo->unassigned_mem >> 10); +} + +void __init dtb_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest) +{ + unsigned long left; + + printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + kinfo->d, kinfo->dtb_paddr, + kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); + + left = copy_to_guest(kinfo->d, kinfo->dtb_paddr, + kinfo->fdt, + fdt_totalsize(kinfo->fdt)); + + if ( left != 0 ) + panic("Unable to copy the DTB to %pd memory (left = %lu bytes)\n", + kinfo->d, left); + xfree(kinfo->fdt); +} + +void __init initrd_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest) +{ + const struct bootmodule *mod = kinfo->initrd_bootmodule; + paddr_t load_addr = kinfo->initrd_paddr; + paddr_t paddr, len; + int node; + int res; + __be32 val[2]; + __be32 *cellp; + void __iomem *initrd; + + if ( !mod || !mod->size ) + return; + + paddr = mod->start; + len = mod->size; + + printk("Loading %pd initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + kinfo->d, paddr, load_addr, load_addr + len); + + /* Fix up linux,initrd-start and linux,initrd-end in /chosen */ + node = fdt_path_offset(kinfo->fdt, "/chosen"); + if ( node < 0 ) + panic("Cannot find the /chosen node\n"); + + cellp = (__be32 *)val; + dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr); + res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-start", + val, sizeof(val)); + if ( res ) + panic("Cannot fix up \"linux,initrd-start\" property\n"); + + cellp = (__be32 *)val; + dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr + len); + res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-end", + val, sizeof(val)); + if ( res ) + panic("Cannot fix up \"linux,initrd-end\" property\n"); + + initrd = ioremap_wc(paddr, len); + if ( !initrd ) + panic("Unable to map the %pd initrd\n", kinfo->d); + + res = copy_to_guest(kinfo->d, load_addr, + initrd, len); + if ( res != 0 ) + panic("Unable to copy the initrd in the %pd memory\n", kinfo->d); + + iounmap(initrd); +} diff --git a/xen/include/xen/fdt-domain-build.h b/xen/include/xen/fdt-domain-build.h index 30d5358a0f..45981dbec0 100644 --- a/xen/include/xen/fdt-domain-build.h +++ b/xen/include/xen/fdt-domain-build.h @@ -6,12 +6,21 @@ #include #include #include +#include #include struct domain; struct page_info; struct membanks; +typedef bool (*alloc_domheap_mem_cb)(struct domain *d, struct page_info *pg, + unsigned int order, void *extra); +bool allocate_domheap_memory(struct domain *d, paddr_t tot_size, + alloc_domheap_mem_cb cb, void *extra); + +bool allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, + paddr_t tot_size); +void allocate_memory(struct domain *d, struct kernel_info *kinfo); int construct_domain(struct domain *d, struct kernel_info *kinfo); int construct_hwdom(struct kernel_info *kinfo, const struct dt_device_node *node); @@ -23,6 +32,37 @@ int make_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells, const struct membanks *mem); int make_timer_node(const struct kernel_info *kinfo); +static inline int get_allocation_size(paddr_t size) +{ + /* + * get_order_from_bytes returns the order greater than or equal to + * the given size, but we need less than or equal. Adding one to + * the size pushes an evenly aligned size into the next order, so + * we can then unconditionally subtract 1 from the order which is + * returned. + */ + return get_order_from_bytes(size + 1) - 1; +} + +typedef unsigned long (*copy_to_guest_phys_cb)(struct domain *d, + paddr_t gpa, + void *buf, + unsigned int len); + +void initrd_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest); + +void dtb_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest); + +int find_unallocated_memory(const struct kernel_info *kinfo, + const struct membanks *mem_banks[], + unsigned int nr_mem_banks, + struct membanks *free_regions, + int (*cb)(unsigned long s_gfn, + unsigned long e_gfn, + void *data)); + #endif /* __XEN_FDT_DOMAIN_BUILD_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:23:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976621.1363759 (Exim 4.92) (envelope-from ) id 1uC65Z-0008AT-Qv; Tue, 06 May 2025 00:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976621.1363759; Tue, 06 May 2025 00:23: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 1uC65Z-0008AM-Nw; Tue, 06 May 2025 00:23:13 +0000 Received: by outflank-mailman (input) for mailman id 976621; Tue, 06 May 2025 00:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC65Y-0008AB-Jz for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC65Y-00AiuW-1t for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC65Y-002iCV-1m for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23: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=oW0+XJTljnFwtjEQVj44QMlzn3T54nFYmuXe9P93Rx0=; b=ZxYbokgUoO15iJ+8TkOkv/Jjit tkDIpTuPKvQSMbPjT+XiEX9uLLVCEIQflSly1CBdq+piahzJsrB96sNUqx9K81O2BNqTFMRS9dTeb X0fhXcS4QgQhLwRgvNG2u6xDzFfbc/ULEtj1lRCe5wi4JGZ7XayVQyBQ2TAXK5yc+1Qg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/common: dom0less: introduce common dom0less-build.c Message-Id: Date: Tue, 06 May 2025 00:23:12 +0000 commit 43afe6f0302446636a23242cf24d38e305607382 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:38 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/common: dom0less: introduce common dom0less-build.c Part of Arm's dom0less-build.c could be common between architectures which are using device tree files to create guest domains. Thereby move some parts of Arm's dom0less-build.c to common code with minor changes. As a part of theses changes the following changes are introduced: - Introduce make_arch_nodes() to cover arch-specific nodes. For example, in case of Arm, it is PSCI and vpl011 nodes. - Introduce set_domain_type() to abstract a way how setting of domain type happens. For example, RISC-V won't have this member of arch_domain structure as vCPUs will always have the same bitness as hypervisor. In case of Arm, it is possible that Arm64 could create 32-bit and 64-bit domains. - Introduce init_vuart() to cover details of virtual uart initialization. - Introduce init_intc_phandle() to cover some details of interrupt controller phandle initialization. As an example, RISC-V could have different name for interrupt controller node ( APLIC, PLIC, IMSIC, etc ) but the code in domain_handle_dtb_bootmodule() could handle only one interrupt controller node name. - s/make_gic_domU_node/make_intc_domU_node as GIC is Arm specific naming and add prototype of make_intc_domU_node() to dom0less-build.h The following functions are moved to xen/common/device-tree: - Functions which are moved as is: - domain_p2m_pages(). - handle_passthrough_prop(). - handle_prop_pfdt(). - scan_pfdt_node(). - check_partial_fdt(). - Functions which are moved with some minor changes: - alloc_xenstore_evtchn(): - ifdef-ing by CONFIG_HVM accesses to hvm.params. - prepare_dtb_domU(): - ifdef-ing access to gnttab_{start,size} by CONFIG_GRANT_TABLE. - s/make_gic_domU_node/make_intc_domU_node. - Add call of make_arch_nodes(). - domain_handle_dtb_bootmodule(): - hide details of interrupt controller phandle initialization by calling init_intc_phandle(). - Update the comment above init_intc_phandle(): s/gic/interrupt controller. - construct_domU(): - ifdef-ing by CONFIG_HVM accesses to hvm.params. - Call init_vuart() to hide Arm's vpl011_init() details there. - Add call of set_domain_type() instead of setting kinfo->arch.type explicitly. Some parts of dom0less-build.c are wraped by #ifdef CONFIG_STATIC_{SHMEM,MEMORY} as not all archs support these configs. Signed-off-by: Oleksii Kurochko [stefano: fix code style] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/arm/dom0less-build.c | 714 ++----------------------------- xen/common/device-tree/dom0less-build.c | 708 ++++++++++++++++++++++++++++++ xen/include/asm-generic/dom0less-build.h | 18 +- 3 files changed, 760 insertions(+), 680 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 0adeec7b94..a49764f0ad 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -25,8 +25,6 @@ #include #include -bool __initdata need_xenstore; - #ifdef CONFIG_VGICV2 static int __init make_gicv2_domU_node(struct kernel_info *kinfo) { @@ -152,7 +150,7 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo) } #endif -static int __init make_gic_domU_node(struct kernel_info *kinfo) +int __init make_intc_domU_node(struct kernel_info *kinfo) { switch ( kinfo->d->arch.vgic.version ) { @@ -218,708 +216,60 @@ static int __init make_vpl011_uart_node(struct kernel_info *kinfo) } #endif -/* - * Scan device tree properties for passthrough specific information. - * Returns < 0 on error - * 0 on success - */ -static int __init handle_passthrough_prop(struct kernel_info *kinfo, - const struct fdt_property *xen_reg, - const struct fdt_property *xen_path, - bool xen_force, - uint32_t address_cells, - uint32_t size_cells) -{ - const __be32 *cell; - unsigned int i, len; - struct dt_device_node *node; - int res; - paddr_t mstart, size, gstart; - - /* xen,reg specifies where to map the MMIO region */ - cell = (const __be32 *)xen_reg->data; - len = fdt32_to_cpu(xen_reg->len) / ((address_cells * 2 + size_cells) * - sizeof(uint32_t)); - - for ( i = 0; i < len; i++ ) - { - device_tree_get_reg(&cell, address_cells, size_cells, - &mstart, &size); - gstart = dt_next_cell(address_cells, &cell); - - if ( gstart & ~PAGE_MASK || mstart & ~PAGE_MASK || size & ~PAGE_MASK ) - { - printk(XENLOG_ERR - "DomU passthrough config has not page aligned addresses/sizes\n"); - return -EINVAL; - } - - res = iomem_permit_access(kinfo->d, paddr_to_pfn(mstart), - paddr_to_pfn(PAGE_ALIGN(mstart + size - 1))); - if ( res ) - { - printk(XENLOG_ERR "Unable to permit to dom%d access to" - " 0x%"PRIpaddr" - 0x%"PRIpaddr"\n", - kinfo->d->domain_id, - mstart & PAGE_MASK, PAGE_ALIGN(mstart + size) - 1); - return res; - } - - res = map_regions_p2mt(kinfo->d, - gaddr_to_gfn(gstart), - PFN_DOWN(size), - maddr_to_mfn(mstart), - p2m_mmio_direct_dev); - if ( res < 0 ) - { - printk(XENLOG_ERR - "Failed to map %"PRIpaddr" to the guest at%"PRIpaddr"\n", - mstart, gstart); - return -EFAULT; - } - } - - /* - * If xen_force, we let the user assign a MMIO region with no - * associated path. - */ - if ( xen_path == NULL ) - return xen_force ? 0 : -EINVAL; - - /* - * xen,path specifies the corresponding node in the host DT. - * Both interrupt mappings and IOMMU settings are based on it, - * as they are done based on the corresponding host DT node. - */ - node = dt_find_node_by_path(xen_path->data); - if ( node == NULL ) - { - printk(XENLOG_ERR "Couldn't find node %s in host_dt!\n", - xen_path->data); - return -EINVAL; - } - - res = map_device_irqs_to_domain(kinfo->d, node, true, NULL); - if ( res < 0 ) - return res; - - res = iommu_add_dt_device(node); - if ( res < 0 ) - return res; - - /* If xen_force, we allow assignment of devices without IOMMU protection. */ - if ( xen_force && !dt_device_is_protected(node) ) - return 0; - - return iommu_assign_dt_device(kinfo->d, node); -} - -static int __init handle_prop_pfdt(struct kernel_info *kinfo, - const void *pfdt, int nodeoff, - uint32_t address_cells, uint32_t size_cells, - bool scan_passthrough_prop) -{ - void *fdt = kinfo->fdt; - int propoff, nameoff, res; - const struct fdt_property *prop, *xen_reg = NULL, *xen_path = NULL; - const char *name; - bool found, xen_force = false; - - for ( propoff = fdt_first_property_offset(pfdt, nodeoff); - propoff >= 0; - propoff = fdt_next_property_offset(pfdt, propoff) ) - { - if ( !(prop = fdt_get_property_by_offset(pfdt, propoff, NULL)) ) - return -FDT_ERR_INTERNAL; - - found = false; - nameoff = fdt32_to_cpu(prop->nameoff); - name = fdt_string(pfdt, nameoff); - - if ( scan_passthrough_prop ) - { - if ( dt_prop_cmp("xen,reg", name) == 0 ) - { - xen_reg = prop; - found = true; - } - else if ( dt_prop_cmp("xen,path", name) == 0 ) - { - xen_path = prop; - found = true; - } - else if ( dt_prop_cmp("xen,force-assign-without-iommu", - name) == 0 ) - { - xen_force = true; - found = true; - } - } - - /* - * Copy properties other than the ones above: xen,reg, xen,path, - * and xen,force-assign-without-iommu. - */ - if ( !found ) - { - res = fdt_property(fdt, name, prop->data, fdt32_to_cpu(prop->len)); - if ( res ) - return res; - } - } - - /* - * Only handle passthrough properties if both xen,reg and xen,path - * are present, or if xen,force-assign-without-iommu is specified. - */ - if ( xen_reg != NULL && (xen_path != NULL || xen_force) ) - { - res = handle_passthrough_prop(kinfo, xen_reg, xen_path, xen_force, - address_cells, size_cells); - if ( res < 0 ) - { - printk(XENLOG_ERR "Failed to assign device to %pd\n", kinfo->d); - return res; - } - } - else if ( (xen_path && !xen_reg) || (xen_reg && !xen_path && !xen_force) ) - { - printk(XENLOG_ERR "xen,reg or xen,path missing for %pd\n", - kinfo->d); - return -EINVAL; - } - - /* FDT_ERR_NOTFOUND => There is no more properties for this node */ - return ( propoff != -FDT_ERR_NOTFOUND ) ? propoff : 0; -} - -static int __init scan_pfdt_node(struct kernel_info *kinfo, const void *pfdt, - int nodeoff, - uint32_t address_cells, uint32_t size_cells, - bool scan_passthrough_prop) -{ - int rc = 0; - void *fdt = kinfo->fdt; - int node_next; - - rc = fdt_begin_node(fdt, fdt_get_name(pfdt, nodeoff, NULL)); - if ( rc ) - return rc; - - rc = handle_prop_pfdt(kinfo, pfdt, nodeoff, address_cells, size_cells, - scan_passthrough_prop); - if ( rc ) - return rc; - - address_cells = device_tree_get_u32(pfdt, nodeoff, "#address-cells", - DT_ROOT_NODE_ADDR_CELLS_DEFAULT); - size_cells = device_tree_get_u32(pfdt, nodeoff, "#size-cells", - DT_ROOT_NODE_SIZE_CELLS_DEFAULT); - - node_next = fdt_first_subnode(pfdt, nodeoff); - while ( node_next > 0 ) - { - rc = scan_pfdt_node(kinfo, pfdt, node_next, address_cells, size_cells, - scan_passthrough_prop); - if ( rc ) - return rc; - - node_next = fdt_next_subnode(pfdt, node_next); - } - - return fdt_end_node(fdt); -} - -static int __init check_partial_fdt(void *pfdt, size_t size) +int __init make_arch_nodes(struct kernel_info *kinfo) { - int res; - - if ( fdt_magic(pfdt) != FDT_MAGIC ) - { - dprintk(XENLOG_ERR, "Partial FDT is not a valid Flat Device Tree"); - return -EINVAL; - } - - res = fdt_check_header(pfdt); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed to check the partial FDT (%d)", res); - return -EINVAL; - } - - if ( fdt_totalsize(pfdt) > size ) - { - dprintk(XENLOG_ERR, "Partial FDT totalsize is too big"); - return -EINVAL; - } - - return 0; -} - -static int __init domain_handle_dtb_bootmodule(struct domain *d, - struct kernel_info *kinfo) -{ - void *pfdt; - int res, node_next; - - pfdt = ioremap_cache(kinfo->dtb_bootmodule->start, - kinfo->dtb_bootmodule->size); - if ( pfdt == NULL ) - return -EFAULT; - - res = check_partial_fdt(pfdt, kinfo->dtb_bootmodule->size); - if ( res < 0 ) - goto out; - - for ( node_next = fdt_first_subnode(pfdt, 0); - node_next > 0; - node_next = fdt_next_subnode(pfdt, node_next) ) - { - const char *name = fdt_get_name(pfdt, node_next, NULL); - - if ( name == NULL ) - continue; - - /* - * Only scan /gic /aliases /passthrough, ignore the rest. - * They don't have to be parsed in order. - * - * Take the GIC phandle value from the special /gic node in the - * DTB fragment. - */ - if ( dt_node_cmp(name, "gic") == 0 ) - { - uint32_t phandle_intc = fdt_get_phandle(pfdt, node_next); - - if ( phandle_intc != 0 ) - kinfo->phandle_intc = phandle_intc; - continue; - } - - if ( dt_node_cmp(name, "aliases") == 0 ) - { - res = scan_pfdt_node(kinfo, pfdt, node_next, - DT_ROOT_NODE_ADDR_CELLS_DEFAULT, - DT_ROOT_NODE_SIZE_CELLS_DEFAULT, - false); - if ( res ) - goto out; - continue; - } - if ( dt_node_cmp(name, "passthrough") == 0 ) - { - res = scan_pfdt_node(kinfo, pfdt, node_next, - DT_ROOT_NODE_ADDR_CELLS_DEFAULT, - DT_ROOT_NODE_SIZE_CELLS_DEFAULT, - true); - if ( res ) - goto out; - continue; - } - } - - out: - iounmap(pfdt); - - return res; -} - -/* - * The max size for DT is 2MB. However, the generated DT is small (not including - * domU passthrough DT nodes whose size we account separately), 4KB are enough - * for now, but we might have to increase it in the future. - */ -#define DOMU_DTB_SIZE 4096 -static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) -{ - int addrcells, sizecells; - int ret, fdt_size = DOMU_DTB_SIZE; - - kinfo->phandle_intc = GUEST_PHANDLE_GIC; - kinfo->gnttab_start = GUEST_GNTTAB_BASE; - kinfo->gnttab_size = GUEST_GNTTAB_SIZE; - - addrcells = GUEST_ROOT_ADDRESS_CELLS; - sizecells = GUEST_ROOT_SIZE_CELLS; - - /* Account for domU passthrough DT size */ - if ( kinfo->dtb_bootmodule ) - fdt_size += kinfo->dtb_bootmodule->size; - - /* Cap to max DT size if needed */ - fdt_size = min(fdt_size, SZ_2M); - - kinfo->fdt = xmalloc_bytes(fdt_size); - if ( kinfo->fdt == NULL ) - return -ENOMEM; - - ret = fdt_create(kinfo->fdt, fdt_size); - if ( ret < 0 ) - goto err; - - ret = fdt_finish_reservemap(kinfo->fdt); - if ( ret < 0 ) - goto err; - - ret = fdt_begin_node(kinfo->fdt, ""); - if ( ret < 0 ) - goto err; - - ret = fdt_property_cell(kinfo->fdt, "#address-cells", addrcells); - if ( ret ) - goto err; - - ret = fdt_property_cell(kinfo->fdt, "#size-cells", sizecells); - if ( ret ) - goto err; - - ret = make_chosen_node(kinfo); - if ( ret ) - goto err; + int ret; ret = make_psci_node(kinfo->fdt); if ( ret ) - goto err; - - ret = make_cpus_node(d, kinfo->fdt); - if ( ret ) - goto err; - - ret = make_memory_node(kinfo, addrcells, sizecells, - kernel_info_get_mem(kinfo)); - if ( ret ) - goto err; - - ret = make_resv_memory_node(kinfo, addrcells, sizecells); - if ( ret ) - goto err; - - /* - * domain_handle_dtb_bootmodule has to be called before the rest of - * the device tree is generated because it depends on the value of - * the field phandle_intc. - */ - if ( kinfo->dtb_bootmodule ) - { - ret = domain_handle_dtb_bootmodule(d, kinfo); - if ( ret ) - goto err; - } - - ret = make_gic_domU_node(kinfo); - if ( ret ) - goto err; - - ret = make_timer_node(kinfo); - if ( ret ) - goto err; + return -EINVAL; if ( kinfo->arch.vpl011 ) { - ret = -EINVAL; #ifdef CONFIG_SBSA_VUART_CONSOLE ret = make_vpl011_uart_node(kinfo); #endif if ( ret ) - goto err; - } - - if ( kinfo->dom0less_feature & DOM0LESS_ENHANCED_NO_XS ) - { - ret = make_hypervisor_node(d, kinfo, addrcells, sizecells); - if ( ret ) - goto err; + return -EINVAL; } - ret = fdt_end_node(kinfo->fdt); - if ( ret < 0 ) - goto err; - - ret = fdt_finish(kinfo->fdt); - if ( ret < 0 ) - goto err; - return 0; - - err: - printk("Device tree generation failed (%d).\n", ret); - xfree(kinfo->fdt); - - return -EINVAL; } -#define XENSTORE_PFN_OFFSET 1 -static int __init alloc_xenstore_page(struct domain *d) +/* TODO: make arch.type generic ? */ +#ifdef CONFIG_ARM_64 +void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) { - struct page_info *xenstore_pg; - struct xenstore_domain_interface *interface; - mfn_t mfn; - gfn_t gfn; - int rc; - - if ( (UINT_MAX - d->max_pages) < 1 ) - { - printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages by 1 page.\n", - d); - return -EINVAL; - } - - d->max_pages += 1; - xenstore_pg = alloc_domheap_page(d, MEMF_bits(32)); - if ( xenstore_pg == NULL && is_64bit_domain(d) ) - xenstore_pg = alloc_domheap_page(d, 0); - if ( xenstore_pg == NULL ) - return -ENOMEM; - - mfn = page_to_mfn(xenstore_pg); - if ( !mfn_x(mfn) ) - return -ENOMEM; - - if ( !is_domain_direct_mapped(d) ) - gfn = gaddr_to_gfn(GUEST_MAGIC_BASE + - (XENSTORE_PFN_OFFSET << PAGE_SHIFT)); - else - gfn = gaddr_to_gfn(mfn_to_maddr(mfn)); - - rc = guest_physmap_add_page(d, gfn, mfn, 0); - if ( rc ) - { - free_domheap_page(xenstore_pg); - return rc; - } - - d->arch.hvm.params[HVM_PARAM_STORE_PFN] = gfn_x(gfn); - interface = map_domain_page(mfn); - interface->connection = XENSTORE_RECONNECT; - unmap_domain_page(interface); - - return 0; + /* type must be set before allocate memory */ + d->arch.type = kinfo->arch.type; } - -static int __init alloc_xenstore_params(struct kernel_info *kinfo) +#else +void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) { - struct domain *d = kinfo->d; - int rc = 0; - - if ( (kinfo->dom0less_feature & (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY)) - == (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY) ) - d->arch.hvm.params[HVM_PARAM_STORE_PFN] = XENSTORE_PFN_LATE_ALLOC; - else if ( kinfo->dom0less_feature & DOM0LESS_XENSTORE ) - { - rc = alloc_xenstore_page(d); - if ( rc < 0 ) - return rc; - } - - return rc; + /* Nothing to do */ } +#endif -static void __init domain_vcpu_affinity(struct domain *d, - const struct dt_device_node *node) +int __init init_vuart(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) { - struct dt_device_node *np; - - dt_for_each_child_node(node, np) - { - const char *hard_affinity_str = NULL; - uint32_t val; - int rc; - struct vcpu *v; - cpumask_t affinity; - - if ( !dt_device_is_compatible(np, "xen,vcpu") ) - continue; - - if ( !dt_property_read_u32(np, "id", &val) ) - panic("Invalid xen,vcpu node for domain %s\n", dt_node_name(node)); - - if ( val >= d->max_vcpus ) - panic("Invalid vcpu_id %u for domain %s, max_vcpus=%u\n", val, - dt_node_name(node), d->max_vcpus); - - v = d->vcpu[val]; - rc = dt_property_read_string(np, "hard-affinity", &hard_affinity_str); - if ( rc < 0 ) - continue; - - cpumask_clear(&affinity); - while ( *hard_affinity_str != '\0' ) - { - unsigned int start, end; - - start = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); - - if ( *hard_affinity_str == '-' ) /* Range */ - { - hard_affinity_str++; - end = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); - } - else /* Single value */ - end = start; - - if ( end >= nr_cpu_ids ) - panic("Invalid pCPU %u for domain %s\n", end, dt_node_name(node)); - - for ( ; start <= end; start++ ) - cpumask_set_cpu(start, &affinity); - - if ( *hard_affinity_str == ',' ) - hard_affinity_str++; - else if ( *hard_affinity_str != '\0' ) - break; - } + int rc = 0; - rc = vcpu_set_hard_affinity(v, &affinity); - if ( rc ) - panic("vcpu%d: failed (rc=%d) to set hard affinity for domain %s\n", - v->vcpu_id, rc, dt_node_name(node)); - } -} + kinfo->arch.vpl011 = dt_property_read_bool(node, "vpl011"); -#ifdef CONFIG_ARCH_PAGING_MEMPOOL -static unsigned long __init domain_p2m_pages(unsigned long maxmem_kb, - unsigned int smp_cpus) -{ /* - * Keep in sync with libxl__get_required_paging_memory(). - * 256 pages (1MB) per vcpu, plus 1 page per MiB of RAM for the P2M map, - * plus 128 pages to cover extended regions. + * Base address and irq number are needed when creating vpl011 device + * tree node in prepare_dtb_domU, so initialization on related variables + * shall be done first. */ - unsigned long memkb = 4 * (256 * smp_cpus + (maxmem_kb / 1024) + 128); - - BUILD_BUG_ON(PAGE_SIZE != SZ_4K); - - return DIV_ROUND_UP(memkb, 1024) << (20 - PAGE_SHIFT); -} - -static int __init domain_p2m_set_allocation(struct domain *d, uint64_t mem, - const struct dt_device_node *node) -{ - unsigned long p2m_pages; - uint32_t p2m_mem_mb; - int rc; - - rc = dt_property_read_u32(node, "xen,domain-p2m-mem-mb", &p2m_mem_mb); - /* If xen,domain-p2m-mem-mb is not specified, use the default value. */ - p2m_pages = rc ? - p2m_mem_mb << (20 - PAGE_SHIFT) : - domain_p2m_pages(mem, d->max_vcpus); - - spin_lock(&d->arch.paging.lock); - rc = p2m_set_allocation(d, p2m_pages, NULL); - spin_unlock(&d->arch.paging.lock); - - return rc; -} -#else /* !CONFIG_ARCH_PAGING_MEMPOOL */ -static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, - const struct dt_device_node *node) -{ - return 0; -} -#endif /* CONFIG_ARCH_PAGING_MEMPOOL */ - -int __init construct_domU(struct domain *d, - const struct dt_device_node *node) -{ - struct kernel_info kinfo = KERNEL_INFO_INIT; - const char *dom0less_enhanced; - int rc; - u64 mem; - - rc = dt_property_read_u64(node, "memory", &mem); - if ( !rc ) - { - printk("Error building DomU: cannot read \"memory\" property\n"); - return -EINVAL; - } - kinfo.unassigned_mem = (paddr_t)mem * SZ_1K; - - rc = domain_p2m_set_allocation(d, mem, node); - if ( rc != 0 ) - return rc; - - printk("*** LOADING DOMU cpus=%u memory=%#"PRIx64"KB ***\n", - d->max_vcpus, mem); - - kinfo.arch.vpl011 = dt_property_read_bool(node, "vpl011"); - if ( kinfo.arch.vpl011 && is_hardware_domain(d) ) - panic("hardware domain cannot specify vpl011\n"); - - rc = dt_property_read_string(node, "xen,enhanced", &dom0less_enhanced); - if ( rc == -EILSEQ || - rc == -ENODATA || - (rc == 0 && !strcmp(dom0less_enhanced, "enabled")) ) - { - need_xenstore = true; - kinfo.dom0less_feature = DOM0LESS_ENHANCED; - } - else if ( rc == 0 && !strcmp(dom0less_enhanced, "legacy") ) - { - need_xenstore = true; - kinfo.dom0less_feature = DOM0LESS_ENHANCED_LEGACY; - } - else if ( rc == 0 && !strcmp(dom0less_enhanced, "no-xenstore") ) - kinfo.dom0less_feature = DOM0LESS_ENHANCED_NO_XS; - - if ( vcpu_create(d, 0) == NULL ) - return -ENOMEM; - - d->max_pages = ((paddr_t)mem * SZ_1K) >> PAGE_SHIFT; - - kinfo.d = d; - - rc = kernel_probe(&kinfo, node); - if ( rc < 0 ) - return rc; - -#ifdef CONFIG_ARM_64 - /* type must be set before allocate memory */ - d->arch.type = kinfo.arch.type; -#endif - if ( is_hardware_domain(d) ) - { - rc = construct_hwdom(&kinfo, node); - if ( rc < 0 ) - return rc; - } - else + if ( kinfo->arch.vpl011 ) { - if ( !dt_find_property(node, "xen,static-mem", NULL) ) - allocate_memory(d, &kinfo); - else if ( !is_domain_direct_mapped(d) ) - allocate_static_memory(d, &kinfo, node); - else - assign_static_memory_11(d, &kinfo, node); - - rc = process_shm(d, &kinfo, node); - if ( rc < 0 ) - return rc; - - /* - * Base address and irq number are needed when creating vpl011 device - * tree node in prepare_dtb_domU, so initialization on related variables - * shall be done first. - */ - if ( kinfo.arch.vpl011 ) - { - rc = domain_vpl011_init(d, NULL); - if ( rc < 0 ) - return rc; - } - - rc = prepare_dtb_domU(d, &kinfo); - if ( rc < 0 ) - return rc; - - rc = construct_domain(d, &kinfo); + rc = domain_vpl011_init(d, NULL); if ( rc < 0 ) return rc; } - domain_vcpu_affinity(d, node); - - return alloc_xenstore_params(&kinfo); + return rc; } void __init arch_create_domUs(struct dt_device_node *node, @@ -995,6 +345,22 @@ void __init arch_create_domUs(struct dt_device_node *node, } } +int __init init_intc_phandle(struct kernel_info *kinfo, const char *name, + const int node_next, const void *pfdt) +{ + if ( dt_node_cmp(name, "gic") == 0 ) + { + uint32_t phandle_intc = fdt_get_phandle(pfdt, node_next); + + if ( phandle_intc != 0 ) + kinfo->phandle_intc = phandle_intc; + + return 0; + } + + return 1; +} + /* * Local variables: * mode: C diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 203b762e2c..4aa36c8ef3 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -3,24 +3,43 @@ #include #include #include +#include #include #include +#include +#include #include #include +#include #include +#include #include +#include #include #include #include +#include #include #include #include +#include #include #include +#if __has_include() +# include +#endif + +#if __has_include() +# include +#endif + +#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX + static domid_t __initdata xs_domid = DOMID_INVALID; +static bool __initdata need_xenstore; void __init set_xs_domain(struct domain *d) { @@ -109,6 +128,695 @@ static void __init initialize_domU_xenstore(void) } } +/* + * Scan device tree properties for passthrough specific information. + * Returns < 0 on error + * 0 on success + */ +static int __init handle_passthrough_prop(struct kernel_info *kinfo, + const struct fdt_property *xen_reg, + const struct fdt_property *xen_path, + bool xen_force, + uint32_t address_cells, + uint32_t size_cells) +{ + const __be32 *cell; + unsigned int i, len; + struct dt_device_node *node; + int res; + paddr_t mstart, size, gstart; + + /* xen,reg specifies where to map the MMIO region */ + cell = (const __be32 *)xen_reg->data; + len = fdt32_to_cpu(xen_reg->len) / ((address_cells * 2 + size_cells) * + sizeof(uint32_t)); + + for ( i = 0; i < len; i++ ) + { + device_tree_get_reg(&cell, address_cells, size_cells, + &mstart, &size); + gstart = dt_next_cell(address_cells, &cell); + + if ( gstart & ~PAGE_MASK || mstart & ~PAGE_MASK || size & ~PAGE_MASK ) + { + printk(XENLOG_ERR + "DomU passthrough config has not page aligned addresses/sizes\n"); + return -EINVAL; + } + + res = iomem_permit_access(kinfo->d, paddr_to_pfn(mstart), + paddr_to_pfn(PAGE_ALIGN(mstart + size - 1))); + if ( res ) + { + printk(XENLOG_ERR "Unable to permit to dom%d access to" + " 0x%"PRIpaddr" - 0x%"PRIpaddr"\n", + kinfo->d->domain_id, + mstart & PAGE_MASK, PAGE_ALIGN(mstart + size) - 1); + return res; + } + + res = map_regions_p2mt(kinfo->d, + gaddr_to_gfn(gstart), + PFN_DOWN(size), + maddr_to_mfn(mstart), + p2m_mmio_direct_dev); + if ( res < 0 ) + { + printk(XENLOG_ERR + "Failed to map %"PRIpaddr" to the guest at%"PRIpaddr"\n", + mstart, gstart); + return -EFAULT; + } + } + + /* + * If xen_force, we let the user assign a MMIO region with no + * associated path. + */ + if ( xen_path == NULL ) + return xen_force ? 0 : -EINVAL; + + /* + * xen,path specifies the corresponding node in the host DT. + * Both interrupt mappings and IOMMU settings are based on it, + * as they are done based on the corresponding host DT node. + */ + node = dt_find_node_by_path(xen_path->data); + if ( node == NULL ) + { + printk(XENLOG_ERR "Couldn't find node %s in host_dt!\n", + xen_path->data); + return -EINVAL; + } + + res = map_device_irqs_to_domain(kinfo->d, node, true, NULL); + if ( res < 0 ) + return res; + + res = iommu_add_dt_device(node); + if ( res < 0 ) + return res; + + /* If xen_force, we allow assignment of devices without IOMMU protection. */ + if ( xen_force && !dt_device_is_protected(node) ) + return 0; + + return iommu_assign_dt_device(kinfo->d, node); +} + +static int __init handle_prop_pfdt(struct kernel_info *kinfo, + const void *pfdt, int nodeoff, + uint32_t address_cells, uint32_t size_cells, + bool scan_passthrough_prop) +{ + void *fdt = kinfo->fdt; + int propoff, nameoff, res; + const struct fdt_property *prop, *xen_reg = NULL, *xen_path = NULL; + const char *name; + bool found, xen_force = false; + + for ( propoff = fdt_first_property_offset(pfdt, nodeoff); + propoff >= 0; + propoff = fdt_next_property_offset(pfdt, propoff) ) + { + if ( !(prop = fdt_get_property_by_offset(pfdt, propoff, NULL)) ) + return -FDT_ERR_INTERNAL; + + found = false; + nameoff = fdt32_to_cpu(prop->nameoff); + name = fdt_string(pfdt, nameoff); + + if ( scan_passthrough_prop ) + { + if ( dt_prop_cmp("xen,reg", name) == 0 ) + { + xen_reg = prop; + found = true; + } + else if ( dt_prop_cmp("xen,path", name) == 0 ) + { + xen_path = prop; + found = true; + } + else if ( dt_prop_cmp("xen,force-assign-without-iommu", + name) == 0 ) + { + xen_force = true; + found = true; + } + } + + /* + * Copy properties other than the ones above: xen,reg, xen,path, + * and xen,force-assign-without-iommu. + */ + if ( !found ) + { + res = fdt_property(fdt, name, prop->data, fdt32_to_cpu(prop->len)); + if ( res ) + return res; + } + } + + /* + * Only handle passthrough properties if both xen,reg and xen,path + * are present, or if xen,force-assign-without-iommu is specified. + */ + if ( xen_reg != NULL && (xen_path != NULL || xen_force) ) + { + res = handle_passthrough_prop(kinfo, xen_reg, xen_path, xen_force, + address_cells, size_cells); + if ( res < 0 ) + { + printk(XENLOG_ERR "Failed to assign device to %pd\n", kinfo->d); + return res; + } + } + else if ( (xen_path && !xen_reg) || (xen_reg && !xen_path && !xen_force) ) + { + printk(XENLOG_ERR "xen,reg or xen,path missing for %pd\n", + kinfo->d); + return -EINVAL; + } + + /* FDT_ERR_NOTFOUND => There is no more properties for this node */ + return ( propoff != -FDT_ERR_NOTFOUND ) ? propoff : 0; +} + +static int __init scan_pfdt_node(struct kernel_info *kinfo, const void *pfdt, + int nodeoff, + uint32_t address_cells, uint32_t size_cells, + bool scan_passthrough_prop) +{ + int rc = 0; + void *fdt = kinfo->fdt; + int node_next; + + rc = fdt_begin_node(fdt, fdt_get_name(pfdt, nodeoff, NULL)); + if ( rc ) + return rc; + + rc = handle_prop_pfdt(kinfo, pfdt, nodeoff, address_cells, size_cells, + scan_passthrough_prop); + if ( rc ) + return rc; + + address_cells = device_tree_get_u32(pfdt, nodeoff, "#address-cells", + DT_ROOT_NODE_ADDR_CELLS_DEFAULT); + size_cells = device_tree_get_u32(pfdt, nodeoff, "#size-cells", + DT_ROOT_NODE_SIZE_CELLS_DEFAULT); + + node_next = fdt_first_subnode(pfdt, nodeoff); + while ( node_next > 0 ) + { + rc = scan_pfdt_node(kinfo, pfdt, node_next, address_cells, size_cells, + scan_passthrough_prop); + if ( rc ) + return rc; + + node_next = fdt_next_subnode(pfdt, node_next); + } + + return fdt_end_node(fdt); +} + +static int __init check_partial_fdt(void *pfdt, size_t size) +{ + int res; + + if ( fdt_magic(pfdt) != FDT_MAGIC ) + { + dprintk(XENLOG_ERR, "Partial FDT is not a valid Flat Device Tree"); + return -EINVAL; + } + + res = fdt_check_header(pfdt); + if ( res ) + { + dprintk(XENLOG_ERR, "Failed to check the partial FDT (%d)", res); + return -EINVAL; + } + + if ( fdt_totalsize(pfdt) > size ) + { + dprintk(XENLOG_ERR, "Partial FDT totalsize is too big"); + return -EINVAL; + } + + return 0; +} + +static int __init domain_handle_dtb_bootmodule(struct domain *d, + struct kernel_info *kinfo) +{ + void *pfdt; + int res, node_next; + + pfdt = ioremap_cache(kinfo->dtb_bootmodule->start, + kinfo->dtb_bootmodule->size); + if ( pfdt == NULL ) + return -EFAULT; + + res = check_partial_fdt(pfdt, kinfo->dtb_bootmodule->size); + if ( res < 0 ) + goto out; + + for ( node_next = fdt_first_subnode(pfdt, 0); + node_next > 0; + node_next = fdt_next_subnode(pfdt, node_next) ) + { + const char *name = fdt_get_name(pfdt, node_next, NULL); + + if ( name == NULL ) + continue; + + /* + * Only scan /$(interrupt_controller) /aliases /passthrough, + * ignore the rest. + * They don't have to be parsed in order. + * + * Take the interrupt controller phandle value from the special + * interrupt controller node in the DTB fragment. + */ + if ( init_intc_phandle(kinfo, name, node_next, pfdt) == 0 ) + continue; + + if ( dt_node_cmp(name, "aliases") == 0 ) + { + res = scan_pfdt_node(kinfo, pfdt, node_next, + DT_ROOT_NODE_ADDR_CELLS_DEFAULT, + DT_ROOT_NODE_SIZE_CELLS_DEFAULT, + false); + if ( res ) + goto out; + continue; + } + if ( dt_node_cmp(name, "passthrough") == 0 ) + { + res = scan_pfdt_node(kinfo, pfdt, node_next, + DT_ROOT_NODE_ADDR_CELLS_DEFAULT, + DT_ROOT_NODE_SIZE_CELLS_DEFAULT, + true); + if ( res ) + goto out; + continue; + } + } + + out: + iounmap(pfdt); + + return res; +} + +/* + * The max size for DT is 2MB. However, the generated DT is small (not including + * domU passthrough DT nodes whose size we account separately), 4KB are enough + * for now, but we might have to increase it in the future. + */ +#define DOMU_DTB_SIZE 4096 +static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) +{ + int addrcells, sizecells; + int ret, fdt_size = DOMU_DTB_SIZE; + + kinfo->phandle_intc = GUEST_PHANDLE_GIC; + +#ifdef CONFIG_GRANT_TABLE + kinfo->gnttab_start = GUEST_GNTTAB_BASE; + kinfo->gnttab_size = GUEST_GNTTAB_SIZE; +#endif + + addrcells = GUEST_ROOT_ADDRESS_CELLS; + sizecells = GUEST_ROOT_SIZE_CELLS; + + /* Account for domU passthrough DT size */ + if ( kinfo->dtb_bootmodule ) + fdt_size += kinfo->dtb_bootmodule->size; + + /* Cap to max DT size if needed */ + fdt_size = min(fdt_size, SZ_2M); + + kinfo->fdt = xmalloc_bytes(fdt_size); + if ( kinfo->fdt == NULL ) + return -ENOMEM; + + ret = fdt_create(kinfo->fdt, fdt_size); + if ( ret < 0 ) + goto err; + + ret = fdt_finish_reservemap(kinfo->fdt); + if ( ret < 0 ) + goto err; + + ret = fdt_begin_node(kinfo->fdt, ""); + if ( ret < 0 ) + goto err; + + ret = fdt_property_cell(kinfo->fdt, "#address-cells", addrcells); + if ( ret ) + goto err; + + ret = fdt_property_cell(kinfo->fdt, "#size-cells", sizecells); + if ( ret ) + goto err; + + ret = make_chosen_node(kinfo); + if ( ret ) + goto err; + + ret = make_cpus_node(d, kinfo->fdt); + if ( ret ) + goto err; + + ret = make_memory_node(kinfo, addrcells, sizecells, + kernel_info_get_mem(kinfo)); + if ( ret ) + goto err; + +#ifdef CONFIG_STATIC_SHM + ret = make_resv_memory_node(kinfo, addrcells, sizecells); + if ( ret ) + goto err; +#endif + + /* + * domain_handle_dtb_bootmodule has to be called before the rest of + * the device tree is generated because it depends on the value of + * the field phandle_intc. + */ + if ( kinfo->dtb_bootmodule ) + { + ret = domain_handle_dtb_bootmodule(d, kinfo); + if ( ret ) + goto err; + } + + ret = make_intc_domU_node(kinfo); + if ( ret ) + goto err; + + ret = make_timer_node(kinfo); + if ( ret ) + goto err; + + if ( kinfo->dom0less_feature & DOM0LESS_ENHANCED_NO_XS ) + { + ret = make_hypervisor_node(d, kinfo, addrcells, sizecells); + if ( ret ) + goto err; + } + + ret = make_arch_nodes(kinfo); + if ( ret ) + goto err; + + ret = fdt_end_node(kinfo->fdt); + if ( ret < 0 ) + goto err; + + ret = fdt_finish(kinfo->fdt); + if ( ret < 0 ) + goto err; + + return 0; + + err: + printk("Device tree generation failed (%d).\n", ret); + xfree(kinfo->fdt); + + return -EINVAL; +} + +#define XENSTORE_PFN_OFFSET 1 +static int __init alloc_xenstore_page(struct domain *d) +{ + struct page_info *xenstore_pg; + struct xenstore_domain_interface *interface; + mfn_t mfn; + gfn_t gfn; + int rc; + + if ( (UINT_MAX - d->max_pages) < 1 ) + { + printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages by 1 page.\n", + d); + return -EINVAL; + } + + d->max_pages += 1; + xenstore_pg = alloc_domheap_page(d, MEMF_bits(32)); + if ( xenstore_pg == NULL && is_64bit_domain(d) ) + xenstore_pg = alloc_domheap_page(d, 0); + if ( xenstore_pg == NULL ) + return -ENOMEM; + + mfn = page_to_mfn(xenstore_pg); + if ( !mfn_x(mfn) ) + return -ENOMEM; + + if ( !is_domain_direct_mapped(d) ) + gfn = gaddr_to_gfn(GUEST_MAGIC_BASE + + (XENSTORE_PFN_OFFSET << PAGE_SHIFT)); + else + gfn = gaddr_to_gfn(mfn_to_maddr(mfn)); + + rc = guest_physmap_add_page(d, gfn, mfn, 0); + if ( rc ) + { + free_domheap_page(xenstore_pg); + return rc; + } + +#ifdef CONFIG_HVM + d->arch.hvm.params[HVM_PARAM_STORE_PFN] = gfn_x(gfn); +#endif + interface = map_domain_page(mfn); + interface->connection = XENSTORE_RECONNECT; + unmap_domain_page(interface); + + return 0; +} + +static int __init alloc_xenstore_params(struct kernel_info *kinfo) +{ + struct domain *d = kinfo->d; + int rc = 0; + +#ifdef CONFIG_HVM + if ( (kinfo->dom0less_feature & (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY)) + == (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY) ) + d->arch.hvm.params[HVM_PARAM_STORE_PFN] = XENSTORE_PFN_LATE_ALLOC; + else +#endif + if ( kinfo->dom0less_feature & DOM0LESS_XENSTORE ) + { + rc = alloc_xenstore_page(d); + if ( rc < 0 ) + return rc; + } + + return rc; +} + +static void __init domain_vcpu_affinity(struct domain *d, + const struct dt_device_node *node) +{ + struct dt_device_node *np; + + dt_for_each_child_node(node, np) + { + const char *hard_affinity_str = NULL; + uint32_t val; + int rc; + struct vcpu *v; + cpumask_t affinity; + + if ( !dt_device_is_compatible(np, "xen,vcpu") ) + continue; + + if ( !dt_property_read_u32(np, "id", &val) ) + panic("Invalid xen,vcpu node for domain %s\n", dt_node_name(node)); + + if ( val >= d->max_vcpus ) + panic("Invalid vcpu_id %u for domain %s, max_vcpus=%u\n", val, + dt_node_name(node), d->max_vcpus); + + v = d->vcpu[val]; + rc = dt_property_read_string(np, "hard-affinity", &hard_affinity_str); + if ( rc < 0 ) + continue; + + cpumask_clear(&affinity); + while ( *hard_affinity_str != '\0' ) + { + unsigned int start, end; + + start = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); + + if ( *hard_affinity_str == '-' ) /* Range */ + { + hard_affinity_str++; + end = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); + } + else /* Single value */ + end = start; + + if ( end >= nr_cpu_ids ) + panic("Invalid pCPU %u for domain %s\n", end, dt_node_name(node)); + + for ( ; start <= end; start++ ) + cpumask_set_cpu(start, &affinity); + + if ( *hard_affinity_str == ',' ) + hard_affinity_str++; + else if ( *hard_affinity_str != '\0' ) + break; + } + + rc = vcpu_set_hard_affinity(v, &affinity); + if ( rc ) + panic("vcpu%d: failed (rc=%d) to set hard affinity for domain %s\n", + v->vcpu_id, rc, dt_node_name(node)); + } +} + +#ifdef CONFIG_ARCH_PAGING_MEMPOOL +static unsigned long __init domain_p2m_pages(unsigned long maxmem_kb, + unsigned int smp_cpus) +{ + /* + * Keep in sync with libxl__get_required_paging_memory(). + * 256 pages (1MB) per vcpu, plus 1 page per MiB of RAM for the P2M map, + * plus 128 pages to cover extended regions. + */ + unsigned long memkb = 4 * (256 * smp_cpus + (maxmem_kb / 1024) + 128); + + BUILD_BUG_ON(PAGE_SIZE != SZ_4K); + + return DIV_ROUND_UP(memkb, 1024) << (20 - PAGE_SHIFT); +} + +static int __init domain_p2m_set_allocation(struct domain *d, uint64_t mem, + const struct dt_device_node *node) +{ + unsigned long p2m_pages; + uint32_t p2m_mem_mb; + int rc; + + rc = dt_property_read_u32(node, "xen,domain-p2m-mem-mb", &p2m_mem_mb); + /* If xen,domain-p2m-mem-mb is not specified, use the default value. */ + p2m_pages = rc ? + p2m_mem_mb << (20 - PAGE_SHIFT) : + domain_p2m_pages(mem, d->max_vcpus); + + spin_lock(&d->arch.paging.lock); + rc = p2m_set_allocation(d, p2m_pages, NULL); + spin_unlock(&d->arch.paging.lock); + + return rc; +} +#else /* !CONFIG_ARCH_PAGING_MEMPOOL */ +static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, + const struct dt_device_node *node) +{ + return 0; +} +#endif /* CONFIG_ARCH_PAGING_MEMPOOL */ + +static int __init construct_domU(struct domain *d, + const struct dt_device_node *node) +{ + struct kernel_info kinfo = KERNEL_INFO_INIT; + const char *dom0less_enhanced; + int rc; + u64 mem; + + rc = dt_property_read_u64(node, "memory", &mem); + if ( !rc ) + { + printk("Error building DomU: cannot read \"memory\" property\n"); + return -EINVAL; + } + kinfo.unassigned_mem = (paddr_t)mem * SZ_1K; + + rc = domain_p2m_set_allocation(d, mem, node); + if ( rc != 0 ) + return rc; + + printk("*** LOADING DOMU cpus=%u memory=%#"PRIx64"KB ***\n", + d->max_vcpus, mem); + + rc = dt_property_read_string(node, "xen,enhanced", &dom0less_enhanced); + if ( rc == -EILSEQ || + rc == -ENODATA || + (rc == 0 && !strcmp(dom0less_enhanced, "enabled")) ) + { + need_xenstore = true; + kinfo.dom0less_feature = DOM0LESS_ENHANCED; + } + else if ( rc == 0 && !strcmp(dom0less_enhanced, "legacy") ) + { + need_xenstore = true; + kinfo.dom0less_feature = DOM0LESS_ENHANCED_LEGACY; + } + else if ( rc == 0 && !strcmp(dom0less_enhanced, "no-xenstore") ) + kinfo.dom0less_feature = DOM0LESS_ENHANCED_NO_XS; + + if ( vcpu_create(d, 0) == NULL ) + return -ENOMEM; + + d->max_pages = ((paddr_t)mem * SZ_1K) >> PAGE_SHIFT; + + kinfo.d = d; + + rc = kernel_probe(&kinfo, node); + if ( rc < 0 ) + return rc; + + set_domain_type(d, &kinfo); + + if ( is_hardware_domain(d) ) + { + rc = construct_hwdom(&kinfo, node); + if ( rc < 0 ) + return rc; + } + else + { + if ( !dt_find_property(node, "xen,static-mem", NULL) ) + allocate_memory(d, &kinfo); +#ifdef CONFIG_STATIC_MEMORY + else if ( !is_domain_direct_mapped(d) ) + allocate_static_memory(d, &kinfo, node); + else + assign_static_memory_11(d, &kinfo, node); +#endif + +#ifdef CONFIG_STATIC_SHM + rc = process_shm(d, &kinfo, node); + if ( rc < 0 ) + return rc; +#endif + + rc = init_vuart(d, &kinfo, node); + if ( rc < 0 ) + return rc; + + rc = prepare_dtb_domU(d, &kinfo); + if ( rc < 0 ) + return rc; + + rc = construct_domain(d, &kinfo); + if ( rc < 0 ) + return rc; + } + + domain_vcpu_affinity(d, node); + + return alloc_xenstore_params(&kinfo); +} + void __init create_domUs(void) { struct dt_device_node *node; diff --git a/xen/include/asm-generic/dom0less-build.h b/xen/include/asm-generic/dom0less-build.h index 2003be743f..e0ad0429ec 100644 --- a/xen/include/asm-generic/dom0less-build.h +++ b/xen/include/asm-generic/dom0less-build.h @@ -12,10 +12,7 @@ struct domain; #include struct dt_device_node; - -/* TODO: remove both when construct_domU() will be moved to common. */ -#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX -extern bool need_xenstore; +struct kernel_info; /* * List of possible features for dom0less domUs @@ -49,12 +46,21 @@ void create_domUs(void); bool is_dom0less_mode(void); void set_xs_domain(struct domain *d); -int construct_domU(struct domain *d, const struct dt_device_node *node); - void arch_create_domUs(struct dt_device_node *node, struct xen_domctl_createdomain *d_cfg, unsigned int flags); +int init_vuart(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); + +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); + #else /* !CONFIG_DOM0LESS_BOOT */ static inline void create_domUs(void) {} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 00:23:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 00:23:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976622.1363763 (Exim 4.92) (envelope-from ) id 1uC65j-0008DT-UH; Tue, 06 May 2025 00:23:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976622.1363763; Tue, 06 May 2025 00:23: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 1uC65j-0008DL-RE; Tue, 06 May 2025 00:23:23 +0000 Received: by outflank-mailman (input) for mailman id 976622; Tue, 06 May 2025 00:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC65i-0008DD-MU for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC65i-00Aiuc-2A for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC65i-002iDy-24 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 00:23: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=hxKiI7nQLdL2aI8Wx2gtalfMRjrInnRoVEuzSraHxvI=; b=d7cGJlA80dvHKGs6maZ4H+Euto GBQq4t60kL462T28JKel9knJ3LHmLAQGc4JPmWQzAdyzSd8R1uqimf74ut3q4Ttl7HSgPZuX8moq6 E8IaIuZre23yTHi1Mj3t8sgN8MmJkNJua1OmUuhPPAweUGtaba7MH/JxAfqkzM7m0dFw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: check read handler behavior Message-Id: Date: Tue, 06 May 2025 00:23:22 +0000 commit 9a5e22b64266c19b2b01c47a6728be42a8195e52 Author: Stewart Hildebrand AuthorDate: Fri Apr 18 14:58:36 2025 -0400 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/arm: check read handler behavior We expect mmio read handlers to leave the bits above the access size zeroed. Add an ASSERT to check this aspect of read handler behavior. Suggested-by: Roger Pau Monné Signed-off-by: Stewart Hildebrand Acked-by: Julien Grall --- xen/arch/arm/io.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index 653428e16c..5a4b0e8f25 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -37,6 +37,8 @@ static enum io_state handle_read(const struct mmio_handler *handler, if ( !handler->ops->read(v, info, &r, handler->priv) ) return IO_ABORT; + ASSERT((r & ~GENMASK((1U << info->dabt.size) * 8 - 1, 0)) == 0); + r = sign_extend(dabt, r); set_user_reg(regs, dabt.reg, r); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:44:10 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976635.1363776 (Exim 4.92) (envelope-from ) id 1uC7Ln-0000mz-GQ; Tue, 06 May 2025 01:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976635.1363776; Tue, 06 May 2025 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 1uC7Ln-0000ms-Dw; Tue, 06 May 2025 01:44:03 +0000 Received: by outflank-mailman (input) for mailman id 976635; Tue, 06 May 2025 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 1uC7Lm-0000mm-Bb for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 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 1uC7Lm-00CLIA-0k for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7Lm-002ufV-0Z for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 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=tL4up4wr/iKBXKz02muGpPYDPw1D7fe3KHmzz+GMqhU=; b=aWTl0gh8MimJJFIedlcXcLOD1m fCewrg4q55wSASwNHphSP2cpYBWJEXGs0ZQcWSrbZ9px60G6HMk8iBnRkIlQWl+eaPuZYYk4MG4ic Th3wMUDoRJQCfT1fCUEoVAmkLPZ5iddjESbDqy+webQxhDokJJWprutQx1l2ZR1OtGCY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: drop declaration of handle_device_interrupts() Message-Id: Date: Tue, 06 May 2025 01:44:02 +0000 commit 07107633b3455ed9dc22498708e01e4aea1d6527 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:31 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 13:13:04 2025 -0700 xen/arm: drop declaration of handle_device_interrupts() There is no definition of handle_device_interrupts() thereby it could be dropped. Signed-off-by: Oleksii Kurochko Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/domain_build.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 17619c875d..378c10cc98 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -28,17 +28,6 @@ void evtchn_allocate(struct domain *d); unsigned int get_allocation_size(paddr_t size); -/* - * handle_device_interrupts retrieves the interrupts configuration from - * a device tree node and maps those interrupts to the target domain. - * - * Returns: - * < 0 error - * 0 success - */ -int handle_device_interrupts(struct domain *d, struct dt_device_node *dev, - bool need_mapping); - /* * Helper to write an interrupts with the GIC format * This code is assuming the irq is an PPI. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976636.1363780 (Exim 4.92) (envelope-from ) id 1uC7Lx-0000od-IC; Tue, 06 May 2025 01:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976636.1363780; Tue, 06 May 2025 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 1uC7Lx-0000oW-FM; Tue, 06 May 2025 01:44:13 +0000 Received: by outflank-mailman (input) for mailman id 976636; Tue, 06 May 2025 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 1uC7Lw-0000oI-DP for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 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 1uC7Lw-00CLII-1E for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7Lw-002ugU-0v for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 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=D9QB85/PsfkgCRo9l1CIFnYmnRhDnSm7cFawuw7RCHE=; b=fTuPeNlZhOzEOAi9Z7N0v8VJp0 8bh2XZyobxrlN19XSK9cO8PUCujWRQ+zWvimz0oe7f2xVY17ZaVNq93YFH3Zzc1PqH1QLrZs/TSpq zZQ9jIXGfE4oOMGcPCulwWZFksEByVKbbhPCekea4Wcex+drkgi2c7WYPDuCpIxkw7N0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: dom0less: make some parts of Arm's CONFIG_DOM0LESS common Message-Id: Date: Tue, 06 May 2025 01:44:12 +0000 commit ad03faa942b953752a1e2083430be23033a3a5c3 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:32 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:17 2025 -0700 xen/common: dom0less: make some parts of Arm's CONFIG_DOM0LESS common Move some parts of Arm's Dom0Less code to be reused by other architectures. At the moment, RISC-V is going to reuse these parts. Move dom0less-build.h from the Arm-specific directory to asm-generic as these header is expected to be the same across acrhictectures with some updates: add the following declaration of construct_domU(), and arch_create_domUs() as there are some parts which are still architecture-specific. Introduce HAS_DOM0LESS to provide ability to enable generic Dom0less code for an architecture. Relocate the CONFIG_DOM0LESS configuration to the common with adding "depends on HAS_DOM0LESS" to not break builds for architectures which don't support CONFIG_DOM0LESS config, especically it would be useful to not provide stubs for construct_domU(), arch_create_domUs() in case of *-randconfig which may set CONFIG_DOM0LESS=y. Move is_dom0less_mode() function to the common code, as it depends on boot modules that are already part of the common code. Move create_domUs() function to the common code with some updates: - Add arch_create_domUs() to cover parsing of arch-specific features, for example, SVE (Scalar Vector Extension ) exists only in Arm. Signed-off-by: Oleksii Kurochko [stefano: fix arch_create_domUs to only modify flags] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/arm/Kconfig | 9 +- xen/arch/arm/dom0less-build.c | 371 +++++------------------------- xen/arch/arm/include/asm/Makefile | 1 + xen/arch/arm/include/asm/dom0less-build.h | 34 --- xen/common/Kconfig | 12 + xen/common/device-tree/Makefile | 1 + xen/common/device-tree/dom0less-build.c | 294 +++++++++++++++++++++++ xen/include/asm-generic/dom0less-build.h | 50 ++++ 8 files changed, 415 insertions(+), 357 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index da8a406f5a..d0e0a7753c 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -15,6 +15,7 @@ config ARM select GENERIC_UART_INIT select HAS_ALTERNATIVE if HAS_VMAP select HAS_DEVICE_TREE + select HAS_DOM0LESS select HAS_STACK_PROTECTOR select HAS_UBSAN @@ -120,14 +121,6 @@ config GICV2 Driver for the ARM Generic Interrupt Controller v2. If unsure, say Y -config DOM0LESS_BOOT - bool "Dom0less boot support" if EXPERT - default y - help - Dom0less boot support enables Xen to create and start domU guests during - Xen boot without the need of a control domain (Dom0), which could be - present anyway. - config GICV3 bool "GICv3 driver" depends on !NEW_VGIC diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a356fc94fc..a731fdc653 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -22,48 +22,7 @@ #include #include -#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX - -static domid_t __initdata xs_domid = DOMID_INVALID; -static bool __initdata need_xenstore; - -void __init set_xs_domain(struct domain *d) -{ - xs_domid = d->domain_id; - set_global_virq_handler(d, VIRQ_DOM_EXC); -} - -bool __init is_dom0less_mode(void) -{ - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; - unsigned int i; - bool dom0found = false; - bool domUfound = false; - - /* Look into the bootmodules */ - for ( i = 0 ; i < mods->nr_mods ; i++ ) - { - mod = &mods->module[i]; - /* Find if dom0 and domU kernels are present */ - if ( mod->kind == BOOTMOD_KERNEL ) - { - if ( mod->domU == false ) - { - dom0found = true; - break; - } - else - domUfound = true; - } - } - - /* - * If there is no dom0 kernel but at least one domU, then we are in - * dom0less mode - */ - return ( !dom0found && domUfound ); -} +bool __initdata need_xenstore; #ifdef CONFIG_VGICV2 static int __init make_gicv2_domU_node(struct kernel_info *kinfo) @@ -686,25 +645,6 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) return -EINVAL; } -static int __init alloc_xenstore_evtchn(struct domain *d) -{ - evtchn_alloc_unbound_t alloc; - int rc; - - alloc.dom = d->domain_id; - alloc.remote_dom = xs_domid; - rc = evtchn_alloc_unbound(&alloc, 0); - if ( rc ) - { - printk("Failed allocating event channel for domain\n"); - return rc; - } - - d->arch.hvm.params[HVM_PARAM_STORE_EVTCHN] = alloc.port; - - return 0; -} - #define XENSTORE_PFN_OFFSET 1 static int __init alloc_xenstore_page(struct domain *d) { @@ -771,36 +711,6 @@ static int __init alloc_xenstore_params(struct kernel_info *kinfo) return rc; } -static void __init initialize_domU_xenstore(void) -{ - struct domain *d; - - if ( xs_domid == DOMID_INVALID ) - return; - - for_each_domain( d ) - { - uint64_t gfn = d->arch.hvm.params[HVM_PARAM_STORE_PFN]; - int rc; - - if ( gfn == 0 ) - continue; - - if ( is_xenstore_domain(d) ) - continue; - - rc = alloc_xenstore_evtchn(d); - if ( rc < 0 ) - panic("%pd: Failed to allocate xenstore_evtchn\n", d); - - if ( gfn != XENSTORE_PFN_LATE_ALLOC && IS_ENABLED(CONFIG_GRANT_TABLE) ) - { - ASSERT(gfn < UINT32_MAX); - gnttab_seed_entry(d, GNTTAB_RESERVED_XENSTORE, xs_domid, gfn); - } - } -} - static void __init domain_vcpu_affinity(struct domain *d, const struct dt_device_node *node) { @@ -906,8 +816,8 @@ static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, } #endif /* CONFIG_ARCH_PAGING_MEMPOOL */ -static int __init construct_domU(struct domain *d, - const struct dt_device_node *node) +int __init construct_domU(struct domain *d, + const struct dt_device_node *node) { struct kernel_info kinfo = KERNEL_INFO_INIT; const char *dom0less_enhanced; @@ -1009,246 +919,77 @@ static int __init construct_domU(struct domain *d, return alloc_xenstore_params(&kinfo); } -void __init create_domUs(void) +void __init arch_create_domUs(struct dt_device_node *node, + struct xen_domctl_createdomain *d_cfg, + unsigned int flags) { - struct dt_device_node *node; - const char *dom0less_iommu; - bool iommu = false; - const struct dt_device_node *cpupool_node, - *chosen = dt_find_node_by_path("/chosen"); - const char *llc_colors_str = NULL; - - BUG_ON(chosen == NULL); - dt_for_each_child_node(chosen, node) - { - struct domain *d; - struct xen_domctl_createdomain d_cfg = { - .arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE, - .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, - /* - * The default of 1023 should be sufficient for guests because - * on ARM we don't bind physical interrupts to event channels. - * The only use of the evtchn port is inter-domain communications. - * 1023 is also the default value used in libxl. - */ - .max_evtchn_port = 1023, - .max_grant_frames = -1, - .max_maptrack_frames = -1, - .grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version), - }; - unsigned int flags = 0U; - bool has_dtb = false; - uint32_t val; - int rc; - - if ( !dt_device_is_compatible(node, "xen,domain") ) - continue; - - if ( (max_init_domid + 1) >= DOMID_FIRST_RESERVED ) - panic("No more domain IDs available\n"); + uint32_t val; - if ( dt_property_read_u32(node, "capabilities", &val) ) - { - if ( val & ~DOMAIN_CAPS_MASK ) - panic("Invalid capabilities (%"PRIx32")\n", val); - - if ( val & DOMAIN_CAPS_CONTROL ) - flags |= CDF_privileged; - - if ( val & DOMAIN_CAPS_HARDWARE ) - { - if ( hardware_domain ) - panic("Only 1 hardware domain can be specified! (%pd)\n", - hardware_domain); - - d_cfg.max_grant_frames = gnttab_dom0_frames(); - d_cfg.max_evtchn_port = -1; - flags |= CDF_hardware; - iommu = true; - } - - if ( val & DOMAIN_CAPS_XENSTORE ) - { - if ( xs_domid != DOMID_INVALID ) - panic("Only 1 xenstore domain can be specified! (%u)\n", - xs_domid); + d_cfg->arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE; + d_cfg->flags |= XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap; - d_cfg.flags |= XEN_DOMCTL_CDF_xs_domain; - d_cfg.max_evtchn_port = -1; - } - } - - if ( dt_find_property(node, "xen,static-mem", NULL) ) - { - if ( llc_coloring_enabled ) - panic("LLC coloring and static memory are incompatible\n"); - - flags |= CDF_staticmem; - } - - if ( dt_property_read_bool(node, "direct-map") ) - { - if ( !(flags & CDF_staticmem) ) - panic("direct-map is not valid for domain %s without static allocation.\n", - dt_node_name(node)); - - flags |= CDF_directmap; - } - - if ( !dt_property_read_u32(node, "cpus", &d_cfg.max_vcpus) ) - panic("Missing property 'cpus' for domain %s\n", - dt_node_name(node)); - - if ( !dt_property_read_string(node, "passthrough", &dom0less_iommu) ) - { - if ( flags & CDF_hardware ) - panic("Don't specify passthrough for hardware domain\n"); - - if ( !strcmp(dom0less_iommu, "enabled") ) - iommu = true; - } - - if ( (flags & CDF_hardware) && !(flags & CDF_directmap) && - !iommu_enabled ) - panic("non-direct mapped hardware domain requires iommu\n"); - - if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") ) - { - if ( flags & CDF_hardware ) - panic("\"multiboot,device-tree\" incompatible with hardware domain\n"); - - has_dtb = true; - } - - if ( iommu_enabled && (iommu || has_dtb) ) - d_cfg.flags |= XEN_DOMCTL_CDF_iommu; - - if ( !dt_property_read_u32(node, "nr_spis", &d_cfg.arch.nr_spis) ) - { - int vpl011_virq = GUEST_VPL011_SPI; - - d_cfg.arch.nr_spis = VGIC_DEF_NR_SPIS; - - /* - * The VPL011 virq is GUEST_VPL011_SPI, unless direct-map is - * set, in which case it'll match the hardware. - * - * Since the domain is not yet created, we can't use - * d->arch.vpl011.irq. So the logic to find the vIRQ has to - * be hardcoded. - * The logic here shall be consistent with the one in - * domain_vpl011_init(). - */ - if ( flags & CDF_directmap ) - { - vpl011_virq = serial_irq(SERHND_DTUART); - if ( vpl011_virq < 0 ) - panic("Error getting IRQ number for this serial port %d\n", - SERHND_DTUART); - } + if ( !dt_property_read_u32(node, "nr_spis", &d_cfg->arch.nr_spis) ) + { + int vpl011_virq = GUEST_VPL011_SPI; - /* - * vpl011 uses one emulated SPI. If vpl011 is requested, make - * sure that we allocate enough SPIs for it. - */ - if ( dt_property_read_bool(node, "vpl011") ) - d_cfg.arch.nr_spis = MAX(d_cfg.arch.nr_spis, - vpl011_virq - 32 + 1); - } - else if ( flags & CDF_hardware ) - panic("nr_spis cannot be specified for hardware domain\n"); + d_cfg->arch.nr_spis = VGIC_DEF_NR_SPIS; - /* Get the optional property domain-cpupool */ - cpupool_node = dt_parse_phandle(node, "domain-cpupool", 0); - if ( cpupool_node ) + /* + * The VPL011 virq is GUEST_VPL011_SPI, unless direct-map is + * set, in which case it'll match the hardware. + * + * Since the domain is not yet created, we can't use + * d->arch.vpl011.irq. So the logic to find the vIRQ has to + * be hardcoded. + * The logic here shall be consistent with the one in + * domain_vpl011_init(). + */ + if ( flags & CDF_directmap ) { - int pool_id = btcpupools_get_domain_pool_id(cpupool_node); - if ( pool_id < 0 ) - panic("Error getting cpupool id from domain-cpupool (%d)\n", - pool_id); - d_cfg.cpupool_id = pool_id; + vpl011_virq = serial_irq(SERHND_DTUART); + if ( vpl011_virq < 0 ) + panic("Error getting IRQ number for this serial port %d\n", + SERHND_DTUART); } - if ( dt_property_read_u32(node, "max_grant_version", &val) ) - d_cfg.grant_opts = XEN_DOMCTL_GRANT_version(val); + /* + * vpl011 uses one emulated SPI. If vpl011 is requested, make + * sure that we allocate enough SPIs for it. + */ + if ( dt_property_read_bool(node, "vpl011") ) + d_cfg->arch.nr_spis = MAX(d_cfg->arch.nr_spis, + vpl011_virq - 32 + 1); + } + else if ( flags & CDF_hardware ) + panic("nr_spis cannot be specified for hardware domain\n"); - if ( dt_property_read_u32(node, "max_grant_frames", &val) ) - { - if ( val > INT32_MAX ) - panic("max_grant_frames (%"PRIu32") overflow\n", val); - d_cfg.max_grant_frames = val; - } + if ( dt_get_property(node, "sve", &val) ) + { +#ifdef CONFIG_ARM64_SVE + unsigned int sve_vl_bits; + bool ret = false; - if ( dt_property_read_u32(node, "max_maptrack_frames", &val) ) + if ( !val ) { - if ( val > INT32_MAX ) - panic("max_maptrack_frames (%"PRIu32") overflow\n", val); - d_cfg.max_maptrack_frames = val; + /* Property found with no value, means max HW VL supported */ + ret = sve_domctl_vl_param(-1, &sve_vl_bits); } - - if ( dt_get_property(node, "sve", &val) ) + else { -#ifdef CONFIG_ARM64_SVE - unsigned int sve_vl_bits; - bool ret = false; - - if ( !val ) - { - /* Property found with no value, means max HW VL supported */ - ret = sve_domctl_vl_param(-1, &sve_vl_bits); - } + if ( dt_property_read_u32(node, "sve", &val) ) + ret = sve_domctl_vl_param(val, &sve_vl_bits); else - { - if ( dt_property_read_u32(node, "sve", &val) ) - ret = sve_domctl_vl_param(val, &sve_vl_bits); - else - panic("Error reading 'sve' property\n"); - } + panic("Error reading 'sve' property\n"); + } - if ( ret ) - d_cfg.arch.sve_vl = sve_encode_vl(sve_vl_bits); - else - panic("SVE vector length error\n"); + if ( ret ) + d_cfg->arch.sve_vl = sve_encode_vl(sve_vl_bits); + else + panic("SVE vector length error\n"); #else - panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); + panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); #endif - } - - dt_property_read_string(node, "llc-colors", &llc_colors_str); - if ( !llc_coloring_enabled && llc_colors_str ) - panic("'llc-colors' found, but LLC coloring is disabled\n"); - - /* - * The variable max_init_domid is initialized with zero, so here it's - * very important to use the pre-increment operator to call - * domain_create() with a domid > 0. (domid == 0 is reserved for Dom0) - */ - d = domain_create(++max_init_domid, &d_cfg, flags); - if ( IS_ERR(d) ) - panic("Error creating domain %s (rc = %ld)\n", - dt_node_name(node), PTR_ERR(d)); - - if ( llc_coloring_enabled && - (rc = domain_set_llc_colors_from_str(d, llc_colors_str)) ) - panic("Error initializing LLC coloring for domain %s (rc = %d)\n", - dt_node_name(node), rc); - - d->is_console = true; - dt_device_set_used_by(node, d->domain_id); - - rc = construct_domU(d, node); - if ( rc ) - panic("Could not set up domain %s (rc = %d)\n", - dt_node_name(node), rc); - - if ( d_cfg.flags & XEN_DOMCTL_CDF_xs_domain ) - set_xs_domain(d); } - - if ( need_xenstore && xs_domid == DOMID_INVALID ) - panic("xenstore requested, but xenstore domain not present\n"); - - initialize_domU_xenstore(); } /* diff --git a/xen/arch/arm/include/asm/Makefile b/xen/arch/arm/include/asm/Makefile index 4a4036c951..831c914cce 100644 --- a/xen/arch/arm/include/asm/Makefile +++ b/xen/arch/arm/include/asm/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only generic-y += altp2m.h generic-y += device.h +generic-y += dom0less-build.h generic-y += hardirq.h generic-y += iocap.h generic-y += paging.h diff --git a/xen/arch/arm/include/asm/dom0less-build.h b/xen/arch/arm/include/asm/dom0less-build.h deleted file mode 100644 index b0e41a1954..0000000000 --- a/xen/arch/arm/include/asm/dom0less-build.h +++ /dev/null @@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_DOM0LESS_BUILD_H_ -#define __ASM_DOM0LESS_BUILD_H_ - -#include - -#ifdef CONFIG_DOM0LESS_BOOT - -void create_domUs(void); -bool is_dom0less_mode(void); -void set_xs_domain(struct domain *d); - -#else /* !CONFIG_DOM0LESS_BOOT */ - -static inline void create_domUs(void) {} -static inline bool is_dom0less_mode(void) -{ - return false; -} -static inline void set_xs_domain(struct domain *d) {} - -#endif /* CONFIG_DOM0LESS_BOOT */ - -#endif /* __ASM_DOM0LESS_BUILD_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/Kconfig b/xen/common/Kconfig index be28060716..f291a5c1c7 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -12,6 +12,15 @@ config CORE_PARKING bool depends on NR_CPUS > 1 +config DOM0LESS_BOOT + bool "Dom0less boot support" if EXPERT + depends on HAS_DOM0LESS && HAS_DEVICE_TREE + default y + help + Dom0less boot support enables Xen to create and start domU guests during + Xen boot without the need of a control domain (Dom0), which could be + present anyway. + config GRANT_TABLE bool "Grant table support" if EXPERT default y @@ -74,6 +83,9 @@ config HAS_DEVICE_TREE bool select LIBFDT +config HAS_DOM0LESS + bool + config HAS_DIT # Data Independent Timing bool diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index 7c549be38a..f3dafc9b81 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -1,5 +1,6 @@ obj-y += bootfdt.init.o obj-y += bootinfo.init.o obj-y += device-tree.o +obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c new file mode 100644 index 0000000000..203b762e2c --- /dev/null +++ b/xen/common/device-tree/dom0less-build.c @@ -0,0 +1,294 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +static domid_t __initdata xs_domid = DOMID_INVALID; + +void __init set_xs_domain(struct domain *d) +{ + xs_domid = d->domain_id; + set_global_virq_handler(d, VIRQ_DOM_EXC); +} + +bool __init is_dom0less_mode(void) +{ + struct bootmodules *mods = &bootinfo.modules; + struct bootmodule *mod; + unsigned int i; + bool dom0found = false; + bool domUfound = false; + + /* Look into the bootmodules */ + for ( i = 0 ; i < mods->nr_mods ; i++ ) + { + mod = &mods->module[i]; + /* Find if dom0 and domU kernels are present */ + if ( mod->kind == BOOTMOD_KERNEL ) + { + if ( mod->domU == false ) + { + dom0found = true; + break; + } + else + domUfound = true; + } + } + + /* + * If there is no dom0 kernel but at least one domU, then we are in + * dom0less mode + */ + return ( !dom0found && domUfound ); +} + +static int __init alloc_xenstore_evtchn(struct domain *d) +{ + evtchn_alloc_unbound_t alloc; + int rc; + + alloc.dom = d->domain_id; + alloc.remote_dom = xs_domid; + rc = evtchn_alloc_unbound(&alloc, 0); + if ( rc ) + { + printk("Failed allocating event channel for domain\n"); + return rc; + } + + d->arch.hvm.params[HVM_PARAM_STORE_EVTCHN] = alloc.port; + + return 0; +} + +static void __init initialize_domU_xenstore(void) +{ + struct domain *d; + + if ( xs_domid == DOMID_INVALID ) + return; + + for_each_domain( d ) + { + uint64_t gfn = d->arch.hvm.params[HVM_PARAM_STORE_PFN]; + int rc; + + if ( gfn == 0 ) + continue; + + if ( is_xenstore_domain(d) ) + continue; + + rc = alloc_xenstore_evtchn(d); + if ( rc < 0 ) + panic("%pd: Failed to allocate xenstore_evtchn\n", d); + + if ( gfn != XENSTORE_PFN_LATE_ALLOC && IS_ENABLED(CONFIG_GRANT_TABLE) ) + { + ASSERT(gfn < UINT32_MAX); + gnttab_seed_entry(d, GNTTAB_RESERVED_XENSTORE, xs_domid, gfn); + } + } +} + +void __init create_domUs(void) +{ + struct dt_device_node *node; + const char *dom0less_iommu; + bool iommu = false; + const struct dt_device_node *cpupool_node, + *chosen = dt_find_node_by_path("/chosen"); + const char *llc_colors_str = NULL; + + BUG_ON(chosen == NULL); + dt_for_each_child_node(chosen, node) + { + struct domain *d; + struct xen_domctl_createdomain d_cfg = {0}; + unsigned int flags = 0U; + bool has_dtb = false; + uint32_t val; + int rc; + + if ( !dt_device_is_compatible(node, "xen,domain") ) + continue; + + if ( (max_init_domid + 1) >= DOMID_FIRST_RESERVED ) + panic("No more domain IDs available\n"); + + d_cfg.max_evtchn_port = 1023; + d_cfg.max_grant_frames = -1; + d_cfg.max_maptrack_frames = -1; + d_cfg.grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version); + + if ( dt_property_read_u32(node, "capabilities", &val) ) + { + if ( val & ~DOMAIN_CAPS_MASK ) + panic("Invalid capabilities (%"PRIx32")\n", val); + + if ( val & DOMAIN_CAPS_CONTROL ) + flags |= CDF_privileged; + + if ( val & DOMAIN_CAPS_HARDWARE ) + { + if ( hardware_domain ) + panic("Only 1 hardware domain can be specified! (%pd)\n", + hardware_domain); + +#ifdef CONFIG_GRANT_TABLE + d_cfg.max_grant_frames = gnttab_dom0_frames(); +#endif + d_cfg.max_evtchn_port = -1; + flags |= CDF_hardware; + iommu = true; + } + + if ( val & DOMAIN_CAPS_XENSTORE ) + { + if ( xs_domid != DOMID_INVALID ) + panic("Only 1 xenstore domain can be specified! (%u)\n", + xs_domid); + + d_cfg.flags |= XEN_DOMCTL_CDF_xs_domain; + d_cfg.max_evtchn_port = -1; + } + } + + if ( dt_find_property(node, "xen,static-mem", NULL) ) + { + if ( llc_coloring_enabled ) + panic("LLC coloring and static memory are incompatible\n"); + + flags |= CDF_staticmem; + } + + if ( dt_property_read_bool(node, "direct-map") ) + { + if ( !(flags & CDF_staticmem) ) + panic("direct-map is not valid for domain %s without static allocation.\n", + dt_node_name(node)); + + flags |= CDF_directmap; + } + + if ( !dt_property_read_u32(node, "cpus", &d_cfg.max_vcpus) ) + panic("Missing property 'cpus' for domain %s\n", + dt_node_name(node)); + + if ( !dt_property_read_string(node, "passthrough", &dom0less_iommu) ) + { + if ( flags & CDF_hardware ) + panic("Don't specify passthrough for hardware domain\n"); + + if ( !strcmp(dom0less_iommu, "enabled") ) + iommu = true; + } + + if ( (flags & CDF_hardware) && !(flags & CDF_directmap) && + !iommu_enabled ) + panic("non-direct mapped hardware domain requires iommu\n"); + + if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") ) + { + if ( flags & CDF_hardware ) + panic("\"multiboot,device-tree\" incompatible with hardware domain\n"); + + has_dtb = true; + } + + if ( iommu_enabled && (iommu || has_dtb) ) + d_cfg.flags |= XEN_DOMCTL_CDF_iommu; + + /* Get the optional property domain-cpupool */ + cpupool_node = dt_parse_phandle(node, "domain-cpupool", 0); + if ( cpupool_node ) + { + int pool_id = btcpupools_get_domain_pool_id(cpupool_node); + if ( pool_id < 0 ) + panic("Error getting cpupool id from domain-cpupool (%d)\n", + pool_id); + d_cfg.cpupool_id = pool_id; + } + + if ( dt_property_read_u32(node, "max_grant_version", &val) ) + d_cfg.grant_opts = XEN_DOMCTL_GRANT_version(val); + + if ( dt_property_read_u32(node, "max_grant_frames", &val) ) + { + if ( val > INT32_MAX ) + panic("max_grant_frames (%"PRIu32") overflow\n", val); + d_cfg.max_grant_frames = val; + } + + if ( dt_property_read_u32(node, "max_maptrack_frames", &val) ) + { + if ( val > INT32_MAX ) + panic("max_maptrack_frames (%"PRIu32") overflow\n", val); + d_cfg.max_maptrack_frames = val; + } + + dt_property_read_string(node, "llc-colors", &llc_colors_str); + if ( !llc_coloring_enabled && llc_colors_str ) + panic("'llc-colors' found, but LLC coloring is disabled\n"); + + arch_create_domUs(node, &d_cfg, flags); + + /* + * The variable max_init_domid is initialized with zero, so here it's + * very important to use the pre-increment operator to call + * domain_create() with a domid > 0. (domid == 0 is reserved for Dom0) + */ + d = domain_create(++max_init_domid, &d_cfg, flags); + if ( IS_ERR(d) ) + panic("Error creating domain %s (rc = %ld)\n", + dt_node_name(node), PTR_ERR(d)); + + if ( llc_coloring_enabled && + (rc = domain_set_llc_colors_from_str(d, llc_colors_str)) ) + panic("Error initializing LLC coloring for domain %s (rc = %d)\n", + dt_node_name(node), rc); + + d->is_console = true; + dt_device_set_used_by(node, d->domain_id); + + rc = construct_domU(d, node); + if ( rc ) + panic("Could not set up domain %s (rc = %d)\n", + dt_node_name(node), rc); + + if ( d_cfg.flags & XEN_DOMCTL_CDF_xs_domain ) + set_xs_domain(d); + } + + if ( need_xenstore && xs_domid == DOMID_INVALID ) + panic("xenstore requested, but xenstore domain not present\n"); + + initialize_domU_xenstore(); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-generic/dom0less-build.h b/xen/include/asm-generic/dom0less-build.h new file mode 100644 index 0000000000..ef2073d802 --- /dev/null +++ b/xen/include/asm-generic/dom0less-build.h @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_GENERIC_DOM0LESS_BUILD_H__ +#define __ASM_GENERIC_DOM0LESS_BUILD_H__ + +#include + +struct domain; + +#ifdef CONFIG_DOM0LESS_BOOT + +#include + +struct dt_device_node; + +/* TODO: remove both when construct_domU() will be moved to common. */ +#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX +extern bool need_xenstore; + +void create_domUs(void); +bool is_dom0less_mode(void); +void set_xs_domain(struct domain *d); + +int construct_domU(struct domain *d, const struct dt_device_node *node); + +void arch_create_domUs(struct dt_device_node *node, + struct xen_domctl_createdomain *d_cfg, + unsigned int flags); + +#else /* !CONFIG_DOM0LESS_BOOT */ + +static inline void create_domUs(void) {} +static inline bool is_dom0less_mode(void) +{ + return false; +} +static inline void set_xs_domain(struct domain *d) {} + +#endif /* CONFIG_DOM0LESS_BOOT */ + +#endif /* __ASM_GENERIC_DOM0LESS_BUILD_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976637.1363785 (Exim 4.92) (envelope-from ) id 1uC7M7-0000s9-Lp; Tue, 06 May 2025 01:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976637.1363785; Tue, 06 May 2025 01: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 1uC7M7-0000rz-J1; Tue, 06 May 2025 01:44:23 +0000 Received: by outflank-mailman (input) for mailman id 976637; Tue, 06 May 2025 01:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC7M6-0000rp-HA for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC7M6-00CLIM-1c for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7M6-002uhJ-1S for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01: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=7pZ2n4CWL38Egmyoo1RdTyt8hFHBE4NSRH1rOk6qBeo=; b=dNOAaG5S4ths6V1RbksDtikX9I UcUPPSmRlZfv9b0uYYVSAq+Ffu7AblKeOzcY3v5gH+q/7XZRg3kI5bgxds1mgOxfSVylnkebOlxrn O5YimeOheOqZmFHPDL5Az5V370HxX9R5L2fQYEtDuIBo6VtG+LYTURjZI2QhpUIi/2sc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] asm-generic: move parts of Arm's asm/kernel.h to common code Message-Id: Date: Tue, 06 May 2025 01:44:22 +0000 commit 02ac109aa5d9c42a5859e0b46d44844536abd4dd Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:33 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 asm-generic: move parts of Arm's asm/kernel.h to common code Move the following parts to common with the following changes: - struct kernel_info: - Create arch_kernel_info for arch specific kernel information. At the moment, it contains domain_type for Arm. - s/phandle_gic/phandle_intc to have more generic name suitable for other archs. - Make text_offset of zimage structure available for RISCV_64. - Wrap by `#ifdef KERNEL_INFO_SHM_MEM_INIT` definition of KERNEL_SHM_MEM_INIT and wrap by `#ifndef KERNEL_INFO_INIT` definition of KERNEL_INFO_INIT to have ability to override KERNEL_INFO_SHM_MEM_INIT for arch in case it doesn't want to use generic one. - Move DOM0LESS_* macros to dom0less-build.h. - Move all others parts of Arm's kernel.h to xen/fdt-kernel.h. Because of the changes in struct kernel_info the correspondent parts of Arm's code are updated. As part of this patch the following clean up happens: - Drop asm/setup.h from asm/kernel.h as nothing depends from it. Add inclusion of asm/setup.h for a code which uses device_tree_get_reg() to avoid compilation issues for CONFIG_STATIC_MEMORY and CONFIG_STATIC_SHM. - Drop inclusion of asm/kernel.h everywhere except xen/fdt-kernel.h. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/acpi/domain_build.c | 2 +- xen/arch/arm/dom0less-build.c | 31 ++++---- xen/arch/arm/domain_build.c | 12 +-- xen/arch/arm/include/asm/domain_build.h | 2 +- xen/arch/arm/include/asm/kernel.h | 123 +--------------------------- xen/arch/arm/include/asm/static-memory.h | 2 +- xen/arch/arm/include/asm/static-shmem.h | 2 +- xen/arch/arm/kernel.c | 13 +-- xen/arch/arm/static-memory.c | 1 + xen/arch/arm/static-shmem.c | 1 + xen/common/device-tree/dt-overlay.c | 2 +- xen/include/asm-generic/dom0less-build.h | 28 +++++++ xen/include/xen/fdt-kernel.h | 132 +++++++++++++++++++++++++++++++ 13 files changed, 198 insertions(+), 153 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index 2ce75543d0..f9ca8b47e5 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -18,7 +19,6 @@ #include #include #include -#include #include /* Override macros from asm/page.h to make them work with mfn_t */ diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a731fdc653..22ac73ab8f 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include @@ -64,11 +65,11 @@ static int __init make_gicv2_domU_node(struct kernel_info *kinfo) if (res) return res; - res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_intc); if (res) return res; - res = fdt_property_cell(fdt, "phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "phandle", kinfo->phandle_intc); if (res) return res; @@ -135,11 +136,11 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo) if (res) return res; - res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_intc); if (res) return res; - res = fdt_property_cell(fdt, "phandle", kinfo->phandle_gic); + res = fdt_property_cell(fdt, "phandle", kinfo->phandle_intc); if (res) return res; @@ -200,7 +201,7 @@ static int __init make_vpl011_uart_node(struct kernel_info *kinfo) return res; res = fdt_property_cell(fdt, "interrupt-parent", - kinfo->phandle_gic); + kinfo->phandle_intc); if ( res ) return res; @@ -486,10 +487,10 @@ static int __init domain_handle_dtb_bootmodule(struct domain *d, */ if ( dt_node_cmp(name, "gic") == 0 ) { - uint32_t phandle_gic = fdt_get_phandle(pfdt, node_next); + uint32_t phandle_intc = fdt_get_phandle(pfdt, node_next); - if ( phandle_gic != 0 ) - kinfo->phandle_gic = phandle_gic; + if ( phandle_intc != 0 ) + kinfo->phandle_intc = phandle_intc; continue; } @@ -532,7 +533,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) int addrcells, sizecells; int ret, fdt_size = DOMU_DTB_SIZE; - kinfo->phandle_gic = GUEST_PHANDLE_GIC; + kinfo->phandle_intc = GUEST_PHANDLE_GIC; kinfo->gnttab_start = GUEST_GNTTAB_BASE; kinfo->gnttab_size = GUEST_GNTTAB_SIZE; @@ -594,7 +595,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) /* * domain_handle_dtb_bootmodule has to be called before the rest of * the device tree is generated because it depends on the value of - * the field phandle_gic. + * the field phandle_intc. */ if ( kinfo->dtb_bootmodule ) { @@ -611,7 +612,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) if ( ret ) goto err; - if ( kinfo->vpl011 ) + if ( kinfo->arch.vpl011 ) { ret = -EINVAL; #ifdef CONFIG_SBSA_VUART_CONSOLE @@ -839,8 +840,8 @@ int __init construct_domU(struct domain *d, printk("*** LOADING DOMU cpus=%u memory=%#"PRIx64"KB ***\n", d->max_vcpus, mem); - kinfo.vpl011 = dt_property_read_bool(node, "vpl011"); - if ( kinfo.vpl011 && is_hardware_domain(d) ) + kinfo.arch.vpl011 = dt_property_read_bool(node, "vpl011"); + if ( kinfo.arch.vpl011 && is_hardware_domain(d) ) panic("hardware domain cannot specify vpl011\n"); rc = dt_property_read_string(node, "xen,enhanced", &dom0less_enhanced); @@ -872,7 +873,7 @@ int __init construct_domU(struct domain *d, #ifdef CONFIG_ARM_64 /* type must be set before allocate memory */ - d->arch.type = kinfo.type; + d->arch.type = kinfo.arch.type; #endif if ( is_hardware_domain(d) ) { @@ -898,7 +899,7 @@ int __init construct_domU(struct domain *d, * tree node in prepare_dtb_domU, so initialization on related variables * shall be done first. */ - if ( kinfo.vpl011 ) + if ( kinfo.arch.vpl011 ) { rc = domain_vpl011_init(d, NULL); if ( rc < 0 ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 270a6b97e4..8c7a054718 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -747,7 +747,7 @@ static int __init fdt_property_interrupts(const struct kernel_info *kinfo, return res; res = fdt_property_cell(kinfo->fdt, "interrupt-parent", - kinfo->phandle_gic); + kinfo->phandle_intc); return res; } @@ -2026,7 +2026,7 @@ static int __init prepare_dtb_hwdom(struct domain *d, struct kernel_info *kinfo) ASSERT(dt_host && (dt_host->sibling == NULL)); - kinfo->phandle_gic = dt_interrupt_controller->phandle; + kinfo->phandle_intc = dt_interrupt_controller->phandle; fdt = device_tree_flattened; new_size = fdt_totalsize(fdt) + DOM0_FDT_EXTRA_SIZE; @@ -2196,13 +2196,13 @@ int __init construct_domain(struct domain *d, struct kernel_info *kinfo) #ifdef CONFIG_ARM_64 /* if aarch32 mode is not supported at EL1 do not allow 32-bit domain */ - if ( !(cpu_has_el1_32) && kinfo->type == DOMAIN_32BIT ) + if ( !(cpu_has_el1_32) && kinfo->arch.type == DOMAIN_32BIT ) { printk("Platform does not support 32-bit domain\n"); return -EINVAL; } - if ( is_sve_domain(d) && (kinfo->type == DOMAIN_32BIT) ) + if ( is_sve_domain(d) && (kinfo->arch.type == DOMAIN_32BIT) ) { printk("SVE is not available for 32-bit domain\n"); return -EINVAL; @@ -2318,7 +2318,7 @@ int __init construct_hwdom(struct kernel_info *kinfo, #ifdef CONFIG_ARM_64 /* type must be set before allocate_memory */ - d->arch.type = kinfo->type; + d->arch.type = kinfo->arch.type; #endif find_gnttab_region(d, kinfo); if ( is_domain_direct_mapped(d) ) diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 378c10cc98..df1c0fe301 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -1,8 +1,8 @@ #ifndef __ASM_DOMAIN_BUILD_H__ #define __ASM_DOMAIN_BUILD_H__ +#include #include -#include typedef __be32 gic_interrupt_t[3]; typedef bool (*alloc_domheap_mem_cb)(struct domain *d, struct page_info *pg, diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index bdc96f4c18..7c3b7fde5b 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -6,137 +6,18 @@ #ifndef __ARCH_ARM_KERNEL_H__ #define __ARCH_ARM_KERNEL_H__ -#include #include -#include -/* - * List of possible features for dom0less domUs - * - * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All the - * default features (excluding Xenstore) will be - * available. Note that an OS *must* not rely on the - * availability of Xen features if this is not set. - * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. The - * xenstore page allocation is done by Xen at - * domain creation. This feature can't be - * enabled without the DOM0LESS_ENHANCED_NO_XS. - * DOM0LESS_XS_LEGACY Xenstore will be enabled for the VM, the - * xenstore page allocation will happen in - * init-dom0less. This feature can't be enabled - * without the DOM0LESS_ENHANCED_NO_XS. - * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All the - * default features (including Xenstore) will be - * available. Note that an OS *must* not rely on the - * availability of Xen features if this is not set. - * DOM0LESS_ENHANCED_LEGACY: Same as before, but using DOM0LESS_XS_LEGACY. - */ -#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) -#define DOM0LESS_XENSTORE BIT(1, U) -#define DOM0LESS_XS_LEGACY BIT(2, U) -#define DOM0LESS_ENHANCED_LEGACY (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XS_LEGACY) -#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENSTORE) - -struct kernel_info { +struct arch_kernel_info +{ #ifdef CONFIG_ARM_64 enum domain_type type; #endif - struct domain *d; - - void *fdt; /* flat device tree */ - paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ - struct meminfo mem; -#ifdef CONFIG_STATIC_SHM - struct shared_meminfo shm_mem; -#endif - - /* kernel entry point */ - paddr_t entry; - - /* grant table region */ - paddr_t gnttab_start; - paddr_t gnttab_size; - - /* boot blob load addresses */ - const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_bootmodule; - const char* cmdline; - paddr_t dtb_paddr; - paddr_t initrd_paddr; - /* Enable pl011 emulation */ bool vpl011; - - /* Enable/Disable PV drivers interfaces */ - uint16_t dom0less_feature; - - /* GIC phandle */ - uint32_t phandle_gic; - - /* loader to use for this kernel */ - void (*load)(struct kernel_info *info); - /* loader specific state */ - union { - struct { - paddr_t kernel_addr; - paddr_t len; -#ifdef CONFIG_ARM_64 - paddr_t text_offset; /* 64-bit Image only */ -#endif - paddr_t start; /* Must be 0 for 64-bit Image */ - } zimage; - }; }; -static inline struct membanks *kernel_info_get_mem(struct kernel_info *kinfo) -{ - return container_of(&kinfo->mem.common, struct membanks, common); -} - -static inline const struct membanks * -kernel_info_get_mem_const(const struct kernel_info *kinfo) -{ - return container_of(&kinfo->mem.common, const struct membanks, common); -} - -#ifdef CONFIG_STATIC_SHM -#define KERNEL_INFO_SHM_MEM_INIT \ - .shm_mem.common.max_banks = NR_SHMEM_BANKS, \ - .shm_mem.common.type = STATIC_SHARED_MEMORY, -#else -#define KERNEL_INFO_SHM_MEM_INIT -#endif - -#define KERNEL_INFO_INIT \ -{ \ - .mem.common.max_banks = NR_MEM_BANKS, \ - .mem.common.type = MEMORY, \ - KERNEL_INFO_SHM_MEM_INIT \ -} - -/* - * Probe the kernel to detemine its type and select a loader. - * - * Sets in info: - * ->type - * ->load hook, and sets loader specific variables ->zimage - */ -int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); - -/* - * Loads the kernel into guest RAM. - * - * Expects to be set in info when called: - * ->mem - * ->fdt - * - * Sets in info: - * ->entry - * ->dtb_paddr - * ->initrd_paddr - */ -void kernel_load(struct kernel_info *info); - #endif /* #ifdef __ARCH_ARM_KERNEL_H__ */ /* diff --git a/xen/arch/arm/include/asm/static-memory.h b/xen/arch/arm/include/asm/static-memory.h index 804166e541..a32a3c6553 100644 --- a/xen/arch/arm/include/asm/static-memory.h +++ b/xen/arch/arm/include/asm/static-memory.h @@ -3,8 +3,8 @@ #ifndef __ASM_STATIC_MEMORY_H_ #define __ASM_STATIC_MEMORY_H_ +#include #include -#include #ifdef CONFIG_STATIC_MEMORY diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index 94eaa9d500..a4f853805a 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -3,8 +3,8 @@ #ifndef __ASM_STATIC_SHMEM_H_ #define __ASM_STATIC_SHMEM_H_ +#include #include -#include #include #ifdef CONFIG_STATIC_SHM diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 2647812e8e..34c8233853 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -16,7 +17,7 @@ #include #include -#include +#include #include #define UIMAGE_MAGIC 0x27051956 @@ -101,7 +102,7 @@ static paddr_t __init kernel_zimage_place(struct kernel_info *info) paddr_t load_addr; #ifdef CONFIG_ARM_64 - if ( (info->type == DOMAIN_64BIT) && (info->zimage.start == 0) ) + if ( (info->arch.type == DOMAIN_64BIT) && (info->zimage.start == 0) ) return mem->bank[0].start + info->zimage.text_offset; #endif @@ -371,10 +372,10 @@ static int __init kernel_uimage_probe(struct kernel_info *info, switch ( uimage.arch ) { case IH_ARCH_ARM: - info->type = DOMAIN_32BIT; + info->arch.type = DOMAIN_32BIT; break; case IH_ARCH_ARM64: - info->type = DOMAIN_64BIT; + info->arch.type = DOMAIN_64BIT; break; default: printk(XENLOG_ERR "Unsupported uImage arch type %d\n", uimage.arch); @@ -444,7 +445,7 @@ static int __init kernel_zimage64_probe(struct kernel_info *info, info->load = kernel_zimage_load; - info->type = DOMAIN_64BIT; + info->arch.type = DOMAIN_64BIT; return 0; } @@ -496,7 +497,7 @@ static int __init kernel_zimage32_probe(struct kernel_info *info, info->load = kernel_zimage_load; #ifdef CONFIG_ARM_64 - info->type = DOMAIN_32BIT; + info->arch.type = DOMAIN_32BIT; #endif return 0; diff --git a/xen/arch/arm/static-memory.c b/xen/arch/arm/static-memory.c index d4585c5a06..e0f76afcd8 100644 --- a/xen/arch/arm/static-memory.c +++ b/xen/arch/arm/static-memory.c @@ -2,6 +2,7 @@ #include +#include #include static bool __init append_static_memory_to_bank(struct domain *d, diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index e8d4ca3ba3..14ae48fb1e 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -6,6 +6,7 @@ #include #include +#include #include #include diff --git a/xen/common/device-tree/dt-overlay.c b/xen/common/device-tree/dt-overlay.c index 97fb99eaaa..81107cb48d 100644 --- a/xen/common/device-tree/dt-overlay.c +++ b/xen/common/device-tree/dt-overlay.c @@ -6,8 +6,8 @@ * Written by Vikram Garhwal * */ -#include #include +#include #include #include #include diff --git a/xen/include/asm-generic/dom0less-build.h b/xen/include/asm-generic/dom0less-build.h index ef2073d802..2003be743f 100644 --- a/xen/include/asm-generic/dom0less-build.h +++ b/xen/include/asm-generic/dom0less-build.h @@ -17,6 +17,34 @@ struct dt_device_node; #define XENSTORE_PFN_LATE_ALLOC UINT64_MAX extern bool need_xenstore; +/* + * List of possible features for dom0less domUs + * + * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All the + * default features (excluding Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. The + * xenstore page allocation is done by Xen at + * domain creation. This feature can't be + * enabled without the DOM0LESS_ENHANCED_NO_XS. + * DOM0LESS_XS_LEGACY Xenstore will be enabled for the VM, the + * xenstore page allocation will happen in + * init-dom0less. This feature can't be enabled + * without the DOM0LESS_ENHANCED_NO_XS. + * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All the + * default features (including Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + * DOM0LESS_ENHANCED_LEGACY: Same as before, but using DOM0LESS_XS_LEGACY. + + */ +#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) +#define DOM0LESS_XENSTORE BIT(1, U) +#define DOM0LESS_XS_LEGACY BIT(2, U) +#define DOM0LESS_ENHANCED_LEGACY (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XS_LEGACY) +#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENSTORE) + void create_domUs(void); bool is_dom0less_mode(void); void set_xs_domain(struct domain *d); diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h new file mode 100644 index 0000000000..516cc68e90 --- /dev/null +++ b/xen/include/xen/fdt-kernel.h @@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * For Kernel image loading. + * + * Copyright (C) 2011 Citrix Systems, Inc. + */ +#ifndef __XEN_FDT_KERNEL_H__ +#define __XEN_FDT_KERNEL_H__ + +#include +#include +#include + +#if __has_include() +# include +#endif + +struct kernel_info { + struct domain *d; + + void *fdt; /* flat device tree */ + paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ + struct meminfo mem; +#ifdef CONFIG_STATIC_SHM + struct shared_meminfo shm_mem; +#endif + + /* kernel entry point */ + paddr_t entry; + + /* grant table region */ + paddr_t gnttab_start; + paddr_t gnttab_size; + + /* boot blob load addresses */ + const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_bootmodule; + const char* cmdline; + paddr_t dtb_paddr; + paddr_t initrd_paddr; + + /* Enable/Disable PV drivers interfaces */ + uint16_t dom0less_feature; + + /* Interrupt controller phandle */ + uint32_t phandle_intc; + + /* loader to use for this kernel */ + void (*load)(struct kernel_info *info); + + /* loader specific state */ + union { + struct { + paddr_t kernel_addr; + paddr_t len; +#if defined(CONFIG_ARM_64) || defined(CONFIG_RISCV_64) + paddr_t text_offset; /* 64-bit Image only */ +#endif + paddr_t start; /* Must be 0 for 64-bit Image */ + } zimage; + }; + +#if __has_include() + struct arch_kernel_info arch; +#endif +}; + +static inline struct membanks *kernel_info_get_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, const struct membanks, common); +} + +#ifndef KERNEL_INFO_SHM_MEM_INIT + +#ifdef CONFIG_STATIC_SHM +#define KERNEL_INFO_SHM_MEM_INIT \ + .shm_mem.common.max_banks = NR_SHMEM_BANKS, \ + .shm_mem.common.type = STATIC_SHARED_MEMORY, +#else +#define KERNEL_INFO_SHM_MEM_INIT +#endif + +#endif /* KERNEL_INFO_SHM_MEM_INIT */ + +#ifndef KERNEL_INFO_INIT + +#define KERNEL_INFO_INIT \ +{ \ + .mem.common.max_banks = NR_MEM_BANKS, \ + .mem.common.type = MEMORY, \ + KERNEL_INFO_SHM_MEM_INIT \ +} + +#endif /* KERNEL_INFO_INIT */ + +/* + * Probe the kernel to detemine its type and select a loader. + * + * Sets in info: + * ->load hook, and sets loader specific variables ->zimage + */ +int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); + +/* + * Loads the kernel into guest RAM. + * + * Expects to be set in info when called: + * ->mem + * ->fdt + * + * Sets in info: + * ->entry + * ->dtb_paddr + * ->initrd_paddr + */ +void kernel_load(struct kernel_info *info); + +#endif /* __XEN_FDT_KERNEL_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976638.1363789 (Exim 4.92) (envelope-from ) id 1uC7MI-0000un-NN; Tue, 06 May 2025 01:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976638.1363789; Tue, 06 May 2025 01: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 1uC7MI-0000ud-Kf; Tue, 06 May 2025 01:44:34 +0000 Received: by outflank-mailman (input) for mailman id 976638; Tue, 06 May 2025 01:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC7MG-0000uK-MO for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC7MG-00CLIa-28 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7MG-002ujz-1n for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01: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=GqLxBLTVxFBvSCt6mmX+sZ7O93fKnaBIHg0pjYjQV+U=; b=hZvqQsQQmPBVzlVJzRyi6vgWO0 oBusA8XY0CnApQaNbNy8wnSJGq2c96kSWd1nSWlgQvi9wc38Vob2K8Hn0l7ebTU0WVBF2gM0zV6qW 4wtPAEy+yKDbc8uaxb9sK8dnbnL3UrDv4Eo3rq6C+IN/ZhUVEqPqssDlmTMckM13PxQQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/static-shmem.h: drop inclusion of asm/setup.h Message-Id: Date: Tue, 06 May 2025 01:44:32 +0000 commit f92533a9d5cadad6cb739fd4016730ef2161d89a Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:34 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 arm/static-shmem.h: drop inclusion of asm/setup.h Nothing is dependent from asm/setup.h in asm/static-shmem.h so inclusion of asm/setup.h is droped. After this drop the following compilation error related to impicit declaration of the following functions device_tree_get_reg and map_device_irqs_to_domain, device_tree_get_u32 occur during compilation of dom0less-build.c ( as they are declared in asm/setup.h ). Add inclusion of in dt-overlay.c as it is using handle_device() declared in . Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/dom0less-build.c | 1 + xen/arch/arm/include/asm/static-shmem.h | 1 - xen/common/device-tree/dt-overlay.c | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 22ac73ab8f..7ea639525d 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index a4f853805a..4034cec32f 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -5,7 +5,6 @@ #include #include -#include #ifdef CONFIG_STATIC_SHM diff --git a/xen/common/device-tree/dt-overlay.c b/xen/common/device-tree/dt-overlay.c index 81107cb48d..d184186c01 100644 --- a/xen/common/device-tree/dt-overlay.c +++ b/xen/common/device-tree/dt-overlay.c @@ -13,6 +13,8 @@ #include #include +#include + #define DT_OVERLAY_MAX_SIZE KB(500) static LIST_HEAD(overlay_tracker); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976639.1363793 (Exim 4.92) (envelope-from ) id 1uC7MS-0000xE-Oj; Tue, 06 May 2025 01:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976639.1363793; Tue, 06 May 2025 01: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 1uC7MS-0000x6-M1; Tue, 06 May 2025 01:44:44 +0000 Received: by outflank-mailman (input) for mailman id 976639; Tue, 06 May 2025 01:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC7MQ-0000wo-Pk for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC7MQ-00CLIg-2T for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7MQ-002ul1-2K for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01: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=5SZ9LY4FGbmsdBxP95Q/7w4OqE7CBKr5I4BRkFqSRLA=; b=LwRDyaTKYJx/8oMXbHnaBU7ME5 p26zPdH3eR55PVwZqbT2Q4bk4b5vNagFRVkxQ2rywMbHSdNXNSar8y90A5g96aRl+gsolDs3i/Ur4 E2WdkSTamJSJAGi7FQiGq2K2qZE06r5YFVUz3VPndlLqLhPI/5PcIC9QL5chhWzyzaQo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] asm-generic: move some parts of Arm's domain_build.h to common Message-Id: Date: Tue, 06 May 2025 01:44:42 +0000 commit a03848f23b91905e764bfce37e10ae7c4dfcd512 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:35 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 asm-generic: move some parts of Arm's domain_build.h to common Nothing changed. Only some functions declaration are moved to xen/include/ headers as they are expected to be used by common code of domain builing or dom0less. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/acpi/domain_build.c | 1 + xen/arch/arm/dom0less-build.c | 1 + xen/arch/arm/domain_build.c | 1 + xen/arch/arm/include/asm/domain_build.h | 10 ---------- xen/arch/arm/kernel.c | 1 + xen/arch/arm/static-shmem.c | 1 + xen/include/xen/fdt-domain-build.h | 35 +++++++++++++++++++++++++++++++++ 7 files changed, 40 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index f9ca8b47e5..1c3555d814 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 7ea639525d..0adeec7b94 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 8c7a054718..9d649b06b3 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include #include +#include #include #include #include diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index df1c0fe301..ebe3724d89 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -12,18 +12,8 @@ bool allocate_domheap_memory(struct domain *d, paddr_t tot_size, bool allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, paddr_t tot_size); void allocate_memory(struct domain *d, struct kernel_info *kinfo); -int construct_domain(struct domain *d, struct kernel_info *kinfo); -int construct_hwdom(struct kernel_info *kinfo, - const struct dt_device_node *node); int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); -int make_chosen_node(const struct kernel_info *kinfo); -int make_cpus_node(const struct domain *d, void *fdt); -int make_hypervisor_node(struct domain *d, const struct kernel_info *kinfo, - int addrcells, int sizecells); -int make_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells, const struct membanks *mem); int make_psci_node(void *fdt); -int make_timer_node(const struct kernel_info *kinfo); void evtchn_allocate(struct domain *d); unsigned int get_allocation_size(paddr_t size); diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 34c8233853..aea8f44413 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 14ae48fb1e..1f8441d920 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include +#include #include #include #include diff --git a/xen/include/xen/fdt-domain-build.h b/xen/include/xen/fdt-domain-build.h new file mode 100644 index 0000000000..30d5358a0f --- /dev/null +++ b/xen/include/xen/fdt-domain-build.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __XEN_FDT_DOMAIN_BUILD_H__ +#define __XEN_FDT_DOMAIN_BUILD_H__ + +#include +#include +#include +#include + +struct domain; +struct page_info; +struct membanks; + +int construct_domain(struct domain *d, struct kernel_info *kinfo); +int construct_hwdom(struct kernel_info *kinfo, + const struct dt_device_node *node); +int make_chosen_node(const struct kernel_info *kinfo); +int make_cpus_node(const struct domain *d, void *fdt); +int make_hypervisor_node(struct domain *d, const struct kernel_info *kinfo, + int addrcells, int sizecells); +int make_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells, const struct membanks *mem); +int make_timer_node(const struct kernel_info *kinfo); + +#endif /* __XEN_FDT_DOMAIN_BUILD_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976640.1363796 (Exim 4.92) (envelope-from ) id 1uC7Mc-000109-RM; Tue, 06 May 2025 01:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976640.1363796; Tue, 06 May 2025 01: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 1uC7Mc-000102-Ov; Tue, 06 May 2025 01:44:54 +0000 Received: by outflank-mailman (input) for mailman id 976640; Tue, 06 May 2025 01:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC7Ma-0000zm-Sv for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC7Ma-00CLIo-2n for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7Ma-002umK-2f for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01: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=5KDW1+Rg2bqXd/Lqg9YzoN8LDSOvnb1ikhPh4y+ojWw=; b=dn8XnH7WCDPJmjQuMYzbpHfM+L PZoA5f/Tj1bZlSObDbvP6NyNXKSf75k7Q4rEZ9P1Q1BnJPvWYrLiPLjPD37g5XnqJTjXJwk60Wm26 8lvb9RzUDdbytu+hkGdy/Ov3JXFlf+nLamv40CoCqGKRnvGr55qZYuOjifMlhFujj14E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: dom0less: introduce common kernel.c Message-Id: Date: Tue, 06 May 2025 01:44:52 +0000 commit a7ee73f581575d29098140a0ae32da1755262de1 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:36 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/common: dom0less: introduce common kernel.c The following functions don't have arch specific things so it is moved to common: - kernel_prboe() - kernel_load() - output_length() Functions necessary for dom0less are only moved. The following changes are done: - Swap __init and return type of kernel_decompress() function to be consistent with defintions of functions in other files. The same for output_length(). - Wrap by "ifdef CONFIG_ARM" the call of kernel_uimage_probe() in kernel_probe() as uImage isn't really used nowadays thereby leave kernel_uimage_probe() call here just for compatability with Arm code. - Introduce kernel_zimage_probe() to cover the case that arch can have different zimage header. - Add ASSERT() for kernel_load() to check that it argument isn't NULL. - Make kernel_uimage_probe() non-static in Arm's code as it is used in common/kernel.c. Introduce CONFIG_DOMAIN_BUILD_HELPERS to not provide stubs for archs which don't provide enough functionality to enable it. Select CONFIG_DOMAIN_BUILD_HELPERS for CONFIG_ARM as only Arm supports it, at the moment. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/kernel.c | 221 +----------------------------------- xen/common/Kconfig | 5 +- xen/common/device-tree/Makefile | 1 + xen/common/device-tree/kernel.c | 242 ++++++++++++++++++++++++++++++++++++++++ xen/include/xen/fdt-kernel.h | 13 +++ 6 files changed, 267 insertions(+), 216 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index d0e0a7753c..3321d89068 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -11,6 +11,7 @@ config ARM_64 config ARM def_bool y + select DOMAIN_BUILD_HELPERS select FUNCTION_ALIGNMENT_4B select GENERIC_UART_INIT select HAS_ALTERNATIVE if HAS_VMAP diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index aea8f44413..cb1efb19e7 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -162,105 +162,6 @@ static void __init kernel_zimage_load(struct kernel_info *info) iounmap(kernel); } -static __init uint32_t output_length(char *image, unsigned long image_len) -{ - return *(uint32_t *)&image[image_len - 4]; -} - -static __init int kernel_decompress(struct bootmodule *mod, uint32_t offset) -{ - char *output, *input; - char magic[2]; - int rc; - unsigned int kernel_order_out; - paddr_t output_size; - struct page_info *pages; - mfn_t mfn; - int i; - paddr_t addr = mod->start; - paddr_t size = mod->size; - - if ( size < offset ) - return -EINVAL; - - /* - * It might be that gzip header does not appear at the start address - * (e.g. in case of compressed uImage) so take into account offset to - * gzip header. - */ - addr += offset; - size -= offset; - - if ( size < 2 ) - return -EINVAL; - - copy_from_paddr(magic, addr, sizeof(magic)); - - /* only gzip is supported */ - if ( !gzip_check(magic, size) ) - return -EINVAL; - - input = ioremap_cache(addr, size); - if ( input == NULL ) - return -EFAULT; - - output_size = output_length(input, size); - kernel_order_out = get_order_from_bytes(output_size); - pages = alloc_domheap_pages(NULL, kernel_order_out, 0); - if ( pages == NULL ) - { - iounmap(input); - return -ENOMEM; - } - mfn = page_to_mfn(pages); - output = vmap_contig(mfn, 1 << kernel_order_out); - - rc = perform_gunzip(output, input, size); - clean_dcache_va_range(output, output_size); - iounmap(input); - vunmap(output); - - if ( rc ) - { - free_domheap_pages(pages, kernel_order_out); - return rc; - } - - mod->start = page_to_maddr(pages); - mod->size = output_size; - - /* - * Need to free pages after output_size here because they won't be - * freed by discard_initial_modules - */ - i = PFN_UP(output_size); - for ( ; i < (1 << kernel_order_out); i++ ) - free_domheap_page(pages + i); - - /* - * When using static heap feature, don't give bootmodules memory back to - * the heap allocator - */ - if ( using_static_heap ) - return 0; - - /* - * When freeing the kernel, we need to pass the module start address and - * size as they were before taking an offset to gzip header into account, - * so that the entire region will be freed. - */ - addr -= offset; - size += offset; - - /* - * Free the original kernel, update the pointers to the - * decompressed kernel - */ - fw_unreserved_regions(addr, addr + size, init_domheap_pages, 0); - - return 0; -} - /* * Uimage CPU Architecture Codes */ @@ -273,8 +174,8 @@ static __init int kernel_decompress(struct bootmodule *mod, uint32_t offset) /* * Check if the image is a uImage and setup kernel_info */ -static int __init kernel_uimage_probe(struct kernel_info *info, - struct bootmodule *mod) +int __init kernel_uimage_probe(struct kernel_info *info, + struct bootmodule *mod) { struct { __be32 magic; /* Image Header Magic Number */ @@ -504,130 +405,20 @@ static int __init kernel_zimage32_probe(struct kernel_info *info, return 0; } -int __init kernel_probe(struct kernel_info *info, - const struct dt_device_node *domain) +int __init kernel_zimage_probe(struct kernel_info *info, paddr_t addr, + paddr_t size) { - struct bootmodule *mod = NULL; - struct bootcmdline *cmd = NULL; - struct dt_device_node *node; - u64 kernel_addr, initrd_addr, dtb_addr, size; int rc; - /* - * We need to initialize start to 0. This field may be populated during - * kernel_xxx_probe() if the image has a fixed entry point (for e.g. - * uimage.ep). - * We will use this to determine if the image has a fixed entry point or - * the load address should be used as the start address. - */ - info->entry = 0; - - /* domain is NULL only for the hardware domain */ - if ( domain == NULL ) - { - ASSERT(is_hardware_domain(info->d)); - - mod = boot_module_find_by_kind(BOOTMOD_KERNEL); - - info->kernel_bootmodule = mod; - info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); - - cmd = boot_cmdline_find_by_kind(BOOTMOD_KERNEL); - if ( cmd ) - info->cmdline = &cmd->cmdline[0]; - } - else - { - const char *name = NULL; - - dt_for_each_child_node(domain, node) - { - if ( dt_device_is_compatible(node, "multiboot,kernel") ) - { - u32 len; - const __be32 *val; - - val = dt_get_property(node, "reg", &len); - dt_get_range(&val, node, &kernel_addr, &size); - mod = boot_module_find_by_addr_and_kind( - BOOTMOD_KERNEL, kernel_addr); - info->kernel_bootmodule = mod; - } - else if ( dt_device_is_compatible(node, "multiboot,ramdisk") ) - { - u32 len; - const __be32 *val; - - val = dt_get_property(node, "reg", &len); - dt_get_range(&val, node, &initrd_addr, &size); - info->initrd_bootmodule = boot_module_find_by_addr_and_kind( - BOOTMOD_RAMDISK, initrd_addr); - } - else if ( dt_device_is_compatible(node, "multiboot,device-tree") ) - { - uint32_t len; - const __be32 *val; - - val = dt_get_property(node, "reg", &len); - if ( val == NULL ) - continue; - dt_get_range(&val, node, &dtb_addr, &size); - info->dtb_bootmodule = boot_module_find_by_addr_and_kind( - BOOTMOD_GUEST_DTB, dtb_addr); - } - else - continue; - } - name = dt_node_name(domain); - cmd = boot_cmdline_find_by_name(name); - if ( cmd ) - info->cmdline = &cmd->cmdline[0]; - } - if ( !mod || !mod->size ) - { - printk(XENLOG_ERR "Missing kernel boot module?\n"); - return -ENOENT; - } - - printk("Loading %pd kernel from boot module @ %"PRIpaddr"\n", - info->d, info->kernel_bootmodule->start); - if ( info->initrd_bootmodule ) - printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", - info->initrd_bootmodule->start); - - /* - * uImage header always appears at the top of the image (even compressed), - * so it needs to be probed first. Note that in case of compressed uImage, - * kernel_decompress is called from kernel_uimage_probe making the function - * self-containing (i.e. fall through only in case of a header not found). - */ - rc = kernel_uimage_probe(info, mod); - if ( rc != -ENOENT ) - return rc; - - /* - * If it is a gzip'ed image, 32bit or 64bit, uncompress it. - * At this point, gzip header appears (if at all) at the top of the image, - * so pass 0 as an offset. - */ - rc = kernel_decompress(mod, 0); - if ( rc && rc != -EINVAL ) - return rc; - #ifdef CONFIG_ARM_64 - rc = kernel_zimage64_probe(info, mod->start, mod->size); + rc = kernel_zimage64_probe(info, addr, size); if (rc < 0) #endif - rc = kernel_zimage32_probe(info, mod->start, mod->size); + rc = kernel_zimage32_probe(info, addr, size); return rc; } -void __init kernel_load(struct kernel_info *info) -{ - info->load(info); -} - /* * Local variables: * mode: C diff --git a/xen/common/Kconfig b/xen/common/Kconfig index f291a5c1c7..4bec78c6f2 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -14,13 +14,16 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE + depends on HAS_DOM0LESS && HAS_DEVICE_TREE && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests during Xen boot without the need of a control domain (Dom0), which could be present anyway. +config DOMAIN_BUILD_HELPERS + bool + config GRANT_TABLE bool "Grant table support" if EXPERT default y diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index f3dafc9b81..e88a4d5799 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -4,3 +4,4 @@ obj-y += device-tree.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o +obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o diff --git a/xen/common/device-tree/kernel.c b/xen/common/device-tree/kernel.c new file mode 100644 index 0000000000..1bf3bbf64e --- /dev/null +++ b/xen/common/device-tree/kernel.c @@ -0,0 +1,242 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +static uint32_t __init output_length(char *image, unsigned long image_len) +{ + return *(uint32_t *)&image[image_len - 4]; +} + +int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) +{ + char *output, *input; + char magic[2]; + int rc; + unsigned int kernel_order_out; + paddr_t output_size; + struct page_info *pages; + mfn_t mfn; + int i; + paddr_t addr = mod->start; + paddr_t size = mod->size; + + if ( size < offset ) + return -EINVAL; + + /* + * It might be that gzip header does not appear at the start address + * (e.g. in case of compressed uImage) so take into account offset to + * gzip header. + */ + addr += offset; + size -= offset; + + if ( size < 2 ) + return -EINVAL; + + copy_from_paddr(magic, addr, sizeof(magic)); + + /* only gzip is supported */ + if ( !gzip_check(magic, size) ) + return -EINVAL; + + input = ioremap_cache(addr, size); + if ( input == NULL ) + return -EFAULT; + + output_size = output_length(input, size); + kernel_order_out = get_order_from_bytes(output_size); + pages = alloc_domheap_pages(NULL, kernel_order_out, 0); + if ( pages == NULL ) + { + iounmap(input); + return -ENOMEM; + } + mfn = page_to_mfn(pages); + output = vmap_contig(mfn, 1 << kernel_order_out); + + rc = perform_gunzip(output, input, size); + clean_dcache_va_range(output, output_size); + iounmap(input); + vunmap(output); + + if ( rc ) + { + free_domheap_pages(pages, kernel_order_out); + return rc; + } + + mod->start = page_to_maddr(pages); + mod->size = output_size; + + /* + * Need to free pages after output_size here because they won't be + * freed by discard_initial_modules + */ + i = PFN_UP(output_size); + for ( ; i < (1 << kernel_order_out); i++ ) + free_domheap_page(pages + i); + + /* + * When using static heap feature, don't give bootmodules memory back to + * the heap allocator + */ + if ( using_static_heap ) + return 0; + + /* + * When freeing the kernel, we need to pass the module start address and + * size as they were before taking an offset to gzip header into account, + * so that the entire region will be freed. + */ + addr -= offset; + size += offset; + + /* + * Free the original kernel, update the pointers to the + * decompressed kernel + */ + fw_unreserved_regions(addr, addr + size, init_domheap_pages, 0); + + return 0; +} + +int __init kernel_probe(struct kernel_info *info, + const struct dt_device_node *domain) +{ + struct bootmodule *mod = NULL; + struct bootcmdline *cmd = NULL; + struct dt_device_node *node; + u64 kernel_addr, initrd_addr, dtb_addr, size; + int rc; + + /* + * We need to initialize start to 0. This field may be populated during + * kernel_xxx_probe() if the image has a fixed entry point (for e.g. + * uimage.ep). + * We will use this to determine if the image has a fixed entry point or + * the load address should be used as the start address. + */ + info->entry = 0; + + /* domain is NULL only for the hardware domain */ + if ( domain == NULL ) + { + ASSERT(is_hardware_domain(info->d)); + + mod = boot_module_find_by_kind(BOOTMOD_KERNEL); + + info->kernel_bootmodule = mod; + info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); + + cmd = boot_cmdline_find_by_kind(BOOTMOD_KERNEL); + if ( cmd ) + info->cmdline = &cmd->cmdline[0]; + } + else + { + const char *name = NULL; + + dt_for_each_child_node(domain, node) + { + if ( dt_device_is_compatible(node, "multiboot,kernel") ) + { + u32 len; + const __be32 *val; + + val = dt_get_property(node, "reg", &len); + dt_get_range(&val, node, &kernel_addr, &size); + mod = boot_module_find_by_addr_and_kind( + BOOTMOD_KERNEL, kernel_addr); + info->kernel_bootmodule = mod; + } + else if ( dt_device_is_compatible(node, "multiboot,ramdisk") ) + { + u32 len; + const __be32 *val; + + val = dt_get_property(node, "reg", &len); + dt_get_range(&val, node, &initrd_addr, &size); + info->initrd_bootmodule = boot_module_find_by_addr_and_kind( + BOOTMOD_RAMDISK, initrd_addr); + } + else if ( dt_device_is_compatible(node, "multiboot,device-tree") ) + { + uint32_t len; + const __be32 *val; + + val = dt_get_property(node, "reg", &len); + if ( val == NULL ) + continue; + dt_get_range(&val, node, &dtb_addr, &size); + info->dtb_bootmodule = boot_module_find_by_addr_and_kind( + BOOTMOD_GUEST_DTB, dtb_addr); + } + else + continue; + } + name = dt_node_name(domain); + cmd = boot_cmdline_find_by_name(name); + if ( cmd ) + info->cmdline = &cmd->cmdline[0]; + } + if ( !mod || !mod->size ) + { + printk(XENLOG_ERR "Missing kernel boot module?\n"); + return -ENOENT; + } + + printk("Loading %pd kernel from boot module @ %"PRIpaddr"\n", + info->d, info->kernel_bootmodule->start); + if ( info->initrd_bootmodule ) + printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", + info->initrd_bootmodule->start); + + /* + * uImage isn't really used nowadays thereby leave kernel_uimage_probe() + * call here just for compatability with Arm code. + */ +#ifdef CONFIG_ARM + /* + * uImage header always appears at the top of the image (even compressed), + * so it needs to be probed first. Note that in case of compressed uImage, + * kernel_decompress is called from kernel_uimage_probe making the function + * self-containing (i.e. fall through only in case of a header not found). + */ + rc = kernel_uimage_probe(info, mod); + if ( rc != -ENOENT ) + return rc; +#endif + + /* + * If it is a gzip'ed image, 32bit or 64bit, uncompress it. + * At this point, gzip header appears (if at all) at the top of the image, + * so pass 0 as an offset. + */ + rc = kernel_decompress(mod, 0); + if ( rc && rc != -EINVAL ) + return rc; + + rc = kernel_zimage_probe(info, mod->start, mod->size); + + return rc; +} + +void __init kernel_load(struct kernel_info *info) +{ + ASSERT(info && info->load); + + info->load(info); +} diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 516cc68e90..7a6cd67c22 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -120,6 +120,19 @@ int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); */ void kernel_load(struct kernel_info *info); +int kernel_decompress(struct bootmodule *mod, uint32_t offset); + +int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t size); + +/* + * uImage isn't really used nowadays thereby leave kernel_uimage_probe() + * call here just for compatability with Arm code. + */ +#ifdef CONFIG_ARM +struct bootmodule; +int kernel_uimage_probe(struct kernel_info *info, struct bootmodule *mod); +#endif + #endif /* __XEN_FDT_KERNEL_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:45:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976641.1363801 (Exim 4.92) (envelope-from ) id 1uC7Mm-00012L-Ty; Tue, 06 May 2025 01:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976641.1363801; Tue, 06 May 2025 01: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 1uC7Mm-00012D-QU; Tue, 06 May 2025 01:45:04 +0000 Received: by outflank-mailman (input) for mailman id 976641; Tue, 06 May 2025 01:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC7Ml-000123-0O for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC7Mk-00CLJU-37 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7Mk-002upR-2y for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01: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=MkoruJnZbImb5ZDP+D32140Ngk+ZRdLESMcLnrCGfPI=; b=Xtg9cr1yFMij78azrCatbcVBYy ZRSB0rK9SRs0Cx6cQEpxnHzu+5cScrY9R/ACjBJ00tgyy3uODcfEp17lFGyI08rOKTQmzleGAOos/ ChcIdo/8CxH8X1j3vkNIgIRcxrJ4gbuu3Alj1P5KsL5wRE28jklqh34mX4/N7zcYOcaI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: dom0less: introduce common domain-build.c Message-Id: Date: Tue, 06 May 2025 01:45:02 +0000 commit d07b7369aa65b0ac78bb6264a832cbb3c9716855 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:37 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/common: dom0less: introduce common domain-build.c Some functions of Arm's domain_build.c could be reused by dom0less or other features connected to domain construction/build. The following functions are moved to common: - get_allocation_size(). - allocate_domheap_memory(). - guest_map_pages(). - allocate_bank_memory(). - add_hwdom_free_regions(). - find_unallocated_memory(). - allocate_memory(). - dtb_load(). - initrd_load(). Prototype of dtb_load() and initrd_load() is updated to recieve a pointer to copy_to_guest_phys() as some archs require copy_to_guest_phys_fluch_dcache(). Update arm/include/asm/Makefile to generate domain-build.h for Arm as it is used by domain-build.c. Signed-off-by: Oleksii Kurochko Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 397 +------------------------------- xen/arch/arm/include/asm/domain_build.h | 9 - xen/common/device-tree/Makefile | 1 + xen/common/device-tree/domain-build.c | 395 +++++++++++++++++++++++++++++++ xen/include/xen/fdt-domain-build.h | 40 ++++ 5 files changed, 438 insertions(+), 404 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9d649b06b3..df29619c40 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -120,18 +120,6 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) return vcpu_create(dom0, 0); } -unsigned int __init get_allocation_size(paddr_t size) -{ - /* - * get_order_from_bytes returns the order greater than or equal to - * the given size, but we need less than or equal. Adding one to - * the size pushes an evenly aligned size into the next order, so - * we can then unconditionally subtract 1 from the order which is - * returned. - */ - return get_order_from_bytes(size + 1) - 1; -} - /* * Insert the given pages into a memory bank, banks are ordered by address. * @@ -418,98 +406,6 @@ static void __init allocate_memory_11(struct domain *d, } } -bool __init allocate_domheap_memory(struct domain *d, paddr_t tot_size, - alloc_domheap_mem_cb cb, void *extra) -{ - unsigned int max_order = UINT_MAX; - - while ( tot_size > 0 ) - { - unsigned int order = get_allocation_size(tot_size); - struct page_info *pg; - - order = min(max_order, order); - - pg = alloc_domheap_pages(d, order, 0); - if ( !pg ) - { - /* - * If we can't allocate one page, then it is unlikely to - * succeed in the next iteration. So bail out. - */ - if ( !order ) - return false; - - /* - * If we can't allocate memory with order, then it is - * unlikely to succeed in the next iteration. - * Record the order - 1 to avoid re-trying. - */ - max_order = order - 1; - continue; - } - - if ( !cb(d, pg, order, extra) ) - return false; - - tot_size -= (1ULL << (PAGE_SHIFT + order)); - } - - return true; -} - -static bool __init guest_map_pages(struct domain *d, struct page_info *pg, - unsigned int order, void *extra) -{ - gfn_t *sgfn = (gfn_t *)extra; - int res; - - BUG_ON(!sgfn); - res = guest_physmap_add_page(d, *sgfn, page_to_mfn(pg), order); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed map pages to DOMU: %d", res); - return false; - } - - *sgfn = gfn_add(*sgfn, 1UL << order); - - return true; -} - -bool __init allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, - paddr_t tot_size) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - struct domain *d = kinfo->d; - struct membank *bank; - - /* - * allocate_bank_memory can be called with a tot_size of zero for - * the second memory bank. It is not an error and we can safely - * avoid creating a zero-size memory bank. - */ - if ( tot_size == 0 ) - return true; - - bank = &mem->bank[mem->nr_banks]; - bank->start = gfn_to_gaddr(sgfn); - bank->size = tot_size; - - /* - * Allocate pages from the heap until tot_size is zero and map them to the - * guest using guest_map_pages, passing the starting gfn as extra parameter - * for the map operation. - */ - if ( !allocate_domheap_memory(d, tot_size, guest_map_pages, &sgfn) ) - return false; - - mem->nr_banks++; - kinfo->unassigned_mem -= bank->size; - - return true; -} - /* * When PCI passthrough is available we want to keep the * "linux,pci-domain" in sync for every host bridge. @@ -900,226 +796,6 @@ int __init add_ext_regions(unsigned long s_gfn, unsigned long e_gfn, return 0; } -static int __init add_hwdom_free_regions(unsigned long s_gfn, - unsigned long e_gfn, void *data) -{ - struct membanks *free_regions = data; - paddr_t start, size; - paddr_t s = pfn_to_paddr(s_gfn); - paddr_t e = pfn_to_paddr(e_gfn); - unsigned int i, j; - - if ( free_regions->nr_banks >= free_regions->max_banks ) - return 0; - - /* - * Both start and size of the free region should be 2MB aligned to - * potentially allow superpage mapping. - */ - start = (s + SZ_2M - 1) & ~(SZ_2M - 1); - if ( start > e ) - return 0; - - /* - * e is actually "end-1" because it is called by rangeset functions - * which are inclusive of the last address. - */ - e += 1; - size = (e - start) & ~(SZ_2M - 1); - - /* Find the insert position (descending order). */ - for ( i = 0; i < free_regions->nr_banks ; i++ ) - if ( size > free_regions->bank[i].size ) - break; - - /* Move the other banks to make space. */ - for ( j = free_regions->nr_banks; j > i ; j-- ) - { - free_regions->bank[j].start = free_regions->bank[j - 1].start; - free_regions->bank[j].size = free_regions->bank[j - 1].size; - } - - free_regions->bank[i].start = start; - free_regions->bank[i].size = size; - free_regions->nr_banks++; - - return 0; -} - -/* - * Find unused regions of Host address space which can be exposed to domain - * using the host memory layout. In order to calculate regions we exclude every - * region passed in mem_banks from the Host RAM. - */ -static int __init find_unallocated_memory(const struct kernel_info *kinfo, - const struct membanks *mem_banks[], - unsigned int nr_mem_banks, - struct membanks *free_regions, - int (*cb)(unsigned long s_gfn, - unsigned long e_gfn, - void *data)) -{ - const struct membanks *mem = bootinfo_get_mem(); - struct rangeset *unalloc_mem; - paddr_t start, end; - unsigned int i, j; - int res; - - ASSERT(domain_use_host_layout(kinfo->d)); - - unalloc_mem = rangeset_new(NULL, NULL, 0); - if ( !unalloc_mem ) - return -ENOMEM; - - /* Start with all available RAM */ - for ( i = 0; i < mem->nr_banks; i++ ) - { - start = mem->bank[i].start; - end = mem->bank[i].start + mem->bank[i].size; - res = rangeset_add_range(unalloc_mem, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", - start, end); - goto out; - } - } - - /* Remove all regions listed in mem_banks */ - for ( i = 0; i < nr_mem_banks; i++ ) - for ( j = 0; j < mem_banks[i]->nr_banks; j++ ) - { - start = mem_banks[i]->bank[j].start; - - /* Shared memory banks can contain INVALID_PADDR as start */ - if ( INVALID_PADDR == start ) - continue; - - end = mem_banks[i]->bank[j].start + mem_banks[i]->bank[j].size; - res = rangeset_remove_range(unalloc_mem, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR - "Failed to add: %#"PRIpaddr"->%#"PRIpaddr", error %d\n", - start, end, res); - goto out; - } - } - - start = 0; - end = (1ULL << p2m_ipa_bits) - 1; - res = rangeset_report_ranges(unalloc_mem, PFN_DOWN(start), PFN_DOWN(end), - cb, free_regions); - if ( res ) - free_regions->nr_banks = 0; - else if ( !free_regions->nr_banks ) - res = -ENOENT; - -out: - rangeset_destroy(unalloc_mem); - - return res; -} - -void __init allocate_memory(struct domain *d, struct kernel_info *kinfo) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - unsigned int i, nr_banks = GUEST_RAM_BANKS; - struct membanks *hwdom_free_mem = NULL; - - printk(XENLOG_INFO "Allocating mappings totalling %ldMB for %pd:\n", - /* Don't want format this as PRIpaddr (16 digit hex) */ - (unsigned long)(kinfo->unassigned_mem >> 20), d); - - mem->nr_banks = 0; - /* - * Use host memory layout for hwdom. Only case for this is when LLC coloring - * is enabled. - */ - if ( is_hardware_domain(d) ) - { - struct membanks *gnttab = membanks_xzalloc(1, MEMORY); - /* - * Exclude the following regions: - * 1) Remove reserved memory - * 2) Grant table assigned to hwdom - */ - const struct membanks *mem_banks[] = { - bootinfo_get_reserved_mem(), - gnttab, - }; - - if ( !gnttab ) - goto fail; - - gnttab->nr_banks = 1; - gnttab->bank[0].start = kinfo->gnttab_start; - gnttab->bank[0].size = kinfo->gnttab_size; - - hwdom_free_mem = membanks_xzalloc(NR_MEM_BANKS, MEMORY); - if ( !hwdom_free_mem ) - goto fail; - - if ( find_unallocated_memory(kinfo, mem_banks, ARRAY_SIZE(mem_banks), - hwdom_free_mem, add_hwdom_free_regions) ) - goto fail; - - nr_banks = hwdom_free_mem->nr_banks; - xfree(gnttab); - } - - for ( i = 0; kinfo->unassigned_mem > 0 && nr_banks > 0; i++, nr_banks-- ) - { - paddr_t bank_start, bank_size; - - if ( is_hardware_domain(d) ) - { - bank_start = hwdom_free_mem->bank[i].start; - bank_size = hwdom_free_mem->bank[i].size; - } - else - { - const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; - const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; - - if ( i >= GUEST_RAM_BANKS ) - goto fail; - - bank_start = bankbase[i]; - bank_size = banksize[i]; - } - - bank_size = MIN(bank_size, kinfo->unassigned_mem); - if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(bank_start), bank_size) ) - goto fail; - } - - if ( kinfo->unassigned_mem ) - goto fail; - - for( i = 0; i < mem->nr_banks; i++ ) - { - printk(XENLOG_INFO "%pd BANK[%d] %#"PRIpaddr"-%#"PRIpaddr" (%ldMB)\n", - d, - i, - mem->bank[i].start, - mem->bank[i].start + mem->bank[i].size, - /* Don't want format this as PRIpaddr (16 digit hex) */ - (unsigned long)(mem->bank[i].size >> 20)); - } - - xfree(hwdom_free_mem); - return; - - fail: - panic("Failed to allocate requested domain memory." - /* Don't want format this as PRIpaddr (16 digit hex) */ - " %ldKB unallocated. Fix the VMs configurations.\n", - (unsigned long)kinfo->unassigned_mem >> 10); -} - static int __init handle_pci_range(const struct dt_device_node *dev, uint64_t addr, uint64_t len, void *data) { @@ -2059,75 +1735,6 @@ static int __init prepare_dtb_hwdom(struct domain *d, struct kernel_info *kinfo) return -EINVAL; } -static void __init dtb_load(struct kernel_info *kinfo) -{ - unsigned long left; - - printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - kinfo->d, kinfo->dtb_paddr, - kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); - - left = copy_to_guest_phys_flush_dcache(kinfo->d, kinfo->dtb_paddr, - kinfo->fdt, - fdt_totalsize(kinfo->fdt)); - - if ( left != 0 ) - panic("Unable to copy the DTB to %pd memory (left = %lu bytes)\n", - kinfo->d, left); - xfree(kinfo->fdt); -} - -static void __init initrd_load(struct kernel_info *kinfo) -{ - const struct bootmodule *mod = kinfo->initrd_bootmodule; - paddr_t load_addr = kinfo->initrd_paddr; - paddr_t paddr, len; - int node; - int res; - __be32 val[2]; - __be32 *cellp; - void __iomem *initrd; - - if ( !mod || !mod->size ) - return; - - paddr = mod->start; - len = mod->size; - - printk("Loading %pd initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - kinfo->d, paddr, load_addr, load_addr + len); - - /* Fix up linux,initrd-start and linux,initrd-end in /chosen */ - node = fdt_path_offset(kinfo->fdt, "/chosen"); - if ( node < 0 ) - panic("Cannot find the /chosen node\n"); - - cellp = (__be32 *)val; - dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr); - res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-start", - val, sizeof(val)); - if ( res ) - panic("Cannot fix up \"linux,initrd-start\" property\n"); - - cellp = (__be32 *)val; - dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr + len); - res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-end", - val, sizeof(val)); - if ( res ) - panic("Cannot fix up \"linux,initrd-end\" property\n"); - - initrd = ioremap_wc(paddr, len); - if ( !initrd ) - panic("Unable to map the %pd initrd\n", kinfo->d); - - res = copy_to_guest_phys_flush_dcache(kinfo->d, load_addr, - initrd, len); - if ( res != 0 ) - panic("Unable to copy the initrd in the %pd memory\n", kinfo->d); - - iounmap(initrd); -} - /* * Allocate the event channel PPIs and setup the HVM_PARAM_CALLBACK_IRQ. * The allocated IRQ will be found in d->arch.evtchn_irq. @@ -2220,8 +1827,8 @@ int __init construct_domain(struct domain *d, struct kernel_info *kinfo) */ kernel_load(kinfo); /* initrd_load will fix up the fdt, so call it before dtb_load */ - initrd_load(kinfo); - dtb_load(kinfo); + initrd_load(kinfo, copy_to_guest_phys_flush_dcache); + dtb_load(kinfo, copy_to_guest_phys_flush_dcache); memset(regs, 0, sizeof(*regs)); diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index ebe3724d89..9655e9d453 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -5,19 +5,10 @@ #include typedef __be32 gic_interrupt_t[3]; -typedef bool (*alloc_domheap_mem_cb)(struct domain *d, struct page_info *pg, - unsigned int order, void *extra); -bool allocate_domheap_memory(struct domain *d, paddr_t tot_size, - alloc_domheap_mem_cb cb, void *extra); -bool allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, - paddr_t tot_size); -void allocate_memory(struct domain *d, struct kernel_info *kinfo); int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); int make_psci_node(void *fdt); void evtchn_allocate(struct domain *d); -unsigned int get_allocation_size(paddr_t size); - /* * Helper to write an interrupts with the GIC format * This code is assuming the irq is an PPI. diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index e88a4d5799..831b91399b 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -1,6 +1,7 @@ obj-y += bootfdt.init.o obj-y += bootinfo.init.o obj-y += device-tree.o +obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c new file mode 100644 index 0000000000..762b63e2b0 --- /dev/null +++ b/xen/common/device-tree/domain-build.c @@ -0,0 +1,395 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +bool __init allocate_domheap_memory(struct domain *d, paddr_t tot_size, + alloc_domheap_mem_cb cb, void *extra) +{ + unsigned int max_order = UINT_MAX; + + while ( tot_size > 0 ) + { + unsigned int order = get_allocation_size(tot_size); + struct page_info *pg; + + order = min(max_order, order); + + pg = alloc_domheap_pages(d, order, 0); + if ( !pg ) + { + /* + * If we can't allocate one page, then it is unlikely to + * succeed in the next iteration. So bail out. + */ + if ( !order ) + return false; + + /* + * If we can't allocate memory with order, then it is + * unlikely to succeed in the next iteration. + * Record the order - 1 to avoid re-trying. + */ + max_order = order - 1; + continue; + } + + if ( !cb(d, pg, order, extra) ) + return false; + + tot_size -= (1ULL << (PAGE_SHIFT + order)); + } + + return true; +} + +static bool __init guest_map_pages(struct domain *d, struct page_info *pg, + unsigned int order, void *extra) +{ + gfn_t *sgfn = (gfn_t *)extra; + int res; + + BUG_ON(!sgfn); + res = guest_physmap_add_page(d, *sgfn, page_to_mfn(pg), order); + if ( res ) + { + dprintk(XENLOG_ERR, "Failed map pages to DOMU: %d", res); + return false; + } + + *sgfn = gfn_add(*sgfn, 1UL << order); + + return true; +} + +bool __init allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, + paddr_t tot_size) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + struct domain *d = kinfo->d; + struct membank *bank; + + /* + * allocate_bank_memory can be called with a tot_size of zero for + * the second memory bank. It is not an error and we can safely + * avoid creating a zero-size memory bank. + */ + if ( tot_size == 0 ) + return true; + + bank = &mem->bank[mem->nr_banks]; + bank->start = gfn_to_gaddr(sgfn); + bank->size = tot_size; + + /* + * Allocate pages from the heap until tot_size is zero and map them to the + * guest using guest_map_pages, passing the starting gfn as extra parameter + * for the map operation. + */ + if ( !allocate_domheap_memory(d, tot_size, guest_map_pages, &sgfn) ) + return false; + + mem->nr_banks++; + kinfo->unassigned_mem -= bank->size; + + return true; +} + +static int __init add_hwdom_free_regions(unsigned long s_gfn, + unsigned long e_gfn, void *data) +{ + struct membanks *free_regions = data; + paddr_t start, size; + paddr_t s = pfn_to_paddr(s_gfn); + paddr_t e = pfn_to_paddr(e_gfn); + unsigned int i, j; + + if ( free_regions->nr_banks >= free_regions->max_banks ) + return 0; + + /* + * Both start and size of the free region should be 2MB aligned to + * potentially allow superpage mapping. + */ + start = (s + SZ_2M - 1) & ~(SZ_2M - 1); + if ( start > e ) + return 0; + + /* + * e is actually "end-1" because it is called by rangeset functions + * which are inclusive of the last address. + */ + e += 1; + size = (e - start) & ~(SZ_2M - 1); + + /* Find the insert position (descending order). */ + for ( i = 0; i < free_regions->nr_banks ; i++ ) + if ( size > free_regions->bank[i].size ) + break; + + /* Move the other banks to make space. */ + for ( j = free_regions->nr_banks; j > i ; j-- ) + { + free_regions->bank[j].start = free_regions->bank[j - 1].start; + free_regions->bank[j].size = free_regions->bank[j - 1].size; + } + + free_regions->bank[i].start = start; + free_regions->bank[i].size = size; + free_regions->nr_banks++; + + return 0; +} + +/* + * Find unused regions of Host address space which can be exposed to domain + * using the host memory layout. In order to calculate regions we exclude every + * region passed in mem_banks from the Host RAM. + */ +int __init find_unallocated_memory(const struct kernel_info *kinfo, + const struct membanks *mem_banks[], + unsigned int nr_mem_banks, + struct membanks *free_regions, + int (*cb)(unsigned long s_gfn, + unsigned long e_gfn, + void *data)) +{ + const struct membanks *mem = bootinfo_get_mem(); + struct rangeset *unalloc_mem; + paddr_t start, end; + unsigned int i, j; + int res; + + ASSERT(domain_use_host_layout(kinfo->d)); + + unalloc_mem = rangeset_new(NULL, NULL, 0); + if ( !unalloc_mem ) + return -ENOMEM; + + /* Start with all available RAM */ + for ( i = 0; i < mem->nr_banks; i++ ) + { + start = mem->bank[i].start; + end = mem->bank[i].start + mem->bank[i].size; + res = rangeset_add_range(unalloc_mem, PFN_DOWN(start), + PFN_DOWN(end - 1)); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", + start, end); + goto out; + } + } + + /* Remove all regions listed in mem_banks */ + for ( i = 0; i < nr_mem_banks; i++ ) + for ( j = 0; j < mem_banks[i]->nr_banks; j++ ) + { + start = mem_banks[i]->bank[j].start; + + /* Shared memory banks can contain INVALID_PADDR as start */ + if ( INVALID_PADDR == start ) + continue; + + end = mem_banks[i]->bank[j].start + mem_banks[i]->bank[j].size; + res = rangeset_remove_range(unalloc_mem, PFN_DOWN(start), + PFN_DOWN(end - 1)); + if ( res ) + { + printk(XENLOG_ERR + "Failed to add: %#"PRIpaddr"->%#"PRIpaddr", error %d\n", + start, end, res); + goto out; + } + } + + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_report_ranges(unalloc_mem, PFN_DOWN(start), PFN_DOWN(end), + cb, free_regions); + if ( res ) + free_regions->nr_banks = 0; + else if ( !free_regions->nr_banks ) + res = -ENOENT; + +out: + rangeset_destroy(unalloc_mem); + + return res; +} + +void __init allocate_memory(struct domain *d, struct kernel_info *kinfo) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + unsigned int i, nr_banks = GUEST_RAM_BANKS; + struct membanks *hwdom_free_mem = NULL; + + printk(XENLOG_INFO "Allocating mappings totalling %ldMB for %pd:\n", + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(kinfo->unassigned_mem >> 20), d); + + mem->nr_banks = 0; + /* + * Use host memory layout for hwdom. Only case for this is when LLC coloring + * is enabled. + */ + if ( is_hardware_domain(d) ) + { + struct membanks *gnttab = membanks_xzalloc(1, MEMORY); + /* + * Exclude the following regions: + * 1) Remove reserved memory + * 2) Grant table assigned to hwdom + */ + const struct membanks *mem_banks[] = { + bootinfo_get_reserved_mem(), + gnttab, + }; + + if ( !gnttab ) + goto fail; + + gnttab->nr_banks = 1; + gnttab->bank[0].start = kinfo->gnttab_start; + gnttab->bank[0].size = kinfo->gnttab_size; + + hwdom_free_mem = membanks_xzalloc(NR_MEM_BANKS, MEMORY); + if ( !hwdom_free_mem ) + goto fail; + + if ( find_unallocated_memory(kinfo, mem_banks, ARRAY_SIZE(mem_banks), + hwdom_free_mem, add_hwdom_free_regions) ) + goto fail; + + nr_banks = hwdom_free_mem->nr_banks; + xfree(gnttab); + } + + for ( i = 0; kinfo->unassigned_mem > 0 && nr_banks > 0; i++, nr_banks-- ) + { + paddr_t bank_start, bank_size; + + if ( is_hardware_domain(d) ) + { + bank_start = hwdom_free_mem->bank[i].start; + bank_size = hwdom_free_mem->bank[i].size; + } + else + { + const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; + const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; + + if ( i >= GUEST_RAM_BANKS ) + goto fail; + + bank_start = bankbase[i]; + bank_size = banksize[i]; + } + + bank_size = MIN(bank_size, kinfo->unassigned_mem); + if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(bank_start), bank_size) ) + goto fail; + } + + if ( kinfo->unassigned_mem ) + goto fail; + + for( i = 0; i < mem->nr_banks; i++ ) + { + printk(XENLOG_INFO "%pd BANK[%d] %#"PRIpaddr"-%#"PRIpaddr" (%ldMB)\n", + d, + i, + mem->bank[i].start, + mem->bank[i].start + mem->bank[i].size, + /* Don't want format this as PRIpaddr (16 digit hex) */ + (unsigned long)(mem->bank[i].size >> 20)); + } + + xfree(hwdom_free_mem); + return; + + fail: + panic("Failed to allocate requested domain memory." + /* Don't want format this as PRIpaddr (16 digit hex) */ + " %ldKB unallocated. Fix the VMs configurations.\n", + (unsigned long)kinfo->unassigned_mem >> 10); +} + +void __init dtb_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest) +{ + unsigned long left; + + printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + kinfo->d, kinfo->dtb_paddr, + kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); + + left = copy_to_guest(kinfo->d, kinfo->dtb_paddr, + kinfo->fdt, + fdt_totalsize(kinfo->fdt)); + + if ( left != 0 ) + panic("Unable to copy the DTB to %pd memory (left = %lu bytes)\n", + kinfo->d, left); + xfree(kinfo->fdt); +} + +void __init initrd_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest) +{ + const struct bootmodule *mod = kinfo->initrd_bootmodule; + paddr_t load_addr = kinfo->initrd_paddr; + paddr_t paddr, len; + int node; + int res; + __be32 val[2]; + __be32 *cellp; + void __iomem *initrd; + + if ( !mod || !mod->size ) + return; + + paddr = mod->start; + len = mod->size; + + printk("Loading %pd initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + kinfo->d, paddr, load_addr, load_addr + len); + + /* Fix up linux,initrd-start and linux,initrd-end in /chosen */ + node = fdt_path_offset(kinfo->fdt, "/chosen"); + if ( node < 0 ) + panic("Cannot find the /chosen node\n"); + + cellp = (__be32 *)val; + dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr); + res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-start", + val, sizeof(val)); + if ( res ) + panic("Cannot fix up \"linux,initrd-start\" property\n"); + + cellp = (__be32 *)val; + dt_set_cell(&cellp, ARRAY_SIZE(val), load_addr + len); + res = fdt_setprop_inplace(kinfo->fdt, node, "linux,initrd-end", + val, sizeof(val)); + if ( res ) + panic("Cannot fix up \"linux,initrd-end\" property\n"); + + initrd = ioremap_wc(paddr, len); + if ( !initrd ) + panic("Unable to map the %pd initrd\n", kinfo->d); + + res = copy_to_guest(kinfo->d, load_addr, + initrd, len); + if ( res != 0 ) + panic("Unable to copy the initrd in the %pd memory\n", kinfo->d); + + iounmap(initrd); +} diff --git a/xen/include/xen/fdt-domain-build.h b/xen/include/xen/fdt-domain-build.h index 30d5358a0f..45981dbec0 100644 --- a/xen/include/xen/fdt-domain-build.h +++ b/xen/include/xen/fdt-domain-build.h @@ -6,12 +6,21 @@ #include #include #include +#include #include struct domain; struct page_info; struct membanks; +typedef bool (*alloc_domheap_mem_cb)(struct domain *d, struct page_info *pg, + unsigned int order, void *extra); +bool allocate_domheap_memory(struct domain *d, paddr_t tot_size, + alloc_domheap_mem_cb cb, void *extra); + +bool allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, + paddr_t tot_size); +void allocate_memory(struct domain *d, struct kernel_info *kinfo); int construct_domain(struct domain *d, struct kernel_info *kinfo); int construct_hwdom(struct kernel_info *kinfo, const struct dt_device_node *node); @@ -23,6 +32,37 @@ int make_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells, const struct membanks *mem); int make_timer_node(const struct kernel_info *kinfo); +static inline int get_allocation_size(paddr_t size) +{ + /* + * get_order_from_bytes returns the order greater than or equal to + * the given size, but we need less than or equal. Adding one to + * the size pushes an evenly aligned size into the next order, so + * we can then unconditionally subtract 1 from the order which is + * returned. + */ + return get_order_from_bytes(size + 1) - 1; +} + +typedef unsigned long (*copy_to_guest_phys_cb)(struct domain *d, + paddr_t gpa, + void *buf, + unsigned int len); + +void initrd_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest); + +void dtb_load(struct kernel_info *kinfo, + copy_to_guest_phys_cb copy_to_guest); + +int find_unallocated_memory(const struct kernel_info *kinfo, + const struct membanks *mem_banks[], + unsigned int nr_mem_banks, + struct membanks *free_regions, + int (*cb)(unsigned long s_gfn, + unsigned long e_gfn, + void *data)); + #endif /* __XEN_FDT_DOMAIN_BUILD_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:45:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976642.1363805 (Exim 4.92) (envelope-from ) id 1uC7Mw-00015N-0Z; Tue, 06 May 2025 01:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976642.1363805; Tue, 06 May 2025 01: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 1uC7Mv-00015G-UD; Tue, 06 May 2025 01:45:13 +0000 Received: by outflank-mailman (input) for mailman id 976642; Tue, 06 May 2025 01:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC7Mv-000155-2x for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC7Mv-00CLJY-0C for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7Mv-002uqQ-05 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:13 +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=YYSR9sXgLDbi0Ohlt/VYAtan8BLWw4StnvGbkZLL4uY=; b=PN89ACCFqbA7bYUOvURald2jrH 4j5Sb7kH5ZFWOD7J4Gve+fG5Ir9pmaykYMEf4LeM41LhvGHAAET7Ge2GYm/PEu7qi/1sltLNFjeWH /LZt+aE+1ikaUjenGN/1bOn1BU+Xaln7ToTuzzmBuwjH8Bd5nLOslLVmNTHMID5KvMfw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: dom0less: introduce common dom0less-build.c Message-Id: Date: Tue, 06 May 2025 01:45:13 +0000 commit 43afe6f0302446636a23242cf24d38e305607382 Author: Oleksii Kurochko AuthorDate: Mon May 5 20:10:38 2025 +0200 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/common: dom0less: introduce common dom0less-build.c Part of Arm's dom0less-build.c could be common between architectures which are using device tree files to create guest domains. Thereby move some parts of Arm's dom0less-build.c to common code with minor changes. As a part of theses changes the following changes are introduced: - Introduce make_arch_nodes() to cover arch-specific nodes. For example, in case of Arm, it is PSCI and vpl011 nodes. - Introduce set_domain_type() to abstract a way how setting of domain type happens. For example, RISC-V won't have this member of arch_domain structure as vCPUs will always have the same bitness as hypervisor. In case of Arm, it is possible that Arm64 could create 32-bit and 64-bit domains. - Introduce init_vuart() to cover details of virtual uart initialization. - Introduce init_intc_phandle() to cover some details of interrupt controller phandle initialization. As an example, RISC-V could have different name for interrupt controller node ( APLIC, PLIC, IMSIC, etc ) but the code in domain_handle_dtb_bootmodule() could handle only one interrupt controller node name. - s/make_gic_domU_node/make_intc_domU_node as GIC is Arm specific naming and add prototype of make_intc_domU_node() to dom0less-build.h The following functions are moved to xen/common/device-tree: - Functions which are moved as is: - domain_p2m_pages(). - handle_passthrough_prop(). - handle_prop_pfdt(). - scan_pfdt_node(). - check_partial_fdt(). - Functions which are moved with some minor changes: - alloc_xenstore_evtchn(): - ifdef-ing by CONFIG_HVM accesses to hvm.params. - prepare_dtb_domU(): - ifdef-ing access to gnttab_{start,size} by CONFIG_GRANT_TABLE. - s/make_gic_domU_node/make_intc_domU_node. - Add call of make_arch_nodes(). - domain_handle_dtb_bootmodule(): - hide details of interrupt controller phandle initialization by calling init_intc_phandle(). - Update the comment above init_intc_phandle(): s/gic/interrupt controller. - construct_domU(): - ifdef-ing by CONFIG_HVM accesses to hvm.params. - Call init_vuart() to hide Arm's vpl011_init() details there. - Add call of set_domain_type() instead of setting kinfo->arch.type explicitly. Some parts of dom0less-build.c are wraped by #ifdef CONFIG_STATIC_{SHMEM,MEMORY} as not all archs support these configs. Signed-off-by: Oleksii Kurochko [stefano: fix code style] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/arm/dom0less-build.c | 714 ++----------------------------- xen/common/device-tree/dom0less-build.c | 708 ++++++++++++++++++++++++++++++ xen/include/asm-generic/dom0less-build.h | 18 +- 3 files changed, 760 insertions(+), 680 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 0adeec7b94..a49764f0ad 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -25,8 +25,6 @@ #include #include -bool __initdata need_xenstore; - #ifdef CONFIG_VGICV2 static int __init make_gicv2_domU_node(struct kernel_info *kinfo) { @@ -152,7 +150,7 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo) } #endif -static int __init make_gic_domU_node(struct kernel_info *kinfo) +int __init make_intc_domU_node(struct kernel_info *kinfo) { switch ( kinfo->d->arch.vgic.version ) { @@ -218,708 +216,60 @@ static int __init make_vpl011_uart_node(struct kernel_info *kinfo) } #endif -/* - * Scan device tree properties for passthrough specific information. - * Returns < 0 on error - * 0 on success - */ -static int __init handle_passthrough_prop(struct kernel_info *kinfo, - const struct fdt_property *xen_reg, - const struct fdt_property *xen_path, - bool xen_force, - uint32_t address_cells, - uint32_t size_cells) -{ - const __be32 *cell; - unsigned int i, len; - struct dt_device_node *node; - int res; - paddr_t mstart, size, gstart; - - /* xen,reg specifies where to map the MMIO region */ - cell = (const __be32 *)xen_reg->data; - len = fdt32_to_cpu(xen_reg->len) / ((address_cells * 2 + size_cells) * - sizeof(uint32_t)); - - for ( i = 0; i < len; i++ ) - { - device_tree_get_reg(&cell, address_cells, size_cells, - &mstart, &size); - gstart = dt_next_cell(address_cells, &cell); - - if ( gstart & ~PAGE_MASK || mstart & ~PAGE_MASK || size & ~PAGE_MASK ) - { - printk(XENLOG_ERR - "DomU passthrough config has not page aligned addresses/sizes\n"); - return -EINVAL; - } - - res = iomem_permit_access(kinfo->d, paddr_to_pfn(mstart), - paddr_to_pfn(PAGE_ALIGN(mstart + size - 1))); - if ( res ) - { - printk(XENLOG_ERR "Unable to permit to dom%d access to" - " 0x%"PRIpaddr" - 0x%"PRIpaddr"\n", - kinfo->d->domain_id, - mstart & PAGE_MASK, PAGE_ALIGN(mstart + size) - 1); - return res; - } - - res = map_regions_p2mt(kinfo->d, - gaddr_to_gfn(gstart), - PFN_DOWN(size), - maddr_to_mfn(mstart), - p2m_mmio_direct_dev); - if ( res < 0 ) - { - printk(XENLOG_ERR - "Failed to map %"PRIpaddr" to the guest at%"PRIpaddr"\n", - mstart, gstart); - return -EFAULT; - } - } - - /* - * If xen_force, we let the user assign a MMIO region with no - * associated path. - */ - if ( xen_path == NULL ) - return xen_force ? 0 : -EINVAL; - - /* - * xen,path specifies the corresponding node in the host DT. - * Both interrupt mappings and IOMMU settings are based on it, - * as they are done based on the corresponding host DT node. - */ - node = dt_find_node_by_path(xen_path->data); - if ( node == NULL ) - { - printk(XENLOG_ERR "Couldn't find node %s in host_dt!\n", - xen_path->data); - return -EINVAL; - } - - res = map_device_irqs_to_domain(kinfo->d, node, true, NULL); - if ( res < 0 ) - return res; - - res = iommu_add_dt_device(node); - if ( res < 0 ) - return res; - - /* If xen_force, we allow assignment of devices without IOMMU protection. */ - if ( xen_force && !dt_device_is_protected(node) ) - return 0; - - return iommu_assign_dt_device(kinfo->d, node); -} - -static int __init handle_prop_pfdt(struct kernel_info *kinfo, - const void *pfdt, int nodeoff, - uint32_t address_cells, uint32_t size_cells, - bool scan_passthrough_prop) -{ - void *fdt = kinfo->fdt; - int propoff, nameoff, res; - const struct fdt_property *prop, *xen_reg = NULL, *xen_path = NULL; - const char *name; - bool found, xen_force = false; - - for ( propoff = fdt_first_property_offset(pfdt, nodeoff); - propoff >= 0; - propoff = fdt_next_property_offset(pfdt, propoff) ) - { - if ( !(prop = fdt_get_property_by_offset(pfdt, propoff, NULL)) ) - return -FDT_ERR_INTERNAL; - - found = false; - nameoff = fdt32_to_cpu(prop->nameoff); - name = fdt_string(pfdt, nameoff); - - if ( scan_passthrough_prop ) - { - if ( dt_prop_cmp("xen,reg", name) == 0 ) - { - xen_reg = prop; - found = true; - } - else if ( dt_prop_cmp("xen,path", name) == 0 ) - { - xen_path = prop; - found = true; - } - else if ( dt_prop_cmp("xen,force-assign-without-iommu", - name) == 0 ) - { - xen_force = true; - found = true; - } - } - - /* - * Copy properties other than the ones above: xen,reg, xen,path, - * and xen,force-assign-without-iommu. - */ - if ( !found ) - { - res = fdt_property(fdt, name, prop->data, fdt32_to_cpu(prop->len)); - if ( res ) - return res; - } - } - - /* - * Only handle passthrough properties if both xen,reg and xen,path - * are present, or if xen,force-assign-without-iommu is specified. - */ - if ( xen_reg != NULL && (xen_path != NULL || xen_force) ) - { - res = handle_passthrough_prop(kinfo, xen_reg, xen_path, xen_force, - address_cells, size_cells); - if ( res < 0 ) - { - printk(XENLOG_ERR "Failed to assign device to %pd\n", kinfo->d); - return res; - } - } - else if ( (xen_path && !xen_reg) || (xen_reg && !xen_path && !xen_force) ) - { - printk(XENLOG_ERR "xen,reg or xen,path missing for %pd\n", - kinfo->d); - return -EINVAL; - } - - /* FDT_ERR_NOTFOUND => There is no more properties for this node */ - return ( propoff != -FDT_ERR_NOTFOUND ) ? propoff : 0; -} - -static int __init scan_pfdt_node(struct kernel_info *kinfo, const void *pfdt, - int nodeoff, - uint32_t address_cells, uint32_t size_cells, - bool scan_passthrough_prop) -{ - int rc = 0; - void *fdt = kinfo->fdt; - int node_next; - - rc = fdt_begin_node(fdt, fdt_get_name(pfdt, nodeoff, NULL)); - if ( rc ) - return rc; - - rc = handle_prop_pfdt(kinfo, pfdt, nodeoff, address_cells, size_cells, - scan_passthrough_prop); - if ( rc ) - return rc; - - address_cells = device_tree_get_u32(pfdt, nodeoff, "#address-cells", - DT_ROOT_NODE_ADDR_CELLS_DEFAULT); - size_cells = device_tree_get_u32(pfdt, nodeoff, "#size-cells", - DT_ROOT_NODE_SIZE_CELLS_DEFAULT); - - node_next = fdt_first_subnode(pfdt, nodeoff); - while ( node_next > 0 ) - { - rc = scan_pfdt_node(kinfo, pfdt, node_next, address_cells, size_cells, - scan_passthrough_prop); - if ( rc ) - return rc; - - node_next = fdt_next_subnode(pfdt, node_next); - } - - return fdt_end_node(fdt); -} - -static int __init check_partial_fdt(void *pfdt, size_t size) +int __init make_arch_nodes(struct kernel_info *kinfo) { - int res; - - if ( fdt_magic(pfdt) != FDT_MAGIC ) - { - dprintk(XENLOG_ERR, "Partial FDT is not a valid Flat Device Tree"); - return -EINVAL; - } - - res = fdt_check_header(pfdt); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed to check the partial FDT (%d)", res); - return -EINVAL; - } - - if ( fdt_totalsize(pfdt) > size ) - { - dprintk(XENLOG_ERR, "Partial FDT totalsize is too big"); - return -EINVAL; - } - - return 0; -} - -static int __init domain_handle_dtb_bootmodule(struct domain *d, - struct kernel_info *kinfo) -{ - void *pfdt; - int res, node_next; - - pfdt = ioremap_cache(kinfo->dtb_bootmodule->start, - kinfo->dtb_bootmodule->size); - if ( pfdt == NULL ) - return -EFAULT; - - res = check_partial_fdt(pfdt, kinfo->dtb_bootmodule->size); - if ( res < 0 ) - goto out; - - for ( node_next = fdt_first_subnode(pfdt, 0); - node_next > 0; - node_next = fdt_next_subnode(pfdt, node_next) ) - { - const char *name = fdt_get_name(pfdt, node_next, NULL); - - if ( name == NULL ) - continue; - - /* - * Only scan /gic /aliases /passthrough, ignore the rest. - * They don't have to be parsed in order. - * - * Take the GIC phandle value from the special /gic node in the - * DTB fragment. - */ - if ( dt_node_cmp(name, "gic") == 0 ) - { - uint32_t phandle_intc = fdt_get_phandle(pfdt, node_next); - - if ( phandle_intc != 0 ) - kinfo->phandle_intc = phandle_intc; - continue; - } - - if ( dt_node_cmp(name, "aliases") == 0 ) - { - res = scan_pfdt_node(kinfo, pfdt, node_next, - DT_ROOT_NODE_ADDR_CELLS_DEFAULT, - DT_ROOT_NODE_SIZE_CELLS_DEFAULT, - false); - if ( res ) - goto out; - continue; - } - if ( dt_node_cmp(name, "passthrough") == 0 ) - { - res = scan_pfdt_node(kinfo, pfdt, node_next, - DT_ROOT_NODE_ADDR_CELLS_DEFAULT, - DT_ROOT_NODE_SIZE_CELLS_DEFAULT, - true); - if ( res ) - goto out; - continue; - } - } - - out: - iounmap(pfdt); - - return res; -} - -/* - * The max size for DT is 2MB. However, the generated DT is small (not including - * domU passthrough DT nodes whose size we account separately), 4KB are enough - * for now, but we might have to increase it in the future. - */ -#define DOMU_DTB_SIZE 4096 -static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) -{ - int addrcells, sizecells; - int ret, fdt_size = DOMU_DTB_SIZE; - - kinfo->phandle_intc = GUEST_PHANDLE_GIC; - kinfo->gnttab_start = GUEST_GNTTAB_BASE; - kinfo->gnttab_size = GUEST_GNTTAB_SIZE; - - addrcells = GUEST_ROOT_ADDRESS_CELLS; - sizecells = GUEST_ROOT_SIZE_CELLS; - - /* Account for domU passthrough DT size */ - if ( kinfo->dtb_bootmodule ) - fdt_size += kinfo->dtb_bootmodule->size; - - /* Cap to max DT size if needed */ - fdt_size = min(fdt_size, SZ_2M); - - kinfo->fdt = xmalloc_bytes(fdt_size); - if ( kinfo->fdt == NULL ) - return -ENOMEM; - - ret = fdt_create(kinfo->fdt, fdt_size); - if ( ret < 0 ) - goto err; - - ret = fdt_finish_reservemap(kinfo->fdt); - if ( ret < 0 ) - goto err; - - ret = fdt_begin_node(kinfo->fdt, ""); - if ( ret < 0 ) - goto err; - - ret = fdt_property_cell(kinfo->fdt, "#address-cells", addrcells); - if ( ret ) - goto err; - - ret = fdt_property_cell(kinfo->fdt, "#size-cells", sizecells); - if ( ret ) - goto err; - - ret = make_chosen_node(kinfo); - if ( ret ) - goto err; + int ret; ret = make_psci_node(kinfo->fdt); if ( ret ) - goto err; - - ret = make_cpus_node(d, kinfo->fdt); - if ( ret ) - goto err; - - ret = make_memory_node(kinfo, addrcells, sizecells, - kernel_info_get_mem(kinfo)); - if ( ret ) - goto err; - - ret = make_resv_memory_node(kinfo, addrcells, sizecells); - if ( ret ) - goto err; - - /* - * domain_handle_dtb_bootmodule has to be called before the rest of - * the device tree is generated because it depends on the value of - * the field phandle_intc. - */ - if ( kinfo->dtb_bootmodule ) - { - ret = domain_handle_dtb_bootmodule(d, kinfo); - if ( ret ) - goto err; - } - - ret = make_gic_domU_node(kinfo); - if ( ret ) - goto err; - - ret = make_timer_node(kinfo); - if ( ret ) - goto err; + return -EINVAL; if ( kinfo->arch.vpl011 ) { - ret = -EINVAL; #ifdef CONFIG_SBSA_VUART_CONSOLE ret = make_vpl011_uart_node(kinfo); #endif if ( ret ) - goto err; - } - - if ( kinfo->dom0less_feature & DOM0LESS_ENHANCED_NO_XS ) - { - ret = make_hypervisor_node(d, kinfo, addrcells, sizecells); - if ( ret ) - goto err; + return -EINVAL; } - ret = fdt_end_node(kinfo->fdt); - if ( ret < 0 ) - goto err; - - ret = fdt_finish(kinfo->fdt); - if ( ret < 0 ) - goto err; - return 0; - - err: - printk("Device tree generation failed (%d).\n", ret); - xfree(kinfo->fdt); - - return -EINVAL; } -#define XENSTORE_PFN_OFFSET 1 -static int __init alloc_xenstore_page(struct domain *d) +/* TODO: make arch.type generic ? */ +#ifdef CONFIG_ARM_64 +void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) { - struct page_info *xenstore_pg; - struct xenstore_domain_interface *interface; - mfn_t mfn; - gfn_t gfn; - int rc; - - if ( (UINT_MAX - d->max_pages) < 1 ) - { - printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages by 1 page.\n", - d); - return -EINVAL; - } - - d->max_pages += 1; - xenstore_pg = alloc_domheap_page(d, MEMF_bits(32)); - if ( xenstore_pg == NULL && is_64bit_domain(d) ) - xenstore_pg = alloc_domheap_page(d, 0); - if ( xenstore_pg == NULL ) - return -ENOMEM; - - mfn = page_to_mfn(xenstore_pg); - if ( !mfn_x(mfn) ) - return -ENOMEM; - - if ( !is_domain_direct_mapped(d) ) - gfn = gaddr_to_gfn(GUEST_MAGIC_BASE + - (XENSTORE_PFN_OFFSET << PAGE_SHIFT)); - else - gfn = gaddr_to_gfn(mfn_to_maddr(mfn)); - - rc = guest_physmap_add_page(d, gfn, mfn, 0); - if ( rc ) - { - free_domheap_page(xenstore_pg); - return rc; - } - - d->arch.hvm.params[HVM_PARAM_STORE_PFN] = gfn_x(gfn); - interface = map_domain_page(mfn); - interface->connection = XENSTORE_RECONNECT; - unmap_domain_page(interface); - - return 0; + /* type must be set before allocate memory */ + d->arch.type = kinfo->arch.type; } - -static int __init alloc_xenstore_params(struct kernel_info *kinfo) +#else +void __init set_domain_type(struct domain *d, struct kernel_info *kinfo) { - struct domain *d = kinfo->d; - int rc = 0; - - if ( (kinfo->dom0less_feature & (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY)) - == (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY) ) - d->arch.hvm.params[HVM_PARAM_STORE_PFN] = XENSTORE_PFN_LATE_ALLOC; - else if ( kinfo->dom0less_feature & DOM0LESS_XENSTORE ) - { - rc = alloc_xenstore_page(d); - if ( rc < 0 ) - return rc; - } - - return rc; + /* Nothing to do */ } +#endif -static void __init domain_vcpu_affinity(struct domain *d, - const struct dt_device_node *node) +int __init init_vuart(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) { - struct dt_device_node *np; - - dt_for_each_child_node(node, np) - { - const char *hard_affinity_str = NULL; - uint32_t val; - int rc; - struct vcpu *v; - cpumask_t affinity; - - if ( !dt_device_is_compatible(np, "xen,vcpu") ) - continue; - - if ( !dt_property_read_u32(np, "id", &val) ) - panic("Invalid xen,vcpu node for domain %s\n", dt_node_name(node)); - - if ( val >= d->max_vcpus ) - panic("Invalid vcpu_id %u for domain %s, max_vcpus=%u\n", val, - dt_node_name(node), d->max_vcpus); - - v = d->vcpu[val]; - rc = dt_property_read_string(np, "hard-affinity", &hard_affinity_str); - if ( rc < 0 ) - continue; - - cpumask_clear(&affinity); - while ( *hard_affinity_str != '\0' ) - { - unsigned int start, end; - - start = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); - - if ( *hard_affinity_str == '-' ) /* Range */ - { - hard_affinity_str++; - end = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); - } - else /* Single value */ - end = start; - - if ( end >= nr_cpu_ids ) - panic("Invalid pCPU %u for domain %s\n", end, dt_node_name(node)); - - for ( ; start <= end; start++ ) - cpumask_set_cpu(start, &affinity); - - if ( *hard_affinity_str == ',' ) - hard_affinity_str++; - else if ( *hard_affinity_str != '\0' ) - break; - } + int rc = 0; - rc = vcpu_set_hard_affinity(v, &affinity); - if ( rc ) - panic("vcpu%d: failed (rc=%d) to set hard affinity for domain %s\n", - v->vcpu_id, rc, dt_node_name(node)); - } -} + kinfo->arch.vpl011 = dt_property_read_bool(node, "vpl011"); -#ifdef CONFIG_ARCH_PAGING_MEMPOOL -static unsigned long __init domain_p2m_pages(unsigned long maxmem_kb, - unsigned int smp_cpus) -{ /* - * Keep in sync with libxl__get_required_paging_memory(). - * 256 pages (1MB) per vcpu, plus 1 page per MiB of RAM for the P2M map, - * plus 128 pages to cover extended regions. + * Base address and irq number are needed when creating vpl011 device + * tree node in prepare_dtb_domU, so initialization on related variables + * shall be done first. */ - unsigned long memkb = 4 * (256 * smp_cpus + (maxmem_kb / 1024) + 128); - - BUILD_BUG_ON(PAGE_SIZE != SZ_4K); - - return DIV_ROUND_UP(memkb, 1024) << (20 - PAGE_SHIFT); -} - -static int __init domain_p2m_set_allocation(struct domain *d, uint64_t mem, - const struct dt_device_node *node) -{ - unsigned long p2m_pages; - uint32_t p2m_mem_mb; - int rc; - - rc = dt_property_read_u32(node, "xen,domain-p2m-mem-mb", &p2m_mem_mb); - /* If xen,domain-p2m-mem-mb is not specified, use the default value. */ - p2m_pages = rc ? - p2m_mem_mb << (20 - PAGE_SHIFT) : - domain_p2m_pages(mem, d->max_vcpus); - - spin_lock(&d->arch.paging.lock); - rc = p2m_set_allocation(d, p2m_pages, NULL); - spin_unlock(&d->arch.paging.lock); - - return rc; -} -#else /* !CONFIG_ARCH_PAGING_MEMPOOL */ -static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, - const struct dt_device_node *node) -{ - return 0; -} -#endif /* CONFIG_ARCH_PAGING_MEMPOOL */ - -int __init construct_domU(struct domain *d, - const struct dt_device_node *node) -{ - struct kernel_info kinfo = KERNEL_INFO_INIT; - const char *dom0less_enhanced; - int rc; - u64 mem; - - rc = dt_property_read_u64(node, "memory", &mem); - if ( !rc ) - { - printk("Error building DomU: cannot read \"memory\" property\n"); - return -EINVAL; - } - kinfo.unassigned_mem = (paddr_t)mem * SZ_1K; - - rc = domain_p2m_set_allocation(d, mem, node); - if ( rc != 0 ) - return rc; - - printk("*** LOADING DOMU cpus=%u memory=%#"PRIx64"KB ***\n", - d->max_vcpus, mem); - - kinfo.arch.vpl011 = dt_property_read_bool(node, "vpl011"); - if ( kinfo.arch.vpl011 && is_hardware_domain(d) ) - panic("hardware domain cannot specify vpl011\n"); - - rc = dt_property_read_string(node, "xen,enhanced", &dom0less_enhanced); - if ( rc == -EILSEQ || - rc == -ENODATA || - (rc == 0 && !strcmp(dom0less_enhanced, "enabled")) ) - { - need_xenstore = true; - kinfo.dom0less_feature = DOM0LESS_ENHANCED; - } - else if ( rc == 0 && !strcmp(dom0less_enhanced, "legacy") ) - { - need_xenstore = true; - kinfo.dom0less_feature = DOM0LESS_ENHANCED_LEGACY; - } - else if ( rc == 0 && !strcmp(dom0less_enhanced, "no-xenstore") ) - kinfo.dom0less_feature = DOM0LESS_ENHANCED_NO_XS; - - if ( vcpu_create(d, 0) == NULL ) - return -ENOMEM; - - d->max_pages = ((paddr_t)mem * SZ_1K) >> PAGE_SHIFT; - - kinfo.d = d; - - rc = kernel_probe(&kinfo, node); - if ( rc < 0 ) - return rc; - -#ifdef CONFIG_ARM_64 - /* type must be set before allocate memory */ - d->arch.type = kinfo.arch.type; -#endif - if ( is_hardware_domain(d) ) - { - rc = construct_hwdom(&kinfo, node); - if ( rc < 0 ) - return rc; - } - else + if ( kinfo->arch.vpl011 ) { - if ( !dt_find_property(node, "xen,static-mem", NULL) ) - allocate_memory(d, &kinfo); - else if ( !is_domain_direct_mapped(d) ) - allocate_static_memory(d, &kinfo, node); - else - assign_static_memory_11(d, &kinfo, node); - - rc = process_shm(d, &kinfo, node); - if ( rc < 0 ) - return rc; - - /* - * Base address and irq number are needed when creating vpl011 device - * tree node in prepare_dtb_domU, so initialization on related variables - * shall be done first. - */ - if ( kinfo.arch.vpl011 ) - { - rc = domain_vpl011_init(d, NULL); - if ( rc < 0 ) - return rc; - } - - rc = prepare_dtb_domU(d, &kinfo); - if ( rc < 0 ) - return rc; - - rc = construct_domain(d, &kinfo); + rc = domain_vpl011_init(d, NULL); if ( rc < 0 ) return rc; } - domain_vcpu_affinity(d, node); - - return alloc_xenstore_params(&kinfo); + return rc; } void __init arch_create_domUs(struct dt_device_node *node, @@ -995,6 +345,22 @@ void __init arch_create_domUs(struct dt_device_node *node, } } +int __init init_intc_phandle(struct kernel_info *kinfo, const char *name, + const int node_next, const void *pfdt) +{ + if ( dt_node_cmp(name, "gic") == 0 ) + { + uint32_t phandle_intc = fdt_get_phandle(pfdt, node_next); + + if ( phandle_intc != 0 ) + kinfo->phandle_intc = phandle_intc; + + return 0; + } + + return 1; +} + /* * Local variables: * mode: C diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 203b762e2c..4aa36c8ef3 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -3,24 +3,43 @@ #include #include #include +#include #include #include +#include +#include #include #include +#include #include +#include #include +#include #include #include #include +#include #include #include #include +#include #include #include +#if __has_include() +# include +#endif + +#if __has_include() +# include +#endif + +#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX + static domid_t __initdata xs_domid = DOMID_INVALID; +static bool __initdata need_xenstore; void __init set_xs_domain(struct domain *d) { @@ -109,6 +128,695 @@ static void __init initialize_domU_xenstore(void) } } +/* + * Scan device tree properties for passthrough specific information. + * Returns < 0 on error + * 0 on success + */ +static int __init handle_passthrough_prop(struct kernel_info *kinfo, + const struct fdt_property *xen_reg, + const struct fdt_property *xen_path, + bool xen_force, + uint32_t address_cells, + uint32_t size_cells) +{ + const __be32 *cell; + unsigned int i, len; + struct dt_device_node *node; + int res; + paddr_t mstart, size, gstart; + + /* xen,reg specifies where to map the MMIO region */ + cell = (const __be32 *)xen_reg->data; + len = fdt32_to_cpu(xen_reg->len) / ((address_cells * 2 + size_cells) * + sizeof(uint32_t)); + + for ( i = 0; i < len; i++ ) + { + device_tree_get_reg(&cell, address_cells, size_cells, + &mstart, &size); + gstart = dt_next_cell(address_cells, &cell); + + if ( gstart & ~PAGE_MASK || mstart & ~PAGE_MASK || size & ~PAGE_MASK ) + { + printk(XENLOG_ERR + "DomU passthrough config has not page aligned addresses/sizes\n"); + return -EINVAL; + } + + res = iomem_permit_access(kinfo->d, paddr_to_pfn(mstart), + paddr_to_pfn(PAGE_ALIGN(mstart + size - 1))); + if ( res ) + { + printk(XENLOG_ERR "Unable to permit to dom%d access to" + " 0x%"PRIpaddr" - 0x%"PRIpaddr"\n", + kinfo->d->domain_id, + mstart & PAGE_MASK, PAGE_ALIGN(mstart + size) - 1); + return res; + } + + res = map_regions_p2mt(kinfo->d, + gaddr_to_gfn(gstart), + PFN_DOWN(size), + maddr_to_mfn(mstart), + p2m_mmio_direct_dev); + if ( res < 0 ) + { + printk(XENLOG_ERR + "Failed to map %"PRIpaddr" to the guest at%"PRIpaddr"\n", + mstart, gstart); + return -EFAULT; + } + } + + /* + * If xen_force, we let the user assign a MMIO region with no + * associated path. + */ + if ( xen_path == NULL ) + return xen_force ? 0 : -EINVAL; + + /* + * xen,path specifies the corresponding node in the host DT. + * Both interrupt mappings and IOMMU settings are based on it, + * as they are done based on the corresponding host DT node. + */ + node = dt_find_node_by_path(xen_path->data); + if ( node == NULL ) + { + printk(XENLOG_ERR "Couldn't find node %s in host_dt!\n", + xen_path->data); + return -EINVAL; + } + + res = map_device_irqs_to_domain(kinfo->d, node, true, NULL); + if ( res < 0 ) + return res; + + res = iommu_add_dt_device(node); + if ( res < 0 ) + return res; + + /* If xen_force, we allow assignment of devices without IOMMU protection. */ + if ( xen_force && !dt_device_is_protected(node) ) + return 0; + + return iommu_assign_dt_device(kinfo->d, node); +} + +static int __init handle_prop_pfdt(struct kernel_info *kinfo, + const void *pfdt, int nodeoff, + uint32_t address_cells, uint32_t size_cells, + bool scan_passthrough_prop) +{ + void *fdt = kinfo->fdt; + int propoff, nameoff, res; + const struct fdt_property *prop, *xen_reg = NULL, *xen_path = NULL; + const char *name; + bool found, xen_force = false; + + for ( propoff = fdt_first_property_offset(pfdt, nodeoff); + propoff >= 0; + propoff = fdt_next_property_offset(pfdt, propoff) ) + { + if ( !(prop = fdt_get_property_by_offset(pfdt, propoff, NULL)) ) + return -FDT_ERR_INTERNAL; + + found = false; + nameoff = fdt32_to_cpu(prop->nameoff); + name = fdt_string(pfdt, nameoff); + + if ( scan_passthrough_prop ) + { + if ( dt_prop_cmp("xen,reg", name) == 0 ) + { + xen_reg = prop; + found = true; + } + else if ( dt_prop_cmp("xen,path", name) == 0 ) + { + xen_path = prop; + found = true; + } + else if ( dt_prop_cmp("xen,force-assign-without-iommu", + name) == 0 ) + { + xen_force = true; + found = true; + } + } + + /* + * Copy properties other than the ones above: xen,reg, xen,path, + * and xen,force-assign-without-iommu. + */ + if ( !found ) + { + res = fdt_property(fdt, name, prop->data, fdt32_to_cpu(prop->len)); + if ( res ) + return res; + } + } + + /* + * Only handle passthrough properties if both xen,reg and xen,path + * are present, or if xen,force-assign-without-iommu is specified. + */ + if ( xen_reg != NULL && (xen_path != NULL || xen_force) ) + { + res = handle_passthrough_prop(kinfo, xen_reg, xen_path, xen_force, + address_cells, size_cells); + if ( res < 0 ) + { + printk(XENLOG_ERR "Failed to assign device to %pd\n", kinfo->d); + return res; + } + } + else if ( (xen_path && !xen_reg) || (xen_reg && !xen_path && !xen_force) ) + { + printk(XENLOG_ERR "xen,reg or xen,path missing for %pd\n", + kinfo->d); + return -EINVAL; + } + + /* FDT_ERR_NOTFOUND => There is no more properties for this node */ + return ( propoff != -FDT_ERR_NOTFOUND ) ? propoff : 0; +} + +static int __init scan_pfdt_node(struct kernel_info *kinfo, const void *pfdt, + int nodeoff, + uint32_t address_cells, uint32_t size_cells, + bool scan_passthrough_prop) +{ + int rc = 0; + void *fdt = kinfo->fdt; + int node_next; + + rc = fdt_begin_node(fdt, fdt_get_name(pfdt, nodeoff, NULL)); + if ( rc ) + return rc; + + rc = handle_prop_pfdt(kinfo, pfdt, nodeoff, address_cells, size_cells, + scan_passthrough_prop); + if ( rc ) + return rc; + + address_cells = device_tree_get_u32(pfdt, nodeoff, "#address-cells", + DT_ROOT_NODE_ADDR_CELLS_DEFAULT); + size_cells = device_tree_get_u32(pfdt, nodeoff, "#size-cells", + DT_ROOT_NODE_SIZE_CELLS_DEFAULT); + + node_next = fdt_first_subnode(pfdt, nodeoff); + while ( node_next > 0 ) + { + rc = scan_pfdt_node(kinfo, pfdt, node_next, address_cells, size_cells, + scan_passthrough_prop); + if ( rc ) + return rc; + + node_next = fdt_next_subnode(pfdt, node_next); + } + + return fdt_end_node(fdt); +} + +static int __init check_partial_fdt(void *pfdt, size_t size) +{ + int res; + + if ( fdt_magic(pfdt) != FDT_MAGIC ) + { + dprintk(XENLOG_ERR, "Partial FDT is not a valid Flat Device Tree"); + return -EINVAL; + } + + res = fdt_check_header(pfdt); + if ( res ) + { + dprintk(XENLOG_ERR, "Failed to check the partial FDT (%d)", res); + return -EINVAL; + } + + if ( fdt_totalsize(pfdt) > size ) + { + dprintk(XENLOG_ERR, "Partial FDT totalsize is too big"); + return -EINVAL; + } + + return 0; +} + +static int __init domain_handle_dtb_bootmodule(struct domain *d, + struct kernel_info *kinfo) +{ + void *pfdt; + int res, node_next; + + pfdt = ioremap_cache(kinfo->dtb_bootmodule->start, + kinfo->dtb_bootmodule->size); + if ( pfdt == NULL ) + return -EFAULT; + + res = check_partial_fdt(pfdt, kinfo->dtb_bootmodule->size); + if ( res < 0 ) + goto out; + + for ( node_next = fdt_first_subnode(pfdt, 0); + node_next > 0; + node_next = fdt_next_subnode(pfdt, node_next) ) + { + const char *name = fdt_get_name(pfdt, node_next, NULL); + + if ( name == NULL ) + continue; + + /* + * Only scan /$(interrupt_controller) /aliases /passthrough, + * ignore the rest. + * They don't have to be parsed in order. + * + * Take the interrupt controller phandle value from the special + * interrupt controller node in the DTB fragment. + */ + if ( init_intc_phandle(kinfo, name, node_next, pfdt) == 0 ) + continue; + + if ( dt_node_cmp(name, "aliases") == 0 ) + { + res = scan_pfdt_node(kinfo, pfdt, node_next, + DT_ROOT_NODE_ADDR_CELLS_DEFAULT, + DT_ROOT_NODE_SIZE_CELLS_DEFAULT, + false); + if ( res ) + goto out; + continue; + } + if ( dt_node_cmp(name, "passthrough") == 0 ) + { + res = scan_pfdt_node(kinfo, pfdt, node_next, + DT_ROOT_NODE_ADDR_CELLS_DEFAULT, + DT_ROOT_NODE_SIZE_CELLS_DEFAULT, + true); + if ( res ) + goto out; + continue; + } + } + + out: + iounmap(pfdt); + + return res; +} + +/* + * The max size for DT is 2MB. However, the generated DT is small (not including + * domU passthrough DT nodes whose size we account separately), 4KB are enough + * for now, but we might have to increase it in the future. + */ +#define DOMU_DTB_SIZE 4096 +static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) +{ + int addrcells, sizecells; + int ret, fdt_size = DOMU_DTB_SIZE; + + kinfo->phandle_intc = GUEST_PHANDLE_GIC; + +#ifdef CONFIG_GRANT_TABLE + kinfo->gnttab_start = GUEST_GNTTAB_BASE; + kinfo->gnttab_size = GUEST_GNTTAB_SIZE; +#endif + + addrcells = GUEST_ROOT_ADDRESS_CELLS; + sizecells = GUEST_ROOT_SIZE_CELLS; + + /* Account for domU passthrough DT size */ + if ( kinfo->dtb_bootmodule ) + fdt_size += kinfo->dtb_bootmodule->size; + + /* Cap to max DT size if needed */ + fdt_size = min(fdt_size, SZ_2M); + + kinfo->fdt = xmalloc_bytes(fdt_size); + if ( kinfo->fdt == NULL ) + return -ENOMEM; + + ret = fdt_create(kinfo->fdt, fdt_size); + if ( ret < 0 ) + goto err; + + ret = fdt_finish_reservemap(kinfo->fdt); + if ( ret < 0 ) + goto err; + + ret = fdt_begin_node(kinfo->fdt, ""); + if ( ret < 0 ) + goto err; + + ret = fdt_property_cell(kinfo->fdt, "#address-cells", addrcells); + if ( ret ) + goto err; + + ret = fdt_property_cell(kinfo->fdt, "#size-cells", sizecells); + if ( ret ) + goto err; + + ret = make_chosen_node(kinfo); + if ( ret ) + goto err; + + ret = make_cpus_node(d, kinfo->fdt); + if ( ret ) + goto err; + + ret = make_memory_node(kinfo, addrcells, sizecells, + kernel_info_get_mem(kinfo)); + if ( ret ) + goto err; + +#ifdef CONFIG_STATIC_SHM + ret = make_resv_memory_node(kinfo, addrcells, sizecells); + if ( ret ) + goto err; +#endif + + /* + * domain_handle_dtb_bootmodule has to be called before the rest of + * the device tree is generated because it depends on the value of + * the field phandle_intc. + */ + if ( kinfo->dtb_bootmodule ) + { + ret = domain_handle_dtb_bootmodule(d, kinfo); + if ( ret ) + goto err; + } + + ret = make_intc_domU_node(kinfo); + if ( ret ) + goto err; + + ret = make_timer_node(kinfo); + if ( ret ) + goto err; + + if ( kinfo->dom0less_feature & DOM0LESS_ENHANCED_NO_XS ) + { + ret = make_hypervisor_node(d, kinfo, addrcells, sizecells); + if ( ret ) + goto err; + } + + ret = make_arch_nodes(kinfo); + if ( ret ) + goto err; + + ret = fdt_end_node(kinfo->fdt); + if ( ret < 0 ) + goto err; + + ret = fdt_finish(kinfo->fdt); + if ( ret < 0 ) + goto err; + + return 0; + + err: + printk("Device tree generation failed (%d).\n", ret); + xfree(kinfo->fdt); + + return -EINVAL; +} + +#define XENSTORE_PFN_OFFSET 1 +static int __init alloc_xenstore_page(struct domain *d) +{ + struct page_info *xenstore_pg; + struct xenstore_domain_interface *interface; + mfn_t mfn; + gfn_t gfn; + int rc; + + if ( (UINT_MAX - d->max_pages) < 1 ) + { + printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages by 1 page.\n", + d); + return -EINVAL; + } + + d->max_pages += 1; + xenstore_pg = alloc_domheap_page(d, MEMF_bits(32)); + if ( xenstore_pg == NULL && is_64bit_domain(d) ) + xenstore_pg = alloc_domheap_page(d, 0); + if ( xenstore_pg == NULL ) + return -ENOMEM; + + mfn = page_to_mfn(xenstore_pg); + if ( !mfn_x(mfn) ) + return -ENOMEM; + + if ( !is_domain_direct_mapped(d) ) + gfn = gaddr_to_gfn(GUEST_MAGIC_BASE + + (XENSTORE_PFN_OFFSET << PAGE_SHIFT)); + else + gfn = gaddr_to_gfn(mfn_to_maddr(mfn)); + + rc = guest_physmap_add_page(d, gfn, mfn, 0); + if ( rc ) + { + free_domheap_page(xenstore_pg); + return rc; + } + +#ifdef CONFIG_HVM + d->arch.hvm.params[HVM_PARAM_STORE_PFN] = gfn_x(gfn); +#endif + interface = map_domain_page(mfn); + interface->connection = XENSTORE_RECONNECT; + unmap_domain_page(interface); + + return 0; +} + +static int __init alloc_xenstore_params(struct kernel_info *kinfo) +{ + struct domain *d = kinfo->d; + int rc = 0; + +#ifdef CONFIG_HVM + if ( (kinfo->dom0less_feature & (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY)) + == (DOM0LESS_XENSTORE | DOM0LESS_XS_LEGACY) ) + d->arch.hvm.params[HVM_PARAM_STORE_PFN] = XENSTORE_PFN_LATE_ALLOC; + else +#endif + if ( kinfo->dom0less_feature & DOM0LESS_XENSTORE ) + { + rc = alloc_xenstore_page(d); + if ( rc < 0 ) + return rc; + } + + return rc; +} + +static void __init domain_vcpu_affinity(struct domain *d, + const struct dt_device_node *node) +{ + struct dt_device_node *np; + + dt_for_each_child_node(node, np) + { + const char *hard_affinity_str = NULL; + uint32_t val; + int rc; + struct vcpu *v; + cpumask_t affinity; + + if ( !dt_device_is_compatible(np, "xen,vcpu") ) + continue; + + if ( !dt_property_read_u32(np, "id", &val) ) + panic("Invalid xen,vcpu node for domain %s\n", dt_node_name(node)); + + if ( val >= d->max_vcpus ) + panic("Invalid vcpu_id %u for domain %s, max_vcpus=%u\n", val, + dt_node_name(node), d->max_vcpus); + + v = d->vcpu[val]; + rc = dt_property_read_string(np, "hard-affinity", &hard_affinity_str); + if ( rc < 0 ) + continue; + + cpumask_clear(&affinity); + while ( *hard_affinity_str != '\0' ) + { + unsigned int start, end; + + start = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); + + if ( *hard_affinity_str == '-' ) /* Range */ + { + hard_affinity_str++; + end = simple_strtoul(hard_affinity_str, &hard_affinity_str, 0); + } + else /* Single value */ + end = start; + + if ( end >= nr_cpu_ids ) + panic("Invalid pCPU %u for domain %s\n", end, dt_node_name(node)); + + for ( ; start <= end; start++ ) + cpumask_set_cpu(start, &affinity); + + if ( *hard_affinity_str == ',' ) + hard_affinity_str++; + else if ( *hard_affinity_str != '\0' ) + break; + } + + rc = vcpu_set_hard_affinity(v, &affinity); + if ( rc ) + panic("vcpu%d: failed (rc=%d) to set hard affinity for domain %s\n", + v->vcpu_id, rc, dt_node_name(node)); + } +} + +#ifdef CONFIG_ARCH_PAGING_MEMPOOL +static unsigned long __init domain_p2m_pages(unsigned long maxmem_kb, + unsigned int smp_cpus) +{ + /* + * Keep in sync with libxl__get_required_paging_memory(). + * 256 pages (1MB) per vcpu, plus 1 page per MiB of RAM for the P2M map, + * plus 128 pages to cover extended regions. + */ + unsigned long memkb = 4 * (256 * smp_cpus + (maxmem_kb / 1024) + 128); + + BUILD_BUG_ON(PAGE_SIZE != SZ_4K); + + return DIV_ROUND_UP(memkb, 1024) << (20 - PAGE_SHIFT); +} + +static int __init domain_p2m_set_allocation(struct domain *d, uint64_t mem, + const struct dt_device_node *node) +{ + unsigned long p2m_pages; + uint32_t p2m_mem_mb; + int rc; + + rc = dt_property_read_u32(node, "xen,domain-p2m-mem-mb", &p2m_mem_mb); + /* If xen,domain-p2m-mem-mb is not specified, use the default value. */ + p2m_pages = rc ? + p2m_mem_mb << (20 - PAGE_SHIFT) : + domain_p2m_pages(mem, d->max_vcpus); + + spin_lock(&d->arch.paging.lock); + rc = p2m_set_allocation(d, p2m_pages, NULL); + spin_unlock(&d->arch.paging.lock); + + return rc; +} +#else /* !CONFIG_ARCH_PAGING_MEMPOOL */ +static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, + const struct dt_device_node *node) +{ + return 0; +} +#endif /* CONFIG_ARCH_PAGING_MEMPOOL */ + +static int __init construct_domU(struct domain *d, + const struct dt_device_node *node) +{ + struct kernel_info kinfo = KERNEL_INFO_INIT; + const char *dom0less_enhanced; + int rc; + u64 mem; + + rc = dt_property_read_u64(node, "memory", &mem); + if ( !rc ) + { + printk("Error building DomU: cannot read \"memory\" property\n"); + return -EINVAL; + } + kinfo.unassigned_mem = (paddr_t)mem * SZ_1K; + + rc = domain_p2m_set_allocation(d, mem, node); + if ( rc != 0 ) + return rc; + + printk("*** LOADING DOMU cpus=%u memory=%#"PRIx64"KB ***\n", + d->max_vcpus, mem); + + rc = dt_property_read_string(node, "xen,enhanced", &dom0less_enhanced); + if ( rc == -EILSEQ || + rc == -ENODATA || + (rc == 0 && !strcmp(dom0less_enhanced, "enabled")) ) + { + need_xenstore = true; + kinfo.dom0less_feature = DOM0LESS_ENHANCED; + } + else if ( rc == 0 && !strcmp(dom0less_enhanced, "legacy") ) + { + need_xenstore = true; + kinfo.dom0less_feature = DOM0LESS_ENHANCED_LEGACY; + } + else if ( rc == 0 && !strcmp(dom0less_enhanced, "no-xenstore") ) + kinfo.dom0less_feature = DOM0LESS_ENHANCED_NO_XS; + + if ( vcpu_create(d, 0) == NULL ) + return -ENOMEM; + + d->max_pages = ((paddr_t)mem * SZ_1K) >> PAGE_SHIFT; + + kinfo.d = d; + + rc = kernel_probe(&kinfo, node); + if ( rc < 0 ) + return rc; + + set_domain_type(d, &kinfo); + + if ( is_hardware_domain(d) ) + { + rc = construct_hwdom(&kinfo, node); + if ( rc < 0 ) + return rc; + } + else + { + if ( !dt_find_property(node, "xen,static-mem", NULL) ) + allocate_memory(d, &kinfo); +#ifdef CONFIG_STATIC_MEMORY + else if ( !is_domain_direct_mapped(d) ) + allocate_static_memory(d, &kinfo, node); + else + assign_static_memory_11(d, &kinfo, node); +#endif + +#ifdef CONFIG_STATIC_SHM + rc = process_shm(d, &kinfo, node); + if ( rc < 0 ) + return rc; +#endif + + rc = init_vuart(d, &kinfo, node); + if ( rc < 0 ) + return rc; + + rc = prepare_dtb_domU(d, &kinfo); + if ( rc < 0 ) + return rc; + + rc = construct_domain(d, &kinfo); + if ( rc < 0 ) + return rc; + } + + domain_vcpu_affinity(d, node); + + return alloc_xenstore_params(&kinfo); +} + void __init create_domUs(void) { struct dt_device_node *node; diff --git a/xen/include/asm-generic/dom0less-build.h b/xen/include/asm-generic/dom0less-build.h index 2003be743f..e0ad0429ec 100644 --- a/xen/include/asm-generic/dom0less-build.h +++ b/xen/include/asm-generic/dom0less-build.h @@ -12,10 +12,7 @@ struct domain; #include struct dt_device_node; - -/* TODO: remove both when construct_domU() will be moved to common. */ -#define XENSTORE_PFN_LATE_ALLOC UINT64_MAX -extern bool need_xenstore; +struct kernel_info; /* * List of possible features for dom0less domUs @@ -49,12 +46,21 @@ void create_domUs(void); bool is_dom0less_mode(void); void set_xs_domain(struct domain *d); -int construct_domU(struct domain *d, const struct dt_device_node *node); - void arch_create_domUs(struct dt_device_node *node, struct xen_domctl_createdomain *d_cfg, unsigned int flags); +int init_vuart(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); + +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); + #else /* !CONFIG_DOM0LESS_BOOT */ static inline void create_domUs(void) {} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 01:45:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 01:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.976643.1363809 (Exim 4.92) (envelope-from ) id 1uC7N6-00018Z-4H; Tue, 06 May 2025 01:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 976643.1363809; Tue, 06 May 2025 01:45: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 1uC7N6-00018R-1L; Tue, 06 May 2025 01:45:24 +0000 Received: by outflank-mailman (input) for mailman id 976643; Tue, 06 May 2025 01:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uC7N5-00018K-5O for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uC7N5-00CLJc-0S for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uC7N5-002ut9-0M for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 01:45:23 +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=euEu874XXfRjltt7LEbgG0KRaRPHhDSe+jVeA3k04i0=; b=kl+b1/KIN9frbntbNdsyso1C7v xvmLLUHzuDWJ7K68fB19GIgqvM653WfNb6ezYiQYj8b4Q0vZIImrDaaX3KAk+2cMZFBpbo72VVDV+ IpstzBREGSx82Tr/L0CnckhzlUW9FTTvTU8LNggRMaBGApSGoZF3jhg/rK4PJRGSCUzM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: check read handler behavior Message-Id: Date: Tue, 06 May 2025 01:45:23 +0000 commit 9a5e22b64266c19b2b01c47a6728be42a8195e52 Author: Stewart Hildebrand AuthorDate: Fri Apr 18 14:58:36 2025 -0400 Commit: Stefano Stabellini CommitDate: Mon May 5 14:38:59 2025 -0700 xen/arm: check read handler behavior We expect mmio read handlers to leave the bits above the access size zeroed. Add an ASSERT to check this aspect of read handler behavior. Suggested-by: Roger Pau Monné Signed-off-by: Stewart Hildebrand Acked-by: Julien Grall --- xen/arch/arm/io.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index 653428e16c..5a4b0e8f25 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -37,6 +37,8 @@ static enum io_state handle_read(const struct mmio_handler *handler, if ( !handler->ops->read(v, info, &r, handler->priv) ) return IO_ABORT; + ASSERT((r & ~GENMASK((1U << info->dabt.size) * 8 - 1, 0)) == 0); + r = sign_extend(dabt, r); set_user_reg(regs, dabt.reg, r); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 06 23:00:11 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 23:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978068.1364932 (Exim 4.92) (envelope-from ) id 1uCRGe-0001uQ-BN; Tue, 06 May 2025 23:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978068.1364932; Tue, 06 May 2025 23:00: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 1uCRGe-0001u6-8c; Tue, 06 May 2025 23:00:04 +0000 Received: by outflank-mailman (input) for mailman id 978068; Tue, 06 May 2025 23:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCRGc-0001Oj-60 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 23:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCRGb-00D0Ik-37 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 23:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCRGb-006XSH-2b for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 23: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=NYAQhO7fFCeX5qDPhSr9c0KjA+14fmj+zaTolyNUhR8=; b=gFtL1S8BKtF+AQFzPmEBs2XXm6 wyqRvsnpXs9HWqTe9th3q/+AF+6ePGgn9l1wnp1hLqKMM2WlIQZW3/ATfCVFoUiWLEI9YTh3J4jzT eXtg9Z3pCWn4G2v/jqZaqw21Qv6gKc6WMsw5pDz7AhekGpbGudeaquFzStRaO55BiX1c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpufeatures: cpuid features for Sierra Forest Message-Id: Date: Tue, 06 May 2025 23:00:01 +0000 commit e0d0af238d2f8eb6cd43f8a85bc788a572cffd22 Author: Kevin Lampis AuthorDate: Tue May 6 09:13:30 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 6 23:56:00 2025 +0100 x86/cpufeatures: cpuid features for Sierra Forest Add new cpuid features for Sierra Forest. Signed-off-by: Kevin Lampis Reviewed-by: Andrew Cooper --- xen/include/public/arch-x86/cpufeatureset.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index cc6e984a88..c290d16683 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -304,13 +304,18 @@ XEN_CPUFEATURE(SM3, 10*32+ 1) /*A SM3 Instructions */ XEN_CPUFEATURE(SM4, 10*32+ 2) /*A SM4 Instructions */ XEN_CPUFEATURE(AVX_VNNI, 10*32+ 4) /*A AVX-VNNI Instructions */ XEN_CPUFEATURE(AVX512_BF16, 10*32+ 5) /*A AVX512 BFloat16 Instructions */ +XEN_CPUFEATURE(LASS, 10*32+ 6) /* Linear Address Space Separation */ XEN_CPUFEATURE(CMPCCXADD, 10*32+ 7) /*a CMPccXADD Instructions */ +XEN_CPUFEATURE(ARCH_PERF_MON, 10*32+8) /* Architectural Perfmon */ XEN_CPUFEATURE(FZRM, 10*32+10) /*A Fast Zero-length REP MOVSB */ XEN_CPUFEATURE(FSRS, 10*32+11) /*A Fast Short REP STOSB */ XEN_CPUFEATURE(FSRCS, 10*32+12) /*A Fast Short REP CMPSB/SCASB */ XEN_CPUFEATURE(WRMSRNS, 10*32+19) /*S WRMSR Non-Serialising */ XEN_CPUFEATURE(AMX_FP16, 10*32+21) /* AMX FP16 instruction */ XEN_CPUFEATURE(AVX_IFMA, 10*32+23) /*A AVX-IFMA Instructions */ +XEN_CPUFEATURE(LAM, 10*32+26) /* Linear Address Masking */ +XEN_CPUFEATURE(MSRLIST, 10*32+27) /* {RD,WR}MSRLIST instructions */ +XEN_CPUFEATURE(NO_INVD, 10*32+30) /* INVD instruction unusable */ /* AMD-defined CPU features, CPUID level 0x80000021.eax, word 11 */ XEN_CPUFEATURE(NO_NEST_BP, 11*32+ 0) /*A No Nested Data Breakpoints */ @@ -340,6 +345,7 @@ XEN_CPUFEATURE(RRSBA_CTRL, 13*32+ 2) /*S MSR_SPEC_CTRL.RRSBA_DIS_* */ XEN_CPUFEATURE(DDP_CTRL, 13*32+ 3) /* MSR_SPEC_CTRL.DDP_DIS_U */ XEN_CPUFEATURE(BHI_CTRL, 13*32+ 4) /*S MSR_SPEC_CTRL.BHI_DIS_S */ XEN_CPUFEATURE(MCDT_NO, 13*32+ 5) /*A MCDT_NO */ +XEN_CPUFEATURE(UC_LOCK_DIS, 13*32+ 6) /* UC-lock disable */ /* Intel-defined CPU features, CPUID level 0x00000007:1.ecx, word 14 */ @@ -349,7 +355,9 @@ XEN_CPUFEATURE(AVX_NE_CONVERT, 15*32+ 5) /*A AVX-NE-CONVERT Instructions */ XEN_CPUFEATURE(AMX_COMPLEX, 15*32+ 8) /* AMX Complex Instructions */ XEN_CPUFEATURE(AVX_VNNI_INT16, 15*32+10) /*A AVX-VNNI-INT16 Instructions */ XEN_CPUFEATURE(PREFETCHI, 15*32+14) /*A PREFETCHIT{0,1} Instructions */ +XEN_CPUFEATURE(UIRET_UIF, 15*32+17) /* UIRET updates UIF */ XEN_CPUFEATURE(CET_SSS, 15*32+18) /* CET Supervisor Shadow Stacks safe to use */ +XEN_CPUFEATURE(SLSM, 15*32+24) /* Static Lockstep Mode */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.eax, word 16 */ XEN_CPUFEATURE(RDCL_NO, 16*32+ 0) /*A No Rogue Data Cache Load (Meltdown) */ @@ -368,6 +376,7 @@ XEN_CPUFEATURE(DOITM, 16*32+12) /* Data Operand Invariant Timing XEN_CPUFEATURE(SBDR_SSDP_NO, 16*32+13) /*A No Shared Buffer Data Read or Sideband Stale Data Propagation */ XEN_CPUFEATURE(FBSDP_NO, 16*32+14) /*A No Fill Buffer Stale Data Propagation */ XEN_CPUFEATURE(PSDP_NO, 16*32+15) /*A No Primary Stale Data Propagation */ +XEN_CPUFEATURE(MCU_EXT, 16*32+16) /* MCU_STATUS/ENUM MSRs */ XEN_CPUFEATURE(FB_CLEAR, 16*32+17) /*!A| Fill Buffers cleared by VERW */ XEN_CPUFEATURE(FB_CLEAR_CTRL, 16*32+18) /* MSR_OPT_CPU_CTRL.FB_CLEAR_DIS */ XEN_CPUFEATURE(RRSBA, 16*32+19) /*! Restricted RSB Alternative */ @@ -379,6 +388,8 @@ XEN_CPUFEATURE(GDS_CTRL, 16*32+25) /* MCU_OPT_CTRL.GDS_MIT_{DIS,LOCK XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ +XEN_CPUFEATURE(IGN_UMONITOR, 16*32+29) /* MCU_OPT_CTRL.IGN_UMONITOR */ +XEN_CPUFEATURE(MON_UMON_MITG, 16*32+30) /* MCU_OPT_CTRL.MON_UMON_MITG */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 06 23:00:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 May 2025 23:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978069.1364937 (Exim 4.92) (envelope-from ) id 1uCRGn-0002Kx-Cw; Tue, 06 May 2025 23:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978069.1364937; Tue, 06 May 2025 23:00: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 1uCRGn-0002Kn-9z; Tue, 06 May 2025 23:00:13 +0000 Received: by outflank-mailman (input) for mailman id 978069; Tue, 06 May 2025 23:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCRGm-0002Kh-3b for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 23:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCRGm-00D0J8-0B for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 23:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCRGm-006XVA-04 for xen-changelog@lists.xenproject.org; Tue, 06 May 2025 23:00: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=ifc9aRVuniD9wFgXl4oANcyCivtmUWaf5lkwJb+nYlE=; b=nfa3RDP5u5j2VGalaAGIR1uKFK pdO7ijyWuAKUmOtHw108HXlfpq4L6cP8Q+Dk/UruohxLQOnhdBTxJM9kbxNvcZYrY4Oww9+M4a9dH FIht4asP/wlWWTsgMDtAHbAOVmxnHVPG/3PrTB7Mn9x/RHb6pWbshOzdhONG2mt8iO48=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sha2: Export additional sha256 functions Message-Id: Date: Tue, 06 May 2025 23:00:12 +0000 commit aea52ce607fe716acc56ad89f07e1513c89018eb Author: Ross Lagerwall AuthorDate: Tue May 6 14:56:50 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 6 23:56:00 2025 +0100 xen/sha2: Export additional sha256 functions In future, some code needs to generate a digest over several separate buffers so export the necessary functions to do so. Adjust sha2_256_final() to have a proper digest parameter. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper --- xen/include/xen/sha2.h | 11 +++++++++++ xen/lib/sha2-256.c | 15 ++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/include/xen/sha2.h b/xen/include/xen/sha2.h index 47d97fbf01..09c69195a9 100644 --- a/xen/include/xen/sha2.h +++ b/xen/include/xen/sha2.h @@ -12,4 +12,15 @@ void sha2_256_digest(uint8_t digest[SHA2_256_DIGEST_SIZE], const void *msg, size_t len); +struct sha2_256_state { + uint32_t state[SHA2_256_DIGEST_SIZE / sizeof(uint32_t)]; + uint8_t buf[64]; + size_t count; /* Byte count. */ +}; + +void sha2_256_init(struct sha2_256_state *s); +void sha2_256_update(struct sha2_256_state *s, const void *msg, size_t len); +void sha2_256_final(struct sha2_256_state *s, + uint8_t digest[SHA2_256_DIGEST_SIZE]); + #endif /* XEN_SHA2_H */ diff --git a/xen/lib/sha2-256.c b/xen/lib/sha2-256.c index 19e8252188..d1b2c20b98 100644 --- a/xen/lib/sha2-256.c +++ b/xen/lib/sha2-256.c @@ -10,12 +10,6 @@ #include #include -struct sha2_256_state { - uint32_t state[SHA2_256_DIGEST_SIZE / sizeof(uint32_t)]; - uint8_t buf[64]; - size_t count; /* Byte count. */ -}; - static uint32_t choose(uint32_t x, uint32_t y, uint32_t z) { return z ^ (x & (y ^ z)); @@ -131,7 +125,7 @@ static void sha2_256_transform(uint32_t *state, const void *_input) state[4] += e; state[5] += f; state[6] += g; state[7] += h; } -static void sha2_256_init(struct sha2_256_state *s) +void sha2_256_init(struct sha2_256_state *s) { *s = (struct sha2_256_state){ .state = { @@ -147,8 +141,7 @@ static void sha2_256_init(struct sha2_256_state *s) }; } -static void sha2_256_update(struct sha2_256_state *s, const void *msg, - size_t len) +void sha2_256_update(struct sha2_256_state *s, const void *msg, size_t len) { unsigned int partial = s->count & 63; @@ -177,9 +170,9 @@ static void sha2_256_update(struct sha2_256_state *s, const void *msg, memcpy(s->buf + partial, msg, len); } -static void sha2_256_final(struct sha2_256_state *s, void *_dst) +void sha2_256_final(struct sha2_256_state *s, uint8_t digest[SHA2_256_DIGEST_SIZE]) { - uint32_t *dst = _dst; + uint32_t *dst = (uint32_t *)digest; unsigned int i, partial = s->count & 63; /* Start padding */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 07 07:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 07:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978284.1365101 (Exim 4.92) (envelope-from ) id 1uCZcN-0001ec-2e; Wed, 07 May 2025 07:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978284.1365101; Wed, 07 May 2025 07: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 1uCZcN-0001eU-02; Wed, 07 May 2025 07:55:03 +0000 Received: by outflank-mailman (input) for mailman id 978284; Wed, 07 May 2025 07:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCZcL-0001eO-Qb for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 07:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCZcL-00Erjf-2P for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 07:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCZcL-003qX9-2D for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 07: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=VNg/2mRxvnkzzT/YkDU8U4rTkdPn3IU+CgmqD2e9Ls0=; b=lKYYaVOeveOqMWOeJ7pEzGXq4m eCMMBfUuVmdBpeKAzm08xQGjPFyqYxPKnNOG+lu9JtDfHEoR7TWN1uB+rF1OXWPd6OsIL1LB18s8P 3Zlmk+i6mcB8WvxJB2HNmxt7EeimoAzx0ztnrJUN9Chu4eRVl5np5A+uuD+qqkQhiVic=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpufeatures: cpuid features for Sierra Forest Message-Id: Date: Wed, 07 May 2025 07:55:01 +0000 commit e0d0af238d2f8eb6cd43f8a85bc788a572cffd22 Author: Kevin Lampis AuthorDate: Tue May 6 09:13:30 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 6 23:56:00 2025 +0100 x86/cpufeatures: cpuid features for Sierra Forest Add new cpuid features for Sierra Forest. Signed-off-by: Kevin Lampis Reviewed-by: Andrew Cooper --- xen/include/public/arch-x86/cpufeatureset.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index cc6e984a88..c290d16683 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -304,13 +304,18 @@ XEN_CPUFEATURE(SM3, 10*32+ 1) /*A SM3 Instructions */ XEN_CPUFEATURE(SM4, 10*32+ 2) /*A SM4 Instructions */ XEN_CPUFEATURE(AVX_VNNI, 10*32+ 4) /*A AVX-VNNI Instructions */ XEN_CPUFEATURE(AVX512_BF16, 10*32+ 5) /*A AVX512 BFloat16 Instructions */ +XEN_CPUFEATURE(LASS, 10*32+ 6) /* Linear Address Space Separation */ XEN_CPUFEATURE(CMPCCXADD, 10*32+ 7) /*a CMPccXADD Instructions */ +XEN_CPUFEATURE(ARCH_PERF_MON, 10*32+8) /* Architectural Perfmon */ XEN_CPUFEATURE(FZRM, 10*32+10) /*A Fast Zero-length REP MOVSB */ XEN_CPUFEATURE(FSRS, 10*32+11) /*A Fast Short REP STOSB */ XEN_CPUFEATURE(FSRCS, 10*32+12) /*A Fast Short REP CMPSB/SCASB */ XEN_CPUFEATURE(WRMSRNS, 10*32+19) /*S WRMSR Non-Serialising */ XEN_CPUFEATURE(AMX_FP16, 10*32+21) /* AMX FP16 instruction */ XEN_CPUFEATURE(AVX_IFMA, 10*32+23) /*A AVX-IFMA Instructions */ +XEN_CPUFEATURE(LAM, 10*32+26) /* Linear Address Masking */ +XEN_CPUFEATURE(MSRLIST, 10*32+27) /* {RD,WR}MSRLIST instructions */ +XEN_CPUFEATURE(NO_INVD, 10*32+30) /* INVD instruction unusable */ /* AMD-defined CPU features, CPUID level 0x80000021.eax, word 11 */ XEN_CPUFEATURE(NO_NEST_BP, 11*32+ 0) /*A No Nested Data Breakpoints */ @@ -340,6 +345,7 @@ XEN_CPUFEATURE(RRSBA_CTRL, 13*32+ 2) /*S MSR_SPEC_CTRL.RRSBA_DIS_* */ XEN_CPUFEATURE(DDP_CTRL, 13*32+ 3) /* MSR_SPEC_CTRL.DDP_DIS_U */ XEN_CPUFEATURE(BHI_CTRL, 13*32+ 4) /*S MSR_SPEC_CTRL.BHI_DIS_S */ XEN_CPUFEATURE(MCDT_NO, 13*32+ 5) /*A MCDT_NO */ +XEN_CPUFEATURE(UC_LOCK_DIS, 13*32+ 6) /* UC-lock disable */ /* Intel-defined CPU features, CPUID level 0x00000007:1.ecx, word 14 */ @@ -349,7 +355,9 @@ XEN_CPUFEATURE(AVX_NE_CONVERT, 15*32+ 5) /*A AVX-NE-CONVERT Instructions */ XEN_CPUFEATURE(AMX_COMPLEX, 15*32+ 8) /* AMX Complex Instructions */ XEN_CPUFEATURE(AVX_VNNI_INT16, 15*32+10) /*A AVX-VNNI-INT16 Instructions */ XEN_CPUFEATURE(PREFETCHI, 15*32+14) /*A PREFETCHIT{0,1} Instructions */ +XEN_CPUFEATURE(UIRET_UIF, 15*32+17) /* UIRET updates UIF */ XEN_CPUFEATURE(CET_SSS, 15*32+18) /* CET Supervisor Shadow Stacks safe to use */ +XEN_CPUFEATURE(SLSM, 15*32+24) /* Static Lockstep Mode */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.eax, word 16 */ XEN_CPUFEATURE(RDCL_NO, 16*32+ 0) /*A No Rogue Data Cache Load (Meltdown) */ @@ -368,6 +376,7 @@ XEN_CPUFEATURE(DOITM, 16*32+12) /* Data Operand Invariant Timing XEN_CPUFEATURE(SBDR_SSDP_NO, 16*32+13) /*A No Shared Buffer Data Read or Sideband Stale Data Propagation */ XEN_CPUFEATURE(FBSDP_NO, 16*32+14) /*A No Fill Buffer Stale Data Propagation */ XEN_CPUFEATURE(PSDP_NO, 16*32+15) /*A No Primary Stale Data Propagation */ +XEN_CPUFEATURE(MCU_EXT, 16*32+16) /* MCU_STATUS/ENUM MSRs */ XEN_CPUFEATURE(FB_CLEAR, 16*32+17) /*!A| Fill Buffers cleared by VERW */ XEN_CPUFEATURE(FB_CLEAR_CTRL, 16*32+18) /* MSR_OPT_CPU_CTRL.FB_CLEAR_DIS */ XEN_CPUFEATURE(RRSBA, 16*32+19) /*! Restricted RSB Alternative */ @@ -379,6 +388,8 @@ XEN_CPUFEATURE(GDS_CTRL, 16*32+25) /* MCU_OPT_CTRL.GDS_MIT_{DIS,LOCK XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ +XEN_CPUFEATURE(IGN_UMONITOR, 16*32+29) /* MCU_OPT_CTRL.IGN_UMONITOR */ +XEN_CPUFEATURE(MON_UMON_MITG, 16*32+30) /* MCU_OPT_CTRL.MON_UMON_MITG */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 07 07:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 07:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978286.1365115 (Exim 4.92) (envelope-from ) id 1uCZcX-0001uZ-AT; Wed, 07 May 2025 07:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978286.1365115; Wed, 07 May 2025 07: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 1uCZcX-0001uR-7l; Wed, 07 May 2025 07:55:13 +0000 Received: by outflank-mailman (input) for mailman id 978286; Wed, 07 May 2025 07:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCZcV-0001tr-Sy for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 07:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCZcV-00Erjl-2n for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 07:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCZcV-003qbL-2a for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 07: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=HzOfIvZwzxtdr4BNgf0luVj2tRYK+y073e/SzY+xWTQ=; b=yLtOKodvfIFfuoPl1Iuhpw1G+B USL0TxPSgyIv83qkiSHLjb1IDo9/17IxysN8IdKiYre+SzBMa4OdmphpGidNJYfuPRBjWk99uapN+ s8BN5yzOyWwc9DhouWbTOcRCKQkRZ/dH6TDrCnZtD745ZG851emJSpSIk6hvUTIgOtj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sha2: Export additional sha256 functions Message-Id: Date: Wed, 07 May 2025 07:55:11 +0000 commit aea52ce607fe716acc56ad89f07e1513c89018eb Author: Ross Lagerwall AuthorDate: Tue May 6 14:56:50 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 6 23:56:00 2025 +0100 xen/sha2: Export additional sha256 functions In future, some code needs to generate a digest over several separate buffers so export the necessary functions to do so. Adjust sha2_256_final() to have a proper digest parameter. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper --- xen/include/xen/sha2.h | 11 +++++++++++ xen/lib/sha2-256.c | 15 ++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/include/xen/sha2.h b/xen/include/xen/sha2.h index 47d97fbf01..09c69195a9 100644 --- a/xen/include/xen/sha2.h +++ b/xen/include/xen/sha2.h @@ -12,4 +12,15 @@ void sha2_256_digest(uint8_t digest[SHA2_256_DIGEST_SIZE], const void *msg, size_t len); +struct sha2_256_state { + uint32_t state[SHA2_256_DIGEST_SIZE / sizeof(uint32_t)]; + uint8_t buf[64]; + size_t count; /* Byte count. */ +}; + +void sha2_256_init(struct sha2_256_state *s); +void sha2_256_update(struct sha2_256_state *s, const void *msg, size_t len); +void sha2_256_final(struct sha2_256_state *s, + uint8_t digest[SHA2_256_DIGEST_SIZE]); + #endif /* XEN_SHA2_H */ diff --git a/xen/lib/sha2-256.c b/xen/lib/sha2-256.c index 19e8252188..d1b2c20b98 100644 --- a/xen/lib/sha2-256.c +++ b/xen/lib/sha2-256.c @@ -10,12 +10,6 @@ #include #include -struct sha2_256_state { - uint32_t state[SHA2_256_DIGEST_SIZE / sizeof(uint32_t)]; - uint8_t buf[64]; - size_t count; /* Byte count. */ -}; - static uint32_t choose(uint32_t x, uint32_t y, uint32_t z) { return z ^ (x & (y ^ z)); @@ -131,7 +125,7 @@ static void sha2_256_transform(uint32_t *state, const void *_input) state[4] += e; state[5] += f; state[6] += g; state[7] += h; } -static void sha2_256_init(struct sha2_256_state *s) +void sha2_256_init(struct sha2_256_state *s) { *s = (struct sha2_256_state){ .state = { @@ -147,8 +141,7 @@ static void sha2_256_init(struct sha2_256_state *s) }; } -static void sha2_256_update(struct sha2_256_state *s, const void *msg, - size_t len) +void sha2_256_update(struct sha2_256_state *s, const void *msg, size_t len) { unsigned int partial = s->count & 63; @@ -177,9 +170,9 @@ static void sha2_256_update(struct sha2_256_state *s, const void *msg, memcpy(s->buf + partial, msg, len); } -static void sha2_256_final(struct sha2_256_state *s, void *_dst) +void sha2_256_final(struct sha2_256_state *s, uint8_t digest[SHA2_256_DIGEST_SIZE]) { - uint32_t *dst = _dst; + uint32_t *dst = (uint32_t *)digest; unsigned int i, partial = s->count & 63; /* Start padding */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:22:10 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978651.1365373 (Exim 4.92) (envelope-from ) id 1uChX2-0007uh-BP; Wed, 07 May 2025 16:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978651.1365373; Wed, 07 May 2025 16: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 1uChX2-0007uY-8f; Wed, 07 May 2025 16:22:04 +0000 Received: by outflank-mailman (input) for mailman id 978651; Wed, 07 May 2025 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 1uChX0-0007uS-P1 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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 1uChX0-00F8C3-1v for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChX0-0012JK-1Z for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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=hjiD0IFMEA8QB0vi6qKsZU2gWmqlElbVd5t5hWvWCh4=; b=cLVeCT9iwICsUX/ASiUfpuufFg xwPAkdfdL/4rhOrePJDx6JRhZgTAzSuoFnrdSUX1nQYkpaCR59puWv+wcBK7zIvoWVBwMevrxSMj+ yFIZbSRmNrOOeAUkK5MKxf9E0MEqNIGhFjXJqC+EXKSN/HatYMY/NbReEizy/IOJgWms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] automation: upgrade Linux kernel for arm64 tests to 6.6.74 Message-Id: Date: Wed, 07 May 2025 16:22:02 +0000 commit 56badca5d8e7a550ccedbe69c65ff4fdf83ab736 Author: Stefano Stabellini AuthorDate: Fri Jan 31 15:32:53 2025 -0800 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: upgrade Linux kernel for arm64 tests to 6.6.74 Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel (cherry picked from commit 87f87a5586b8c4bcee08ae6b82a985e242ab21dd) --- automation/gitlab-ci/build.yaml | 4 +-- automation/gitlab-ci/test.yaml | 2 +- .../tests-artifacts/kernel/5.19-arm64v8.dockerfile | 37 --------------------- .../kernel/6.6.74-arm64v8.dockerfile | 38 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 6a2e491534..5995063d77 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -269,9 +269,9 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-5.19-arm64-export: +kernel-6.6.74-arm64-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 script: - mkdir binaries && cp /Image binaries/Image artifacts: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 3e583a2d29..8fa32310ca 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -4,7 +4,7 @@ .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export - - kernel-5.19-arm64-export + - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile deleted file mode 100644 index 8e33995ba3..0000000000 --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile new file mode 100644 index 0000000000..73e5145425 --- /dev/null +++ b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile @@ -0,0 +1,38 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=6.6.74 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + bc \ + curl \ + flex \ + bison \ + libssl-dev \ + && \ + \ + # Build the kernel + curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ + sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ + sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ + make -j$(nproc) Image.gz && \ + cp arch/arm64/boot/Image / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:22:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978652.1365377 (Exim 4.92) (envelope-from ) id 1uChXC-0007xq-Cv; Wed, 07 May 2025 16:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978652.1365377; Wed, 07 May 2025 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 1uChXC-0007xi-A6; Wed, 07 May 2025 16:22:14 +0000 Received: by outflank-mailman (input) for mailman id 978652; Wed, 07 May 2025 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 1uChXA-0007xU-NV for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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 1uChXA-00F8C7-2F for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChXA-0012XT-27 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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=XDGLaeZkdr8uCYup4njS5QDbAVgSiKXtg5pr7oYu/ic=; b=5wFWmCL7IL7sw11n6Mh5wZslV1 E2A5sDIq83J3kDMg5E27EBiwf7wKA6+LLr+bSJsgcJOKrkqq0oEyZ2VlFtilEx9sY7VQVjplVMYVD gn7QZjO3TC32y+VgDAK0S5+L5VTXeLseWJ1+oc+CzqcQTWkILjpEl9QtkmK9Lrmbd+0g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] automation: upgrade arm32 kernel from bullseye to bookworm Message-Id: Date: Wed, 07 May 2025 16:22:12 +0000 commit d4e5f8c627bc1e8a3a9d843153e37d64e4406bf2 Author: Stefano Stabellini AuthorDate: Thu Feb 20 14:56:20 2025 -0800 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: upgrade arm32 kernel from bullseye to bookworm Signed-off-by: Stefano Stabellini Reviewed-by: Roger Pau Monné (cherry picked from commit 80ee4df5df1d89cf4ccaaca0562faee1cfa8c448) --- automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 41f6e5d8e6..0c94e662aa 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -11,7 +11,7 @@ serial_log="$(pwd)/smoke.serial" cd binaries # Use the kernel from Debian -curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz +curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bookworm/main/installer-armhf/current/images/netboot/vmlinuz # Use a tiny initrd based on busybox from Alpine Linux curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:22:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978653.1365382 (Exim 4.92) (envelope-from ) id 1uChXM-00080F-Ec; Wed, 07 May 2025 16:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978653.1365382; Wed, 07 May 2025 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 1uChXM-000807-Ba; Wed, 07 May 2025 16:22:24 +0000 Received: by outflank-mailman (input) for mailman id 978653; Wed, 07 May 2025 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 1uChXK-0007zz-S6 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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 1uChXK-00F8CF-2h for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChXK-0012cr-2Q for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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=RE2UJ+u0tYfb9liqNKRPY/BL7RALwAW069NO+DmeZ+Y=; b=oo85Cvu6fGQ0+bNxfjz8St0Ut7 0oDooTeXuQpG5HZgdW1fJDXcGb2Z1pnYBzg1detySf355z5JH0I2euG8wWGmqI0+zAC6aAnXMLNeM nPj3MjbJqGhEILNe462oZyA03Ewveaub1taF1s0XchBIKaWVSHZpadio1eqPlsBK7kVk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] automation: skip building domU if there is no test defined for it Message-Id: Date: Wed, 07 May 2025 16:22:22 +0000 commit f2603e2b1d783ef1ad2b12a6fb1539d7cfeb3ca9 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:51 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: skip building domU if there is no test defined for it This will be useful for later tests not using generic domU (unit tests, xtf etc). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit ae521cd96f98adc99df0d897aedd384535b7f21d) --- automation/scripts/qubes-x86-64.sh | 50 +++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8a0b7bfbc0..7eb3ce1bf7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -144,26 +144,28 @@ disk = [ ] ${domU_extra_config} " -# DomU -mkdir -p rootfs -cd rootfs -# fakeroot is needed to preserve device nodes in rootless podman container -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run -echo "#!/bin/sh +if [ -n "$domU_check" ]; then + # DomU + mkdir -p rootfs + cd rootfs + # fakeroot is needed to preserve device nodes in rootless podman container + fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz + mkdir proc + mkdir run + mkdir srv + mkdir sys + rm var/run + echo "#!/bin/sh ${domU_check} " > etc/local.d/xen.start -chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz -cd .. -rm -rf rootfs + chmod +x etc/local.d/xen.start + echo "rc_verbose=yes" >> etc/rc.conf + sed -i -e 's/^Welcome/domU \0/' etc/issue + find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + cd .. + rm -rf rootfs +fi # DOM0 rootfs mkdir -p rootfs @@ -188,11 +190,19 @@ ifconfig eth0 up ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 +" > etc/local.d/xen.start + +if [ -n "$domU_check" ]; then + echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & xl create /etc/xen/domU.cfg ${dom0_check} -" > etc/local.d/xen.start +" >> etc/local.d/xen.start +else + echo "${dom0_check}" >> etc/local.d/xen.start +fi + chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg @@ -201,7 +211,9 @@ echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +if [ -n "$domU_check" ]; then + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +fi find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:22:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978654.1365385 (Exim 4.92) (envelope-from ) id 1uChXW-00082Q-Fv; Wed, 07 May 2025 16:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978654.1365385; Wed, 07 May 2025 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 1uChXW-00082I-D5; Wed, 07 May 2025 16:22:34 +0000 Received: by outflank-mailman (input) for mailman id 978654; Wed, 07 May 2025 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 1uChXU-000825-VH for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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 1uChXU-00F8Ce-31 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChXU-0012iX-2s for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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=BsRnsIa2dhoxQPwpeMevPR5xvAYH2apAITlOacaCJPQ=; b=DNtX4FLN6rAnWfi/KU8V2RKx7M 2M59GuWkoqDNNVaRWYsQuhxkSrgc2qbPtj4R99IYRWKgkpNU4L2saFMizmni3Edrg6k73UXGD4bXh C50wgIvAJEkz/BD/+nZsXA3SjC6SwSXSe/KNW2szG1fQegtDR2RSsbpfgYMsxyS/eILs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] automation: add jobs running tests from tools/tests/* Message-Id: Date: Wed, 07 May 2025 16:22:32 +0000 commit b0a94e392cfe1a208410b4d0557cd880310555a4 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:52 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: add jobs running tests from tools/tests/* There are a bunch of tests in tools/tests/, let them run in CI. For each subdirectory expect "make run" will run the test, and observe its exit code. This way, adding new tests is easy, and they will be automatically picked up. For better visibility, log test output to junit xml format, and let gitlab ingest it. Set SUT_ADDR variable with name/address of the system under test, so a network can be used to extract the file. The actual address is set using DHCP. And for the test internal network, still add the 192.168.0.1 IP (but don't replace the DHCP-provided one). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit fc10d6ecdd64c42dc4e3318ac31cd544a8d84959) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++ automation/scripts/build | 1 + automation/scripts/qubes-x86-64.sh | 28 +++++++++++++++++++++++ automation/scripts/run-tools-tests | 47 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 8fa32310ca..2930d64448 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -130,6 +130,7 @@ PCIDEV: "03:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1" + SUT_ADDR: test-2.testnet artifacts: paths: - smoke.serial @@ -274,6 +275,28 @@ adl-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +adl-tools-tests-pv-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +adl-tools-tests-pvh-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: diff --git a/automation/scripts/build b/automation/scripts/build index 952599cc25..522efe774e 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -109,5 +109,6 @@ else # even though dist/ contains everything, while some containers don't even # build Xen cp -r dist binaries/ + cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7eb3ce1bf7..7c80e0c233 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -10,6 +10,8 @@ set -ex # - pci-pv PV dom0, PV domU + PCI Passthrough # - pvshim PV dom0, PVSHIM domU # - s3 PV dom0, S3 suspend/resume +# - tools-tests-pv PV dom0, run tests from tools/tests/* +# - tools-tests-pvh PVH dom0, run tests from tools/tests/* test_variant=$1 ### defaults @@ -19,6 +21,7 @@ timeout=120 domU_type="pvh" domU_vif="'bridge=xenbr0'," domU_extra_config= +retrieve_xml= case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM @@ -126,6 +129,21 @@ done " ;; + ### tests: tools-tests-pv, tools-tests-pvh + "tools-tests-pv"|"tools-tests-pvh") + retrieve_xml=1 + passed="test passed" + domU_check="" + dom0_check=" +/tests/run-tools-tests /tests /tmp/tests-junit.xml && echo \"${passed}\" +nc -l -p 8080 < /tmp/tests-junit.xml >/dev/null & +" + if [ "${test_variant}" = "tools-tests-pvh" ]; then + extra_xen_opts="dom0=pvh" + fi + + ;; + *) echo "Unrecognised test_variant '${test_variant}'" >&2 exit 1 @@ -178,6 +196,8 @@ mkdir srv mkdir sys rm var/run cp -ar ../binaries/dist/install/* . +cp -ar ../binaries/tests . +cp -a ../automation/scripts/run-tools-tests tests/ echo "#!/bin/bash @@ -192,6 +212,10 @@ ifconfig xenbr0 192.168.0.1 " > etc/local.d/xen.start +if [ -n "$retrieve_xml" ]; then + echo "timeout 30s udhcpc -i xenbr0" >> etc/local.d/xen.start +fi + if [ -n "$domU_check" ]; then echo " # get domU console content into test log @@ -272,6 +296,10 @@ if [ $timeout -le 0 ]; then exit 1 fi +if [ -n "$retrieve_xml" ]; then + nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml \n' > "$xml_out" +printf '\n' >> "$xml_out" +printf ' \n' >> "$xml_out" +failed= +for dir in "$1"/*; do + [ -d "$dir" ] || continue + echo "Running test in $dir" + printf ' \n' "$dir" >> "$xml_out" + ret= + for f in "$dir"/*; do + [ -f "$f" ] || continue + [ -x "$f" ] || continue + "$f" 2>&1 | tee /tmp/out + ret=$? + if [ "$ret" -ne 0 ]; then + echo "FAILED: $ret" + failed+=" $dir" + printf ' \n' "$f" "$ret" >> "$xml_out" + # TODO: could use xml escaping... but current tests seems to + # produce sane output + cat /tmp/out >> "$xml_out" + printf ' \n' >> "$xml_out" + else + echo "PASSED" + fi + done + if [ -z "$ret" ]; then + printf ' \n' "$dir" >> "$xml_out" + fi + printf ' \n' >> "$xml_out" +done +printf ' \n' >> "$xml_out" +printf '\n' >> "$xml_out" + +if [ -n "$failed" ]; then + exit 1 +fi -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:22:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978655.1365391 (Exim 4.92) (envelope-from ) id 1uChXg-00085R-Ih; Wed, 07 May 2025 16:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978655.1365391; Wed, 07 May 2025 16:22: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 1uChXg-00085I-Ef; Wed, 07 May 2025 16:22:44 +0000 Received: by outflank-mailman (input) for mailman id 978655; Wed, 07 May 2025 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 1uChXf-00084j-1w for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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 1uChXf-00F8Ci-06 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChXe-0012oO-3C for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:22: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=1DGi6z0JkTuVdYbrN7HQe/foaiAFL6W5yHEu6uRXq9g=; b=QKTB35CmufvNHakaM1JwGgkGJb ztWN1Gncyth8akDBh/XpvCarysMGcvGCy5AW+au4UXyMjO1G2sM4aMUc0o556UIauXYYQgC74aYJq FMN2ZScMUoxX6mmcH/d+nXPVZZRxYkTGOwKoM4rPxK6vZys3OGf32nhs3zXpqL1eRuZ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] automation: allow selecting individual jobs via CI variables Message-Id: Date: Wed, 07 May 2025 16:22:42 +0000 commit 56899974ca83d15a0413389a5dcd7fc079e89f6c Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:53 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: allow selecting individual jobs via CI variables Debugging sometimes involves running specific jobs on different versions. It's useful to easily avoid running all of the not interesting ones (for given case) to save both time and CI resources. Doing so used to require changing the yaml files, usually in several places. Ease this step by adding SELECTED_JOBS_ONLY variable that takes a regex. Note that one needs to satisfy job dependencies on their own (for example if a test job needs a build job, that specific build job needs to be included too). The variable can be specified via Gitlab web UI when scheduling a pipeline, but it can be also set when doing git push directly: git push -o ci.variable=SELECTED_JOBS_ONLY="/job1|job2/" More details at https://docs.gitlab.co.jp/ee/user/project/push_options.html The variable needs to include regex for selecting jobs, including enclosing slashes. A coma/space separated list of jobs to select would be friendlier UX, but unfortunately that is not supported: https://gitlab.com/gitlab-org/gitlab/-/issues/209904 (note the proposed workaround doesn't work for job-level CI_JOB_NAME). On the other hand, the regex is more flexible (one can select for example all arm32 jobs). Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 9d419afa4667ba0369471c4a0e11e0717289c7bf) --- .gitlab-ci.yml | 2 ++ automation/gitlab-ci/build.yaml | 6 ++++++ automation/gitlab-ci/test.yaml | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a9b8b7228..b3beb2ff9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ variables: XEN_REGISTRY: registry.gitlab.com/xen-project/xen + SELECTED_JOBS_ONLY: + description: "Regex to select only some jobs, must be enclosed with /. For example /job1|job2/" workflow: rules: diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 5995063d77..4fd800e996 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -12,6 +12,12 @@ - '*/*.log' when: always needs: [] + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + when: always + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .gcc-tmpl: variables: &gcc diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 2930d64448..d5c995019d 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,11 @@ .test-jobs-common: stage: test image: ${XEN_REGISTRY}/${CONTAINER} + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export @@ -99,6 +104,9 @@ - '*.dtb' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,6 +125,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -137,6 +148,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:22:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978656.1365392 (Exim 4.92) (envelope-from ) id 1uChXq-00088k-Kj; Wed, 07 May 2025 16:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978656.1365392; Wed, 07 May 2025 16:22: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 1uChXq-00088c-Hz; Wed, 07 May 2025 16:22:54 +0000 Received: by outflank-mailman (input) for mailman id 978656; Wed, 07 May 2025 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 1uChXp-00088R-4X for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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 1uChXp-00F8Cm-0N for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:22:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChXp-0012tP-0H for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 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=OQA0DE8bV90+lhaIL2E2EVcWjZH3NK5M74x+CZU4i7w=; b=ODP6jL4NyAblRZCOAvEYzaOqth WJu+yZ852ynDOM6H+fOURlozK5DqWAArXDE4wbai3F275/VyI7RDemORHi+5t4JCC3RdaIdnd86kw +Bh+d17N9WC2YKz3IvzzfxMXubks3aJvehpOU2Yk2ywn+en2Z6ufoNVpV2wm9WZRVz18=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] automation: add tools/tests jobs on the AMD Zen3+ runner too Message-Id: Date: Wed, 07 May 2025 16:22:53 +0000 commit 2b430f8685764a1a897a8b88fea51bf7bd1024fe Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:54 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: add tools/tests jobs on the AMD Zen3+ runner too Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit b551aed4ab131e61a13922d07bd7d9e29d694f31) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d5c995019d..225eb43998 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -173,6 +173,7 @@ PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-11.testnet tags: - qubes-hw11 @@ -367,6 +368,28 @@ zen3p-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +zen3p-tools-tests-pv-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen3p-tools-tests-pvh-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:23:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978657.1365397 (Exim 4.92) (envelope-from ) id 1uChY0-0008BI-Lp; Wed, 07 May 2025 16:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978657.1365397; Wed, 07 May 2025 16:23: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 1uChY0-0008BA-JK; Wed, 07 May 2025 16:23:04 +0000 Received: by outflank-mailman (input) for mailman id 978657; Wed, 07 May 2025 16:23:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChXz-0008At-7U for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChXz-00F8D4-0d for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChXz-001359-0Y for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:03 +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=QrwocYuwzHW59A/Dq8NeMUuUKXfS054BJs8DrStsJ6s=; b=gC7+Wi8AdjO2pixhax7bqyhI5R keAEiU+/uiV0xm8zTGfblYsJ7qLenQ5oTRWpsrnXEwlow+3ph32mrinsB3s0dXRIDGoTJhoam3ihF 0+WlWl2ot6TpilPfL2sd5yt4s1U0qnaK5kuu3qVqUwd9E0W8EhbXAYZUSDxXeU9OgMsA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] automation/eclair: Reduce verbosity of ECLAIR logs. Message-Id: Date: Wed, 07 May 2025 16:23:03 +0000 commit 59be07b2d3786e0e4a1d6a15af6bf5ddd89b1ead Author: Nicola Vetrini AuthorDate: Tue Mar 4 18:49:36 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation/eclair: Reduce verbosity of ECLAIR logs. While activating verbose logging simplifies debugging, this causes GitLab logs to be truncated, preventing the links to the ECLAIR analysis database to be shown. No functional change. Fixes: c4392ec83244 ("automation: Add ECLAIR utilities and settings") Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini (cherry picked from commit 78f2a5792c68128e3205dd18f0f92fd408bf5cd8) --- automation/eclair_analysis/ECLAIR/analysis.ecl | 2 -- automation/eclair_analysis/ECLAIR/analyze.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 8326156b38..399099938f 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -10,8 +10,6 @@ setq(analysis_kind,getenv("ANALYSIS_KIND")) # strings_map("scheduled-analysis",500,"","^.*$",0) # map_strings("scheduled-analysis",analysis_kind) --verbose - -enable=B.REPORT.ECB -config=B.REPORT.ECB,output=join_paths(data_dir,"FRAME.@FRAME@.ecb") -config=B.REPORT.ECB,preprocessed=show diff --git a/automation/eclair_analysis/ECLAIR/analyze.sh b/automation/eclair_analysis/ECLAIR/analyze.sh index 1dc63c1bc2..2356fc4007 100755 --- a/automation/eclair_analysis/ECLAIR/analyze.sh +++ b/automation/eclair_analysis/ECLAIR/analyze.sh @@ -91,11 +91,13 @@ find "${ECLAIR_DATA_DIR}" -maxdepth 1 -name "FRAME.*.ecb" | sort | xargs cat | "${ECLAIR_BIN_DIR}eclair_report" \ "-create_db='${PROJECT_ECD}'" \ + -quiet \ -load=/dev/stdin > "${ECLAIR_REPORT_LOG}" 2>&1 # Create the Jenkins reports file. "${ECLAIR_BIN_DIR}eclair_report" \ "-db='${PROJECT_ECD}'" \ + -quiet \ "-eval_file='${SCRIPT_DIR}/report.ecl'" \ >> "${ECLAIR_REPORT_LOG}" 2>&1 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:23:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978658.1365401 (Exim 4.92) (envelope-from ) id 1uChYA-0008DX-NE; Wed, 07 May 2025 16:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978658.1365401; Wed, 07 May 2025 16:23: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 1uChYA-0008DP-Ke; Wed, 07 May 2025 16:23:14 +0000 Received: by outflank-mailman (input) for mailman id 978658; Wed, 07 May 2025 16:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChY9-0008DC-A5 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChY9-00F8D8-0v for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChY9-0013Ca-0p for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:13 +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=DTunA8lGSUxBen8XiSz07v+7PUMaQknPJMaGQ9ZBBM0=; b=sW6eB+MsFaaxySpIaIPjk9xmkZ /MEr3DOGGd2nDNk/b8tqt5nH5mWF65hN6jZSQUNh/hhMqfY1727d4VXFIyie6lGxaHJlTfc+qk6OT YasUbpA538QjTEusH9MD5KEOIvbT7hUCeayNUdmrS0RplkUnmkeON9hI+HYasnB57J6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] ci: create boot.ipxe for legacy boot Message-Id: Date: Wed, 07 May 2025 16:23:13 +0000 commit d6a11ac3634fd41be562d11d62afe24571352da6 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:35 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 ci: create boot.ipxe for legacy boot Hardware runners that use legacy boot use iPXE instead of grub2. Create boot.ipxe for those too - with exact same options. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 42beecae0b219fdfa04db729dea2229e05bf4af0) --- automation/scripts/qubes-x86-64.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7c80e0c233..f272964459 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -251,6 +251,14 @@ module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen module2 (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg +echo "#!ipxe + +kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot +module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot +module /gitlab-ci/initrd-dom0 || reboot +boot +" > $TFTP/boot.ipxe + cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:23:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978659.1365407 (Exim 4.92) (envelope-from ) id 1uChYK-0008Fi-PR; Wed, 07 May 2025 16:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978659.1365407; Wed, 07 May 2025 16:23: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 1uChYK-0008Fa-Lz; Wed, 07 May 2025 16:23:24 +0000 Received: by outflank-mailman (input) for mailman id 978659; Wed, 07 May 2025 16:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChYJ-0008FS-Em for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChYJ-00F8DG-1C for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChYJ-0013Nh-17 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:23 +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=4NYnMmEiKEtNgHrWCAiG9q7hU7TxsNpqXen873YOjUg=; b=7En2XwYasUkMY4UBMuta4M8emS vN1Yg5q7EI/zeu0kof1DuVtLDeLnk0AL455cFGaBn9NFDLqpBcydkRZkqUQfn0DjYC5iP+ecOG2Hi fs9aLo1ty+HXdLe62yHudAvnOGp4epj92gHLDXC56lEJC/pEHB5/LXX6wRV4d8iNno04=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] ci: add Intel KabyLake HW runner Message-Id: Date: Wed, 07 May 2025 16:23:23 +0000 commit a30bb23e9a2d9f2891917ce842babbf6ff7d5a14 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:36 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 ci: add Intel KabyLake HW runner This is Intel i7-7567U in NUC 7i7BNH. This one is an older one, with no firmware updates (last update from 2023) and no microcode udpates either. While this firmware supports UEFI, network boot works only in legacy mode - thus legacy is used here (via iPXE, instead of grub2.efi). Testing legacy boot path may be a useful thing on its own. Add the same set of tests as on ADL runner. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 911a766f143196a1576c1b009e2e1cde8b921062) --- automation/gitlab-ci/test.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 225eb43998..d05b9a98af 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -155,6 +155,17 @@ tags: - qubes-hw2 +.kbl-x86-64: + # it's really similar to the ADL one + extends: .adl-x86-64 + variables: + PCIDEV: "00:1f.6" + PCIDEV_INTR: "MSI" + CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-3.testnet + tags: + - qubes-hw3 + .zen2-x86-64: # it's really similar to the above extends: .adl-x86-64 @@ -312,6 +323,84 @@ adl-tools-tests-pvh-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +kbl-smoke-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-suspend-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-hvm-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pvshim-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pvh-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:23:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978660.1365409 (Exim 4.92) (envelope-from ) id 1uChYU-0008Ho-QC; Wed, 07 May 2025 16:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978660.1365409; Wed, 07 May 2025 16:23: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 1uChYU-0008Hg-NY; Wed, 07 May 2025 16:23:34 +0000 Received: by outflank-mailman (input) for mailman id 978660; Wed, 07 May 2025 16:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChYT-0008HY-Fd for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChYT-00F8Da-1U for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChYT-0013eI-1O for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23: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=4rOu2Dr9sCNlGlc4e1oShza+tq01WLfJ3vcpcbVLQN8=; b=QcsaFnGUtramCiKReqQTSnbZAU Z3BDEZzT9VUEd9aHxWE3Fis6WwnqR/OImleEL9/cPqBIUlnReHBrCZYF2EelPt79iuMcMItBEUQ0p a7IsPscDWPA5njnTairaiLgb5YZkgoA/sLCi0dYcqg6A2V6uJwi47SnBK+kLhG+h57PI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: prevent grub unpacking initramfs Message-Id: Date: Wed, 07 May 2025 16:23:33 +0000 commit 0ab5bedcfdb6ad818ba21808779473c35f4c40d4 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:01 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: prevent grub unpacking initramfs It fails on larger initramfs (~250MB one) and sometimes even smaller depending on memory size/memory map, let Linux do it. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 32e6d052c2d88437c6fcec81e5369bc8016ac7e9) --- automation/scripts/qubes-x86-64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index f272964459..8e78b7984e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -248,7 +248,7 @@ CONTROLLER=control@thor.testnet echo " multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (http)/gitlab-ci/initrd-dom0 +module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg echo "#!ipxe -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:23:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978661.1365413 (Exim 4.92) (envelope-from ) id 1uChYe-0008Ke-Rc; Wed, 07 May 2025 16:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978661.1365413; Wed, 07 May 2025 16:23: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 1uChYe-0008KW-Oz; Wed, 07 May 2025 16:23:44 +0000 Received: by outflank-mailman (input) for mailman id 978661; Wed, 07 May 2025 16:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChYd-0008K1-Ia for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChYd-00F8Di-1l for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChYd-0013xU-1f for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23: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=gb6tVEg6CZBUokoAclZd6HCEfTpkt1NAOldzkJNTZMM=; b=AIBPTwv2HAVjlKkfKwIWUr3jNR 0EwecQ+7kNG5CvA/Y/zDyqtETUUYpVayVWGSwxGyRKjalp7ehQtvQbWNMlBHArO3RJJdv7lXuZulb WCpWd+9KlHP5nFPpG54C5Zqa6yYUNsUU2qLCuPKht7AzG2aJY0WxA9vLbF5eC4E5+jTo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: enable XHCI console in Xen debug build on Alpine Message-Id: Date: Wed, 07 May 2025 16:23:43 +0000 commit d747ca04b4b6eb2c4c3ccfa3f052c44e7dd5d9c6 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:03 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: enable XHCI console in Xen debug build on Alpine This build is used for hardware tests, and some runners use XHCI console Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 17cf98d73043d4737783781df6526488b90d1565) --- automation/gitlab-ci/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 4fd800e996..fa00f8beed 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -341,6 +341,7 @@ alpine-3.18-gcc-debug: CONFIG_ARGO=y CONFIG_UBSAN=y CONFIG_UBSAN_FATAL=y + CONFIG_XHCI=y debian-12-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:23:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978662.1365417 (Exim 4.92) (envelope-from ) id 1uChYo-0008N1-St; Wed, 07 May 2025 16:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978662.1365417; Wed, 07 May 2025 16:23: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 1uChYo-0008Mt-QL; Wed, 07 May 2025 16:23:54 +0000 Received: by outflank-mailman (input) for mailman id 978662; Wed, 07 May 2025 16:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChYn-0008Mh-Lj for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChYn-00F8Dm-24 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChYn-00148Y-1y for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:23: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=6itJ8HaQwHd7Dtz61Er7200G0M+hR2OqKdXV+BSvamk=; b=TxcNysl6qKQL/dtvIaWlZur6hh KKmixF72TgBtcNCmlOQ0pyzfm99AL+Htqx8VnLNIhZJYW3Duc3HbbroRKH2uPD3J8frc0/GLUC/HY l5tauIvnH6W5WeSvG2zTppfk0N5CUtYgGqIhwvt8f84iHG4ZDKu8tGWA3mjvA8GYElbo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: include domU kernel messages in the console output log Message-Id: Date: Wed, 07 May 2025 16:23:53 +0000 commit 17c6958bb47e3d15349b69d417b1fd47c23eaad3 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:04 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: include domU kernel messages in the console output log Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD (cherry picked from commit 1804064f68d52a47f1fc1454a3b254c16abe192b) --- automation/scripts/qubes-x86-64.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8e78b7984e..80000854bc 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -175,6 +175,8 @@ if [ -n "$domU_check" ]; then rm var/run echo "#!/bin/sh +echo 8 > /proc/sys/kernel/printk + ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:24:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:24:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978663.1365420 (Exim 4.92) (envelope-from ) id 1uChYz-0008Pd-Uv; Wed, 07 May 2025 16:24:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978663.1365420; Wed, 07 May 2025 16:24:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChYz-0008PT-Ro; Wed, 07 May 2025 16:24:05 +0000 Received: by outflank-mailman (input) for mailman id 978663; Wed, 07 May 2025 16:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChYx-0008PC-OB for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChYx-00F8E3-2K for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChYx-0014E5-2F for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:03 +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=FJNJdV1rN9qAyZnBPh7iH5XIuVvxIv8xca+HAqWhMdk=; b=V9sETaGwEXs0UOg/7zsxUe/bYO k3omE173Wm5KplccDbYG41fxlNOU/7+biLYs0MafKx5sye1J1OTBBk1NohdhDIdUQ31SLxlFjMgmn 8wlGFkA8yU2f3/+aZ7zJ+Kwi/22wgyhamXaPQEgLbpEqn17ytlIzB+ImAFf8lAne1pJ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: increase verbosity of starting a domain Message-Id: Date: Wed, 07 May 2025 16:24:03 +0000 commit 78317ae331fe8d5b46892aa7d8b4d25d4a29088a Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:05 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: increase verbosity of starting a domain And start collecting qemu log earlier, so it isn't lost in case of a timeout during domain startup. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit b8d41a9b22bbe9a08c8438eacf7b705500f20cea) --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 1ff689b577..17e2141d62 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index e1cd838809..0c60a66e25 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -21,7 +21,7 @@ echo "#!/bin/bash xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > ./root/xen.start echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 4d22a124df..8774a87012 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 80000854bc..7867724ebd 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -122,7 +122,6 @@ echo \"${passed}\" " dom0_check=" -tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -222,7 +221,8 @@ if [ -n "$domU_check" ]; then echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & +xl -vvv create /etc/xen/domU.cfg ${dom0_check} " >> etc/local.d/xen.start else diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index f70cfdc155..7834ffbe05 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -49,7 +49,7 @@ ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg set +x until grep -q \"${DOMU_MSG}\" /var/log/xen/console/guest-domU.log; do sleep 1 @@ -75,7 +75,7 @@ done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=" insmod /root/xen-argo.ko -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:24:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:24:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978664.1365425 (Exim 4.92) (envelope-from ) id 1uChZ9-0008Si-1U; Wed, 07 May 2025 16:24:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978664.1365425; Wed, 07 May 2025 16:24:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZ8-0008Sb-V0; Wed, 07 May 2025 16:24:14 +0000 Received: by outflank-mailman (input) for mailman id 978664; Wed, 07 May 2025 16:24:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZ7-0008SR-Qp for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChZ7-00F8EG-2a for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChZ7-0014It-2V for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:13 +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=TXbNoxWVUp9+SOzaT8vBvGSPivjsempKcWEq0A3G6Os=; b=ItbnMMVWG9sIxKEpnZUNY0bQqi oWSVkVap9nYrpIfR0EeRUgvWcsw+s/RZL1/jFbDDvIL1/HIOGvUeCJRk9C6pQ14bda068aNaGfowo 64bJFEl4L42tzChUWTKq2t4/9hWlrz/ew20ofu3kT2mjv28oS907TAMcS1lEOBOU2j8U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: consistently use DOCKER_CMD in makefiles Message-Id: Date: Wed, 07 May 2025 16:24:13 +0000 commit 23f7c8341c48fa6db9ce8c0be41738a508cf1642 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:06 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: consistently use DOCKER_CMD in makefiles This allows rebuilding containers using podman too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 5606b982acd44cc1f0715c424a11b2e76420aa18) --- automation/build/Makefile | 4 ++-- automation/tests-artifacts/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/build/Makefile b/automation/build/Makefile index 4df43b0407..fedf7524da 100644 --- a/automation/build/Makefile +++ b/automation/build/Makefile @@ -31,8 +31,8 @@ clean: define CLEAN_RULE .PHONY: clean-$(1) clean-$(1): - if [ -n "$$$$(docker image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ - docker image rm $(REGISTRY)/$(subst /,:,$(1)); \ + if [ -n "$$$$($(DOCKER_CMD) image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ + $(DOCKER_CMD) image rm $(REGISTRY)/$(subst /,:,$(1)); \ fi endef diff --git a/automation/tests-artifacts/Makefile b/automation/tests-artifacts/Makefile index d055cd696b..80a60a94f3 100644 --- a/automation/tests-artifacts/Makefile +++ b/automation/tests-artifacts/Makefile @@ -10,9 +10,9 @@ help: @echo "To push container builds, set the env var PUSH" %: %.dockerfile ## Builds containers - docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:24:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978665.1365429 (Exim 4.92) (envelope-from ) id 1uChZJ-0008VH-2t; Wed, 07 May 2025 16:24:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978665.1365429; Wed, 07 May 2025 16:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZJ-0008V9-0J; Wed, 07 May 2025 16:24:25 +0000 Received: by outflank-mailman (input) for mailman id 978665; Wed, 07 May 2025 16:24:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZH-0008Uu-Tv for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChZH-00F8EM-2u for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChZH-0014NG-2k for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:23 +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=KKslPGtF4Q/1wz0VM/hs/mAy987XpdJOejO6MJLDg8c=; b=UIOsaQjB3TdcevV8oz1Q55VK7e KtxMnkgflhWkPI9QcHE4Pli3BWK5IrZNZmsVCu9f/QiD8tIExrzKMBRAxB5368rIyRJF00CIqmnZP 3JzjwVB+iFGrCCreFglQpH/QnNbwQfHDPAJJ6S51Kr/3IyuGjWbGbJlVLNCSoJ9ZGjuo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: wait for the network interface in PCI passthrough tests Message-Id: Date: Wed, 07 May 2025 16:24:23 +0000 commit 052e7f57ec053d708206046e920f250da80d82a7 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:07 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: wait for the network interface in PCI passthrough tests The network driver initializes asynchronously, and it may not be ready yet by the time the startup script is called. This is especially the case for USB network adapter (where the PCI device is the USB controller) in the upcoming runner. Don't bother about separate timeout - test timeout will cover this part too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 6e3fe711fbf3a659160ab7ef2c293dffd62bbda4) --- automation/scripts/qubes-x86-64.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7867724ebd..2b04d281d7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -104,6 +104,7 @@ on_reboot = "destroy" domU_check=" set -x -e interface=eth0 +while ! [ -e \"/sys/class/net/\$interface\" ]; do sleep 1; done ip link set \"\$interface\" up timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:24:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:24:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978666.1365433 (Exim 4.92) (envelope-from ) id 1uChZT-00006F-4K; Wed, 07 May 2025 16:24:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978666.1365433; Wed, 07 May 2025 16:24:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZT-000067-1h; Wed, 07 May 2025 16:24:35 +0000 Received: by outflank-mailman (input) for mailman id 978666; Wed, 07 May 2025 16:24:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZS-00005p-0g for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChZR-00F8Ev-3D for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChZR-0014TQ-35 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24: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=9hmFXpCQHz0wXFd6xgKB6QPD8UlkCUdGfV8IKmKX7oI=; b=AtBkOS8XzTkmf9+xCt5iiqhsGb 89OV1VW2nQfuEzUPY8RFKgFg2CZV1MPx4oBkik2g5jxIgc3Jbc8SDiMMn2zEU9eswBHgwocuIGD90 D9LN3zbUuL6vOVry7KJ2+mfriwQ8gxebKCVNyOAhj1Sz5v5v+rOjXEcX/aSzZKi80DlQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: adjust resolving network interface into PCI device Message-Id: Date: Wed, 07 May 2025 16:24:33 +0000 commit 87ab3ad4456945abdaaa308663d2e78ab4fb5f46 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:09 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: adjust resolving network interface into PCI device Change how PCI device lookup is done to handle also USB devices, in which case get the USB controller. Instead of taking basename of the 'device' symlink, resolve the full path (example: /sys/devices/pci0000:00/0000:00:09.0/usb4/4-7/4-7:1.0) and take the first part after pci0000:00. Theoretically it could be a bridge, but VM has flat PCI topology. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 930279d96ca706f05e5860bef4126fc97457d256) --- automation/scripts/qubes-x86-64.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 2b04d281d7..a964ac4b7a 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -110,7 +110,8 @@ timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') ping -c 10 \"\$pingip\" echo domU started -pcidevice=\$(basename \$(readlink /sys/class/net/\$interface/device)) +pcidevice=\$(realpath /sys/class/net/\$interface/device | + sed 's#.*pci0000:00/\\([^/]*\\).*#\\1#') lspci -vs \$pcidevice " if [ -n "$PCIDEV_INTR" ]; then -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:24:45 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:24:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978668.1365437 (Exim 4.92) (envelope-from ) id 1uChZd-000098-5z; Wed, 07 May 2025 16:24:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978668.1365437; Wed, 07 May 2025 16:24: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 1uChZd-000090-35; Wed, 07 May 2025 16:24:45 +0000 Received: by outflank-mailman (input) for mailman id 978668; Wed, 07 May 2025 16:24:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZc-00008j-3j for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChZc-00F8F2-0I for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChZc-0014fJ-0A for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:44 +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=I9+sgey6z/mGpytbsfhA8QatMPaI36Hi62w/vCQYnv4=; b=kElKOBCcORobH1DljxUdQgsguM YaBIt0w2ZPrb/08+QxMZU/wLhrARZymddI7XW4VTHQiqZXfu/lcBVl3wIvGnRdy+WQZwzm0wII8ji gFeneoAjjAYOBnbzGxRaL/KuqlaW5wPDKvOb5uIbbSJIBBXOjpEYaSiRCWCXO5GR6bjE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Message-Id: Date: Wed, 07 May 2025 16:24:44 +0000 commit e9978d089a19515543f9873559f015f071ca5881 Author: Andrew Cooper AuthorDate: Wed Apr 9 13:50:00 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Linux 6.6.56 was already added to test-artifacts for the argo testing, and this removes one moving part while cleaning things up. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit f8588376648aa87f22cc709453f32473f45923c0) --- automation/gitlab-ci/build.yaml | 13 ------- automation/gitlab-ci/test.yaml | 4 ++- .../tests-artifacts/kernel/6.1.19.dockerfile | 41 ---------------------- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index fa00f8beed..a29bac0af4 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -308,19 +308,6 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 -# x86_64 test artifacts - -kernel-6.1.19-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 - script: - - mkdir binaries && cp /bzImage binaries/bzImage - artifacts: - paths: - - binaries/bzImage - tags: - - x86_64 - # Jobs below this line # Build jobs needed for tests diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d05b9a98af..a23ff8a6e7 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -16,7 +16,9 @@ - qemu-system-aarch64-6.0.0-arm32-export .x86-64-test-needs: &x86-64-test-needs - - kernel-6.1.19-export + - project: xen-project/hardware/test-artifacts + job: linux-6.6.56-x86_64 + ref: master - project: xen-project/hardware/test-artifacts job: x86_64-rootfs-alpine-3.18 ref: master diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile deleted file mode 100644 index 073eaa0e11..0000000000 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.1.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libelf-dev \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -# Build the kernel -RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make xen.config && \ - scripts/config --enable BRIDGE && \ - scripts/config --enable IGC && \ - scripts/config --enable TUN && \ - cp .config .config.orig && \ - cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ - make -j$(nproc) bzImage && \ - cp arch/x86/boot/bzImage / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:24:55 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:24:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978669.1365441 (Exim 4.92) (envelope-from ) id 1uChZn-0000Bh-7T; Wed, 07 May 2025 16:24:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978669.1365441; Wed, 07 May 2025 16:24: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 1uChZn-0000BZ-4Q; Wed, 07 May 2025 16:24:55 +0000 Received: by outflank-mailman (input) for mailman id 978669; Wed, 07 May 2025 16:24:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZm-0000BL-6E for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChZm-00F8F6-0X for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChZm-0014t5-0T for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:24:54 +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=A6TnfI6J49F91q1xxpMYJZoiD/R9jvWPNA3Q+nS2Orw=; b=kw+jnnANkKazBqu+v+1W2aT3fo dDnwbaPzzMOllZ3QoOMbhYTf9P2kjrW+ATjzpcoKOBZSzK9cz5WYCRKQYHJrZztM/KJ6ruSINLMhL bhj2H1F/SZCyqLjFH8OrfCxOIcsmfi3xZopYdqDbAwCeSwhT4fFSwphG7TD0hCtUOnEg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Message-Id: Date: Wed, 07 May 2025 16:24:54 +0000 commit 18d59a60561a95f071ff786687a2d1d97d36dbeb Author: Andrew Cooper AuthorDate: Wed Apr 9 17:22:54 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Switch over to test-artifacts. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 8b22309c9bae2cb0717651b8b71feb86d8b203f8) --- automation/gitlab-ci/build.yaml | 11 ------- automation/gitlab-ci/test.yaml | 4 ++- .../kernel/6.6.74-arm64v8.dockerfile | 38 ---------------------- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index a29bac0af4..0effeb8b52 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -275,17 +275,6 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-6.6.74-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a23ff8a6e7..59a2de28c8 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -8,8 +8,10 @@ - when: on_success .arm64-test-needs: &arm64-test-needs + - project: xen-project/hardware/test-artifacts + job: linux-6.6.86-arm64 + ref: master - alpine-3.18-arm64-rootfs-export - - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile deleted file mode 100644 index 73e5145425..0000000000 --- a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.6.74 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libssl-dev \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:25:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:25:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978671.1365445 (Exim 4.92) (envelope-from ) id 1uChZx-0000EC-8X; Wed, 07 May 2025 16:25:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978671.1365445; Wed, 07 May 2025 16:25:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZx-0000E4-5s; Wed, 07 May 2025 16:25:05 +0000 Received: by outflank-mailman (input) for mailman id 978671; Wed, 07 May 2025 16:25:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChZw-0000Dp-9B for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChZw-00F8FL-0p for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChZw-00157o-0i for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:04 +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=H+gP2PsJWXIth7WjcQQEI8yS/Ya8mcccE1uq8+lMCDQ=; b=QnGmUSclZ2ZMLELebJUKNEl685 D233puR5BtkdhU+ssw4AqUQIBvnkEQw5Ak7aCbvVNkFojPBRcSu31ftd3Snn6126//V6O/eqxQNze V3EKzFjQWYAxdqVdhLIE6SFtc4LZbrQSpw9OJOS2wYZoplBMB1gXdOP/MZ7bFWoiVsLI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: Drop stale test-artifacts/alpine/3.18.dockerfile Message-Id: Date: Wed, 07 May 2025 16:25:04 +0000 commit a70222e30cc5caefb8637a2a7b7c5d3ef31e6d73 Author: Andrew Cooper AuthorDate: Mon Apr 7 18:15:32 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Drop stale test-artifacts/alpine/3.18.dockerfile This should have been dropped too, as the authoritative copy lives in another repo now. Fixes: babe11b46c1a ("CI: Drop alpine-3.18-rootfs-export and use test-artefacts") Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 424d20afae9a0d85c17e9dec3922af6448929b8c) --- automation/tests-artifacts/alpine/3.18.dockerfile | 67 ----------------------- 1 file changed, 67 deletions(-) diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile deleted file mode 100644 index 311a92889b..0000000000 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add libgcc && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - apk add pciutils && \ - apk add libelf && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add modules boot && \ - rc-update add killprocs shutdown && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - echo > /etc/modules && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:25:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:25:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978672.1365448 (Exim 4.92) (envelope-from ) id 1uCha7-0000Gt-9v; Wed, 07 May 2025 16:25:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978672.1365448; Wed, 07 May 2025 16:25:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCha7-0000Ge-7I; Wed, 07 May 2025 16:25:15 +0000 Received: by outflank-mailman (input) for mailman id 978672; Wed, 07 May 2025 16:25:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCha6-0000GW-C1 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCha6-00F8FP-17 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCha6-0015PD-11 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:14 +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=vf8fN7FgEUKEByV02fkFMec6Uo95II11RfGdrQJgcMk=; b=SyQtq1McoHHrjdTKJ4cQnTRecJ CC+pb7n9fNpA2o+XZY5gFibmvCE1S+GIasK3rOs04B4kKO/D9Og2pQY/gKzrDf2mpSLq8Akd9Cn2W vUBiTwNOWDynIdLX1plCQmFkS4E/NGcZMvZiBRjm6q+16MWM8yNqYlOI4bneNewH+1v4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: wait for Xen to start before waiting for test to complete Message-Id: Date: Wed, 07 May 2025 16:25:14 +0000 commit 17bad6958ad664db37278b3deef5e4d345daac8a Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:13 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: wait for Xen to start before waiting for test to complete Add additional stage in console output parsing - wait for first message from Xen. The message is defined via BOOT_MSG variable. This has two effects: - distinguishes failing Xen to load at all from later test failures - resets timeout when Xen starts loading The latter is especially relevant for hardware tests where firmware + network boot may take some time before Xen starts booting. The two-stage timeout is more robust solution than increasing the overall timeout. The issue has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. This patch is a first stage before qubes-x86-64.sh is switched to use expect in the next stage. While at it, consistently use 'expect -re' for all matches. This especially allows matching newlines ("\n"), which will become relevant in the next patch. And document variables used in console.exp. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit 7c96a27e375d8d7cbbb5493ebef0e29f90bfd273) --- automation/scripts/console.exp | 27 ++++++++++++++++++----- automation/scripts/qemu-alpine-x86_64.sh | 1 + automation/scripts/qemu-smoke-dom0-arm32.sh | 1 + automation/scripts/qemu-smoke-dom0-arm64.sh | 1 + automation/scripts/qemu-smoke-dom0less-arm32.sh | 1 + automation/scripts/qemu-xtf-dom0less-arm64.sh | 1 + automation/scripts/xilinx-smoke-dom0-x86_64.sh | 1 + automation/scripts/xilinx-smoke-dom0less-arm64.sh | 1 + 8 files changed, 29 insertions(+), 5 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 31ce97b91b..c27f893dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -1,4 +1,17 @@ #!/usr/bin/env expect +# +# Variables used by this script: +# - TEST_TIMEOUT: timeout between each *_MSG match +# - TEST_TIMEOUT_OVERRIDE: when set, overrides TEST_TIMEOUT +# - TEST_LOG: save console log to this file +# - TEST_CMD: commands that prints test system console output to stdout - in +# qemu tests that's usually qemu itself (with -serial stdio), in hardware +# tests that's a command to read serial console +# - UBOOT_CMD (optional): command to enter at u-boot prompt +# - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - LOG_MSG (optional): final console message to wait for +# - PASSED: message to look for to consider test a success; if LOG_MSG is set, +# both LOG_MSG and PASSED must appear (in any order) for test to succeed if {[info exists env(TEST_TIMEOUT_OVERRIDE)]} { set timeout $env(TEST_TIMEOUT_OVERRIDE) @@ -28,21 +41,25 @@ if {[info exists env(UBOOT_CMD)]} { send "$env(UBOOT_CMD)\r" } +if {[info exists env(BOOT_MSG)]} { + expect -re "$env(BOOT_MSG)" +} + if {[info exists env(LOG_MSG)]} { expect { - "$env(PASSED)" { - expect "$env(LOG_MSG)" + -re "$env(PASSED)" { + expect -re "$env(LOG_MSG)" exit 0 } - "$env(LOG_MSG)" { - expect "$env(PASSED)" + -re "$env(LOG_MSG)" { + expect -re "$env(PASSED)" exit 0 } } } expect { - "$env(PASSED)" { + -re "$env(PASSED)" { exit 0 } } diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 17e2141d62..89bdb4df7d 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -85,6 +85,7 @@ export TEST_CMD="qemu-system-x86_64 \ -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0" export TEST_LOG="smoke.serial" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index 0c60a66e25..4f50eabdef 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -92,6 +92,7 @@ export TEST_CMD="./qemu-system-arm \ export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" export TEST_LOG="${serial_log}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="/ #" diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 8774a87012..51d037b000 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -104,6 +104,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 0c94e662aa..0e2c5496db 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -144,6 +144,7 @@ export TEST_CMD="./qemu-system-arm \ -bios /usr/lib/u-boot/qemu_arm/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="${serial_log}" export LOG_MSG="${dom0_prompt}" export PASSED="${passed}" diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh b/automation/scripts/qemu-xtf-dom0less-arm64.sh index 9608de6ec0..436f460c3c 100755 --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh @@ -61,6 +61,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export PASSED="${passed}" diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7834ffbe05..69caabe2d8 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -159,6 +159,7 @@ stty -F ${SERIAL_DEV} 57600 # Capture test result and power off board before exiting. export PASSED="${PASS_MSG}" +export BOOT_MSG="Latest ChangeSet: " export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index b24ad11b8c..3e1fcf6bf9 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -140,6 +140,7 @@ stty -F ${SERIAL_DEV} 115200 # Capture test result and power off board before exiting. export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Welcome to Alpine Linux" export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:25:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:25:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978673.1365453 (Exim 4.92) (envelope-from ) id 1uChaH-0000KC-Cb; Wed, 07 May 2025 16:25:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978673.1365453; Wed, 07 May 2025 16:25:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChaH-0000K4-A3; Wed, 07 May 2025 16:25:25 +0000 Received: by outflank-mailman (input) for mailman id 978673; Wed, 07 May 2025 16:25:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChaG-0000Jr-F6 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChaG-00F8FV-1Q for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChaG-0015ll-1I for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:24 +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=CfonWbBt/oxa8Gq/M7TK7kmEikoi3yin9zFiTFWBib8=; b=uTJrzEa8Jv9S3tZrZACy2S1OUd lb5MRGLESt9bv9zY/OmJCQpiZqX1Ful2mrSrqRL42PQ78g4gjE2z4ibmjWmECH4w92bYip+HDgfUe j9iMznJL2kaDy+RIbX+rtmqpeMf21T08Bvt+nKSuRwPG90FWTPuXcQnSB9U+lXDI1WEs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: fix waiting for final test message Message-Id: Date: Wed, 07 May 2025 16:25:24 +0000 commit 563af5983b1eb928e318635f51714cbf93cf86dd Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:14 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: fix waiting for final test message Expect normally discards initial part of its buffer after matching the patter, before looking for the next one. If both PASSED and LOG_MSG happen to be in the buffer at the same time, depending on their order, only one will be matched and the waiting for the other will timeout. Example expect -d output of this happening (parts eclipsed for brevity): expect: does "\r\r\r\nWelcome to Alpine Linux 3.18\r\r\r\n...\r\r\r\r\n(domU) + echo 'pci test passed'\r\r\r\r\n(domU) pci test passed\r\r\r\r..." (spawn_id exp4) match regular expression "pci test passed"? Gate "pci test passed"? gate=yes re=yes ... Gate keeper glob pattern for '\nWelcome to Alpine Linux' is ' Welcome to Alpine Linux'. Activating booster. expect: does "'\r\r\r\r\n(domU) pci test passed\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) \r\r\r\r\r\n(domU) domU Welcome to Alpine Linux 3.18\r\r\r\r\n(domU) \rKernel 6.6.56 on an x86_64 (/dev/hvc0)\r\r\r\r\n(domU) \r\r\r\r\r\n" (spawn_id exp4) match regular expression "\nWelcome to Alpine Linux"? Gate "\nWelcome to Alpine Linux"? gate=no Fix this by using -notransfer flag to keep matched part in the buffer. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 1e12cbd6af2c92e61a1363ef208f71da1eae47ab) CI: fix waiting for final test message (again) The previous attempt has correct diagnosis, but added -notransfer flag in a wrong place - it should be used in the first (outer) match out of two, not the second (inner) one. Fixes: 1e12cbd6af2c ("CI: fix waiting for final test message") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 79de6507c59021484e7c0b359f45035eab891e88) --- automation/scripts/console.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index c27f893dfb..2414f37fd2 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -47,11 +47,11 @@ if {[info exists env(BOOT_MSG)]} { if {[info exists env(LOG_MSG)]} { expect { - -re "$env(PASSED)" { + -notransfer -re "$env(PASSED)" { expect -re "$env(LOG_MSG)" exit 0 } - -re "$env(LOG_MSG)" { + -notransfer -re "$env(LOG_MSG)" { expect -re "$env(PASSED)" exit 0 } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:25:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:25:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978674.1365457 (Exim 4.92) (envelope-from ) id 1uChaR-0000Mb-ES; Wed, 07 May 2025 16:25:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978674.1365457; Wed, 07 May 2025 16:25:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChaR-0000MT-BR; Wed, 07 May 2025 16:25:35 +0000 Received: by outflank-mailman (input) for mailman id 978674; Wed, 07 May 2025 16:25:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChaQ-0000MI-Ip for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChaQ-00F8Ft-1m for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChaQ-0015v3-1g for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:34 +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=m1UaVr5Y/SeTBo0jUxjBdVJtBqZkjc6AmHcwnU59vGI=; b=YqRuUYof27qTbzFBHfmLoNGaAD vfb4ZIGSyT3boGMjMhbQ2sUmnFg20tezT6fgepIGhnWeoq6eDRlUBRWiU4+/nDcSfP58aEphJ5fPX xaIHqU3SkngDOuwOTW7A3QQKQQK/q1RfEtm+y/PWMHlWJxUmXOgw8uz3e6sZU02jSYuw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: switch qubes runners to use console.exp Message-Id: Date: Wed, 07 May 2025 16:25:34 +0000 commit 16b30e082793ec34747d25a49f3cbfa13db79d72 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:15 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: switch qubes runners to use console.exp It appears as sometimes it takes more time for Xen even start booting, mostly due to firmware and fetching large boot files by grub. In some jobs the current timeout is pretty close to the actual time needed, and sometimes (rarely for now) test fails due to timeout expiring in the middle of dom0 booting. This will be happening more often if the initramfs will grow (and with more complex tests). This has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. Switch to using expect (console.exp) for more robust test output handling. This allows waiting separately for Xen starting to boot and then for the test to complete. For now, set both of those to 120s, which pessimistically bumps timeout for the whole test to 240s (from 120s). Add S3 handling to console.exp via SUSPEND_MSG + WAKEUP_CMD. Signed-off-by: Marek Marczykowski-Górecki (cherry picked from commit d604d774a24bae21e15c831e172455bd4600663d) --- automation/build/alpine/3.18-arm64v8.dockerfile | 1 + automation/scripts/console.exp | 13 +++++++ automation/scripts/qubes-x86-64.sh | 52 +++++++------------------ 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 19fe46f841..b8482d5bf4 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -48,3 +48,4 @@ RUN apk --no-cache add \ # qubes test deps openssh-client \ fakeroot \ + expect \ diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 2414f37fd2..fc80513dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -9,6 +9,10 @@ # tests that's a command to read serial console # - UBOOT_CMD (optional): command to enter at u-boot prompt # - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - SUSPEND_MSG (optional): message signaling system is going to sleep, it's +# trigger for WAKEUP_CMD (see below) +# - WAKEUP_CMD (optional): command to execute to wakeup the system 30s after +# seeing SUSPEND_MSG # - LOG_MSG (optional): final console message to wait for # - PASSED: message to look for to consider test a success; if LOG_MSG is set, # both LOG_MSG and PASSED must appear (in any order) for test to succeed @@ -45,6 +49,15 @@ if {[info exists env(BOOT_MSG)]} { expect -re "$env(BOOT_MSG)" } +if {[info exists env(WAKEUP_CMD)]} { + expect -re "$env(SUSPEND_MSG)" + + # keep it suspended a bit, then wakeup + sleep 30 + + system "$env(WAKEUP_CMD)" +} + if {[info exists env(LOG_MSG)]} { expect { -notransfer -re "$env(PASSED)" { diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index a964ac4b7a..861e302d84 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -ex -o pipefail # One of: # - "" PV dom0, PVH domU @@ -267,52 +267,26 @@ cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -# start logging the serial; this gives interactive console, don't close its -# stdin to not close it; the 'cat' is important, plain redirection would hang -# until somebody opens the pipe; opening and closing the pipe is used to close -# the console -mkfifo /tmp/console-stdin -cat /tmp/console-stdin |\ -ssh $CONTROLLER console | tee smoke.serial | sed 's/\r//' & - # start the system pointing at gitlab-ci predefined config ssh $CONTROLLER gitlabci poweron -trap "ssh $CONTROLLER poweroff; : > /tmp/console-stdin" EXIT +trap "ssh $CONTROLLER poweroff" EXIT if [ -n "$wait_and_wakeup" ]; then - # wait for suspend or a timeout - until grep "$wait_and_wakeup" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) - done - if [ $timeout -le 0 ]; then - echo "ERROR: suspend timeout, aborting" - exit 1 - fi - # keep it suspended a bit, then wakeup - sleep 30 - ssh $CONTROLLER wake + export SUSPEND_MSG="$wait_and_wakeup" + export WAKEUP_CMD="ssh $CONTROLLER wake" fi -set +x -until grep "^Welcome to Alpine Linux" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) -done -set -x - -tail -n 100 smoke.serial - -if [ $timeout -le 0 ]; then - echo "ERROR: test timeout, aborting" - exit 1 -fi +export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " +export LOG_MSG="\nWelcome to Alpine Linux" +export TEST_CMD="ssh $CONTROLLER console" +export TEST_LOG="smoke.serial" +export TEST_TIMEOUT="$timeout" +./automation/scripts/console.exp | sed 's/\r\+$//' +TEST_RESULT=$? if [ -n "$retrieve_xml" ]; then nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:25:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978675.1365461 (Exim 4.92) (envelope-from ) id 1uChab-0000PF-FQ; Wed, 07 May 2025 16:25:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978675.1365461; Wed, 07 May 2025 16:25: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 1uChab-0000P7-Cq; Wed, 07 May 2025 16:25:45 +0000 Received: by outflank-mailman (input) for mailman id 978675; Wed, 07 May 2025 16:25:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChaa-0000P0-LH for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChaa-00F8Fx-22 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChaa-00162K-1w for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:44 +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=w5pSEm2lXMpSDN9tch4SVP2HkZpwpMBoKWn5NV3ut3E=; b=hFxEDLxWCc1kDSRXH57WHJ4j0z vV6ov5Y7n06ioL4ZpM4VRIIXLUDo0Kgw8QV93v/U7yQXgk8b2DUrL9Tj+UR9MIviG9yf7FWwMbAX7 nBtAXP27GrSev1P7t6j5o6Vvgcb6+90bBQ54/tsePbw5kK/e6UdRs91h8lj5BhVBlGI8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: write whole etc/issue for domU initrd Message-Id: Date: Wed, 07 May 2025 16:25:44 +0000 commit fd7218e3f470e80b98422a031f72d57904175d0e Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:16 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: write whole etc/issue for domU initrd Upcoming changes won't unpack original rootfs anymore, so sed on existing file cannot be used. Override the whole file instead. No functional change intended. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit f401eae6ec446671ad79deac84421d56808d43f2) --- automation/scripts/qubes-x86-64.sh | 5 ++++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 861e302d84..c4be714642 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -182,7 +182,10 @@ ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf - sed -i -e 's/^Welcome/domU \0/' etc/issue + echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 69caabe2d8..7e5382931b 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -103,7 +103,10 @@ ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue +echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue copy_domU_files find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:25:55 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:25:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978677.1365464 (Exim 4.92) (envelope-from ) id 1uChal-0000Rm-Gn; Wed, 07 May 2025 16:25:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978677.1365464; Wed, 07 May 2025 16:25: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 1uChal-0000Re-EJ; Wed, 07 May 2025 16:25:55 +0000 Received: by outflank-mailman (input) for mailman id 978677; Wed, 07 May 2025 16:25:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChak-0000RQ-O4 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChak-00F8Lc-2J for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChak-00168k-2D for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:25:54 +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=sneOM2pOxCwdlXazvX9IlW0JCMrQK+66Vvu3mMAHJuo=; b=sdTPRtZ3axBda1X1K/QTG9grjU vA1weqZ4Cpj7syPj7E2bLfvk41pSfV34FynVyYpkdZWoq6zqbGapNbMmP1nn5zF5BWM3YUSoN3iXE Polg/RFHT98tEworSjXOPhuRj8CLPSo3qotaS5r65R8zzgkyHeAWBA23sSIg8iaRRQSM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: Rename intermediate artefacts in qemu-* scripts Message-Id: Date: Wed, 07 May 2025 16:25:54 +0000 commit 20212a32e9cf626854fab1fe59bfcdbf4748ecff Author: Andrew Cooper AuthorDate: Sat Apr 12 15:33:01 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Rename intermediate artefacts in qemu-* scripts Right now, we have initrd.cpio.gz as domU, and initrd.tar.gz as the base for dom0. Rename initrd.cpio.gz to domU-rootfs.cpio.gz, and xen-rootfs.cpio.gz to dom0-rootfs.cpio.gz to make it clearer which is which. Rename the VM from test to domU. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 9caca83404e707694d229853f8158c4c243c575c) --- automation/scripts/qemu-alpine-x86_64.sh | 16 ++++++++-------- automation/scripts/qemu-smoke-dom0-arm64.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 89bdb4df7d..569bd766d3 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -25,7 +25,7 @@ mount -t devtmpfs devtmpfs /dev chmod +x initrd/init # DomU rootfs cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. # initrd.tar.gz is Dom0 rootfs @@ -38,15 +38,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/bzImage\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash set -x @@ -56,13 +56,13 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf # rebuild Dom0 rootfs -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF @@ -70,7 +70,7 @@ cat >> binaries/pxelinux.0 << EOF kernel xen console=com1 console_timestamps=boot module bzImage console=hvc0 -module xen-rootfs.cpio.gz +module dom0-rootfs.cpio.gz boot EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 51d037b000..e8e49ded24 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -24,7 +24,7 @@ mount -t devtmpfs devtmpfs /dev /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. mkdir -p rootfs @@ -36,15 +36,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/Image\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -52,12 +52,12 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded @@ -78,7 +78,7 @@ MEMORY_END="0xC0000000" DEVICE_TREE="virt-gicv2.dtb" XEN="xen" DOM0_KERNEL="Image" -DOM0_RAMDISK="xen-rootfs.cpio.gz" +DOM0_RAMDISK="dom0-rootfs.cpio.gz" XEN_CMD="console=dtuart dom0_mem=1024M console_timestamps=boot" NUM_DOMUS=0 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:26:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:26:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978678.1365469 (Exim 4.92) (envelope-from ) id 1uChav-0000UC-IR; Wed, 07 May 2025 16:26:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978678.1365469; Wed, 07 May 2025 16:26:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChav-0000U4-Fj; Wed, 07 May 2025 16:26:05 +0000 Received: by outflank-mailman (input) for mailman id 978678; Wed, 07 May 2025 16:26:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChau-0000Tw-Qj for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChau-00F8Lx-2a for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChau-0016FQ-2V for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:04 +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=5DB+odq0ldPvd8y2mOxhb9lDcveCrEb3qD5YkyTBVOo=; b=Thd1s/OGYnTrBr9VU+S8sifjP8 +qF9PmPQCOAuJLltat+GIsqistUe4adtjAuV7vLZP/hX+qGZXuFLhQOMUvvlsVgou76OmCZNv5c6j 64kSJgCeHU725RT6en2L+Na5XYVX8XUb7N9myF66nYUwLSddWQEV3jNB2fl8tf9+2RWQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: avoid repacking initrd as part of the test job Message-Id: Date: Wed, 07 May 2025 16:26:04 +0000 commit 7f26cba32cc833ac428def5512cfc3ea922dcf7f Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:17 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: avoid repacking initrd as part of the test job Use the new test-artifacts which provide rootfs.cpio.gz rather than initrd.tar.gz. rootfs.cpio.gz also has all the necessary top-level directories, and includes the rc_verbose setting, so these modifications can be dropped. Having that, do not repack the whole initrd, but only pack modified files and rely on Linux handling of concatenated archives. This allows packing just test-related files (which includes the whole toolstack), instead of the whole initrd. For xilinx-smoke-dom0-x86_64.sh, this involves instructing grub not to unzip the archive, as doing so corrupts it. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 786f3238094f9460f59bce9f250adbf426f89297) --- automation/gitlab-ci/test.yaml | 8 +++--- automation/scripts/qemu-alpine-x86_64.sh | 16 +++++------- automation/scripts/qemu-smoke-dom0-arm64.sh | 14 +++++----- automation/scripts/qemu-smoke-dom0less-arm64.sh | 15 +++++------ automation/scripts/qubes-x86-64.sh | 32 +++++++++-------------- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 27 ++++++++++--------- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 30 +++++++++------------ 7 files changed, 61 insertions(+), 81 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 59a2de28c8..51229cbe56 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -11,7 +11,9 @@ - project: xen-project/hardware/test-artifacts job: linux-6.6.86-arm64 ref: master - - alpine-3.18-arm64-rootfs-export + - project: xen-project/hardware/test-artifacts + job: alpine-3.18-arm64-rootfs + ref: master - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs @@ -22,7 +24,7 @@ job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master .qemu-arm64: @@ -243,7 +245,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: job: x86_64-kernel-linux-6.6.56 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master - project: xen-project/hardware/test-artifacts job: x86_64-argo-linux-6.6.56 diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 569bd766d3..c7dd121978 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -28,16 +28,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. -# initrd.tar.gz is Dom0 rootfs +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root echo "name=\"domU\" @@ -60,9 +58,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -# rebuild Dom0 rootfs -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index e8e49ded24..c0cf61ff8f 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -27,15 +27,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root echo "name=\"domU\" @@ -56,8 +55,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 83e1866ca6..48c424922d 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -111,16 +111,14 @@ cd initrd find . | cpio --create --format='newc' | gzip > ../binaries/initrd cd .. -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash @@ -139,8 +137,7 @@ xl network-attach 1 type=vif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # ImageBuilder diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index c4be714642..e2376cb51c 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -164,16 +164,13 @@ ${domU_extra_config} " if [ -n "$domU_check" ]; then - # DomU + # DomU rootfs + cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + + # test-local configuration mkdir -p rootfs cd rootfs - # fakeroot is needed to preserve device nodes in rootless podman container - fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz - mkdir proc - mkdir run - mkdir srv - mkdir sys - rm var/run + mkdir -p etc/local.d echo "#!/bin/sh echo 8 > /proc/sys/kernel/printk @@ -181,26 +178,22 @@ echo 8 > /proc/sys/kernel/printk ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start - echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue - find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs fi -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir boot -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -237,7 +230,6 @@ fi chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console @@ -245,7 +237,7 @@ cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU fi -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7e5382931b..1fc52d78db 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -80,6 +80,7 @@ argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () { + mkdir -p root usr/local/lib usr/local/bin cp "${WORKDIR}/binaries/xen-argo.ko" "root/" cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" @@ -89,12 +90,13 @@ else fatal "Unknown test: ${TEST}" fi -# Set up domU rootfs. +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc run srv sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh set -x export LD_LIBRARY_PATH=/usr/local/lib @@ -102,22 +104,22 @@ PATH=/usr/local/bin:/usr/local/sbin:\$PATH ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue copy_domU_files -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# Set up dom0 rootfs. +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir boot proc run srv sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . echo "#!/bin/bash set -x @@ -127,14 +129,13 @@ ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU copy_dom0_files -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # Load software into TFTP server directory. @@ -147,7 +148,7 @@ echo " net_default_server=10.0.6.1 multiboot2 (tftp)/${TEST_BOARD}/xen ${XEN_CMDLINE} sync_console module2 (tftp)/${TEST_BOARD}/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (tftp)/${TEST_BOARD}/initrd-dom0 +module2 --nounzip (tftp)/${TEST_BOARD}/initrd-dom0 boot " > ${TFTP}/${TEST_BOARD}/grub.cfg diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 3e1fcf6bf9..a3031ecab0 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -38,36 +38,31 @@ echo \"${passed}\" " fi -# DomU +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -78,8 +73,7 @@ bash /etc/init.d/xencommons start ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:26:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:26:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978679.1365473 (Exim 4.92) (envelope-from ) id 1uChb5-0000XH-LM; Wed, 07 May 2025 16:26:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978679.1365473; Wed, 07 May 2025 16:26:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChb5-0000X9-Ie; Wed, 07 May 2025 16:26:15 +0000 Received: by outflank-mailman (input) for mailman id 978679; Wed, 07 May 2025 16:26:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChb4-0000X3-TA for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChb4-00F8M9-2p for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChb4-0016JZ-2l for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:14 +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=shFtAHPR/6IRyHmI12A1qiLBjtohMhJP20xqVuh2jfE=; b=xoyHlu1INwmvHkDljeRKN7lmYU DJN00Y5KNSz7LABYri82+e5QSi6etYRmQOdOYEi19ewcq2SISr2aDNYUQct8oW9iMxaLA8H1Q/czK kGsXzFWPXfryVR/Fda8VficA6xYPKz1ItsTpgMN5sYqmY0UE5jCWEK4/6cAJJ2lnXse8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: remove now unused alpine-3.18-arm64-rootfs job and its container Message-Id: Date: Wed, 07 May 2025 16:26:14 +0000 commit 1532272067c33cfbcf5231ddb6d1ff341d1b8939 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 15:47:22 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: remove now unused alpine-3.18-arm64-rootfs job and its container This got moved to test-artifacts. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper Acked-by: Anthony PERARD (cherry picked from commit 93f12111c749962b77eb4671d740d3d010429174) --- automation/gitlab-ci/build.yaml | 11 ---- .../tests-artifacts/alpine/3.18-arm64v8.dockerfile | 66 ---------------------- 2 files changed, 77 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 0effeb8b52..5f0acda942 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -264,17 +264,6 @@ # Arm test artifacts -alpine-3.18-arm64-rootfs-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8 - script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - artifacts: - paths: - - binaries/initrd.tar.gz - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index a4542f7039..0000000000 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add networking sysinit && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add killprocs shutdown && \ - rc-update add modloop sysinit && \ - rc-update add modules boot && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add sysctl boot && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:26:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:26:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978680.1365477 (Exim 4.92) (envelope-from ) id 1uChbF-0000Zm-Mf; Wed, 07 May 2025 16:26:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978680.1365477; Wed, 07 May 2025 16:26:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChbF-0000Zf-K5; Wed, 07 May 2025 16:26:25 +0000 Received: by outflank-mailman (input) for mailman id 978680; Wed, 07 May 2025 16:26:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChbE-0000ZU-Vn for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChbE-00F8MF-35 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChbE-0016Sj-30 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:24 +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=3Eh4HFouI+2UK86kMIorcxMNwPU2wp4CQV4YDDFjGaM=; b=BOSCwC2DMFm9sImzX6nta0jwDx gGvHRAqnVIgmAzET/+LlioCPsm94XRgI7TYqQzsIOCCA3nFNm2ZlVTk5ZdgULcleTVC1jqoU+Koil y9zikACXitrAbVZpCKKYFay7jmeptd8elF2CYCeDhNr5fGhp7jW0YXbNcSXMoryIbN8s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: Switch to new argo artefact Message-Id: Date: Wed, 07 May 2025 16:26:24 +0000 commit 69a629b46204b7949cf1784aa3949fb855b42491 Author: Andrew Cooper AuthorDate: Thu Apr 10 21:39:16 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Switch to new argo artefact The argo artefact is now a cpio archive and can be appended to dom?-rootfs directly, rather than being part of of the overlay. Drop the copy_dom?_files() functions. xen-argo.ko has moved into the standard location, so update the insmod path. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 464d4dd4565c271a46f01a7909593f89b538259f) --- automation/gitlab-ci/test.yaml | 5 +---- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 51229cbe56..ef3560930c 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -242,14 +242,11 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: needs: - alpine-3.18-gcc-debug - project: xen-project/hardware/test-artifacts - job: x86_64-kernel-linux-6.6.56 + job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master - - project: xen-project/hardware/test-artifacts - job: x86_64-argo-linux-6.6.56 - ref: master adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 1fc52d78db..85007dcc29 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -28,8 +28,6 @@ extra = "root=/dev/ram0 console=hvc0" memory = 512 ' DOMU_CFG_EXTRA="" -copy_domU_files () { :; } -copy_dom0_files () { :; } # Select test variant. if [ "${TEST}" = "ping" ]; then @@ -66,7 +64,7 @@ then PASS_MSG="TEST: Message from DOMU" XEN_CMD_EXTRA="argo=1,mac-permissive=1" DOMU_CMD=" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko until false do echo \"${PASS_MSG}\" @@ -74,24 +72,19 @@ do done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " -copy_dom0_files () -{ - mkdir -p root usr/local/lib usr/local/bin - cp "${WORKDIR}/binaries/xen-argo.ko" "root/" - cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" - cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" -} -copy_domU_files () { copy_dom0_files; } else fatal "Unknown test: ${TEST}" fi # DomU rootfs cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz +if [[ "${TEST}" == argo ]]; then + cat binaries/argo.cpio.gz >> binaries/domU-rootfs.cpio.gz +fi # test-local configuration mkdir -p rootfs @@ -108,13 +101,15 @@ echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue -copy_domU_files find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +if [[ "${TEST}" == argo ]]; then + cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz +fi # test-local configuration mkdir -p rootfs @@ -134,7 +129,6 @@ echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -copy_dom0_files find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:26:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:26:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978681.1365481 (Exim 4.92) (envelope-from ) id 1uChbQ-0000bw-O0; Wed, 07 May 2025 16:26:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978681.1365481; Wed, 07 May 2025 16:26:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChbQ-0000bp-La; Wed, 07 May 2025 16:26:36 +0000 Received: by outflank-mailman (input) for mailman id 978681; Wed, 07 May 2025 16:26:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChbP-0000bg-26 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChbP-00F8Mc-08 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChbP-0016Yt-03 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:35 +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=mG4bJTliVUUwiYZUGC1ie6wEQn7bxzHINqsfL71WHwY=; b=ylb3oHD/f3Z0jiiLudbaIzoObY B/43t2FsD66rRGq1OxIX1h+x2jB7KqzjnN5bFvx3MLtulou3GGhccOxMgofvBOoSpb2Yd+iay6Qa/ nm23UkIbG9OWox7BbKrGRrMypKyMet8mbp4vFqZAXmN9UKzyJI3DSoikt9hbhySms5EU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: save toolstack artifact as cpio.gz Message-Id: Date: Wed, 07 May 2025 16:26:35 +0000 commit 0258350a63745e12b40286e2f73b0ebf52438fc0 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:19 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: save toolstack artifact as cpio.gz This avoids the need to re-compress it in every test job. This saves minutes of wallclock time. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 4611ae6fb8f90d25601fcc0688799ef63a374304) --- automation/scripts/build | 2 +- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 +++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 3 +-- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 522efe774e..51effec81d 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -108,7 +108,7 @@ else # 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 - cp -r dist binaries/ + (cd dist/install; find | cpio -o -H newc | gzip) > binaries/xen-tools.cpio.gz cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index c7dd121978..fe86caa393 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -30,11 +30,11 @@ cd .. # Dom0 rootfs cp rootfs.cpio.gz dom0-rootfs.cpio.gz +cat xen-tools.cpio.gz >> dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../dist/install/* . mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index c0cf61ff8f..61dd24b9ab 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -29,11 +29,11 @@ cd .. # Dom0 rootfs cp rootfs.cpio.gz dom0-rootfs.cpio.gz +cat xen-tools.cpio.gz >> dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../dist/install/* . mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 48c424922d..2c9a927c5c 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -113,11 +113,11 @@ cd .. # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../binaries/dist/install/* . mkdir -p etc/local.d echo "#!/bin/bash diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index e2376cb51c..3947027d6e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -189,12 +189,12 @@ fi # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs mkdir -p boot etc/local.d -cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -228,8 +228,10 @@ else fi chmod +x etc/local.d/xen.start +mkdir -p etc/xen echo "$domU_config" > etc/xen/domU.cfg +mkdir -p etc/default echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 85007dcc29..1f8cc172c6 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -107,6 +107,7 @@ rm -rf rootfs # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz if [[ "${TEST}" == argo ]]; then cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz fi @@ -114,8 +115,7 @@ fi # test-local configuration mkdir -p rootfs cd rootfs -mkdir -p boot etc/local.d -cp -ar ../binaries/dist/install/* . +mkdir -p boot etc/local.d etc/xen etc/default echo "#!/bin/bash set -x export LD_LIBRARY_PATH=/usr/local/lib diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index a3031ecab0..59f3fe7edb 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -56,12 +56,11 @@ rm -rf rootfs # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../binaries/dist/install/* . - mkdir -p etc/local.d echo "#!/bin/bash -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:26:46 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:26:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978682.1365485 (Exim 4.92) (envelope-from ) id 1uChba-0000ex-Pj; Wed, 07 May 2025 16:26:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978682.1365485; Wed, 07 May 2025 16:26:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChba-0000ep-N5; Wed, 07 May 2025 16:26:46 +0000 Received: by outflank-mailman (input) for mailman id 978682; Wed, 07 May 2025 16:26:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChbZ-0000eV-57 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChbZ-00F8Mh-0Q for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChbZ-0016m7-0L for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:45 +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=x5/3gxVhs23g34fWmXPYZ07KyTjb8xUrFhz4u+UvDN0=; b=5GlrgTSoS7qqgQObi8+0kBCu40 Ruta8zE/g3KaXW9InAkmq5Z5eH3Fe66L6PVwOZ6C6d0Q9fDT8uOTeR0m8FTqmjP6XvOUu6jbZcRv8 Y7TE/SKJQAIGJax/FLiAEeUqYmqQhwPz2nqwQF+N55pjLPkfi1oDTGdFiPGdBnUbfx8I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: Include microcode for x86 hardware jobs Message-Id: Date: Wed, 07 May 2025 16:26:45 +0000 commit 690655a511cd683a0dec20e4c8bed2f993880c82 Author: Andrew Cooper AuthorDate: Fri Apr 11 20:28:15 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Include microcode for x86 hardware jobs All the x86 hardware runners are out of date, to varying degrees, in terms of microcode. Microcode must be uncompressed and prepended to the initrd in order for Xen to be able to use it during early boot. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 4a39780faafa79034aa4f637ab8a3f1922b95919) --- automation/gitlab-ci/build.yaml | 1 + automation/gitlab-ci/test.yaml | 6 ++++++ automation/scripts/qubes-x86-64.sh | 3 ++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 5f0acda942..5d382bcd24 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -306,6 +306,7 @@ alpine-3.18-gcc-debug: CONFIG_ARGO=y CONFIG_UBSAN=y CONFIG_UBSAN_FATAL=y + CONFIG_UCODE_SCAN_DEFAULT=y CONFIG_XHCI=y debian-12-x86_64-gcc-debug: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ef3560930c..5ce445b78f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -26,6 +26,9 @@ - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86 + ref: master .qemu-arm64: extends: .test-jobs-common @@ -247,6 +250,9 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86 + ref: master adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 3947027d6e..1f90e7002c 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -188,7 +188,8 @@ Kernel \r on an \m (\l) fi # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 1f8cc172c6..5bb44188dc 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -106,7 +106,8 @@ cd .. rm -rf rootfs # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz if [[ "${TEST}" == argo ]]; then cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:26:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:26:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978683.1365489 (Exim 4.92) (envelope-from ) id 1uChbk-0000h8-Ry; Wed, 07 May 2025 16:26:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978683.1365489; Wed, 07 May 2025 16:26:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChbk-0000h1-OS; Wed, 07 May 2025 16:26:56 +0000 Received: by outflank-mailman (input) for mailman id 978683; Wed, 07 May 2025 16:26:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uChbj-0000gp-7i for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uChbj-00F8Mo-0h for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uChbj-00177T-0b for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:26:55 +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=2bpP6FakMsN7nDvyDMwFAQbGOLfeMYDSBKgYbS37Y7M=; b=JocyyYhM/SstDgmlmeKycVMYUL Kh4g1JJIp+DgttmAIlP7lc0rClGg+oLnRQ+KXJiOovjrZGgQtr4+3yMUgpHFLpGCPs2GhR50it7Qp wSfHylwUQ4GljGhJOTLOdelkyn0UBcGjEj+5lFW/1rLFqmirpUOz8QcXnyHmLexz4eCM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] CI: Build with --prefix=/usr rather than setting LD_LIBRARY_PATH Message-Id: Date: Wed, 07 May 2025 16:26:55 +0000 commit 47d911f69eb976785fd17cae4e39de4d55b94b9e Author: Andrew Cooper AuthorDate: Tue Apr 15 13:49:01 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Build with --prefix=/usr rather than setting LD_LIBRARY_PATH This also moves executables too. I'm not sure why xilinx-smoke-dom0-x86_64.sh was overriding PATH too, as /usr/local is clearly in PATH given the other tests, but drop that too. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Acked-by: Stefano Stabellini (cherry picked from commit 7f8c2dd829358406dc9e50d5e386e4d2b20b4303) --- automation/scripts/build | 2 +- automation/scripts/qemu-alpine-x86_64.sh | 1 - automation/scripts/qemu-smoke-dom0-arm64.sh | 1 - automation/scripts/qemu-smoke-dom0less-arm64.sh | 3 +-- automation/scripts/qubes-x86-64.sh | 1 - automation/scripts/xilinx-smoke-dom0-x86_64.sh | 3 --- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 3 +-- 7 files changed, 3 insertions(+), 11 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 51effec81d..a348c781d1 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -67,7 +67,7 @@ elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then collect_xen_artefacts else # Full build. Figure out our ./configure options - cfgargs=() + cfgargs=("--prefix=/usr") cfgargs+=("--enable-docs") # booleans for which compiler is in use diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index fe86caa393..746e70483d 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -49,7 +49,6 @@ echo "#!/bin/bash set -x -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start xl list diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 61dd24b9ab..d6f6b74880 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -46,7 +46,6 @@ extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" " > root/domU.cfg echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start xl list diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 2c9a927c5c..18ea071c2a 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -122,10 +122,9 @@ mkdir -p etc/local.d echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start -/usr/local/lib/xen/bin/init-dom0less +/usr/lib/xen/bin/init-dom0less brctl addbr xenbr0 brctl addif xenbr0 eth0 diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 1f90e7002c..bfdd2ceb99 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -201,7 +201,6 @@ cp -a ../automation/scripts/run-tools-tests tests/ echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start brctl addbr xenbr0 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 5bb44188dc..8f02fa73bd 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -92,8 +92,6 @@ cd rootfs mkdir -p etc/local.d echo "#!/bin/sh set -x -export LD_LIBRARY_PATH=/usr/local/lib -PATH=/usr/local/bin:/usr/local/sbin:\$PATH ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start @@ -119,7 +117,6 @@ cd rootfs mkdir -p boot etc/local.d etc/xen etc/default echo "#!/bin/bash set -x -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start ${DOM0_CMD} " > etc/local.d/xen.start diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 59f3fe7edb..293232eebf 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -64,10 +64,9 @@ cd rootfs mkdir -p etc/local.d echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start -/usr/local/lib/xen/bin/init-dom0less +/usr/lib/xen/bin/init-dom0less ${dom0_check} " > etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978710.1365513 (Exim 4.92) (envelope-from ) id 1uCi2z-0005lr-5a; Wed, 07 May 2025 16:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978710.1365513; Wed, 07 May 2025 16:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi2z-0005lk-2m; Wed, 07 May 2025 16:55:05 +0000 Received: by outflank-mailman (input) for mailman id 978710; Wed, 07 May 2025 16:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi2x-0005le-1A for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi2w-00F98r-2O for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi2w-001dBc-2G for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16: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=AIz5GAw/30aTCXwsVFpjdGt9ryruBBuDabi4/8cZvC0=; b=2PiLIBeX7gjcfWKlPUw+stbwLp 1QOq3N0CeirLiEc9EpHZFgbjJMgYR4H9C/Z4mXoFUII6IlUki587XwbuYZx0VgVRdP/8b8pZYxgqQ RjQgezBSyNj4Ojewu4yV35TCRKbncckoFoIBa2MkSqF867BM4/Lw5UnYBMYrFW9Qzue8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] automation: upgrade Linux kernel for arm64 tests to 6.6.74 Message-Id: Date: Wed, 07 May 2025 16:55:02 +0000 commit 56badca5d8e7a550ccedbe69c65ff4fdf83ab736 Author: Stefano Stabellini AuthorDate: Fri Jan 31 15:32:53 2025 -0800 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: upgrade Linux kernel for arm64 tests to 6.6.74 Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel (cherry picked from commit 87f87a5586b8c4bcee08ae6b82a985e242ab21dd) --- automation/gitlab-ci/build.yaml | 4 +-- automation/gitlab-ci/test.yaml | 2 +- .../tests-artifacts/kernel/5.19-arm64v8.dockerfile | 37 --------------------- .../kernel/6.6.74-arm64v8.dockerfile | 38 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 6a2e491534..5995063d77 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -269,9 +269,9 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-5.19-arm64-export: +kernel-6.6.74-arm64-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 script: - mkdir binaries && cp /Image binaries/Image artifacts: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 3e583a2d29..8fa32310ca 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -4,7 +4,7 @@ .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export - - kernel-5.19-arm64-export + - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile deleted file mode 100644 index 8e33995ba3..0000000000 --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile new file mode 100644 index 0000000000..73e5145425 --- /dev/null +++ b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile @@ -0,0 +1,38 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=6.6.74 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + bc \ + curl \ + flex \ + bison \ + libssl-dev \ + && \ + \ + # Build the kernel + curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ + sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ + sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ + make -j$(nproc) Image.gz && \ + cp arch/arm64/boot/Image / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978711.1365517 (Exim 4.92) (envelope-from ) id 1uCi37-0005nb-7A; Wed, 07 May 2025 16:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978711.1365517; Wed, 07 May 2025 16: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 1uCi37-0005nT-4N; Wed, 07 May 2025 16:55:13 +0000 Received: by outflank-mailman (input) for mailman id 978711; Wed, 07 May 2025 16:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi36-0005nN-UT for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi36-00F98v-2w for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi36-001dUK-2m for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16: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=oJ3eHIYDak8Y4L6K0YIEasxW96szlOo7TKPzgySqAS0=; b=VCbolXr3aly5TgyCPCAKIm+Wd3 wIgzKbMs9pRIh/vPmLjDYDCew2WI9WyMTA5mD6X+LQaepwLJZMhDShEvzNyuV0L0R+5eD+NurFxzX 62hZT6zOokK/nboBsHK2CcoMZohT7Fcpi+uSjXBrTyZLxwX7VlEbTkbRSh4Y/N5P8axg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] automation: upgrade arm32 kernel from bullseye to bookworm Message-Id: Date: Wed, 07 May 2025 16:55:12 +0000 commit d4e5f8c627bc1e8a3a9d843153e37d64e4406bf2 Author: Stefano Stabellini AuthorDate: Thu Feb 20 14:56:20 2025 -0800 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: upgrade arm32 kernel from bullseye to bookworm Signed-off-by: Stefano Stabellini Reviewed-by: Roger Pau Monné (cherry picked from commit 80ee4df5df1d89cf4ccaaca0562faee1cfa8c448) --- automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 41f6e5d8e6..0c94e662aa 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -11,7 +11,7 @@ serial_log="$(pwd)/smoke.serial" cd binaries # Use the kernel from Debian -curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz +curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bookworm/main/installer-armhf/current/images/netboot/vmlinuz # Use a tiny initrd based on busybox from Alpine Linux curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:55:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978712.1365522 (Exim 4.92) (envelope-from ) id 1uCi3I-0005qU-90; Wed, 07 May 2025 16:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978712.1365522; Wed, 07 May 2025 16:55: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 1uCi3I-0005qI-5v; Wed, 07 May 2025 16:55:24 +0000 Received: by outflank-mailman (input) for mailman id 978712; Wed, 07 May 2025 16:55:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi3H-0005q2-21 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi3H-00F992-06 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi3G-001dqz-3C for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16: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=mdubid9cfZh6ilsoli/Ztbw2ZrRa/Y99v5YOKO88uNM=; b=oISvyutCwVCaFWiBtMru6wU8GS 1G2y80/0yGhko/E/YyGLQmFNmoaQ8IhfZTkdZ5QRSSGlQ8R46jGWmibf7afYIQcAdkr56qoVcyTmw zRjts62wh90jSzfEnWDseAYfrF+Qe5LdVVyJ4psRhV5Yn+Nta7PwzmD3gjjH76wCx3Uc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] automation: skip building domU if there is no test defined for it Message-Id: Date: Wed, 07 May 2025 16:55:22 +0000 commit f2603e2b1d783ef1ad2b12a6fb1539d7cfeb3ca9 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:51 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: skip building domU if there is no test defined for it This will be useful for later tests not using generic domU (unit tests, xtf etc). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit ae521cd96f98adc99df0d897aedd384535b7f21d) --- automation/scripts/qubes-x86-64.sh | 50 +++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8a0b7bfbc0..7eb3ce1bf7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -144,26 +144,28 @@ disk = [ ] ${domU_extra_config} " -# DomU -mkdir -p rootfs -cd rootfs -# fakeroot is needed to preserve device nodes in rootless podman container -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run -echo "#!/bin/sh +if [ -n "$domU_check" ]; then + # DomU + mkdir -p rootfs + cd rootfs + # fakeroot is needed to preserve device nodes in rootless podman container + fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz + mkdir proc + mkdir run + mkdir srv + mkdir sys + rm var/run + echo "#!/bin/sh ${domU_check} " > etc/local.d/xen.start -chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz -cd .. -rm -rf rootfs + chmod +x etc/local.d/xen.start + echo "rc_verbose=yes" >> etc/rc.conf + sed -i -e 's/^Welcome/domU \0/' etc/issue + find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + cd .. + rm -rf rootfs +fi # DOM0 rootfs mkdir -p rootfs @@ -188,11 +190,19 @@ ifconfig eth0 up ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 +" > etc/local.d/xen.start + +if [ -n "$domU_check" ]; then + echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & xl create /etc/xen/domU.cfg ${dom0_check} -" > etc/local.d/xen.start +" >> etc/local.d/xen.start +else + echo "${dom0_check}" >> etc/local.d/xen.start +fi + chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg @@ -201,7 +211,9 @@ echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +if [ -n "$domU_check" ]; then + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +fi find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:55:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978713.1365525 (Exim 4.92) (envelope-from ) id 1uCi3S-0005sn-A4; Wed, 07 May 2025 16:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978713.1365525; Wed, 07 May 2025 16:55: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 1uCi3S-0005sf-7T; Wed, 07 May 2025 16:55:34 +0000 Received: by outflank-mailman (input) for mailman id 978713; Wed, 07 May 2025 16:55:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi3R-0005sR-57 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi3R-00F99P-0P for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi3R-001eCk-0I for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55: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=ttWLn7VrCYVQugBbPr+ljJMKW6vsomXusAsjAKGk+oc=; b=3kF5U3aZJYR/qk2tYjcNBEYHiZ R3R5PXnbaSEyh94wjDtU/GeulaBa+Av2DKHDNqnqz7+9TGg6Ib1L7hXrC6hlU7uvzGRj+pYuq1X4L Km9u+mV0zptvTU4XdCU1gvWrYkJzvkClnSttEZBkNLZcbLPo9LRQ1UuGBzm1RITYgSdo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] automation: add jobs running tests from tools/tests/* Message-Id: Date: Wed, 07 May 2025 16:55:33 +0000 commit b0a94e392cfe1a208410b4d0557cd880310555a4 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:52 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: add jobs running tests from tools/tests/* There are a bunch of tests in tools/tests/, let them run in CI. For each subdirectory expect "make run" will run the test, and observe its exit code. This way, adding new tests is easy, and they will be automatically picked up. For better visibility, log test output to junit xml format, and let gitlab ingest it. Set SUT_ADDR variable with name/address of the system under test, so a network can be used to extract the file. The actual address is set using DHCP. And for the test internal network, still add the 192.168.0.1 IP (but don't replace the DHCP-provided one). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit fc10d6ecdd64c42dc4e3318ac31cd544a8d84959) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++ automation/scripts/build | 1 + automation/scripts/qubes-x86-64.sh | 28 +++++++++++++++++++++++ automation/scripts/run-tools-tests | 47 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 8fa32310ca..2930d64448 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -130,6 +130,7 @@ PCIDEV: "03:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1" + SUT_ADDR: test-2.testnet artifacts: paths: - smoke.serial @@ -274,6 +275,28 @@ adl-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +adl-tools-tests-pv-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +adl-tools-tests-pvh-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: diff --git a/automation/scripts/build b/automation/scripts/build index 952599cc25..522efe774e 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -109,5 +109,6 @@ else # even though dist/ contains everything, while some containers don't even # build Xen cp -r dist binaries/ + cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7eb3ce1bf7..7c80e0c233 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -10,6 +10,8 @@ set -ex # - pci-pv PV dom0, PV domU + PCI Passthrough # - pvshim PV dom0, PVSHIM domU # - s3 PV dom0, S3 suspend/resume +# - tools-tests-pv PV dom0, run tests from tools/tests/* +# - tools-tests-pvh PVH dom0, run tests from tools/tests/* test_variant=$1 ### defaults @@ -19,6 +21,7 @@ timeout=120 domU_type="pvh" domU_vif="'bridge=xenbr0'," domU_extra_config= +retrieve_xml= case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM @@ -126,6 +129,21 @@ done " ;; + ### tests: tools-tests-pv, tools-tests-pvh + "tools-tests-pv"|"tools-tests-pvh") + retrieve_xml=1 + passed="test passed" + domU_check="" + dom0_check=" +/tests/run-tools-tests /tests /tmp/tests-junit.xml && echo \"${passed}\" +nc -l -p 8080 < /tmp/tests-junit.xml >/dev/null & +" + if [ "${test_variant}" = "tools-tests-pvh" ]; then + extra_xen_opts="dom0=pvh" + fi + + ;; + *) echo "Unrecognised test_variant '${test_variant}'" >&2 exit 1 @@ -178,6 +196,8 @@ mkdir srv mkdir sys rm var/run cp -ar ../binaries/dist/install/* . +cp -ar ../binaries/tests . +cp -a ../automation/scripts/run-tools-tests tests/ echo "#!/bin/bash @@ -192,6 +212,10 @@ ifconfig xenbr0 192.168.0.1 " > etc/local.d/xen.start +if [ -n "$retrieve_xml" ]; then + echo "timeout 30s udhcpc -i xenbr0" >> etc/local.d/xen.start +fi + if [ -n "$domU_check" ]; then echo " # get domU console content into test log @@ -272,6 +296,10 @@ if [ $timeout -le 0 ]; then exit 1 fi +if [ -n "$retrieve_xml" ]; then + nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml \n' > "$xml_out" +printf '\n' >> "$xml_out" +printf ' \n' >> "$xml_out" +failed= +for dir in "$1"/*; do + [ -d "$dir" ] || continue + echo "Running test in $dir" + printf ' \n' "$dir" >> "$xml_out" + ret= + for f in "$dir"/*; do + [ -f "$f" ] || continue + [ -x "$f" ] || continue + "$f" 2>&1 | tee /tmp/out + ret=$? + if [ "$ret" -ne 0 ]; then + echo "FAILED: $ret" + failed+=" $dir" + printf ' \n' "$f" "$ret" >> "$xml_out" + # TODO: could use xml escaping... but current tests seems to + # produce sane output + cat /tmp/out >> "$xml_out" + printf ' \n' >> "$xml_out" + else + echo "PASSED" + fi + done + if [ -z "$ret" ]; then + printf ' \n' "$dir" >> "$xml_out" + fi + printf ' \n' >> "$xml_out" +done +printf ' \n' >> "$xml_out" +printf '\n' >> "$xml_out" + +if [ -n "$failed" ]; then + exit 1 +fi -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:55:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978714.1365529 (Exim 4.92) (envelope-from ) id 1uCi3c-0005vB-Bb; Wed, 07 May 2025 16:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978714.1365529; Wed, 07 May 2025 16:55: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 1uCi3c-0005v3-91; Wed, 07 May 2025 16:55:44 +0000 Received: by outflank-mailman (input) for mailman id 978714; Wed, 07 May 2025 16:55:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi3b-0005uh-83 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi3b-00F99T-0i for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi3b-001eJw-0a for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55: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=M3KO4WGvRXXi/dBTjkk2PvvnikrHt3LTUbfifodqsoI=; b=Hg8yMTDEQ9GZvlvPA5pidNHSGr 3H0XOnoNe9vqAcAg2eFVOvMM6z0A+jRXr38oRc0QfT+Xj8K6/8qRq0uCiHbl4f1QB2ZdaKsMdl42x AD0ci4l7V6UJQ0PiNTZQI7kRSbKDDzpdjUpOypS2RAzwLU1k6FYIjT2P1TM5FBPOiOyQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] automation: allow selecting individual jobs via CI variables Message-Id: Date: Wed, 07 May 2025 16:55:43 +0000 commit 56899974ca83d15a0413389a5dcd7fc079e89f6c Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:53 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: allow selecting individual jobs via CI variables Debugging sometimes involves running specific jobs on different versions. It's useful to easily avoid running all of the not interesting ones (for given case) to save both time and CI resources. Doing so used to require changing the yaml files, usually in several places. Ease this step by adding SELECTED_JOBS_ONLY variable that takes a regex. Note that one needs to satisfy job dependencies on their own (for example if a test job needs a build job, that specific build job needs to be included too). The variable can be specified via Gitlab web UI when scheduling a pipeline, but it can be also set when doing git push directly: git push -o ci.variable=SELECTED_JOBS_ONLY="/job1|job2/" More details at https://docs.gitlab.co.jp/ee/user/project/push_options.html The variable needs to include regex for selecting jobs, including enclosing slashes. A coma/space separated list of jobs to select would be friendlier UX, but unfortunately that is not supported: https://gitlab.com/gitlab-org/gitlab/-/issues/209904 (note the proposed workaround doesn't work for job-level CI_JOB_NAME). On the other hand, the regex is more flexible (one can select for example all arm32 jobs). Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 9d419afa4667ba0369471c4a0e11e0717289c7bf) --- .gitlab-ci.yml | 2 ++ automation/gitlab-ci/build.yaml | 6 ++++++ automation/gitlab-ci/test.yaml | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a9b8b7228..b3beb2ff9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ variables: XEN_REGISTRY: registry.gitlab.com/xen-project/xen + SELECTED_JOBS_ONLY: + description: "Regex to select only some jobs, must be enclosed with /. For example /job1|job2/" workflow: rules: diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 5995063d77..4fd800e996 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -12,6 +12,12 @@ - '*/*.log' when: always needs: [] + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + when: always + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .gcc-tmpl: variables: &gcc diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 2930d64448..d5c995019d 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,11 @@ .test-jobs-common: stage: test image: ${XEN_REGISTRY}/${CONTAINER} + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export @@ -99,6 +104,9 @@ - '*.dtb' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,6 +125,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -137,6 +148,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:55:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978715.1365533 (Exim 4.92) (envelope-from ) id 1uCi3m-0005xv-EK; Wed, 07 May 2025 16:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978715.1365533; Wed, 07 May 2025 16:55: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 1uCi3m-0005xn-Bh; Wed, 07 May 2025 16:55:54 +0000 Received: by outflank-mailman (input) for mailman id 978715; Wed, 07 May 2025 16:55:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi3l-0005xf-Ar for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi3l-00F9EX-0z for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi3l-001eMO-0t for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:55: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=E8Ewk1qV7PvxJL+PEfASPgUqJIv3ViGJFQeVTlTPo4s=; b=rqzEyD1J6z+k30i1dujCJ7tweW j1dDSefBcV1cU6Oro4xk0pBMe4ARLW3ABilC1mPHjU4NYmyWkKtZefsqXH2SlPv/fWJMz/EPKMWrg qZRQmVzaAU5l/9JmkkjDyzBYUFvPHp67ywei6TpvIypZ5klmV9pDaz/1NPfyNL8qx9MY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] automation: add tools/tests jobs on the AMD Zen3+ runner too Message-Id: Date: Wed, 07 May 2025 16:55:53 +0000 commit 2b430f8685764a1a897a8b88fea51bf7bd1024fe Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:54 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation: add tools/tests jobs on the AMD Zen3+ runner too Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit b551aed4ab131e61a13922d07bd7d9e29d694f31) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d5c995019d..225eb43998 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -173,6 +173,7 @@ PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-11.testnet tags: - qubes-hw11 @@ -367,6 +368,28 @@ zen3p-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +zen3p-tools-tests-pv-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen3p-tools-tests-pvh-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:56:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978716.1365537 (Exim 4.92) (envelope-from ) id 1uCi3w-00060q-Fj; Wed, 07 May 2025 16:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978716.1365537; Wed, 07 May 2025 16:56: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 1uCi3w-00060i-D3; Wed, 07 May 2025 16:56:04 +0000 Received: by outflank-mailman (input) for mailman id 978716; Wed, 07 May 2025 16:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi3v-00060T-HQ for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi3v-00F9FP-1e for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi3v-001few-1N for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:03 +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=m6yxuzQdiHHk2VnPcqA0huY0zRrvCggMEDOE40TrskE=; b=5EpAV9tiSmY9+neJ7WCFJDdt2g klMrbHaAvE7xcqPsX6x4DIUP3aH+7nW7ncbdZ9dJLRKIOIksjpLVBQJlAhl4iAji3m6PJWGJzo8JI cpKdgg19y0OVNUZAkH6kCYS3BtcyFOZpFHYtEcAp0DhGwNpdLqxGp4T0WBq+qw4qj71k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] automation/eclair: Reduce verbosity of ECLAIR logs. Message-Id: Date: Wed, 07 May 2025 16:56:03 +0000 commit 59be07b2d3786e0e4a1d6a15af6bf5ddd89b1ead Author: Nicola Vetrini AuthorDate: Tue Mar 4 18:49:36 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 automation/eclair: Reduce verbosity of ECLAIR logs. While activating verbose logging simplifies debugging, this causes GitLab logs to be truncated, preventing the links to the ECLAIR analysis database to be shown. No functional change. Fixes: c4392ec83244 ("automation: Add ECLAIR utilities and settings") Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini (cherry picked from commit 78f2a5792c68128e3205dd18f0f92fd408bf5cd8) --- automation/eclair_analysis/ECLAIR/analysis.ecl | 2 -- automation/eclair_analysis/ECLAIR/analyze.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 8326156b38..399099938f 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -10,8 +10,6 @@ setq(analysis_kind,getenv("ANALYSIS_KIND")) # strings_map("scheduled-analysis",500,"","^.*$",0) # map_strings("scheduled-analysis",analysis_kind) --verbose - -enable=B.REPORT.ECB -config=B.REPORT.ECB,output=join_paths(data_dir,"FRAME.@FRAME@.ecb") -config=B.REPORT.ECB,preprocessed=show diff --git a/automation/eclair_analysis/ECLAIR/analyze.sh b/automation/eclair_analysis/ECLAIR/analyze.sh index 1dc63c1bc2..2356fc4007 100755 --- a/automation/eclair_analysis/ECLAIR/analyze.sh +++ b/automation/eclair_analysis/ECLAIR/analyze.sh @@ -91,11 +91,13 @@ find "${ECLAIR_DATA_DIR}" -maxdepth 1 -name "FRAME.*.ecb" | sort | xargs cat | "${ECLAIR_BIN_DIR}eclair_report" \ "-create_db='${PROJECT_ECD}'" \ + -quiet \ -load=/dev/stdin > "${ECLAIR_REPORT_LOG}" 2>&1 # Create the Jenkins reports file. "${ECLAIR_BIN_DIR}eclair_report" \ "-db='${PROJECT_ECD}'" \ + -quiet \ "-eval_file='${SCRIPT_DIR}/report.ecl'" \ >> "${ECLAIR_REPORT_LOG}" 2>&1 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:56:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978717.1365541 (Exim 4.92) (envelope-from ) id 1uCi46-000633-HM; Wed, 07 May 2025 16:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978717.1365541; Wed, 07 May 2025 16:56: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 1uCi46-00062w-EX; Wed, 07 May 2025 16:56:14 +0000 Received: by outflank-mailman (input) for mailman id 978717; Wed, 07 May 2025 16:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi45-00062k-Le for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi45-00F9Fb-24 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi45-001gHA-1y for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:13 +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=lHYQPPCKpJpoF0Zac6b7pwDKim+ig58tFwy/Ldb/Q5E=; b=DNwwHEMC5K5HRgzztrZlkN5pCN x9YSWTKMH/a9cgthshkvHyyCwLYIFkhjPDY2k2jtuaaqhNmlX2xbkgTXJEYtXoDk480D1nynIy9oT bOJ7/LZ1elhlj2PErUxa6COrNvaF6iBxZeUgnUsq4l6CTgSWFC5kkeq0YDUbaVYW7s7w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] ci: create boot.ipxe for legacy boot Message-Id: Date: Wed, 07 May 2025 16:56:13 +0000 commit d6a11ac3634fd41be562d11d62afe24571352da6 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:35 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 ci: create boot.ipxe for legacy boot Hardware runners that use legacy boot use iPXE instead of grub2. Create boot.ipxe for those too - with exact same options. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 42beecae0b219fdfa04db729dea2229e05bf4af0) --- automation/scripts/qubes-x86-64.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7c80e0c233..f272964459 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -251,6 +251,14 @@ module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen module2 (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg +echo "#!ipxe + +kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot +module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot +module /gitlab-ci/initrd-dom0 || reboot +boot +" > $TFTP/boot.ipxe + cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:56:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978718.1365545 (Exim 4.92) (envelope-from ) id 1uCi4G-00065a-Iz; Wed, 07 May 2025 16:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978718.1365545; Wed, 07 May 2025 16:56: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 1uCi4G-00065S-GG; Wed, 07 May 2025 16:56:24 +0000 Received: by outflank-mailman (input) for mailman id 978718; Wed, 07 May 2025 16:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi4F-00065D-O2 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi4F-00F9Fh-2J for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi4F-001gVD-2E for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:23 +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=DovaMgkYmvAeosfGvzPxXbu1YC8o3+YbZS8I+8Pt7v8=; b=O5nDrpP932F3HflbQJ27c0i1cY 7TFfUDmh6Y2r3CkkI0EwEIBjzW+22vsKXQ8BscehbSH42RmRk39LlgJA/larTDPWgbnB3BYjV+WVv 8XWH03TxiuIKf74SsEYbJH/FIcXDfHlQaKnDjneVpaPTvCA5eSiCWGTIMW5r2iqibDFQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] ci: add Intel KabyLake HW runner Message-Id: Date: Wed, 07 May 2025 16:56:23 +0000 commit a30bb23e9a2d9f2891917ce842babbf6ff7d5a14 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:36 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 ci: add Intel KabyLake HW runner This is Intel i7-7567U in NUC 7i7BNH. This one is an older one, with no firmware updates (last update from 2023) and no microcode udpates either. While this firmware supports UEFI, network boot works only in legacy mode - thus legacy is used here (via iPXE, instead of grub2.efi). Testing legacy boot path may be a useful thing on its own. Add the same set of tests as on ADL runner. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 911a766f143196a1576c1b009e2e1cde8b921062) --- automation/gitlab-ci/test.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 225eb43998..d05b9a98af 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -155,6 +155,17 @@ tags: - qubes-hw2 +.kbl-x86-64: + # it's really similar to the ADL one + extends: .adl-x86-64 + variables: + PCIDEV: "00:1f.6" + PCIDEV_INTR: "MSI" + CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-3.testnet + tags: + - qubes-hw3 + .zen2-x86-64: # it's really similar to the above extends: .adl-x86-64 @@ -312,6 +323,84 @@ adl-tools-tests-pvh-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +kbl-smoke-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-suspend-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-hvm-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pvshim-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pvh-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:56:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978719.1365548 (Exim 4.92) (envelope-from ) id 1uCi4Q-00067p-KD; Wed, 07 May 2025 16:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978719.1365548; Wed, 07 May 2025 16:56: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 1uCi4Q-00067i-He; Wed, 07 May 2025 16:56:34 +0000 Received: by outflank-mailman (input) for mailman id 978719; Wed, 07 May 2025 16:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi4P-00067a-R4 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi4P-00F9G4-2a for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi4P-001gl3-2U for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56: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=H/+PSdwZC6aJOSE7LGS6ZVKg8Q3HCIh/7CkvQ7N0JPA=; b=uVOtvwSyWeCN0EcNWhwisI4XpJ T+Ukc8EgDjb2MvOFlyEjuieQaRLkzslHb04svcfbo8kc3xMk+tHy/lTXdfEvEeRRmlMWfc8LvLOa8 jB/gFYwI1MNIqTcpRCvyBdlMyZGZpkjA2fojfnwv+J1zGNkwR7JUKqo/Kig4gMqNWGlc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: prevent grub unpacking initramfs Message-Id: Date: Wed, 07 May 2025 16:56:33 +0000 commit 0ab5bedcfdb6ad818ba21808779473c35f4c40d4 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:01 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: prevent grub unpacking initramfs It fails on larger initramfs (~250MB one) and sometimes even smaller depending on memory size/memory map, let Linux do it. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 32e6d052c2d88437c6fcec81e5369bc8016ac7e9) --- automation/scripts/qubes-x86-64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index f272964459..8e78b7984e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -248,7 +248,7 @@ CONTROLLER=control@thor.testnet echo " multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (http)/gitlab-ci/initrd-dom0 +module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg echo "#!ipxe -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:56:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978720.1365553 (Exim 4.92) (envelope-from ) id 1uCi4a-0006Ag-Li; Wed, 07 May 2025 16:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978720.1365553; Wed, 07 May 2025 16:56: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 1uCi4a-0006AY-J8; Wed, 07 May 2025 16:56:44 +0000 Received: by outflank-mailman (input) for mailman id 978720; Wed, 07 May 2025 16:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi4Z-0006A6-TQ for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi4Z-00F9G9-2r for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi4Z-001guw-2l for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56: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=B2y0t60iFrLm0KiKzvVCjIw5fPCkSd4riFHsa/6Lsbo=; b=RDaMeLVLX9L5yW9isBcAvDWU2q 6XXWi2MRDeSv7l756nLsXizn1wrh4oPU9v/5S/H9vknIS9e49ArcQr7d+HGs+CII91UoWUlo5LzyT ngLFzyAEAHdghOQaNDIGApxq5Vel7djyapAjilDCvZyI+7ueml1bhHXGuNbT6bRqE7bo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: enable XHCI console in Xen debug build on Alpine Message-Id: Date: Wed, 07 May 2025 16:56:43 +0000 commit d747ca04b4b6eb2c4c3ccfa3f052c44e7dd5d9c6 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:03 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: enable XHCI console in Xen debug build on Alpine This build is used for hardware tests, and some runners use XHCI console Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 17cf98d73043d4737783781df6526488b90d1565) --- automation/gitlab-ci/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 4fd800e996..fa00f8beed 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -341,6 +341,7 @@ alpine-3.18-gcc-debug: CONFIG_ARGO=y CONFIG_UBSAN=y CONFIG_UBSAN_FATAL=y + CONFIG_XHCI=y debian-12-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:56:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978721.1365557 (Exim 4.92) (envelope-from ) id 1uCi4k-0006Cw-NB; Wed, 07 May 2025 16:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978721.1365557; Wed, 07 May 2025 16:56: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 1uCi4k-0006Co-KY; Wed, 07 May 2025 16:56:54 +0000 Received: by outflank-mailman (input) for mailman id 978721; Wed, 07 May 2025 16:56:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi4j-0006Cf-W9 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi4j-00F9GG-37 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi4j-001h0h-31 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:56: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=vxSgRGuBIjMA9MW2C0bXvagoVgqvs2QFjtFYRNDf0Dg=; b=tXxPYpq/bo0hjkraDxpTMOBAiX DtgTfjXCxWy4e3j6eUGVRMBr3bZ8GIpaJ+xC5lVwOzWFoGBlMEXAHvp8fAiNvcjm+eEvN3EvmoNkX +rLZ8aA3d0EE7N2OSVZ+8sEhWvhN/bZAKhNP95c4Z9F3ExN7/T+LHdKTOWbaDzqcpii8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: include domU kernel messages in the console output log Message-Id: Date: Wed, 07 May 2025 16:56:53 +0000 commit 17c6958bb47e3d15349b69d417b1fd47c23eaad3 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:04 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: include domU kernel messages in the console output log Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD (cherry picked from commit 1804064f68d52a47f1fc1454a3b254c16abe192b) --- automation/scripts/qubes-x86-64.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8e78b7984e..80000854bc 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -175,6 +175,8 @@ if [ -n "$domU_check" ]; then rm var/run echo "#!/bin/sh +echo 8 > /proc/sys/kernel/printk + ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:57:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978722.1365561 (Exim 4.92) (envelope-from ) id 1uCi4u-0006FL-Od; Wed, 07 May 2025 16:57:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978722.1365561; Wed, 07 May 2025 16:57: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 1uCi4u-0006FD-Lz; Wed, 07 May 2025 16:57:04 +0000 Received: by outflank-mailman (input) for mailman id 978722; Wed, 07 May 2025 16:57:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi4u-0006F3-2t for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi4u-00F9GX-0B for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi4u-001h46-04 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:04 +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=fnzSDl56RlmfKOZsEWfUNl2pvXD7SWIfe9fKQMpAU6Q=; b=WGG+xbGYJsg2vbTAO2AFlHBHHu x4JdnRqT+wZaNMKgxyhS8oYLkBneVYWGlzPS64eJO/gaQtRrDjNsQaM7KhhQF1aEFBT7VsPsDgFyr 2S8ocUW+ev14wJUaMFMSlzYwdXV21JMJkK02z9rW88/1SRoZJI2yJ2H0xAiGEVc3uItw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: increase verbosity of starting a domain Message-Id: Date: Wed, 07 May 2025 16:57:04 +0000 commit 78317ae331fe8d5b46892aa7d8b4d25d4a29088a Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:05 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: increase verbosity of starting a domain And start collecting qemu log earlier, so it isn't lost in case of a timeout during domain startup. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit b8d41a9b22bbe9a08c8438eacf7b705500f20cea) --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 1ff689b577..17e2141d62 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index e1cd838809..0c60a66e25 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -21,7 +21,7 @@ echo "#!/bin/bash xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > ./root/xen.start echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 4d22a124df..8774a87012 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 80000854bc..7867724ebd 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -122,7 +122,6 @@ echo \"${passed}\" " dom0_check=" -tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -222,7 +221,8 @@ if [ -n "$domU_check" ]; then echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & +xl -vvv create /etc/xen/domU.cfg ${dom0_check} " >> etc/local.d/xen.start else diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index f70cfdc155..7834ffbe05 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -49,7 +49,7 @@ ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg set +x until grep -q \"${DOMU_MSG}\" /var/log/xen/console/guest-domU.log; do sleep 1 @@ -75,7 +75,7 @@ done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=" insmod /root/xen-argo.ko -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:57:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:57:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978723.1365564 (Exim 4.92) (envelope-from ) id 1uCi54-0006Jp-Rb; Wed, 07 May 2025 16:57:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978723.1365564; Wed, 07 May 2025 16:57: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 1uCi54-0006Jg-Ov; Wed, 07 May 2025 16:57:14 +0000 Received: by outflank-mailman (input) for mailman id 978723; Wed, 07 May 2025 16:57:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi54-0006JY-5O for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi54-00F9Gb-0R for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi54-001h8Q-0M for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:14 +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=ERkfC8HKTIpLHfm5rNC8kit/7CjMxPyP3AeKqTP2Ubg=; b=qUfarzS9gGniX8yNyPTGLmP0du R1/TpANUAtMUi3lpFa78Eh+qYnX615gXSem62r7JaIx3/rZX1wxeMvzAUR8ZTZSj29SaXgXr4bdyH WbQU6PDqeAMzcsCZQoti19TEznlI9f6NHpE0+KpYGHuzO97IOs1PxyN/zS7SvmkszfeA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: consistently use DOCKER_CMD in makefiles Message-Id: Date: Wed, 07 May 2025 16:57:14 +0000 commit 23f7c8341c48fa6db9ce8c0be41738a508cf1642 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:06 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: consistently use DOCKER_CMD in makefiles This allows rebuilding containers using podman too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 5606b982acd44cc1f0715c424a11b2e76420aa18) --- automation/build/Makefile | 4 ++-- automation/tests-artifacts/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/build/Makefile b/automation/build/Makefile index 4df43b0407..fedf7524da 100644 --- a/automation/build/Makefile +++ b/automation/build/Makefile @@ -31,8 +31,8 @@ clean: define CLEAN_RULE .PHONY: clean-$(1) clean-$(1): - if [ -n "$$$$(docker image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ - docker image rm $(REGISTRY)/$(subst /,:,$(1)); \ + if [ -n "$$$$($(DOCKER_CMD) image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ + $(DOCKER_CMD) image rm $(REGISTRY)/$(subst /,:,$(1)); \ fi endef diff --git a/automation/tests-artifacts/Makefile b/automation/tests-artifacts/Makefile index d055cd696b..80a60a94f3 100644 --- a/automation/tests-artifacts/Makefile +++ b/automation/tests-artifacts/Makefile @@ -10,9 +10,9 @@ help: @echo "To push container builds, set the env var PUSH" %: %.dockerfile ## Builds containers - docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:57:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978724.1365569 (Exim 4.92) (envelope-from ) id 1uCi5E-0006MM-Ss; Wed, 07 May 2025 16:57:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978724.1365569; Wed, 07 May 2025 16:57: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 1uCi5E-0006ME-QI; Wed, 07 May 2025 16:57:24 +0000 Received: by outflank-mailman (input) for mailman id 978724; Wed, 07 May 2025 16:57:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5E-0006M2-8B for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi5E-00F9Gf-0i for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi5E-001hKV-0c for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:24 +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=sQGVaWR66NJlui2Jt1lvsjrj8sEbIEmUY0n1VHQwoLE=; b=bpTpAiz5MZXmBi7neiaV4IQI8/ 5fBuEmIBNiNsGsHaJ9dz4V0CwPIuZKseYTYXWtD5aPuLe1OYfkeCEumO+BOJy08ZED3zDGzNH4Xhl 10vWudJRr71tB3QESsMJZaPw2DC9jNdKcX5/B+fdlRV7o2EnN3+izpSUqZN5akIsot+A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: wait for the network interface in PCI passthrough tests Message-Id: Date: Wed, 07 May 2025 16:57:24 +0000 commit 052e7f57ec053d708206046e920f250da80d82a7 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:07 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: wait for the network interface in PCI passthrough tests The network driver initializes asynchronously, and it may not be ready yet by the time the startup script is called. This is especially the case for USB network adapter (where the PCI device is the USB controller) in the upcoming runner. Don't bother about separate timeout - test timeout will cover this part too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 6e3fe711fbf3a659160ab7ef2c293dffd62bbda4) --- automation/scripts/qubes-x86-64.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7867724ebd..2b04d281d7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -104,6 +104,7 @@ on_reboot = "destroy" domU_check=" set -x -e interface=eth0 +while ! [ -e \"/sys/class/net/\$interface\" ]; do sleep 1; done ip link set \"\$interface\" up timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:57:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:57:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978725.1365573 (Exim 4.92) (envelope-from ) id 1uCi5P-0006Oo-UJ; Wed, 07 May 2025 16:57:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978725.1365573; Wed, 07 May 2025 16:57:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5P-0006Og-Rk; Wed, 07 May 2025 16:57:35 +0000 Received: by outflank-mailman (input) for mailman id 978725; Wed, 07 May 2025 16:57:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5O-0006OR-BQ for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi5O-00F9H1-13 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi5O-001hZe-0t for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:34 +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=qepcCuqTVpGAeqGMXKslSliPtfUsJX0I6EKK0A8vWJI=; b=Xa8YT30T74C3tKaxAW5WqmVSjN VoT6m/qxPUoMFwojyhTju/Xumhev4TfTMTZNpJC4mspLn9dMYlaWoWeAjFTxfPaVSF3J0BWVGnLDz 4G0Lbb93P8VRf8lr1ZZoP7C1rvQKswrGBncx/fEQ90efxFDbKQBlaEIdfVdffckRAfvI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: adjust resolving network interface into PCI device Message-Id: Date: Wed, 07 May 2025 16:57:34 +0000 commit 87ab3ad4456945abdaaa308663d2e78ab4fb5f46 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:09 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: adjust resolving network interface into PCI device Change how PCI device lookup is done to handle also USB devices, in which case get the USB controller. Instead of taking basename of the 'device' symlink, resolve the full path (example: /sys/devices/pci0000:00/0000:00:09.0/usb4/4-7/4-7:1.0) and take the first part after pci0000:00. Theoretically it could be a bridge, but VM has flat PCI topology. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 930279d96ca706f05e5860bef4126fc97457d256) --- automation/scripts/qubes-x86-64.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 2b04d281d7..a964ac4b7a 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -110,7 +110,8 @@ timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') ping -c 10 \"\$pingip\" echo domU started -pcidevice=\$(basename \$(readlink /sys/class/net/\$interface/device)) +pcidevice=\$(realpath /sys/class/net/\$interface/device | + sed 's#.*pci0000:00/\\([^/]*\\).*#\\1#') lspci -vs \$pcidevice " if [ -n "$PCIDEV_INTR" ]; then -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:57:46 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:57:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978726.1365576 (Exim 4.92) (envelope-from ) id 1uCi5Z-0006RK-Vs; Wed, 07 May 2025 16:57:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978726.1365576; Wed, 07 May 2025 16:57: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 1uCi5Z-0006RC-TE; Wed, 07 May 2025 16:57:45 +0000 Received: by outflank-mailman (input) for mailman id 978726; Wed, 07 May 2025 16:57:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5Y-0006Qz-En for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi5Y-00F9H7-1O for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi5Y-001huh-1J for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:44 +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=j6zIoXNeFGGjAWKdJ2XAEQJ+3Tr0W/hnrV192Jwe0Po=; b=UOddP9iijY/2Et/h7f39aRhSM3 UjurXsyBUTkaA1NvJhKMnY6kWmjq5mdwFNx2SoM/3B5b1fWWkePqCUsGXuTozLepGK+UyC+zueJlV McfL3wjTmuwEYU9YfNFx/7laQWYs1Gu1oVNFa2N/fNeAhlNdPbMeW/bgBXXFiAxWjZbI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Message-Id: Date: Wed, 07 May 2025 16:57:44 +0000 commit e9978d089a19515543f9873559f015f071ca5881 Author: Andrew Cooper AuthorDate: Wed Apr 9 13:50:00 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Linux 6.6.56 was already added to test-artifacts for the argo testing, and this removes one moving part while cleaning things up. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit f8588376648aa87f22cc709453f32473f45923c0) --- automation/gitlab-ci/build.yaml | 13 ------- automation/gitlab-ci/test.yaml | 4 ++- .../tests-artifacts/kernel/6.1.19.dockerfile | 41 ---------------------- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index fa00f8beed..a29bac0af4 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -308,19 +308,6 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 -# x86_64 test artifacts - -kernel-6.1.19-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 - script: - - mkdir binaries && cp /bzImage binaries/bzImage - artifacts: - paths: - - binaries/bzImage - tags: - - x86_64 - # Jobs below this line # Build jobs needed for tests diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d05b9a98af..a23ff8a6e7 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -16,7 +16,9 @@ - qemu-system-aarch64-6.0.0-arm32-export .x86-64-test-needs: &x86-64-test-needs - - kernel-6.1.19-export + - project: xen-project/hardware/test-artifacts + job: linux-6.6.56-x86_64 + ref: master - project: xen-project/hardware/test-artifacts job: x86_64-rootfs-alpine-3.18 ref: master diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile deleted file mode 100644 index 073eaa0e11..0000000000 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.1.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libelf-dev \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -# Build the kernel -RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make xen.config && \ - scripts/config --enable BRIDGE && \ - scripts/config --enable IGC && \ - scripts/config --enable TUN && \ - cp .config .config.orig && \ - cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ - make -j$(nproc) bzImage && \ - cp arch/x86/boot/bzImage / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:57:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:57:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978727.1365581 (Exim 4.92) (envelope-from ) id 1uCi5k-0006Tf-17; Wed, 07 May 2025 16:57:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978727.1365581; Wed, 07 May 2025 16:57:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5j-0006TX-Up; Wed, 07 May 2025 16:57:55 +0000 Received: by outflank-mailman (input) for mailman id 978727; Wed, 07 May 2025 16:57:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5i-0006TN-HX for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi5i-00F9HB-1e for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi5i-001iAv-1Z for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:57:54 +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=NtYWmHTJVmSboG5Tok2xtrneL7Je7nO9WVx1BF4rdTc=; b=Zh1b6UhO8Fb6NeLu1d9lyDVlZj lEG/HUH0Z+vgdLKSzzOBHxC2o8za150eSz0lT5MfhaGUhXgSRhWJV8vHXeefn81divoeJ6/wvirNK XQX2GfkG2xGGV81SNhpYyLdt3U8fZeSX8nJvcVKoGdAbKCjvNhS78fjq6/K0UbeEa56w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Message-Id: Date: Wed, 07 May 2025 16:57:54 +0000 commit 18d59a60561a95f071ff786687a2d1d97d36dbeb Author: Andrew Cooper AuthorDate: Wed Apr 9 17:22:54 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Switch over to test-artifacts. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 8b22309c9bae2cb0717651b8b71feb86d8b203f8) --- automation/gitlab-ci/build.yaml | 11 ------- automation/gitlab-ci/test.yaml | 4 ++- .../kernel/6.6.74-arm64v8.dockerfile | 38 ---------------------- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index a29bac0af4..0effeb8b52 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -275,17 +275,6 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-6.6.74-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a23ff8a6e7..59a2de28c8 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -8,8 +8,10 @@ - when: on_success .arm64-test-needs: &arm64-test-needs + - project: xen-project/hardware/test-artifacts + job: linux-6.6.86-arm64 + ref: master - alpine-3.18-arm64-rootfs-export - - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile deleted file mode 100644 index 73e5145425..0000000000 --- a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.6.74 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libssl-dev \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:58:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:58:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978728.1365585 (Exim 4.92) (envelope-from ) id 1uCi5u-0006WD-2g; Wed, 07 May 2025 16:58:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978728.1365585; Wed, 07 May 2025 16:58:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5t-0006W5-WD; Wed, 07 May 2025 16:58:06 +0000 Received: by outflank-mailman (input) for mailman id 978728; Wed, 07 May 2025 16:58:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi5s-0006Vp-Jw for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi5s-00F9HQ-1u for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi5s-001iKQ-1p for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:04 +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=OAx8CaaB/R7pTUZtTXbXQNnvoa+jaFBvdpY7Vbsfqyg=; b=PAmhbNSUkg2rSsjt+uSIfSWmgg OkfIMO+Dxvs5V3WDHIde+0XziqozdTDHgzhCopFHQTwIqhVxTJmIVLXHV3PPXog7ezosAEcU71Kx+ VyYDSMCq6xVr8s0zBHBFq9pulSQZ+WNZpaDOLg67Q9X55mVnhWLaCZn9jos9jWUR6O6w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: Drop stale test-artifacts/alpine/3.18.dockerfile Message-Id: Date: Wed, 07 May 2025 16:58:04 +0000 commit a70222e30cc5caefb8637a2a7b7c5d3ef31e6d73 Author: Andrew Cooper AuthorDate: Mon Apr 7 18:15:32 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Drop stale test-artifacts/alpine/3.18.dockerfile This should have been dropped too, as the authoritative copy lives in another repo now. Fixes: babe11b46c1a ("CI: Drop alpine-3.18-rootfs-export and use test-artefacts") Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 424d20afae9a0d85c17e9dec3922af6448929b8c) --- automation/tests-artifacts/alpine/3.18.dockerfile | 67 ----------------------- 1 file changed, 67 deletions(-) diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile deleted file mode 100644 index 311a92889b..0000000000 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add libgcc && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - apk add pciutils && \ - apk add libelf && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add modules boot && \ - rc-update add killprocs shutdown && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - echo > /etc/modules && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:58:16 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:58:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978729.1365589 (Exim 4.92) (envelope-from ) id 1uCi64-0006YH-4g; Wed, 07 May 2025 16:58:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978729.1365589; Wed, 07 May 2025 16:58:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi64-0006YA-1R; Wed, 07 May 2025 16:58:16 +0000 Received: by outflank-mailman (input) for mailman id 978729; Wed, 07 May 2025 16:58:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi62-0006Y1-Mh for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi62-00F9HU-2A for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi62-001iTp-25 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:14 +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=KQbIB0I0Bf20mGBEVh2y1swVWBE0ICoO3p/GNEUTc6E=; b=3vJUeYapmaeVN+ThJZ9Vk9zI1R o2BXo0VWBP/kxV7qlyayyLDyInGgPnJPxDweKDKmEPd5W0qB/qWllMUM3O/CEXyEPUO6vj/Dv2Esp 6QN7wTNnNf6k9nKfrpWU+tAMw+K5XOwmaVCeenJ9BFHxgTACzXFR6cYowcGNdA8D4XCw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: wait for Xen to start before waiting for test to complete Message-Id: Date: Wed, 07 May 2025 16:58:14 +0000 commit 17bad6958ad664db37278b3deef5e4d345daac8a Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:13 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: wait for Xen to start before waiting for test to complete Add additional stage in console output parsing - wait for first message from Xen. The message is defined via BOOT_MSG variable. This has two effects: - distinguishes failing Xen to load at all from later test failures - resets timeout when Xen starts loading The latter is especially relevant for hardware tests where firmware + network boot may take some time before Xen starts booting. The two-stage timeout is more robust solution than increasing the overall timeout. The issue has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. This patch is a first stage before qubes-x86-64.sh is switched to use expect in the next stage. While at it, consistently use 'expect -re' for all matches. This especially allows matching newlines ("\n"), which will become relevant in the next patch. And document variables used in console.exp. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit 7c96a27e375d8d7cbbb5493ebef0e29f90bfd273) --- automation/scripts/console.exp | 27 ++++++++++++++++++----- automation/scripts/qemu-alpine-x86_64.sh | 1 + automation/scripts/qemu-smoke-dom0-arm32.sh | 1 + automation/scripts/qemu-smoke-dom0-arm64.sh | 1 + automation/scripts/qemu-smoke-dom0less-arm32.sh | 1 + automation/scripts/qemu-xtf-dom0less-arm64.sh | 1 + automation/scripts/xilinx-smoke-dom0-x86_64.sh | 1 + automation/scripts/xilinx-smoke-dom0less-arm64.sh | 1 + 8 files changed, 29 insertions(+), 5 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 31ce97b91b..c27f893dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -1,4 +1,17 @@ #!/usr/bin/env expect +# +# Variables used by this script: +# - TEST_TIMEOUT: timeout between each *_MSG match +# - TEST_TIMEOUT_OVERRIDE: when set, overrides TEST_TIMEOUT +# - TEST_LOG: save console log to this file +# - TEST_CMD: commands that prints test system console output to stdout - in +# qemu tests that's usually qemu itself (with -serial stdio), in hardware +# tests that's a command to read serial console +# - UBOOT_CMD (optional): command to enter at u-boot prompt +# - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - LOG_MSG (optional): final console message to wait for +# - PASSED: message to look for to consider test a success; if LOG_MSG is set, +# both LOG_MSG and PASSED must appear (in any order) for test to succeed if {[info exists env(TEST_TIMEOUT_OVERRIDE)]} { set timeout $env(TEST_TIMEOUT_OVERRIDE) @@ -28,21 +41,25 @@ if {[info exists env(UBOOT_CMD)]} { send "$env(UBOOT_CMD)\r" } +if {[info exists env(BOOT_MSG)]} { + expect -re "$env(BOOT_MSG)" +} + if {[info exists env(LOG_MSG)]} { expect { - "$env(PASSED)" { - expect "$env(LOG_MSG)" + -re "$env(PASSED)" { + expect -re "$env(LOG_MSG)" exit 0 } - "$env(LOG_MSG)" { - expect "$env(PASSED)" + -re "$env(LOG_MSG)" { + expect -re "$env(PASSED)" exit 0 } } } expect { - "$env(PASSED)" { + -re "$env(PASSED)" { exit 0 } } diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 17e2141d62..89bdb4df7d 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -85,6 +85,7 @@ export TEST_CMD="qemu-system-x86_64 \ -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0" export TEST_LOG="smoke.serial" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index 0c60a66e25..4f50eabdef 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -92,6 +92,7 @@ export TEST_CMD="./qemu-system-arm \ export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" export TEST_LOG="${serial_log}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="/ #" diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 8774a87012..51d037b000 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -104,6 +104,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 0c94e662aa..0e2c5496db 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -144,6 +144,7 @@ export TEST_CMD="./qemu-system-arm \ -bios /usr/lib/u-boot/qemu_arm/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="${serial_log}" export LOG_MSG="${dom0_prompt}" export PASSED="${passed}" diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh b/automation/scripts/qemu-xtf-dom0less-arm64.sh index 9608de6ec0..436f460c3c 100755 --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh @@ -61,6 +61,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export PASSED="${passed}" diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7834ffbe05..69caabe2d8 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -159,6 +159,7 @@ stty -F ${SERIAL_DEV} 57600 # Capture test result and power off board before exiting. export PASSED="${PASS_MSG}" +export BOOT_MSG="Latest ChangeSet: " export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index b24ad11b8c..3e1fcf6bf9 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -140,6 +140,7 @@ stty -F ${SERIAL_DEV} 115200 # Capture test result and power off board before exiting. export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Welcome to Alpine Linux" export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:58:26 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:58:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978730.1365592 (Exim 4.92) (envelope-from ) id 1uCi6E-0006b2-70; Wed, 07 May 2025 16:58:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978730.1365592; Wed, 07 May 2025 16:58:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6E-0006au-4N; Wed, 07 May 2025 16:58:26 +0000 Received: by outflank-mailman (input) for mailman id 978730; Wed, 07 May 2025 16:58:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6C-0006am-Os for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi6C-00F9Ha-2P for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi6C-001iZj-2K for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:24 +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=QQQcmfpKuYLwZn7br8ySsn4Y0sg8KZjUKLY7bGcO8js=; b=47O0ohAkAUbblaPaH1uAp8wAB8 PWYgmAgkA+Y3rR4JQfHs5u003aPFPzFbH4uJzVjd0I6tTFoPaZeWzw6rRabKMmNj95PF/bOz9tpaM hVQTGcUodPLH7ibbXUxHExr6XIFkxrLbcFtxjRWBZ9Ph/P0/WDeQdmi/xLXXptHTSnJo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: fix waiting for final test message Message-Id: Date: Wed, 07 May 2025 16:58:24 +0000 commit 563af5983b1eb928e318635f51714cbf93cf86dd Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:14 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: fix waiting for final test message Expect normally discards initial part of its buffer after matching the patter, before looking for the next one. If both PASSED and LOG_MSG happen to be in the buffer at the same time, depending on their order, only one will be matched and the waiting for the other will timeout. Example expect -d output of this happening (parts eclipsed for brevity): expect: does "\r\r\r\nWelcome to Alpine Linux 3.18\r\r\r\n...\r\r\r\r\n(domU) + echo 'pci test passed'\r\r\r\r\n(domU) pci test passed\r\r\r\r..." (spawn_id exp4) match regular expression "pci test passed"? Gate "pci test passed"? gate=yes re=yes ... Gate keeper glob pattern for '\nWelcome to Alpine Linux' is ' Welcome to Alpine Linux'. Activating booster. expect: does "'\r\r\r\r\n(domU) pci test passed\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) \r\r\r\r\r\n(domU) domU Welcome to Alpine Linux 3.18\r\r\r\r\n(domU) \rKernel 6.6.56 on an x86_64 (/dev/hvc0)\r\r\r\r\n(domU) \r\r\r\r\r\n" (spawn_id exp4) match regular expression "\nWelcome to Alpine Linux"? Gate "\nWelcome to Alpine Linux"? gate=no Fix this by using -notransfer flag to keep matched part in the buffer. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 1e12cbd6af2c92e61a1363ef208f71da1eae47ab) CI: fix waiting for final test message (again) The previous attempt has correct diagnosis, but added -notransfer flag in a wrong place - it should be used in the first (outer) match out of two, not the second (inner) one. Fixes: 1e12cbd6af2c ("CI: fix waiting for final test message") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 79de6507c59021484e7c0b359f45035eab891e88) --- automation/scripts/console.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index c27f893dfb..2414f37fd2 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -47,11 +47,11 @@ if {[info exists env(BOOT_MSG)]} { if {[info exists env(LOG_MSG)]} { expect { - -re "$env(PASSED)" { + -notransfer -re "$env(PASSED)" { expect -re "$env(LOG_MSG)" exit 0 } - -re "$env(LOG_MSG)" { + -notransfer -re "$env(LOG_MSG)" { expect -re "$env(PASSED)" exit 0 } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:58:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:58:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978731.1365597 (Exim 4.92) (envelope-from ) id 1uCi6O-0006dO-8V; Wed, 07 May 2025 16:58:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978731.1365597; Wed, 07 May 2025 16:58:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6O-0006dG-5j; Wed, 07 May 2025 16:58:36 +0000 Received: by outflank-mailman (input) for mailman id 978731; Wed, 07 May 2025 16:58:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6M-0006d0-ST for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi6M-00F9Hz-2k for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi6M-001ify-2c for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:34 +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=wgzVRDll89kGSZNmBeSXiHc/x6e+6QI8rOJI3hpwVOs=; b=vnNLNKfP6kYRPDmQODi8jxMU2b 1mWC6wrYKXhLYnT+CBhUTBPbE42r+WLy1daPEKmyoMFK9RXA5TlCIMaImRoO0EOzOe0w7DdDe3Waj vBvvMMapLjCxZfEcWVRGEeNRJl9TM69HIfptLr70TDI57QsX6cnTt17sQMJwL9aYa4Jg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: switch qubes runners to use console.exp Message-Id: Date: Wed, 07 May 2025 16:58:34 +0000 commit 16b30e082793ec34747d25a49f3cbfa13db79d72 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:15 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: switch qubes runners to use console.exp It appears as sometimes it takes more time for Xen even start booting, mostly due to firmware and fetching large boot files by grub. In some jobs the current timeout is pretty close to the actual time needed, and sometimes (rarely for now) test fails due to timeout expiring in the middle of dom0 booting. This will be happening more often if the initramfs will grow (and with more complex tests). This has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. Switch to using expect (console.exp) for more robust test output handling. This allows waiting separately for Xen starting to boot and then for the test to complete. For now, set both of those to 120s, which pessimistically bumps timeout for the whole test to 240s (from 120s). Add S3 handling to console.exp via SUSPEND_MSG + WAKEUP_CMD. Signed-off-by: Marek Marczykowski-Górecki (cherry picked from commit d604d774a24bae21e15c831e172455bd4600663d) --- automation/build/alpine/3.18-arm64v8.dockerfile | 1 + automation/scripts/console.exp | 13 +++++++ automation/scripts/qubes-x86-64.sh | 52 +++++++------------------ 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 19fe46f841..b8482d5bf4 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -48,3 +48,4 @@ RUN apk --no-cache add \ # qubes test deps openssh-client \ fakeroot \ + expect \ diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 2414f37fd2..fc80513dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -9,6 +9,10 @@ # tests that's a command to read serial console # - UBOOT_CMD (optional): command to enter at u-boot prompt # - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - SUSPEND_MSG (optional): message signaling system is going to sleep, it's +# trigger for WAKEUP_CMD (see below) +# - WAKEUP_CMD (optional): command to execute to wakeup the system 30s after +# seeing SUSPEND_MSG # - LOG_MSG (optional): final console message to wait for # - PASSED: message to look for to consider test a success; if LOG_MSG is set, # both LOG_MSG and PASSED must appear (in any order) for test to succeed @@ -45,6 +49,15 @@ if {[info exists env(BOOT_MSG)]} { expect -re "$env(BOOT_MSG)" } +if {[info exists env(WAKEUP_CMD)]} { + expect -re "$env(SUSPEND_MSG)" + + # keep it suspended a bit, then wakeup + sleep 30 + + system "$env(WAKEUP_CMD)" +} + if {[info exists env(LOG_MSG)]} { expect { -notransfer -re "$env(PASSED)" { diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index a964ac4b7a..861e302d84 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -ex -o pipefail # One of: # - "" PV dom0, PVH domU @@ -267,52 +267,26 @@ cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -# start logging the serial; this gives interactive console, don't close its -# stdin to not close it; the 'cat' is important, plain redirection would hang -# until somebody opens the pipe; opening and closing the pipe is used to close -# the console -mkfifo /tmp/console-stdin -cat /tmp/console-stdin |\ -ssh $CONTROLLER console | tee smoke.serial | sed 's/\r//' & - # start the system pointing at gitlab-ci predefined config ssh $CONTROLLER gitlabci poweron -trap "ssh $CONTROLLER poweroff; : > /tmp/console-stdin" EXIT +trap "ssh $CONTROLLER poweroff" EXIT if [ -n "$wait_and_wakeup" ]; then - # wait for suspend or a timeout - until grep "$wait_and_wakeup" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) - done - if [ $timeout -le 0 ]; then - echo "ERROR: suspend timeout, aborting" - exit 1 - fi - # keep it suspended a bit, then wakeup - sleep 30 - ssh $CONTROLLER wake + export SUSPEND_MSG="$wait_and_wakeup" + export WAKEUP_CMD="ssh $CONTROLLER wake" fi -set +x -until grep "^Welcome to Alpine Linux" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) -done -set -x - -tail -n 100 smoke.serial - -if [ $timeout -le 0 ]; then - echo "ERROR: test timeout, aborting" - exit 1 -fi +export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " +export LOG_MSG="\nWelcome to Alpine Linux" +export TEST_CMD="ssh $CONTROLLER console" +export TEST_LOG="smoke.serial" +export TEST_TIMEOUT="$timeout" +./automation/scripts/console.exp | sed 's/\r\+$//' +TEST_RESULT=$? if [ -n "$retrieve_xml" ]; then nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:58:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978732.1365601 (Exim 4.92) (envelope-from ) id 1uCi6Y-0006gN-9m; Wed, 07 May 2025 16:58:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978732.1365601; Wed, 07 May 2025 16:58:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6Y-0006gF-78; Wed, 07 May 2025 16:58:46 +0000 Received: by outflank-mailman (input) for mailman id 978732; Wed, 07 May 2025 16:58:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6W-0006g6-V6 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi6W-00F9I6-31 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi6W-001ini-2w for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:44 +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=YxgMnheGqxcHB39IdvmxcXK6nR3/Gb5BpL+1+t5+f8o=; b=hexb3RZRiHNjmNU8dPg8yUVivj e0vBNtpP7eGv+FfsRvFoFTaXo1/iAu3/DoyyDGzqBjIYgq9/Zlp00FQ8ZYPii705XjfaFAX+aLvav OOV03PcDc/pTIHJbfRXwjf00xBWBf81g8xVJwqhdGLlpWBOm3MdNlXgHhhO+zXcklvTc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: write whole etc/issue for domU initrd Message-Id: Date: Wed, 07 May 2025 16:58:44 +0000 commit fd7218e3f470e80b98422a031f72d57904175d0e Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:16 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: write whole etc/issue for domU initrd Upcoming changes won't unpack original rootfs anymore, so sed on existing file cannot be used. Override the whole file instead. No functional change intended. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit f401eae6ec446671ad79deac84421d56808d43f2) --- automation/scripts/qubes-x86-64.sh | 5 ++++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 861e302d84..c4be714642 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -182,7 +182,10 @@ ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf - sed -i -e 's/^Welcome/domU \0/' etc/issue + echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 69caabe2d8..7e5382931b 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -103,7 +103,10 @@ ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue +echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue copy_domU_files find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:58:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:58:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978733.1365605 (Exim 4.92) (envelope-from ) id 1uCi6i-0006ic-Bc; Wed, 07 May 2025 16:58:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978733.1365605; Wed, 07 May 2025 16:58:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6i-0006iU-8e; Wed, 07 May 2025 16:58:56 +0000 Received: by outflank-mailman (input) for mailman id 978733; Wed, 07 May 2025 16:58:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6h-0006iK-1P for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi6h-00F9IA-03 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi6g-001izT-3C for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:58:54 +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=I7/RVvENUISfTRLvX/oRKPq37LJFold8gJWxnC5QK10=; b=5v/sud6a0XHh/NpP7jlwhoZjkx xcsEmVMn0iE9BH/T8UeWcl581HbuLiouQUf54x5+WWCWuTvH8c6D9Qz/1gikB4tOQfC22rDBrELT+ 5SKQlw0L6INdZ/hrgF6pG8snvFIVduZruGkwSBt18bp6pOsRjoazhEFnC1DOIDo46cNc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: Rename intermediate artefacts in qemu-* scripts Message-Id: Date: Wed, 07 May 2025 16:58:54 +0000 commit 20212a32e9cf626854fab1fe59bfcdbf4748ecff Author: Andrew Cooper AuthorDate: Sat Apr 12 15:33:01 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Rename intermediate artefacts in qemu-* scripts Right now, we have initrd.cpio.gz as domU, and initrd.tar.gz as the base for dom0. Rename initrd.cpio.gz to domU-rootfs.cpio.gz, and xen-rootfs.cpio.gz to dom0-rootfs.cpio.gz to make it clearer which is which. Rename the VM from test to domU. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 9caca83404e707694d229853f8158c4c243c575c) --- automation/scripts/qemu-alpine-x86_64.sh | 16 ++++++++-------- automation/scripts/qemu-smoke-dom0-arm64.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 89bdb4df7d..569bd766d3 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -25,7 +25,7 @@ mount -t devtmpfs devtmpfs /dev chmod +x initrd/init # DomU rootfs cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. # initrd.tar.gz is Dom0 rootfs @@ -38,15 +38,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/bzImage\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash set -x @@ -56,13 +56,13 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf # rebuild Dom0 rootfs -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF @@ -70,7 +70,7 @@ cat >> binaries/pxelinux.0 << EOF kernel xen console=com1 console_timestamps=boot module bzImage console=hvc0 -module xen-rootfs.cpio.gz +module dom0-rootfs.cpio.gz boot EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 51d037b000..e8e49ded24 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -24,7 +24,7 @@ mount -t devtmpfs devtmpfs /dev /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. mkdir -p rootfs @@ -36,15 +36,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/Image\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -52,12 +52,12 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded @@ -78,7 +78,7 @@ MEMORY_END="0xC0000000" DEVICE_TREE="virt-gicv2.dtb" XEN="xen" DOM0_KERNEL="Image" -DOM0_RAMDISK="xen-rootfs.cpio.gz" +DOM0_RAMDISK="dom0-rootfs.cpio.gz" XEN_CMD="console=dtuart dom0_mem=1024M console_timestamps=boot" NUM_DOMUS=0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:59:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:59:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978734.1365608 (Exim 4.92) (envelope-from ) id 1uCi6s-0006lp-DH; Wed, 07 May 2025 16:59:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978734.1365608; Wed, 07 May 2025 16:59:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6s-0006lh-9y; Wed, 07 May 2025 16:59:06 +0000 Received: by outflank-mailman (input) for mailman id 978734; Wed, 07 May 2025 16:59:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi6r-0006lQ-4N for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi6r-00F9IQ-0K for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi6r-001jF7-0G for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:05 +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=2ROGLA03Vi/0a29dEu7Tfsqs+wO20xebYhnl+aeuJwY=; b=nm2igy/S+h96Kxm8q6MoTbb+0a TJjVZVjK/gO5Dr/JY43QSPko2odF04Ld5GQp+DlAy7C5Tj8DXydpauf+FOdV21aGYIaPGfcZZnwzj 2pOL88Vr8Cns8t1z7JVGGQtsVYMfMKUY+aEo80JZcJrpmjyn1BBpIHBpfz6HKDu7odmA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: avoid repacking initrd as part of the test job Message-Id: Date: Wed, 07 May 2025 16:59:05 +0000 commit 7f26cba32cc833ac428def5512cfc3ea922dcf7f Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:17 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: avoid repacking initrd as part of the test job Use the new test-artifacts which provide rootfs.cpio.gz rather than initrd.tar.gz. rootfs.cpio.gz also has all the necessary top-level directories, and includes the rc_verbose setting, so these modifications can be dropped. Having that, do not repack the whole initrd, but only pack modified files and rely on Linux handling of concatenated archives. This allows packing just test-related files (which includes the whole toolstack), instead of the whole initrd. For xilinx-smoke-dom0-x86_64.sh, this involves instructing grub not to unzip the archive, as doing so corrupts it. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 786f3238094f9460f59bce9f250adbf426f89297) --- automation/gitlab-ci/test.yaml | 8 +++--- automation/scripts/qemu-alpine-x86_64.sh | 16 +++++------- automation/scripts/qemu-smoke-dom0-arm64.sh | 14 +++++----- automation/scripts/qemu-smoke-dom0less-arm64.sh | 15 +++++------ automation/scripts/qubes-x86-64.sh | 32 +++++++++-------------- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 27 ++++++++++--------- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 30 +++++++++------------ 7 files changed, 61 insertions(+), 81 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 59a2de28c8..51229cbe56 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -11,7 +11,9 @@ - project: xen-project/hardware/test-artifacts job: linux-6.6.86-arm64 ref: master - - alpine-3.18-arm64-rootfs-export + - project: xen-project/hardware/test-artifacts + job: alpine-3.18-arm64-rootfs + ref: master - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs @@ -22,7 +24,7 @@ job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master .qemu-arm64: @@ -243,7 +245,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: job: x86_64-kernel-linux-6.6.56 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master - project: xen-project/hardware/test-artifacts job: x86_64-argo-linux-6.6.56 diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 569bd766d3..c7dd121978 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -28,16 +28,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. -# initrd.tar.gz is Dom0 rootfs +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root echo "name=\"domU\" @@ -60,9 +58,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -# rebuild Dom0 rootfs -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index e8e49ded24..c0cf61ff8f 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -27,15 +27,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root echo "name=\"domU\" @@ -56,8 +55,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 83e1866ca6..48c424922d 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -111,16 +111,14 @@ cd initrd find . | cpio --create --format='newc' | gzip > ../binaries/initrd cd .. -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash @@ -139,8 +137,7 @@ xl network-attach 1 type=vif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # ImageBuilder diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index c4be714642..e2376cb51c 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -164,16 +164,13 @@ ${domU_extra_config} " if [ -n "$domU_check" ]; then - # DomU + # DomU rootfs + cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + + # test-local configuration mkdir -p rootfs cd rootfs - # fakeroot is needed to preserve device nodes in rootless podman container - fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz - mkdir proc - mkdir run - mkdir srv - mkdir sys - rm var/run + mkdir -p etc/local.d echo "#!/bin/sh echo 8 > /proc/sys/kernel/printk @@ -181,26 +178,22 @@ echo 8 > /proc/sys/kernel/printk ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start - echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue - find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs fi -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir boot -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -237,7 +230,6 @@ fi chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console @@ -245,7 +237,7 @@ cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU fi -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7e5382931b..1fc52d78db 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -80,6 +80,7 @@ argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () { + mkdir -p root usr/local/lib usr/local/bin cp "${WORKDIR}/binaries/xen-argo.ko" "root/" cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" @@ -89,12 +90,13 @@ else fatal "Unknown test: ${TEST}" fi -# Set up domU rootfs. +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc run srv sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh set -x export LD_LIBRARY_PATH=/usr/local/lib @@ -102,22 +104,22 @@ PATH=/usr/local/bin:/usr/local/sbin:\$PATH ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue copy_domU_files -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# Set up dom0 rootfs. +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir boot proc run srv sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . echo "#!/bin/bash set -x @@ -127,14 +129,13 @@ ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU copy_dom0_files -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # Load software into TFTP server directory. @@ -147,7 +148,7 @@ echo " net_default_server=10.0.6.1 multiboot2 (tftp)/${TEST_BOARD}/xen ${XEN_CMDLINE} sync_console module2 (tftp)/${TEST_BOARD}/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (tftp)/${TEST_BOARD}/initrd-dom0 +module2 --nounzip (tftp)/${TEST_BOARD}/initrd-dom0 boot " > ${TFTP}/${TEST_BOARD}/grub.cfg diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 3e1fcf6bf9..a3031ecab0 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -38,36 +38,31 @@ echo \"${passed}\" " fi -# DomU +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -78,8 +73,7 @@ bash /etc/init.d/xencommons start ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:59:16 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:59:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978735.1365612 (Exim 4.92) (envelope-from ) id 1uCi72-0006og-Fn; Wed, 07 May 2025 16:59:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978735.1365612; Wed, 07 May 2025 16:59:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi72-0006oZ-DJ; Wed, 07 May 2025 16:59:16 +0000 Received: by outflank-mailman (input) for mailman id 978735; Wed, 07 May 2025 16:59:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi71-0006oO-6g for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi71-00F9IY-0a for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi71-001jZp-0V for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:15 +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=AqHbW/OaA8/54OwTSn/m6WRWQ46I6Ykehr4dQnJG7uE=; b=y5exiswTyj7bu8RqbxeCyPCnx4 TFeNJt1wml0zdAsZWqMXAvPE/6F8b4iZzqOV3J8mKGOgXHjQPMEoedpCMWTqQ7p+cn/0ClldZjF0s f9mDjIGGKiA5NeJBQX22vF8QvpeQdFMIS2v14Xl6ZTtrI2BeImWY4pQVqD+6f6FQjbAg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: remove now unused alpine-3.18-arm64-rootfs job and its container Message-Id: Date: Wed, 07 May 2025 16:59:15 +0000 commit 1532272067c33cfbcf5231ddb6d1ff341d1b8939 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 15:47:22 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: remove now unused alpine-3.18-arm64-rootfs job and its container This got moved to test-artifacts. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper Acked-by: Anthony PERARD (cherry picked from commit 93f12111c749962b77eb4671d740d3d010429174) --- automation/gitlab-ci/build.yaml | 11 ---- .../tests-artifacts/alpine/3.18-arm64v8.dockerfile | 66 ---------------------- 2 files changed, 77 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 0effeb8b52..5f0acda942 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -264,17 +264,6 @@ # Arm test artifacts -alpine-3.18-arm64-rootfs-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8 - script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - artifacts: - paths: - - binaries/initrd.tar.gz - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index a4542f7039..0000000000 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add networking sysinit && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add killprocs shutdown && \ - rc-update add modloop sysinit && \ - rc-update add modules boot && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add sysctl boot && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:59:26 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:59:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978736.1365617 (Exim 4.92) (envelope-from ) id 1uCi7C-0006rC-HO; Wed, 07 May 2025 16:59:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978736.1365617; Wed, 07 May 2025 16:59:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7C-0006r4-Em; Wed, 07 May 2025 16:59:26 +0000 Received: by outflank-mailman (input) for mailman id 978736; Wed, 07 May 2025 16:59:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7B-0006qs-97 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi7B-00F9Ig-0p for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi7B-001jqA-0k for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:25 +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=djHkIBDduWcd66oS/pmedPhlMecw0TZ9q4tua73AHGg=; b=Lc+UFJKZK9+umvKs/WyiHxG9og 0naoB+UP/1WWBkU+EjD7cG5zk0cGf1YdrMAKLZ9ELHp+oMneK5RJpdgelb9Xof3Viym0AT/3tA/9Q Sdp6ic7b+Xa3D8YAFxPElSaUr4s7C7CDgDvPa7by/CjRFjNcjjommmSitFGffYu9PoiI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: Switch to new argo artefact Message-Id: Date: Wed, 07 May 2025 16:59:25 +0000 commit 69a629b46204b7949cf1784aa3949fb855b42491 Author: Andrew Cooper AuthorDate: Thu Apr 10 21:39:16 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Switch to new argo artefact The argo artefact is now a cpio archive and can be appended to dom?-rootfs directly, rather than being part of of the overlay. Drop the copy_dom?_files() functions. xen-argo.ko has moved into the standard location, so update the insmod path. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 464d4dd4565c271a46f01a7909593f89b538259f) --- automation/gitlab-ci/test.yaml | 5 +---- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 51229cbe56..ef3560930c 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -242,14 +242,11 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: needs: - alpine-3.18-gcc-debug - project: xen-project/hardware/test-artifacts - job: x86_64-kernel-linux-6.6.56 + job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master - - project: xen-project/hardware/test-artifacts - job: x86_64-argo-linux-6.6.56 - ref: master adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 1fc52d78db..85007dcc29 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -28,8 +28,6 @@ extra = "root=/dev/ram0 console=hvc0" memory = 512 ' DOMU_CFG_EXTRA="" -copy_domU_files () { :; } -copy_dom0_files () { :; } # Select test variant. if [ "${TEST}" = "ping" ]; then @@ -66,7 +64,7 @@ then PASS_MSG="TEST: Message from DOMU" XEN_CMD_EXTRA="argo=1,mac-permissive=1" DOMU_CMD=" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko until false do echo \"${PASS_MSG}\" @@ -74,24 +72,19 @@ do done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " -copy_dom0_files () -{ - mkdir -p root usr/local/lib usr/local/bin - cp "${WORKDIR}/binaries/xen-argo.ko" "root/" - cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" - cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" -} -copy_domU_files () { copy_dom0_files; } else fatal "Unknown test: ${TEST}" fi # DomU rootfs cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz +if [[ "${TEST}" == argo ]]; then + cat binaries/argo.cpio.gz >> binaries/domU-rootfs.cpio.gz +fi # test-local configuration mkdir -p rootfs @@ -108,13 +101,15 @@ echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue -copy_domU_files find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +if [[ "${TEST}" == argo ]]; then + cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz +fi # test-local configuration mkdir -p rootfs @@ -134,7 +129,6 @@ echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -copy_dom0_files find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:59:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:59:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978737.1365621 (Exim 4.92) (envelope-from ) id 1uCi7M-0006tT-Io; Wed, 07 May 2025 16:59:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978737.1365621; Wed, 07 May 2025 16:59:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7M-0006tL-GE; Wed, 07 May 2025 16:59:36 +0000 Received: by outflank-mailman (input) for mailman id 978737; Wed, 07 May 2025 16:59:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7L-0006tD-BZ for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi7L-00F9JA-14 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi7L-001jvw-10 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:35 +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=EeTFhdL+i9cz34f67uLey4Ctph6rjeAzmt6X5YoSt+U=; b=t7GspFXjb+koznyt+F//4PFzUX uLM3UTGtsxcPZYQoS+MNXm1lul0bHFSxysBI7uj2r9zpsgLHPck6YRZhCIG844Vqa0AR7j/hBVg6y uGt7cOhkQzhMepcKzHSZH7pW6IOdbFh2pkRQvhF/l3seNw9qZlgkKkbAjs1sfJlCpjgo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: save toolstack artifact as cpio.gz Message-Id: Date: Wed, 07 May 2025 16:59:35 +0000 commit 0258350a63745e12b40286e2f73b0ebf52438fc0 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:19 2025 +0200 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: save toolstack artifact as cpio.gz This avoids the need to re-compress it in every test job. This saves minutes of wallclock time. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 4611ae6fb8f90d25601fcc0688799ef63a374304) --- automation/scripts/build | 2 +- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 +++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 3 +-- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 522efe774e..51effec81d 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -108,7 +108,7 @@ else # 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 - cp -r dist binaries/ + (cd dist/install; find | cpio -o -H newc | gzip) > binaries/xen-tools.cpio.gz cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index c7dd121978..fe86caa393 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -30,11 +30,11 @@ cd .. # Dom0 rootfs cp rootfs.cpio.gz dom0-rootfs.cpio.gz +cat xen-tools.cpio.gz >> dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../dist/install/* . mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index c0cf61ff8f..61dd24b9ab 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -29,11 +29,11 @@ cd .. # Dom0 rootfs cp rootfs.cpio.gz dom0-rootfs.cpio.gz +cat xen-tools.cpio.gz >> dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../dist/install/* . mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 48c424922d..2c9a927c5c 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -113,11 +113,11 @@ cd .. # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../binaries/dist/install/* . mkdir -p etc/local.d echo "#!/bin/bash diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index e2376cb51c..3947027d6e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -189,12 +189,12 @@ fi # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs mkdir -p boot etc/local.d -cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -228,8 +228,10 @@ else fi chmod +x etc/local.d/xen.start +mkdir -p etc/xen echo "$domU_config" > etc/xen/domU.cfg +mkdir -p etc/default echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 85007dcc29..1f8cc172c6 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -107,6 +107,7 @@ rm -rf rootfs # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz if [[ "${TEST}" == argo ]]; then cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz fi @@ -114,8 +115,7 @@ fi # test-local configuration mkdir -p rootfs cd rootfs -mkdir -p boot etc/local.d -cp -ar ../binaries/dist/install/* . +mkdir -p boot etc/local.d etc/xen etc/default echo "#!/bin/bash set -x export LD_LIBRARY_PATH=/usr/local/lib diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index a3031ecab0..59f3fe7edb 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -56,12 +56,11 @@ rm -rf rootfs # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../binaries/dist/install/* . - mkdir -p etc/local.d echo "#!/bin/bash -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:59:46 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:59:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978739.1365625 (Exim 4.92) (envelope-from ) id 1uCi7W-0006wL-Kb; Wed, 07 May 2025 16:59:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978739.1365625; Wed, 07 May 2025 16:59:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7W-0006wD-Hc; Wed, 07 May 2025 16:59:46 +0000 Received: by outflank-mailman (input) for mailman id 978739; Wed, 07 May 2025 16:59:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7V-0006w0-E0 for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi7V-00F9JF-1K for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi7V-001k5J-1F for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:45 +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=2kSrV21CN0pxzTCKIkoEOSx1wtQUh58JbNBcAqOWABs=; b=XWlkP01AcsXDQYb6wJvRp4Q998 QF88sZPg4H6930G9mYQ017NeEY6mY/Qn8+42WELhgeLkftU2OHwJ66OJx0yuFe/7VnZpyI8SUiRo5 aSXNIk7WQQq/PKV/0t0BDqzaSOcSgfcypPKfzqfCaEWZfM9Wuakk49GQ7KkcsVpCjvCw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: Include microcode for x86 hardware jobs Message-Id: Date: Wed, 07 May 2025 16:59:45 +0000 commit 690655a511cd683a0dec20e4c8bed2f993880c82 Author: Andrew Cooper AuthorDate: Fri Apr 11 20:28:15 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Include microcode for x86 hardware jobs All the x86 hardware runners are out of date, to varying degrees, in terms of microcode. Microcode must be uncompressed and prepended to the initrd in order for Xen to be able to use it during early boot. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 4a39780faafa79034aa4f637ab8a3f1922b95919) --- automation/gitlab-ci/build.yaml | 1 + automation/gitlab-ci/test.yaml | 6 ++++++ automation/scripts/qubes-x86-64.sh | 3 ++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 5f0acda942..5d382bcd24 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -306,6 +306,7 @@ alpine-3.18-gcc-debug: CONFIG_ARGO=y CONFIG_UBSAN=y CONFIG_UBSAN_FATAL=y + CONFIG_UCODE_SCAN_DEFAULT=y CONFIG_XHCI=y debian-12-x86_64-gcc-debug: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ef3560930c..5ce445b78f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -26,6 +26,9 @@ - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86 + ref: master .qemu-arm64: extends: .test-jobs-common @@ -247,6 +250,9 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86 + ref: master adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 3947027d6e..1f90e7002c 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -188,7 +188,8 @@ Kernel \r on an \m (\l) fi # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 1f8cc172c6..5bb44188dc 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -106,7 +106,8 @@ cd .. rm -rf rootfs # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz if [[ "${TEST}" == argo ]]; then cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed May 07 16:59:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 May 2025 16:59:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.978740.1365629 (Exim 4.92) (envelope-from ) id 1uCi7g-0006yg-Lz; Wed, 07 May 2025 16:59:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 978740.1365629; Wed, 07 May 2025 16:59:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7g-0006yY-J6; Wed, 07 May 2025 16:59:56 +0000 Received: by outflank-mailman (input) for mailman id 978740; Wed, 07 May 2025 16:59:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uCi7f-0006yM-Ge for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uCi7f-00F9JM-1a for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uCi7f-001kAP-1V for xen-changelog@lists.xenproject.org; Wed, 07 May 2025 16:59:55 +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=tfgRAhplraADwcsDmCNKVy7FKwl4rqoIvTpYKEtqY2M=; b=DXUM043UDc4bxyI7lC+ufD61e9 klfK7TEFLyLU/COlysizXH7VMeZ135ZHM1JSdFVNVs2o+b+n5dS+fY9kujjx/yjbu3Vj5zUhJ2AjI SyPsi3gS7aeDw7t6CXdiMP5tqxBAkOCOzOgvurujXJJnoD+fFK83e5ZEcAZU+NB5JpNM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] CI: Build with --prefix=/usr rather than setting LD_LIBRARY_PATH Message-Id: Date: Wed, 07 May 2025 16:59:55 +0000 commit 47d911f69eb976785fd17cae4e39de4d55b94b9e Author: Andrew Cooper AuthorDate: Tue Apr 15 13:49:01 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 7 15:28:02 2025 +0100 CI: Build with --prefix=/usr rather than setting LD_LIBRARY_PATH This also moves executables too. I'm not sure why xilinx-smoke-dom0-x86_64.sh was overriding PATH too, as /usr/local is clearly in PATH given the other tests, but drop that too. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Acked-by: Stefano Stabellini (cherry picked from commit 7f8c2dd829358406dc9e50d5e386e4d2b20b4303) --- automation/scripts/build | 2 +- automation/scripts/qemu-alpine-x86_64.sh | 1 - automation/scripts/qemu-smoke-dom0-arm64.sh | 1 - automation/scripts/qemu-smoke-dom0less-arm64.sh | 3 +-- automation/scripts/qubes-x86-64.sh | 1 - automation/scripts/xilinx-smoke-dom0-x86_64.sh | 3 --- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 3 +-- 7 files changed, 3 insertions(+), 11 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 51effec81d..a348c781d1 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -67,7 +67,7 @@ elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then collect_xen_artefacts else # Full build. Figure out our ./configure options - cfgargs=() + cfgargs=("--prefix=/usr") cfgargs+=("--enable-docs") # booleans for which compiler is in use diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index fe86caa393..746e70483d 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -49,7 +49,6 @@ echo "#!/bin/bash set -x -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start xl list diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 61dd24b9ab..d6f6b74880 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -46,7 +46,6 @@ extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" " > root/domU.cfg echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start xl list diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 2c9a927c5c..18ea071c2a 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -122,10 +122,9 @@ mkdir -p etc/local.d echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start -/usr/local/lib/xen/bin/init-dom0less +/usr/lib/xen/bin/init-dom0less brctl addbr xenbr0 brctl addif xenbr0 eth0 diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 1f90e7002c..bfdd2ceb99 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -201,7 +201,6 @@ cp -a ../automation/scripts/run-tools-tests tests/ echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start brctl addbr xenbr0 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 5bb44188dc..8f02fa73bd 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -92,8 +92,6 @@ cd rootfs mkdir -p etc/local.d echo "#!/bin/sh set -x -export LD_LIBRARY_PATH=/usr/local/lib -PATH=/usr/local/bin:/usr/local/sbin:\$PATH ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start @@ -119,7 +117,6 @@ cd rootfs mkdir -p boot etc/local.d etc/xen etc/default echo "#!/bin/bash set -x -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start ${DOM0_CMD} " > etc/local.d/xen.start diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 59f3fe7edb..293232eebf 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -64,10 +64,9 @@ cd rootfs mkdir -p etc/local.d echo "#!/bin/bash -export LD_LIBRARY_PATH=/usr/local/lib bash /etc/init.d/xencommons start -/usr/local/lib/xen/bin/init-dom0less +/usr/lib/xen/bin/init-dom0less ${dom0_check} " > etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu May 08 12:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 May 2025 12:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979374.1366003 (Exim 4.92) (envelope-from ) id 1uD0mF-00020f-Gq; Thu, 08 May 2025 12:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979374.1366003; Thu, 08 May 2025 12: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 1uD0mF-00020X-EF; Thu, 08 May 2025 12:55:03 +0000 Received: by outflank-mailman (input) for mailman id 979374; Thu, 08 May 2025 12:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uD0mD-00020P-MV for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 12:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uD0mD-00HLIH-1g for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 12:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uD0mD-00FTZR-1R for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 12: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=uHSUMg0T3eI44TonG/cS1ixzFzwRVnCn2PKrZBmAR8g=; b=IganC+wT04feBWGrjQElDWBpbK c/QMhb9UI9IZF84SWpkyW+6FGrkbTaOcaIG+iq0rQoRunM5ed1xNaYDCGY6ld/Nvxxydbfd4R+lLX bI5ClTiOIREfyhQLXRAakRBYN23biaWuXNFdK2Oj6qscd2hdbQoZkyg/jAk2ZWUxXZm8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] lib: Add strcspn function Message-Id: Date: Thu, 08 May 2025 12:55:01 +0000 commit ed9488a0d155562cc4f1c9a1c38031579a347cf4 Author: Ross Lagerwall AuthorDate: Wed May 7 15:45:00 2025 +0100 Commit: Andrew Cooper CommitDate: Thu May 8 10:43:56 2025 +0100 lib: Add strcspn function This will be used by future patches. Signed-off-by: Ross Lagerwall Signed-off-by: Kevin Lampis Reviewed-by: Andrew Cooper --- xen/include/xen/string.h | 5 +++++ xen/lib/Makefile | 1 + xen/lib/strcspn.c | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/xen/include/xen/string.h b/xen/include/xen/string.h index bd4a8f48e9..0ad65303da 100644 --- a/xen/include/xen/string.h +++ b/xen/include/xen/string.h @@ -26,6 +26,7 @@ size_t strnlen(const char *s, size_t count); char *strpbrk(const char *cs,const char *ct); char *strsep(char **s, const char *ct); size_t strspn(const char *s, const char *accept); +size_t strcspn(const char *s, const char *reject); void *memset(void *s, int c, size_t n); void *memcpy(void *dest, const void *src, size_t n); @@ -68,6 +69,10 @@ void *memchr_inv(const void *s, int c, size_t n); #define strlen(s1) __builtin_strlen(s1) #endif +#ifndef __HAVE_ARCH_STRCSPN +#define strcspn(s, r) __builtin_strcspn(s, r) +#endif + #ifndef __HAVE_ARCH_MEMSET #define memset(s, c, n) __builtin_memset(s, c, n) #endif diff --git a/xen/lib/Makefile b/xen/lib/Makefile index 76dc86fab0..5ccb1e5241 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -22,6 +22,7 @@ lib-y += sort.o lib-y += strcasecmp.o lib-y += strchr.o lib-y += strcmp.o +lib-y += strcspn.o lib-y += strlcat.o lib-y += strlcpy.o lib-y += strlen.o diff --git a/xen/lib/strcspn.c b/xen/lib/strcspn.c new file mode 100644 index 0000000000..d572931f54 --- /dev/null +++ b/xen/lib/strcspn.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +#include + +/** + * strcspn - Calculate the length of the initial substring of @s which does not contain letters in @reject + * @s: The string to be searched + * @reject: The string to avoid + */ +size_t (strcspn)(const char *s, const char *reject) +{ + const char *p; + + for (p = s; *p != '\0'; ++p) { + if (strchr(reject, *p)) + break; + } + return p - s; +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 08 13:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 May 2025 13:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979469.1366077 (Exim 4.92) (envelope-from ) id 1uD1N1-0002X2-9D; Thu, 08 May 2025 13:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979469.1366077; Thu, 08 May 2025 13: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 1uD1N1-0002Wv-6X; Thu, 08 May 2025 13:33:03 +0000 Received: by outflank-mailman (input) for mailman id 979469; Thu, 08 May 2025 13:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uD1N0-0002Wm-1C for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 13:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uD1Mz-00HMUQ-2u for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 13:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uD1Mz-00Gi00-2Y for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 13: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=9WwgSfDQoqvc/JcImZrMdkByCAETssn6z+nltF6K2xw=; b=XOFo6ywyMdWO8VYoGk7pOpQy1u +ev5X/lj0pr3dNpPxX/2hh1ej5kBqrky/uvWtdydjamclnVSDROpygVi8ka7C/j7KG4t8ad3UlevE XPti7cnO/xk3gjHTMuXhZJuqUO/Iz2XVWmTdxArehFP+lTPyl1mTjupHg4C0gJhibd/0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] lib: Add strcspn function Message-Id: Date: Thu, 08 May 2025 13:33:01 +0000 commit ed9488a0d155562cc4f1c9a1c38031579a347cf4 Author: Ross Lagerwall AuthorDate: Wed May 7 15:45:00 2025 +0100 Commit: Andrew Cooper CommitDate: Thu May 8 10:43:56 2025 +0100 lib: Add strcspn function This will be used by future patches. Signed-off-by: Ross Lagerwall Signed-off-by: Kevin Lampis Reviewed-by: Andrew Cooper --- xen/include/xen/string.h | 5 +++++ xen/lib/Makefile | 1 + xen/lib/strcspn.c | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/xen/include/xen/string.h b/xen/include/xen/string.h index bd4a8f48e9..0ad65303da 100644 --- a/xen/include/xen/string.h +++ b/xen/include/xen/string.h @@ -26,6 +26,7 @@ size_t strnlen(const char *s, size_t count); char *strpbrk(const char *cs,const char *ct); char *strsep(char **s, const char *ct); size_t strspn(const char *s, const char *accept); +size_t strcspn(const char *s, const char *reject); void *memset(void *s, int c, size_t n); void *memcpy(void *dest, const void *src, size_t n); @@ -68,6 +69,10 @@ void *memchr_inv(const void *s, int c, size_t n); #define strlen(s1) __builtin_strlen(s1) #endif +#ifndef __HAVE_ARCH_STRCSPN +#define strcspn(s, r) __builtin_strcspn(s, r) +#endif + #ifndef __HAVE_ARCH_MEMSET #define memset(s, c, n) __builtin_memset(s, c, n) #endif diff --git a/xen/lib/Makefile b/xen/lib/Makefile index 76dc86fab0..5ccb1e5241 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -22,6 +22,7 @@ lib-y += sort.o lib-y += strcasecmp.o lib-y += strchr.o lib-y += strcmp.o +lib-y += strcspn.o lib-y += strlcat.o lib-y += strlcpy.o lib-y += strlen.o diff --git a/xen/lib/strcspn.c b/xen/lib/strcspn.c new file mode 100644 index 0000000000..d572931f54 --- /dev/null +++ b/xen/lib/strcspn.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +#include + +/** + * strcspn - Calculate the length of the initial substring of @s which does not contain letters in @reject + * @s: The string to be searched + * @reject: The string to avoid + */ +size_t (strcspn)(const char *s, const char *reject) +{ + const char *p; + + for (p = s; *p != '\0'; ++p) { + if (strchr(reject, *p)) + break; + } + return p - s; +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 08 23:55:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 May 2025 23:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979704.1366201 (Exim 4.92) (envelope-from ) id 1uDB4y-0002Zj-NV; Thu, 08 May 2025 23:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979704.1366201; Thu, 08 May 2025 23:55: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 1uDB4y-0002Zb-Kz; Thu, 08 May 2025 23:55:04 +0000 Received: by outflank-mailman (input) for mailman id 979704; Thu, 08 May 2025 23:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDB4x-0002ZC-3A for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDB4w-00051I-2p for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDB4w-001Zsr-2S for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23: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=GnYB1x8F36cnYxuRlzbyqWOxJWrOFt7A+jaQSR7GrW0=; b=lFSOJsrJFyOSzG3wbN8RWkSQI2 LR9KjTJXM9w/qPmSqgj0dK0dNCZa3LJyTOpPfwm+HBusufsTNO5bdY9yRFJMgShD6ZU6XJFIDKpkl cTKMngm8VkLsajxz/mP2SJBvCpI0stNRhFYmAl8IU0hedQBDyVQpZBJsIJ6RvAjQwAXM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: fix math in add_ext_regions Message-Id: Date: Thu, 08 May 2025 23:55:02 +0000 commit 9b21841fd1da2472605a4fe7120fb318a8d88faf Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:30 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:36:49 2025 -0700 xen/arm: fix math in add_ext_regions In commit f37a59813979, the arguments to add_ext_regions() were switched from addresses to frame numbers. add_ext_regions() converts the frame numbers back to addresses, but the end address (e) is rounded down to page size alignment. The logic to calculate the size assumes e points to the last address, not page, effectively leading to the region size being erroneously calculated to be 2M smaller than the actual size of the region. Fix by adding 1 to the frame number before converting back to address. Fixes: f37a59813979 ("xen/arm: domain_build: Track unallocated pages using the frame number") Signed-off-by: Stewart Hildebrand Acked-by: Michal Orzel --- xen/arch/arm/domain_build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index df29619c40..2f2b021dec 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -761,7 +761,7 @@ int __init add_ext_regions(unsigned long s_gfn, unsigned long e_gfn, struct membanks *ext_regions = data; paddr_t start, size; paddr_t s = pfn_to_paddr(s_gfn); - paddr_t e = pfn_to_paddr(e_gfn); + paddr_t e = pfn_to_paddr(e_gfn + 1) - 1; if ( ext_regions->nr_banks >= ext_regions->max_banks ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 08 23:55:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 May 2025 23:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979705.1366205 (Exim 4.92) (envelope-from ) id 1uDB58-0002bb-P9; Thu, 08 May 2025 23:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979705.1366205; Thu, 08 May 2025 23:55: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 1uDB58-0002bR-MI; Thu, 08 May 2025 23:55:14 +0000 Received: by outflank-mailman (input) for mailman id 979705; Thu, 08 May 2025 23:55:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDB57-0002bB-45 for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDB57-00051M-0H for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDB56-001Zx7-30 for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23: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=7VyQgvkuwCA58eIvY5INcJDi+ARz8S0EGmJzEfwzAio=; b=SPptashQydSPyVpuBNCBek2cUV l8+9oRLsGILPPIhrCyki2gpG/pgMkVqVH7jX4SYCjFmQ+/HfaDZLtrOAYqDyXnMgkxehwHjHzNKcM WSgK3g9DnOkHUhAN+7LV+bS/im2iULPfhAPf/U9OcDCPDdmiThmqNc5Bpy1wd6Co5tMM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: fix math in add_hwdom_free_regions Message-Id: Date: Thu, 08 May 2025 23:55:12 +0000 commit 245e47cf8d292401b1147b9ceb0eedadec6288c7 Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:31 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:36:55 2025 -0700 xen/arm: fix math in add_hwdom_free_regions Erroneous logic was duplicated from add_ext_regions() into add_hwdom_free_regions(). Frame numbers are converted to addresses, but the end address (e) is rounded down to page size alignment. The logic to calculate the size assumes e points to the last address, not page, effectively leading to the region size being erroneously calculated to be 2M smaller than the actual size of the region. Fix by adding 1 to the frame number before converting back to address. Fixes: 02975cc38389 ("xen/arm: permit non direct-mapped Dom0 construction") Signed-off-by: Stewart Hildebrand Acked-by: Michal Orzel --- xen/common/device-tree/domain-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 762b63e2b0..9556af43e0 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -109,7 +109,7 @@ static int __init add_hwdom_free_regions(unsigned long s_gfn, struct membanks *free_regions = data; paddr_t start, size; paddr_t s = pfn_to_paddr(s_gfn); - paddr_t e = pfn_to_paddr(e_gfn); + paddr_t e = pfn_to_paddr(e_gfn + 1) - 1; unsigned int i, j; if ( free_regions->nr_banks >= free_regions->max_banks ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 08 23:55:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 May 2025 23:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979706.1366209 (Exim 4.92) (envelope-from ) id 1uDB5I-0002e9-QH; Thu, 08 May 2025 23:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979706.1366209; Thu, 08 May 2025 23:55: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 1uDB5I-0002e1-Ng; Thu, 08 May 2025 23:55:24 +0000 Received: by outflank-mailman (input) for mailman id 979706; Thu, 08 May 2025 23:55:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDB5H-0002dp-79 for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDB5H-00051S-0c for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDB5H-001Zzm-0S for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:23 +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=YJssCRnE90vEt7r/eagCPzABm0mCWdPxalwKjgh+eUM=; b=WhraLOxCEU2ON9R623ikra/YrL o8OpLUbHpVLN597gT4zkTBNj/MqwbtxVw4WsdZHrJNxwtsMMhPU89LanLkmyy51nRCSwt7MN8hZWc bxYGsxAbAYpGbpk/WYed2nUD24My5Xs2b+1ksGUkCu+d235P3oBsorNWjtNLFDdDTagQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: switch find_domU_holes to rangesets Message-Id: Date: Thu, 08 May 2025 23:55:23 +0000 commit 3ef921189637155ffb488aba1c110fa27e0e9fce Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:32 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:37:01 2025 -0700 xen/arm: switch find_domU_holes to rangesets remove_shm_holes_for_domU() is unnecessarily complex: it re-creates the extended regions from scratch. Move the rangeset into find_domU_holes() and create the extended regions only once. This makes is simpler to further manipulate the rangeset for removing other regions. Remove now-unused remove_shm_holes_for_domU(). Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 46 +++++++++++++++++------ xen/arch/arm/include/asm/static-shmem.h | 9 ----- xen/arch/arm/static-shmem.c | 65 --------------------------------- 3 files changed, 35 insertions(+), 85 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 2f2b021dec..05a77a4f92 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -933,34 +933,58 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, struct membanks *ext_regions) { unsigned int i; - uint64_t bankend; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; const struct membanks *kinfo_mem = kernel_info_get_mem_const(kinfo); - int res = -ENOENT; + struct rangeset *mem_holes; + int res; + + mem_holes = rangeset_new(NULL, NULL, 0); + if ( !mem_holes ) + return -ENOMEM; for ( i = 0; i < GUEST_RAM_BANKS; i++ ) { - struct membank *ext_bank = &(ext_regions->bank[ext_regions->nr_banks]); + uint64_t bankend, start, size = 0; - ext_bank->start = ROUNDUP(bankbase[i] + kinfo_mem->bank[i].size, SZ_2M); + start = ROUNDUP(bankbase[i] + kinfo_mem->bank[i].size, SZ_2M); bankend = ~0ULL >> (64 - p2m_ipa_bits); bankend = min(bankend, bankbase[i] + banksize[i] - 1); - if ( bankend > ext_bank->start ) - ext_bank->size = bankend - ext_bank->start + 1; + + if ( bankend > start ) + size = bankend - start + 1; /* 64MB is the minimum size of an extended region */ - if ( ext_bank->size < MB(64) ) + if ( size < MB(64) ) continue; - ext_regions->nr_banks++; - res = 0; + + res = rangeset_add_range(mem_holes, PFN_DOWN(start), PFN_DOWN(bankend)); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + start, start + size - 1); + goto out; + } } + /* Remove static shared memory regions */ + res = remove_shm_from_rangeset(kinfo, mem_holes); if ( res ) - return res; + goto out; - return remove_shm_holes_for_domU(kinfo, ext_regions); + res = rangeset_report_ranges(mem_holes, 0, + PFN_DOWN((1ULL << p2m_ipa_bits) - 1), + add_ext_regions, ext_regions); + if ( res ) + ext_regions->nr_banks = 0; + else if ( !ext_regions->nr_banks ) + res = -ENOENT; + + out: + rangeset_destroy(mem_holes); + + return res; } static int __init find_host_extended_regions(const struct kernel_info *kinfo, diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index 4034cec32f..6a4c33cca8 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -27,9 +27,6 @@ void init_sharedmem_pages(void); int remove_shm_from_rangeset(const struct kernel_info *kinfo, struct rangeset *rangeset); -int remove_shm_holes_for_domU(const struct kernel_info *kinfo, - struct membanks *ext_regions); - int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells); @@ -73,12 +70,6 @@ static inline int remove_shm_from_rangeset(const struct kernel_info *kinfo, return 0; } -static inline int remove_shm_holes_for_domU(const struct kernel_info *kinfo, - struct membanks *ext_regions) -{ - return 0; -} - static inline int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells) { diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 1f8441d920..32ec6d4bc6 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -822,71 +822,6 @@ int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, return 0; } -int __init remove_shm_holes_for_domU(const struct kernel_info *kinfo, - struct membanks *ext_regions) -{ - const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); - struct rangeset *guest_holes; - unsigned int i; - paddr_t start; - paddr_t end; - int res; - - /* No static shared memory region. */ - if ( shm_mem->nr_banks == 0 ) - return 0; - - dt_dprintk("Remove static shared memory holes from extended regions of DomU\n"); - - guest_holes = rangeset_new(NULL, NULL, 0); - if ( !guest_holes ) - return -ENOMEM; - - /* Copy extended regions sets into the rangeset */ - for ( i = 0; i < ext_regions->nr_banks; i++ ) - { - start = ext_regions->bank[i].start; - end = start + ext_regions->bank[i].size; - - res = rangeset_add_range(guest_holes, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR - "Failed to add: %#"PRIpaddr"->%#"PRIpaddr", error: %d\n", - start, end, res); - goto out; - } - } - - /* Remove static shared memory regions */ - res = remove_shm_from_rangeset(kinfo, guest_holes); - if ( res ) - goto out; - - /* - * Take the interval of memory starting from the first extended region bank - * start address and ending to the end of the last extended region bank. - */ - i = ext_regions->nr_banks - 1; - start = ext_regions->bank[0].start; - end = ext_regions->bank[i].start + ext_regions->bank[i].size - 1; - - /* Reset original extended regions to hold new value */ - ext_regions->nr_banks = 0; - res = rangeset_report_ranges(guest_holes, PFN_DOWN(start), PFN_DOWN(end), - add_ext_regions, ext_regions); - if ( res ) - ext_regions->nr_banks = 0; - else if ( !ext_regions->nr_banks ) - res = -ENOENT; - - out: - rangeset_destroy(guest_holes); - - return res; -} - void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, int *nr_cells, int addrcells, int sizecells) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 08 23:55:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 May 2025 23:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979707.1366213 (Exim 4.92) (envelope-from ) id 1uDB5S-0002gW-Re; Thu, 08 May 2025 23:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979707.1366213; Thu, 08 May 2025 23:55: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 1uDB5S-0002gO-P7; Thu, 08 May 2025 23:55:34 +0000 Received: by outflank-mailman (input) for mailman id 979707; Thu, 08 May 2025 23:55:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDB5R-0002gE-9z for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDB5R-00051a-0u for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDB5R-001a3t-0n for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55: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=kAO8+/ECYVJs9TN0N4ZhslMTgycVOIpNE0PITBDFTEY=; b=2HI9Je/zmLKe3AUi+cGJUCv+hx HW988MPZBshiFSqIceIADsb/w/0G2TlO7GDojTwZZwkpCFwRIAgm+w2uRV+sYMk0bPKGKzHBWuKOs JGnHj74F2UxgZYbB908tt6B0drnLnY1afQFbqeKIqi+B6C6nJSjT5mZMs/jfs7LHVst0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] rangeset: introduce rangeset_subtract Message-Id: Date: Thu, 08 May 2025 23:55:33 +0000 commit 31703c5d7a5f608e161037050f69f46e0542b16a Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:33 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:44:35 2025 -0700 rangeset: introduce rangeset_subtract Introduce rangeset_subtract() to remove regions in r2 from r1. Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/common/rangeset.c | 12 ++++++++++++ xen/include/xen/rangeset.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/xen/common/rangeset.c b/xen/common/rangeset.c index e758710390..b9e8912fb1 100644 --- a/xen/common/rangeset.c +++ b/xen/common/rangeset.c @@ -397,6 +397,18 @@ int rangeset_merge(struct rangeset *r1, struct rangeset *r2) return rangeset_report_ranges(r2, 0, ~0UL, merge, r1); } +static int cf_check subtract(unsigned long s, unsigned long e, void *data) +{ + struct rangeset *r = data; + + return rangeset_remove_range(r, s, e); +} + +int rangeset_subtract(struct rangeset *r1, struct rangeset *r2) +{ + return rangeset_report_ranges(r2, 0, ~0UL, subtract, r1); +} + int rangeset_add_singleton( struct rangeset *r, unsigned long s) { diff --git a/xen/include/xen/rangeset.h b/xen/include/xen/rangeset.h index 96c9180825..817505badf 100644 --- a/xen/include/xen/rangeset.h +++ b/xen/include/xen/rangeset.h @@ -85,6 +85,9 @@ int rangeset_consume_ranges(struct rangeset *r, /* Merge rangeset r2 into rangeset r1. */ int __must_check rangeset_merge(struct rangeset *r1, struct rangeset *r2); +/* Subtract rangeset r2 from rangeset r1. */ +int __must_check rangeset_subtract(struct rangeset *r1, struct rangeset *r2); + /* Add/remove/query a single number. */ int __must_check rangeset_add_singleton( struct rangeset *r, unsigned long s); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 08 23:55:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 May 2025 23:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979708.1366216 (Exim 4.92) (envelope-from ) id 1uDB5c-0002j3-TF; Thu, 08 May 2025 23:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979708.1366216; Thu, 08 May 2025 23:55: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 1uDB5c-0002iv-QU; Thu, 08 May 2025 23:55:44 +0000 Received: by outflank-mailman (input) for mailman id 979708; Thu, 08 May 2025 23:55:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDB5b-0002ij-HW for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDB5b-00051i-1e for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDB5b-001aSB-1W for xen-changelog@lists.xenproject.org; Thu, 08 May 2025 23:55: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=TciBvn8Pku30IZoAj6UQuC4gORxTz2B6Obuln00Prtw=; b=W6w3gf2p1zW7Cq7fOk6Ks73mzq imJrIVMWHiz3JUbltiOLKjjiRsoXxYWgLAS0fafcA90rMatARuvisVCNOIKqsMnEBYx9ablBRxkmx YjyIpzQ2Zrsn1L9ZiXsqEJCW6whktgE2bWC0GERkoKnHHXR8mOjP+Ryte07TSQMCa5hw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: exclude xen,reg from domU extended regions Message-Id: Date: Thu, 08 May 2025 23:55:43 +0000 commit fba1b0974dd8ea3e2d2418c33c93ce7c484c2ab5 Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:34 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:44:38 2025 -0700 xen/arm: exclude xen,reg from domU extended regions When a device is passed through to a dom0less domU, the xen,reg ranges may overlap with the extended regions. Remove xen,reg from extended regions. Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 7 +++++++ xen/common/device-tree/dom0less-build.c | 19 ++++++++++++++++++- xen/include/xen/fdt-kernel.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 05a77a4f92..b189a7cfae 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -973,6 +973,13 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, if ( res ) goto out; + if ( kinfo->xen_reg_assigned ) + { + res = rangeset_subtract(mem_holes, kinfo->xen_reg_assigned); + if ( res ) + goto out; + } + res = rangeset_report_ranges(mem_holes, 0, PFN_DOWN((1ULL << p2m_ipa_bits) - 1), add_ext_regions, ext_regions); diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 4aa36c8ef3..2c56f13771 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -146,6 +146,14 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, int res; paddr_t mstart, size, gstart; + if ( !kinfo->xen_reg_assigned ) + { + kinfo->xen_reg_assigned = rangeset_new(NULL, NULL, 0); + + if ( !kinfo->xen_reg_assigned ) + return -ENOMEM; + } + /* xen,reg specifies where to map the MMIO region */ cell = (const __be32 *)xen_reg->data; len = fdt32_to_cpu(xen_reg->len) / ((address_cells * 2 + size_cells) * @@ -187,6 +195,11 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, mstart, gstart); return -EFAULT; } + + res = rangeset_add_range(kinfo->xen_reg_assigned, PFN_DOWN(gstart), + PFN_DOWN(gstart + size - 1)); + if ( res ) + return res; } /* @@ -814,7 +827,11 @@ static int __init construct_domU(struct domain *d, domain_vcpu_affinity(d, node); - return alloc_xenstore_params(&kinfo); + rc = alloc_xenstore_params(&kinfo); + + rangeset_destroy(kinfo.xen_reg_assigned); + + return rc; } void __init create_domUs(void) diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 7a6cd67c22..1939c3ebf7 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -24,6 +24,7 @@ struct kernel_info { #ifdef CONFIG_STATIC_SHM struct shared_meminfo shm_mem; #endif + struct rangeset *xen_reg_assigned; /* kernel entry point */ paddr_t entry; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 09 00:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 00:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979725.1366231 (Exim 4.92) (envelope-from ) id 1uDBqN-0001L4-Fe; Fri, 09 May 2025 00:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979725.1366231; Fri, 09 May 2025 00: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 1uDBqN-0001Kw-D8; Fri, 09 May 2025 00:44:03 +0000 Received: by outflank-mailman (input) for mailman id 979725; Fri, 09 May 2025 00:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDBqM-0001Kq-L9 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDBqM-0007Ad-13 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDBqM-003DkF-0q for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00: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=rZXvOemPEB0yf607ykpjvtAsq03MTabhKZm83GXVFOE=; b=SYrYalIBKH8kSWrDxevqLZWPY/ 6pzNIdmm+lH6gLK6/tgyvriDdKy+xGbMAV4oaQ+SZhsCBKDWDpAbm+U8/hSePMUcby9UQKY5gVWNQ UGIJVkKLT/tpzO6d8rqTxJrvvF/Pv14Ms39nv01WyaH2ymO9z7ODxLVIQfTA+ctHN3uI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: fix math in add_ext_regions Message-Id: Date: Fri, 09 May 2025 00:44:02 +0000 commit 9b21841fd1da2472605a4fe7120fb318a8d88faf Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:30 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:36:49 2025 -0700 xen/arm: fix math in add_ext_regions In commit f37a59813979, the arguments to add_ext_regions() were switched from addresses to frame numbers. add_ext_regions() converts the frame numbers back to addresses, but the end address (e) is rounded down to page size alignment. The logic to calculate the size assumes e points to the last address, not page, effectively leading to the region size being erroneously calculated to be 2M smaller than the actual size of the region. Fix by adding 1 to the frame number before converting back to address. Fixes: f37a59813979 ("xen/arm: domain_build: Track unallocated pages using the frame number") Signed-off-by: Stewart Hildebrand Acked-by: Michal Orzel --- xen/arch/arm/domain_build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index df29619c40..2f2b021dec 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -761,7 +761,7 @@ int __init add_ext_regions(unsigned long s_gfn, unsigned long e_gfn, struct membanks *ext_regions = data; paddr_t start, size; paddr_t s = pfn_to_paddr(s_gfn); - paddr_t e = pfn_to_paddr(e_gfn); + paddr_t e = pfn_to_paddr(e_gfn + 1) - 1; if ( ext_regions->nr_banks >= ext_regions->max_banks ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 00:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 00:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979726.1366234 (Exim 4.92) (envelope-from ) id 1uDBqX-0001N3-HE; Fri, 09 May 2025 00:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979726.1366234; Fri, 09 May 2025 00: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 1uDBqX-0001Mv-EV; Fri, 09 May 2025 00:44:13 +0000 Received: by outflank-mailman (input) for mailman id 979726; Fri, 09 May 2025 00:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDBqW-0001Mn-Q8 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDBqW-0007Al-2W for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDBqW-003EAf-29 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00: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=K2GSCPupd5HWGequiNA+8kuotzuSXcMBdd/8gGzo0LU=; b=sXFeCXdE5gn4HCZNyAuSnV3j+u 0/36g7TzsCa74fVnTp/rSbQfZEk0tGWtQiGCz38MD8PV7Jo4Yc4CylS7XqTS/8ZhYRu09EibAmhOP GQmUnrXZVMN84z/tA8feYLJnhKFBZG9uK4xxhB+Cv0nsXmVB+nxgdkYQ/wOF8WfxqLOo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: fix math in add_hwdom_free_regions Message-Id: Date: Fri, 09 May 2025 00:44:12 +0000 commit 245e47cf8d292401b1147b9ceb0eedadec6288c7 Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:31 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:36:55 2025 -0700 xen/arm: fix math in add_hwdom_free_regions Erroneous logic was duplicated from add_ext_regions() into add_hwdom_free_regions(). Frame numbers are converted to addresses, but the end address (e) is rounded down to page size alignment. The logic to calculate the size assumes e points to the last address, not page, effectively leading to the region size being erroneously calculated to be 2M smaller than the actual size of the region. Fix by adding 1 to the frame number before converting back to address. Fixes: 02975cc38389 ("xen/arm: permit non direct-mapped Dom0 construction") Signed-off-by: Stewart Hildebrand Acked-by: Michal Orzel --- xen/common/device-tree/domain-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 762b63e2b0..9556af43e0 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -109,7 +109,7 @@ static int __init add_hwdom_free_regions(unsigned long s_gfn, struct membanks *free_regions = data; paddr_t start, size; paddr_t s = pfn_to_paddr(s_gfn); - paddr_t e = pfn_to_paddr(e_gfn); + paddr_t e = pfn_to_paddr(e_gfn + 1) - 1; unsigned int i, j; if ( free_regions->nr_banks >= free_regions->max_banks ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 00:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 00:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979727.1366239 (Exim 4.92) (envelope-from ) id 1uDBqh-0001PU-Is; Fri, 09 May 2025 00:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979727.1366239; Fri, 09 May 2025 00: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 1uDBqh-0001PI-Fv; Fri, 09 May 2025 00:44:23 +0000 Received: by outflank-mailman (input) for mailman id 979727; Fri, 09 May 2025 00:44:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDBqh-0001PC-4Z for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDBqh-0007Ap-09 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDBqg-003Eih-38 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00: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=Ul3YVNZiQhzNThFFPTk3owb3taK8hMp/wIFb6nPpeNc=; b=ow6Mpll8O9VwCuq7+a6W32SYym WuScGonNdfO7n///ZJiJHEdQVQZMgWJorZaMSRzv4NQgNmVgf8Qd75YSWUXFOSqlxngEdEaawjraY QsbLE2VIiIA+oySLRq62D7tga/dV6H5CFEnopeKKFGgSmVX73cG7G3jqFSYK5eFfdL4M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: switch find_domU_holes to rangesets Message-Id: Date: Fri, 09 May 2025 00:44:22 +0000 commit 3ef921189637155ffb488aba1c110fa27e0e9fce Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:32 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:37:01 2025 -0700 xen/arm: switch find_domU_holes to rangesets remove_shm_holes_for_domU() is unnecessarily complex: it re-creates the extended regions from scratch. Move the rangeset into find_domU_holes() and create the extended regions only once. This makes is simpler to further manipulate the rangeset for removing other regions. Remove now-unused remove_shm_holes_for_domU(). Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 46 +++++++++++++++++------ xen/arch/arm/include/asm/static-shmem.h | 9 ----- xen/arch/arm/static-shmem.c | 65 --------------------------------- 3 files changed, 35 insertions(+), 85 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 2f2b021dec..05a77a4f92 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -933,34 +933,58 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, struct membanks *ext_regions) { unsigned int i; - uint64_t bankend; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; const struct membanks *kinfo_mem = kernel_info_get_mem_const(kinfo); - int res = -ENOENT; + struct rangeset *mem_holes; + int res; + + mem_holes = rangeset_new(NULL, NULL, 0); + if ( !mem_holes ) + return -ENOMEM; for ( i = 0; i < GUEST_RAM_BANKS; i++ ) { - struct membank *ext_bank = &(ext_regions->bank[ext_regions->nr_banks]); + uint64_t bankend, start, size = 0; - ext_bank->start = ROUNDUP(bankbase[i] + kinfo_mem->bank[i].size, SZ_2M); + start = ROUNDUP(bankbase[i] + kinfo_mem->bank[i].size, SZ_2M); bankend = ~0ULL >> (64 - p2m_ipa_bits); bankend = min(bankend, bankbase[i] + banksize[i] - 1); - if ( bankend > ext_bank->start ) - ext_bank->size = bankend - ext_bank->start + 1; + + if ( bankend > start ) + size = bankend - start + 1; /* 64MB is the minimum size of an extended region */ - if ( ext_bank->size < MB(64) ) + if ( size < MB(64) ) continue; - ext_regions->nr_banks++; - res = 0; + + res = rangeset_add_range(mem_holes, PFN_DOWN(start), PFN_DOWN(bankend)); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + start, start + size - 1); + goto out; + } } + /* Remove static shared memory regions */ + res = remove_shm_from_rangeset(kinfo, mem_holes); if ( res ) - return res; + goto out; - return remove_shm_holes_for_domU(kinfo, ext_regions); + res = rangeset_report_ranges(mem_holes, 0, + PFN_DOWN((1ULL << p2m_ipa_bits) - 1), + add_ext_regions, ext_regions); + if ( res ) + ext_regions->nr_banks = 0; + else if ( !ext_regions->nr_banks ) + res = -ENOENT; + + out: + rangeset_destroy(mem_holes); + + return res; } static int __init find_host_extended_regions(const struct kernel_info *kinfo, diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index 4034cec32f..6a4c33cca8 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -27,9 +27,6 @@ void init_sharedmem_pages(void); int remove_shm_from_rangeset(const struct kernel_info *kinfo, struct rangeset *rangeset); -int remove_shm_holes_for_domU(const struct kernel_info *kinfo, - struct membanks *ext_regions); - int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells); @@ -73,12 +70,6 @@ static inline int remove_shm_from_rangeset(const struct kernel_info *kinfo, return 0; } -static inline int remove_shm_holes_for_domU(const struct kernel_info *kinfo, - struct membanks *ext_regions) -{ - return 0; -} - static inline int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells) { diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 1f8441d920..32ec6d4bc6 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -822,71 +822,6 @@ int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, return 0; } -int __init remove_shm_holes_for_domU(const struct kernel_info *kinfo, - struct membanks *ext_regions) -{ - const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); - struct rangeset *guest_holes; - unsigned int i; - paddr_t start; - paddr_t end; - int res; - - /* No static shared memory region. */ - if ( shm_mem->nr_banks == 0 ) - return 0; - - dt_dprintk("Remove static shared memory holes from extended regions of DomU\n"); - - guest_holes = rangeset_new(NULL, NULL, 0); - if ( !guest_holes ) - return -ENOMEM; - - /* Copy extended regions sets into the rangeset */ - for ( i = 0; i < ext_regions->nr_banks; i++ ) - { - start = ext_regions->bank[i].start; - end = start + ext_regions->bank[i].size; - - res = rangeset_add_range(guest_holes, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR - "Failed to add: %#"PRIpaddr"->%#"PRIpaddr", error: %d\n", - start, end, res); - goto out; - } - } - - /* Remove static shared memory regions */ - res = remove_shm_from_rangeset(kinfo, guest_holes); - if ( res ) - goto out; - - /* - * Take the interval of memory starting from the first extended region bank - * start address and ending to the end of the last extended region bank. - */ - i = ext_regions->nr_banks - 1; - start = ext_regions->bank[0].start; - end = ext_regions->bank[i].start + ext_regions->bank[i].size - 1; - - /* Reset original extended regions to hold new value */ - ext_regions->nr_banks = 0; - res = rangeset_report_ranges(guest_holes, PFN_DOWN(start), PFN_DOWN(end), - add_ext_regions, ext_regions); - if ( res ) - ext_regions->nr_banks = 0; - else if ( !ext_regions->nr_banks ) - res = -ENOENT; - - out: - rangeset_destroy(guest_holes); - - return res; -} - void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, int *nr_cells, int addrcells, int sizecells) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 00:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 00:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979728.1366244 (Exim 4.92) (envelope-from ) id 1uDBqr-0001Rs-Km; Fri, 09 May 2025 00:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979728.1366244; Fri, 09 May 2025 00: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 1uDBqr-0001Rk-HP; Fri, 09 May 2025 00:44:33 +0000 Received: by outflank-mailman (input) for mailman id 979728; Fri, 09 May 2025 00:44:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDBqr-0001Rc-5o for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDBqr-0007B5-0T for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDBqr-003FJZ-0O for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44: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=IQpGNP99XOB8hMEUwyyGgIRufSBZ80oVZFSJLo7dsNw=; b=KlI60CQ0yvkCsWJct6wwgRDnbl pb7ZsSYS7Uu8gTcBb1Sn21+7oVQ6DpETQti4sG4WWbw+4iI1EsKCYBJ13Qv8WSd55GzflriFWt3n4 JcpPC57no8yKVQacyCnPuznifWkVvZZ4iXWM3Ku40GmX8Er/Mhu91L5N9x7oE9kB5eRU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] rangeset: introduce rangeset_subtract Message-Id: Date: Fri, 09 May 2025 00:44:33 +0000 commit 31703c5d7a5f608e161037050f69f46e0542b16a Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:33 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:44:35 2025 -0700 rangeset: introduce rangeset_subtract Introduce rangeset_subtract() to remove regions in r2 from r1. Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/common/rangeset.c | 12 ++++++++++++ xen/include/xen/rangeset.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/xen/common/rangeset.c b/xen/common/rangeset.c index e758710390..b9e8912fb1 100644 --- a/xen/common/rangeset.c +++ b/xen/common/rangeset.c @@ -397,6 +397,18 @@ int rangeset_merge(struct rangeset *r1, struct rangeset *r2) return rangeset_report_ranges(r2, 0, ~0UL, merge, r1); } +static int cf_check subtract(unsigned long s, unsigned long e, void *data) +{ + struct rangeset *r = data; + + return rangeset_remove_range(r, s, e); +} + +int rangeset_subtract(struct rangeset *r1, struct rangeset *r2) +{ + return rangeset_report_ranges(r2, 0, ~0UL, subtract, r1); +} + int rangeset_add_singleton( struct rangeset *r, unsigned long s) { diff --git a/xen/include/xen/rangeset.h b/xen/include/xen/rangeset.h index 96c9180825..817505badf 100644 --- a/xen/include/xen/rangeset.h +++ b/xen/include/xen/rangeset.h @@ -85,6 +85,9 @@ int rangeset_consume_ranges(struct rangeset *r, /* Merge rangeset r2 into rangeset r1. */ int __must_check rangeset_merge(struct rangeset *r1, struct rangeset *r2); +/* Subtract rangeset r2 from rangeset r1. */ +int __must_check rangeset_subtract(struct rangeset *r1, struct rangeset *r2); + /* Add/remove/query a single number. */ int __must_check rangeset_add_singleton( struct rangeset *r, unsigned long s); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 00:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 00:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979729.1366247 (Exim 4.92) (envelope-from ) id 1uDBr2-0001Ug-Lc; Fri, 09 May 2025 00:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979729.1366247; Fri, 09 May 2025 00: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 1uDBr2-0001UY-It; Fri, 09 May 2025 00:44:44 +0000 Received: by outflank-mailman (input) for mailman id 979729; Fri, 09 May 2025 00:44:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDBr1-0001UI-A9 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDBr1-0007BB-0u for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDBr1-003FiX-0j for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 00:44: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=C9J+MKEx6aLaGgKMPHbSw3NZ6LtDzpLDIpvsRLBLxQA=; b=N/OcIazuG12QTD0ZFoOqENlObE nAjwYS199tB1sm17eSgx7FWc79CuUiUquPvT0ryDeQIlT9YX1FckPPvGBdmmeCBYbnk4nppp9sCzA 4rSTX0YnDSCNyrtfmnrZ8/ya0FfRTiU2YVVe0o390T7RFCcVFlufnPjccVhbS4DI9Mk8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: exclude xen,reg from domU extended regions Message-Id: Date: Fri, 09 May 2025 00:44:43 +0000 commit fba1b0974dd8ea3e2d2418c33c93ce7c484c2ab5 Author: Stewart Hildebrand AuthorDate: Thu May 8 09:20:34 2025 -0400 Commit: Stefano Stabellini CommitDate: Thu May 8 16:44:38 2025 -0700 xen/arm: exclude xen,reg from domU extended regions When a device is passed through to a dom0less domU, the xen,reg ranges may overlap with the extended regions. Remove xen,reg from extended regions. Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 7 +++++++ xen/common/device-tree/dom0less-build.c | 19 ++++++++++++++++++- xen/include/xen/fdt-kernel.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 05a77a4f92..b189a7cfae 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -973,6 +973,13 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, if ( res ) goto out; + if ( kinfo->xen_reg_assigned ) + { + res = rangeset_subtract(mem_holes, kinfo->xen_reg_assigned); + if ( res ) + goto out; + } + res = rangeset_report_ranges(mem_holes, 0, PFN_DOWN((1ULL << p2m_ipa_bits) - 1), add_ext_regions, ext_regions); diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 4aa36c8ef3..2c56f13771 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -146,6 +146,14 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, int res; paddr_t mstart, size, gstart; + if ( !kinfo->xen_reg_assigned ) + { + kinfo->xen_reg_assigned = rangeset_new(NULL, NULL, 0); + + if ( !kinfo->xen_reg_assigned ) + return -ENOMEM; + } + /* xen,reg specifies where to map the MMIO region */ cell = (const __be32 *)xen_reg->data; len = fdt32_to_cpu(xen_reg->len) / ((address_cells * 2 + size_cells) * @@ -187,6 +195,11 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, mstart, gstart); return -EFAULT; } + + res = rangeset_add_range(kinfo->xen_reg_assigned, PFN_DOWN(gstart), + PFN_DOWN(gstart + size - 1)); + if ( res ) + return res; } /* @@ -814,7 +827,11 @@ static int __init construct_domU(struct domain *d, domain_vcpu_affinity(d, node); - return alloc_xenstore_params(&kinfo); + rc = alloc_xenstore_params(&kinfo); + + rangeset_destroy(kinfo.xen_reg_assigned); + + return rc; } void __init create_domUs(void) diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 7a6cd67c22..1939c3ebf7 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -24,6 +24,7 @@ struct kernel_info { #ifdef CONFIG_STATIC_SHM struct shared_meminfo shm_mem; #endif + struct rangeset *xen_reg_assigned; /* kernel entry point */ paddr_t entry; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 06:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 06:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979798.1366291 (Exim 4.92) (envelope-from ) id 1uDHI6-00008S-Nn; Fri, 09 May 2025 06:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979798.1366291; Fri, 09 May 2025 06: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 1uDHI6-00008J-Km; Fri, 09 May 2025 06:33:02 +0000 Received: by outflank-mailman (input) for mailman id 979798; Fri, 09 May 2025 06:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDHI5-00008D-Pe for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 06:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDHI5-001sh8-1r for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 06:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDHI5-00GnZ8-1h for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 06: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=ldCJWu5+z9WYO4sZG/Kleg+pJAnzzBlqNKvSfEvFSrA=; b=NvKzbfiPHMy8f1WZmtgjmBj3gE znFcYFGEg+NGu+Ljt7YMFqU56UiOJbwQkrJmZr7Rn4pwGuQtLspIH82Li4++as5bRD3OYmHcRQEks QtT8JSZiWrfyrEMNZgNt4VWWRcGmT/hREnG9hJBCk/+sQofWlyVsrHVvZ4rGOlKiZdws=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] device-tree: Add missing SPDX identifiers and EMACS comment blocks Message-Id: Date: Fri, 09 May 2025 06:33:01 +0000 commit 07e6f576336e857a4d783314b967bc0d517a2065 Author: Michal Orzel AuthorDate: Tue May 6 10:07:52 2025 +0200 Commit: Michal Orzel CommitDate: Fri May 9 08:25:58 2025 +0200 device-tree: Add missing SPDX identifiers and EMACS comment blocks Use the same license as the files from which the code originated during recent code movements. Take the opportunity to add SPDX identifier for device-tree.c and remove the license text. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/common/device-tree/device-tree.c | 5 +---- xen/common/device-tree/domain-build.c | 11 +++++++++++ xen/common/device-tree/kernel.c | 11 +++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/xen/common/device-tree/device-tree.c b/xen/common/device-tree/device-tree.c index 90fee2ba03..886e6c7712 100644 --- a/xen/common/device-tree/device-tree.c +++ b/xen/common/device-tree/device-tree.c @@ -1,13 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Device Tree * * Copyright (C) 2012 Citrix Systems, Inc. * Copyright 2009 Benjamin Herrenschmidt, IBM Corp * benh@kernel.crashing.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 9556af43e0..6b8b8d7cac 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include #include #include @@ -393,3 +395,12 @@ void __init initrd_load(struct kernel_info *kinfo, iounmap(initrd); } + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/common/device-tree/kernel.c b/xen/common/device-tree/kernel.c index 1bf3bbf64e..cb04cd9d50 100644 --- a/xen/common/device-tree/kernel.c +++ b/xen/common/device-tree/kernel.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include #include #include @@ -240,3 +242,12 @@ void __init kernel_load(struct kernel_info *info) info->load(info); } + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 09 07:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 07:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.979822.1366316 (Exim 4.92) (envelope-from ) id 1uDHst-0005j9-SR; Fri, 09 May 2025 07:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 979822.1366316; Fri, 09 May 2025 07: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 1uDHst-0005j1-PM; Fri, 09 May 2025 07:11:03 +0000 Received: by outflank-mailman (input) for mailman id 979822; Fri, 09 May 2025 07:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDHss-0005iv-Sg for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 07:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDHss-001tri-2C for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 07:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDHss-000pyn-1s for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 07: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=BnTq+Cfeh2uzDxvEQ3yG/Kg2nm0MUs63LeXJpr3vPsU=; b=kTS5UvkU4Mp667bJhmAOlPf6iy LuPlQZVp7EHDCf92Cm7ZF5WWw8dowmI8lZxOxRHjk85qIp1AkD+PFY0SUkaIDJKlbO8XuHmGmQMxh VS3Gk+FElDK4R5TPKCR26QhjLVG+KhrHjcgaYYfzVaOn6JG6cxNPxeo4L4ygsuw4qT54=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] device-tree: Add missing SPDX identifiers and EMACS comment blocks Message-Id: Date: Fri, 09 May 2025 07:11:02 +0000 commit 07e6f576336e857a4d783314b967bc0d517a2065 Author: Michal Orzel AuthorDate: Tue May 6 10:07:52 2025 +0200 Commit: Michal Orzel CommitDate: Fri May 9 08:25:58 2025 +0200 device-tree: Add missing SPDX identifiers and EMACS comment blocks Use the same license as the files from which the code originated during recent code movements. Take the opportunity to add SPDX identifier for device-tree.c and remove the license text. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/common/device-tree/device-tree.c | 5 +---- xen/common/device-tree/domain-build.c | 11 +++++++++++ xen/common/device-tree/kernel.c | 11 +++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/xen/common/device-tree/device-tree.c b/xen/common/device-tree/device-tree.c index 90fee2ba03..886e6c7712 100644 --- a/xen/common/device-tree/device-tree.c +++ b/xen/common/device-tree/device-tree.c @@ -1,13 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Device Tree * * Copyright (C) 2012 Citrix Systems, Inc. * Copyright 2009 Benjamin Herrenschmidt, IBM Corp * benh@kernel.crashing.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 9556af43e0..6b8b8d7cac 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include #include #include @@ -393,3 +395,12 @@ void __init initrd_load(struct kernel_info *kinfo, iounmap(initrd); } + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/common/device-tree/kernel.c b/xen/common/device-tree/kernel.c index 1bf3bbf64e..cb04cd9d50 100644 --- a/xen/common/device-tree/kernel.c +++ b/xen/common/device-tree/kernel.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include #include #include @@ -240,3 +242,12 @@ void __init kernel_load(struct kernel_info *info) info->load(info); } + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 12:11:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 12:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980093.1366563 (Exim 4.92) (envelope-from ) id 1uDMZD-0005FO-Lo; Fri, 09 May 2025 12:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980093.1366563; Fri, 09 May 2025 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 1uDMZD-0005FG-JJ; Fri, 09 May 2025 12:11:03 +0000 Received: by outflank-mailman (input) for mailman id 980093; Fri, 09 May 2025 12:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDMZB-0005FA-Tj for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 12:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDMZB-0023D8-25 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 12:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDMZB-001sEV-1q for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 12: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=WLnArhKjlq7nx4ry8jD7LdSxg0wROzU/z1Q8CVgyZAA=; b=OQfwPH5DE5wfE7Xex2wqudke03 /FKk7Lu1vtIM66vZxjB6yUFhzWl74OV5Q5W5twKbFtvgcKKxAKM7oAS9/PA8deuAnjFzToDOr0Wx5 WxIL/SXSV63vhINQK2+74+YQe9xClrnhNFfD9qP8OLORRcIE347K+6bzyNFKB8CCDfmY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/Kconfig: Improve help text for speculative options Message-Id: Date: Fri, 09 May 2025 12:11:01 +0000 commit 9b3a02e66f058ebd77db6628e3144352857bdf2b Author: Andrew Cooper AuthorDate: Thu May 8 16:50:38 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 12:56:48 2025 +0100 xen/Kconfig: Improve help text for speculative options The text for CONFIG_INDIRECT_THUNK isn't really correct, and was already stale by the time speculative vulnerabilities hit the headlines in 2018. It is specifically an out-of-line-ing mechanism, and retpoline is one of several safety sequences used. Some of this boilerplate has been copied into all other options, and isn't interesting for the target audience given that they're all in a "Speculative Hardening" menu. Reword it to be more concise. No functional change. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/common/Kconfig | 53 +++++++++++------------------------------------------ 1 file changed, 11 insertions(+), 42 deletions(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 4bec78c6f2..bf7b081ad0 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -162,29 +162,21 @@ config STATIC_MEMORY menu "Speculative hardening" config INDIRECT_THUNK - bool "Speculative Branch Target Injection Protection" + bool "Out-of-line Indirect Call/Jumps" depends on CC_HAS_INDIRECT_THUNK default y help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. + Compile Xen with out-of-line indirect call and jumps. - One source of data leakage is via branch target injection. - - When enabled, indirect branches are implemented using a new construct - called "retpoline" that prevents speculation. + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + (e.g. function pointers) safely. "Retpoline" is one such sequence. config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of data leakage is via speculative out-of-bounds array - accesses. + Compile Xen with extra hardening for some array accesses. When enabled, specific array accesses which have been deemed liable to be speculatively abused will be hardened to avoid out-of-bounds @@ -193,19 +185,12 @@ config SPECULATIVE_HARDEN_ARRAY This is a best-effort mitigation. There are no guarantees that all areas of code open to abuse have been hardened. - If unsure, say Y. - config SPECULATIVE_HARDEN_BRANCH - bool "Speculative Branch Hardening" + bool "Speculative Conditional Branch Hardening" default y depends on X86 - help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of misbehaviour is by executing the wrong basic block - following a conditional jump. + help + Compile Xen with extra hardening for some conditional branches. When enabled, specific conditions which have been deemed liable to be speculatively abused will be hardened to avoid entering the wrong @@ -216,43 +201,27 @@ config SPECULATIVE_HARDEN_BRANCH optimisations in the compiler haven't subverted the attempts to harden. - If unsure, say Y. - config SPECULATIVE_HARDEN_GUEST_ACCESS bool "Speculative PV Guest Memory Access Hardening" default y depends on PV help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of data leakage is via speculative accesses to hypervisor - memory through guest controlled values used to access guest memory. + Compile Xen with extra hardening for PV guest memory access. When enabled, code paths accessing PV guest memory will have guest controlled addresses massaged such that memory accesses through them won't touch hypervisor address space. - If unsure, say Y. - config SPECULATIVE_HARDEN_LOCK bool "Speculative lock context hardening" default y depends on X86 help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of data leakage is via speculative accesses to lock - critical regions. + Compile Xen with extra hardening for locked regions. This option is disabled by default at run time, and needs to be enabled on the command line. - If unsure, say Y. - endmenu menu "Other hardening" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 09 12:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 12:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980094.1366566 (Exim 4.92) (envelope-from ) id 1uDMuW-0007XV-55; Fri, 09 May 2025 12:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980094.1366566; Fri, 09 May 2025 12: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 1uDMuW-0007XO-2Y; Fri, 09 May 2025 12:33:04 +0000 Received: by outflank-mailman (input) for mailman id 980094; Fri, 09 May 2025 12:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDMuU-0007XI-HY for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 12:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDMuU-0023op-0i for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 12:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDMuU-001suy-0Y for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 12: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=2xgSfdch3Q4cOSfePa2uAFxSJadB8MlXvmlyJi1dTVc=; b=cYTt4eUxHPBD/E44hJM7z6WKMi zQoAiyYIixVFuz7hjKjtWe1YuyPiNmCSPBCd2RA+2CEJ/0xkUkTpvyA2rvTdAH4PMzH4SchWVSjhL 42NOooukBCah6+gVmxzjqfI4MxS0XUCn6fRSZGIYWC1b3o3Jpk5ez+oXoJkIElKKu6yk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/Kconfig: Improve help text for speculative options Message-Id: Date: Fri, 09 May 2025 12:33:02 +0000 commit 9b3a02e66f058ebd77db6628e3144352857bdf2b Author: Andrew Cooper AuthorDate: Thu May 8 16:50:38 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 12:56:48 2025 +0100 xen/Kconfig: Improve help text for speculative options The text for CONFIG_INDIRECT_THUNK isn't really correct, and was already stale by the time speculative vulnerabilities hit the headlines in 2018. It is specifically an out-of-line-ing mechanism, and retpoline is one of several safety sequences used. Some of this boilerplate has been copied into all other options, and isn't interesting for the target audience given that they're all in a "Speculative Hardening" menu. Reword it to be more concise. No functional change. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/common/Kconfig | 53 +++++++++++------------------------------------------ 1 file changed, 11 insertions(+), 42 deletions(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 4bec78c6f2..bf7b081ad0 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -162,29 +162,21 @@ config STATIC_MEMORY menu "Speculative hardening" config INDIRECT_THUNK - bool "Speculative Branch Target Injection Protection" + bool "Out-of-line Indirect Call/Jumps" depends on CC_HAS_INDIRECT_THUNK default y help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. + Compile Xen with out-of-line indirect call and jumps. - One source of data leakage is via branch target injection. - - When enabled, indirect branches are implemented using a new construct - called "retpoline" that prevents speculation. + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + (e.g. function pointers) safely. "Retpoline" is one such sequence. config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of data leakage is via speculative out-of-bounds array - accesses. + Compile Xen with extra hardening for some array accesses. When enabled, specific array accesses which have been deemed liable to be speculatively abused will be hardened to avoid out-of-bounds @@ -193,19 +185,12 @@ config SPECULATIVE_HARDEN_ARRAY This is a best-effort mitigation. There are no guarantees that all areas of code open to abuse have been hardened. - If unsure, say Y. - config SPECULATIVE_HARDEN_BRANCH - bool "Speculative Branch Hardening" + bool "Speculative Conditional Branch Hardening" default y depends on X86 - help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of misbehaviour is by executing the wrong basic block - following a conditional jump. + help + Compile Xen with extra hardening for some conditional branches. When enabled, specific conditions which have been deemed liable to be speculatively abused will be hardened to avoid entering the wrong @@ -216,43 +201,27 @@ config SPECULATIVE_HARDEN_BRANCH optimisations in the compiler haven't subverted the attempts to harden. - If unsure, say Y. - config SPECULATIVE_HARDEN_GUEST_ACCESS bool "Speculative PV Guest Memory Access Hardening" default y depends on PV help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of data leakage is via speculative accesses to hypervisor - memory through guest controlled values used to access guest memory. + Compile Xen with extra hardening for PV guest memory access. When enabled, code paths accessing PV guest memory will have guest controlled addresses massaged such that memory accesses through them won't touch hypervisor address space. - If unsure, say Y. - config SPECULATIVE_HARDEN_LOCK bool "Speculative lock context hardening" default y depends on X86 help - Contemporary processors may use speculative execution as a - performance optimisation, but this can potentially be abused by an - attacker to leak data via speculative sidechannels. - - One source of data leakage is via speculative accesses to lock - critical regions. + Compile Xen with extra hardening for locked regions. This option is disabled by default at run time, and needs to be enabled on the command line. - If unsure, say Y. - endmenu menu "Other hardening" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 21:11:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 21:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980379.1366826 (Exim 4.92) (envelope-from ) id 1uDUzp-00075J-NB; Fri, 09 May 2025 21:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980379.1366826; Fri, 09 May 2025 21:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDUzp-00075B-KR; Fri, 09 May 2025 21:11:05 +0000 Received: by outflank-mailman (input) for mailman id 980379; Fri, 09 May 2025 21:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDUzo-000753-BE for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDUzo-002JeK-0j for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDUzo-000IyT-0N for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:11:04 +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=QFsQazbByjnG8g1STesxn6nNsRG8sF0HUfkySeQ/doQ=; b=ysJzm7TB/bZwaQaUxMz/mF9x0c uaMVjbcz1BCqfmuH1gX1G17S/8pWnZjHYUBZBslA/DTfAktlhlNbBv6UZMthQIdEARZUBbvXRg6K0 gUnES8Aq3eOoPi7CSwwklqZCzsa0eZa/rbyMWhoOUdSmOhUGPFTSsJTdf173hhwxiBuo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/vpci: mask off upper bits in vPCI read mmio handler Message-Id: Date: Fri, 09 May 2025 21:11:04 +0000 commit d13b786e8fd20f08e3eeb81b9a141771d38c69f1 Author: Stewart Hildebrand AuthorDate: Thu May 8 06:46:06 2025 -0400 Commit: Stefano Stabellini CommitDate: Fri May 9 13:58:40 2025 -0700 arm/vpci: mask off upper bits in vPCI read mmio handler On Arm, we expect read handlers to have the bits above the access size zeroed. vPCI read handlers may return all 1s. Mask off the bits above the access size. Fixes: 9a5e22b64266 ("xen/arm: check read handler behavior") Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/arch/arm/vpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index b63a356bb4..3a3ff5d081 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -37,7 +37,7 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { - *r = data; + *r = data & invalid; return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 09 21:11:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 21:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980380.1366829 (Exim 4.92) (envelope-from ) id 1uDUzz-00077H-OU; Fri, 09 May 2025 21:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980380.1366829; Fri, 09 May 2025 21:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDUzz-000779-Lk; Fri, 09 May 2025 21:11:15 +0000 Received: by outflank-mailman (input) for mailman id 980380; Fri, 09 May 2025 21:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDUzy-000771-E7 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDUzy-002Jeh-1J for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDUzy-000JOL-1A for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:11:14 +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=mptFcHVm0vtH1WrXJH0ln7guXwhVJUSfF6zy/VjkMlo=; b=senAvLQHHrTVIMZhURmYLc/e6J 8kzdzXDauUnO7VnbI3ew79CGE7G0oNNxNM50f6CAj7tDRccggF0Li5eJf3hHcAZGE1+4KmK/NcJUK 6xctfpnmKt+phsr+dbvMwolBIo3zg2qIeGyqoMm7fHgmCdYF23sfDPkReEHePccbd2uE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vpci: translate virtual PCI bus topology for guests Message-Id: Date: Fri, 09 May 2025 21:11:14 +0000 commit ad3ac58a9d54206fdca61edd74b937b27334f65a Author: Oleksandr Andrushchenko AuthorDate: Thu May 8 06:46:07 2025 -0400 Commit: Stefano Stabellini CommitDate: Fri May 9 13:58:43 2025 -0700 vpci: translate virtual PCI bus topology for guests There are two originators for the PCI configuration space access: 1. The domain that owns physical host bridge: MMIO handlers are there so we can update vPCI register handlers with the values written by the hardware domain, e.g. physical view of the registers vs guest's view on the configuration space. 2. Guest access to the passed through PCI devices: we need to properly map virtual bus topology to the physical one, e.g. pass the configuration space access to the corresponding physical devices. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Reviewed-by: Roger Pau Monné Acked-by: Stefano Stabellini --- tools/tests/vpci/emul.h | 2 +- xen/arch/arm/vpci.c | 4 ++++ xen/drivers/vpci/vpci.c | 53 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index da446bba86..dd048cffbf 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -89,7 +89,7 @@ typedef union { #define __hwdom_init -#define is_hardware_domain(d) ((void)(d), false) +#define is_hardware_domain(d) ((void)(d), true) #define has_vpci(d) true diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 3a3ff5d081..0ce11ffcc5 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -34,6 +34,8 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; + ASSERT(!bridge == !is_hardware_domain(v->domain)); + if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { @@ -52,6 +54,8 @@ static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, struct pci_host_bridge *bridge = p; pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); + ASSERT(!bridge == !is_hardware_domain(v->domain)); + return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, r); } diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 1e6aa5d799..d2f0f97e0a 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -174,6 +174,35 @@ int vpci_assign_device(struct pci_dev *pdev) } #endif /* __XEN__ */ +/* + * Find the physical device which is mapped to the virtual device + * and translate virtual SBDF to the physical one. + */ +static const struct pci_dev *translate_virtual_device(const struct domain *d, + pci_sbdf_t *sbdf) +{ +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + const struct pci_dev *pdev; + + ASSERT(!is_hardware_domain(d)); + ASSERT(rw_is_locked(&d->pci_lock)); + + for_each_pdev ( d, pdev ) + { + if ( pdev->vpci && (pdev->vpci->guest_sbdf.sbdf == sbdf->sbdf) ) + { + /* Replace guest SBDF with the physical one. */ + *sbdf = pdev->sbdf; + return pdev; + } + } +#else /* !CONFIG_HAS_VPCI_GUEST_SUPPORT */ + ASSERT_UNREACHABLE(); +#endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ + + return NULL; +} + static int vpci_register_cmp(const struct vpci_register *r1, const struct vpci_register *r2) { @@ -453,9 +482,15 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size) * pci_lock is sufficient. */ read_lock(&d->pci_lock); - pdev = pci_get_pdev(d, sbdf); - if ( !pdev && is_hardware_domain(d) ) - pdev = pci_get_pdev(dom_xen, sbdf); + if ( is_hardware_domain(d) ) + { + pdev = pci_get_pdev(d, sbdf); + if ( !pdev ) + pdev = pci_get_pdev(dom_xen, sbdf); + } + else + pdev = translate_virtual_device(d, &sbdf); + if ( !pdev || !pdev->vpci ) { read_unlock(&d->pci_lock); @@ -571,9 +606,15 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, * are modifying BARs, so there is a room for improvement. */ write_lock(&d->pci_lock); - pdev = pci_get_pdev(d, sbdf); - if ( !pdev && is_hardware_domain(d) ) - pdev = pci_get_pdev(dom_xen, sbdf); + if ( is_hardware_domain(d) ) + { + pdev = pci_get_pdev(d, sbdf); + if ( !pdev ) + pdev = pci_get_pdev(dom_xen, sbdf); + } + else + pdev = translate_virtual_device(d, &sbdf); + if ( !pdev || !pdev->vpci ) { /* Ignore writes to read-only devices, which have no ->vpci. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 09 21:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 21:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980383.1366833 (Exim 4.92) (envelope-from ) id 1uDVL7-0001Fb-6B; Fri, 09 May 2025 21:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980383.1366833; Fri, 09 May 2025 21:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDVL7-0001FS-3O; Fri, 09 May 2025 21:33:05 +0000 Received: by outflank-mailman (input) for mailman id 980383; Fri, 09 May 2025 21:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDVL5-0001FM-HM for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDVL5-002KFE-1B for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDVL5-001Lj8-0r for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:33:03 +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=gtvQC+ZKFL/pYjSfREfaZwUH9qYkUQhnwVOiFlvBm5U=; b=ml/rsDOPCfWsk1cd/nAsmHbQwJ QXZE89P6huLSbT5nNcTyXlMK7J4LbrE/9vnM3DFBzizPjmi2hZ18SQ9qjksZynKPdKwq09TegQCA/ RuNvSVXDvnbtd36Cvd3fPF7CQT0THguBrxSFKR2otdRddeIpj4L1gx3OjzFyADTGKXd8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/vpci: mask off upper bits in vPCI read mmio handler Message-Id: Date: Fri, 09 May 2025 21:33:03 +0000 commit d13b786e8fd20f08e3eeb81b9a141771d38c69f1 Author: Stewart Hildebrand AuthorDate: Thu May 8 06:46:06 2025 -0400 Commit: Stefano Stabellini CommitDate: Fri May 9 13:58:40 2025 -0700 arm/vpci: mask off upper bits in vPCI read mmio handler On Arm, we expect read handlers to have the bits above the access size zeroed. vPCI read handlers may return all 1s. Mask off the bits above the access size. Fixes: 9a5e22b64266 ("xen/arm: check read handler behavior") Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/arch/arm/vpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index b63a356bb4..3a3ff5d081 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -37,7 +37,7 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { - *r = data; + *r = data & invalid; return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 21:33:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 21:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980384.1366837 (Exim 4.92) (envelope-from ) id 1uDVLH-0001HF-7X; Fri, 09 May 2025 21:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980384.1366837; Fri, 09 May 2025 21:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDVLH-0001H7-4m; Fri, 09 May 2025 21:33:15 +0000 Received: by outflank-mailman (input) for mailman id 980384; Fri, 09 May 2025 21:33:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDVLF-0001Gw-Jj for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:33:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDVLF-002KFd-1s for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:33:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDVLF-001MBa-1h for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 21:33:13 +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=8Gk2EwX4ziMqD7oT79cf+dZK2kU74uWzNROeIlBJM6A=; b=g026AdHn0uRtcp6kxR7lKYIwh3 EvUoc5unNQTlZe2uveHBS15GKzp68isMg8sYOKa+/7423StNluWlNgY01HqDmCWrbBY4AaEVKdUMm bcKXKru65Qew6GVRe/3XRoy1+ToP7Eu0YYu3OIHL1P9SJ06/0MtlkvryY7EGcnmOG9Sc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci: translate virtual PCI bus topology for guests Message-Id: Date: Fri, 09 May 2025 21:33:13 +0000 commit ad3ac58a9d54206fdca61edd74b937b27334f65a Author: Oleksandr Andrushchenko AuthorDate: Thu May 8 06:46:07 2025 -0400 Commit: Stefano Stabellini CommitDate: Fri May 9 13:58:43 2025 -0700 vpci: translate virtual PCI bus topology for guests There are two originators for the PCI configuration space access: 1. The domain that owns physical host bridge: MMIO handlers are there so we can update vPCI register handlers with the values written by the hardware domain, e.g. physical view of the registers vs guest's view on the configuration space. 2. Guest access to the passed through PCI devices: we need to properly map virtual bus topology to the physical one, e.g. pass the configuration space access to the corresponding physical devices. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Reviewed-by: Roger Pau Monné Acked-by: Stefano Stabellini --- tools/tests/vpci/emul.h | 2 +- xen/arch/arm/vpci.c | 4 ++++ xen/drivers/vpci/vpci.c | 53 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index da446bba86..dd048cffbf 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -89,7 +89,7 @@ typedef union { #define __hwdom_init -#define is_hardware_domain(d) ((void)(d), false) +#define is_hardware_domain(d) ((void)(d), true) #define has_vpci(d) true diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 3a3ff5d081..0ce11ffcc5 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -34,6 +34,8 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; + ASSERT(!bridge == !is_hardware_domain(v->domain)); + if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { @@ -52,6 +54,8 @@ static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, struct pci_host_bridge *bridge = p; pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); + ASSERT(!bridge == !is_hardware_domain(v->domain)); + return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, r); } diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 1e6aa5d799..d2f0f97e0a 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -174,6 +174,35 @@ int vpci_assign_device(struct pci_dev *pdev) } #endif /* __XEN__ */ +/* + * Find the physical device which is mapped to the virtual device + * and translate virtual SBDF to the physical one. + */ +static const struct pci_dev *translate_virtual_device(const struct domain *d, + pci_sbdf_t *sbdf) +{ +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + const struct pci_dev *pdev; + + ASSERT(!is_hardware_domain(d)); + ASSERT(rw_is_locked(&d->pci_lock)); + + for_each_pdev ( d, pdev ) + { + if ( pdev->vpci && (pdev->vpci->guest_sbdf.sbdf == sbdf->sbdf) ) + { + /* Replace guest SBDF with the physical one. */ + *sbdf = pdev->sbdf; + return pdev; + } + } +#else /* !CONFIG_HAS_VPCI_GUEST_SUPPORT */ + ASSERT_UNREACHABLE(); +#endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ + + return NULL; +} + static int vpci_register_cmp(const struct vpci_register *r1, const struct vpci_register *r2) { @@ -453,9 +482,15 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size) * pci_lock is sufficient. */ read_lock(&d->pci_lock); - pdev = pci_get_pdev(d, sbdf); - if ( !pdev && is_hardware_domain(d) ) - pdev = pci_get_pdev(dom_xen, sbdf); + if ( is_hardware_domain(d) ) + { + pdev = pci_get_pdev(d, sbdf); + if ( !pdev ) + pdev = pci_get_pdev(dom_xen, sbdf); + } + else + pdev = translate_virtual_device(d, &sbdf); + if ( !pdev || !pdev->vpci ) { read_unlock(&d->pci_lock); @@ -571,9 +606,15 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, * are modifying BARs, so there is a room for improvement. */ write_lock(&d->pci_lock); - pdev = pci_get_pdev(d, sbdf); - if ( !pdev && is_hardware_domain(d) ) - pdev = pci_get_pdev(dom_xen, sbdf); + if ( is_hardware_domain(d) ) + { + pdev = pci_get_pdev(d, sbdf); + if ( !pdev ) + pdev = pci_get_pdev(dom_xen, sbdf); + } + else + pdev = translate_virtual_device(d, &sbdf); + if ( !pdev || !pdev->vpci ) { /* Ignore writes to read-only devices, which have no ->vpci. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:22:10 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980488.1366941 (Exim 4.92) (envelope-from ) id 1uDX2a-0003z6-Uq; Fri, 09 May 2025 23:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980488.1366941; Fri, 09 May 2025 23: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 1uDX2a-0003yy-SC; Fri, 09 May 2025 23:22:04 +0000 Received: by outflank-mailman (input) for mailman id 980488; Fri, 09 May 2025 23:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX2Y-0003yp-SO for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX2Y-002Nfs-1r for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX2Y-003BSK-1R for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23: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=avxPhEOZqapxBs8YOO/Uvym8F/fcL03mW3KhpE4I1Hg=; b=qY61iflUrGlxOA8dyOmNDt2bZ7 ZNjO7ai3I0YkSg/EIjnlg+T9q/ZjhCGqGDLjK+cF26+r4N0H4xcdiMQmUKJ5DC7HAzTrbkGmeLifT nGOxVX3SDk+mIJ+XhWdx/HyPs8uVX/cwRPGVEUwS1hWQLxXVIp74QtwABWM1eBQh+Zec=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: Remove deprecated "only:variables" in favor of "rules:if" Message-Id: Date: Fri, 09 May 2025 23:22:02 +0000 commit 7efd283a6fdad20a54ec54646ab83e4aa739b050 Author: Anthony PERARD AuthorDate: Tue Nov 19 10:15:27 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Remove deprecated "only:variables" in favor of "rules:if" Also, this prevent using "rules", like in the ".test-jobs-common" template. https://docs.gitlab.com/ee/ci/yaml/#only--except Signed-off-by: Anthony PERARD Reviewed-by: Stefano Stabellini (cherry picked from commit 5726d8e5ef1852be90c9c05f08259b6a4f0ebb5e) --- automation/gitlab-ci/test.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 325be5dc49..dbd4a1d6a9 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -98,9 +98,8 @@ - '*.log' - '*.dtb' when: always - only: - variables: - - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,9 +116,8 @@ - smoke.serial - '*.log' when: always - only: - variables: - - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -137,9 +135,8 @@ - smoke.serial - '*.log' when: always - only: - variables: - - $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:22:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980489.1366944 (Exim 4.92) (envelope-from ) id 1uDX2j-00042F-WB; Fri, 09 May 2025 23:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980489.1366944; Fri, 09 May 2025 23: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 1uDX2j-000427-Td; Fri, 09 May 2025 23:22:13 +0000 Received: by outflank-mailman (input) for mailman id 980489; Fri, 09 May 2025 23:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX2i-00041x-Mz for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX2i-002Nfw-2D for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX2i-003BSt-23 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23: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=qEjwj/JHGtvAWROh8b3stmr0xtJTDFH0ZCJtShQp6nM=; b=1wJ2OW+rv3an2MOdvSsi95oEle NInfWthxPObY4fd0lXhUcFUUIiHYcjtRgVfWV2fyJyLu9P1aHZs2Cn1+f3uc6MZ95LOLVON0+TRJ8 VLh37ytp6kiohjmxDAgkXiS4oz990QKy3/LlMjZIeRnPnKpGzrCUa250gGq/UvPDVh2U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: Define XEN_REGISTRY variable Message-Id: Date: Fri, 09 May 2025 23:22:12 +0000 commit 683100709ee8be4ec8cba36a9eed0df11618c49d Author: Anthony PERARD AuthorDate: Tue Nov 19 10:15:27 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Define XEN_REGISTRY variable This allow to change the registry used for container in a single place, and could be controlled via other mean. Signed-off-by: Anthony PERARD Reviewed-by: Stefano Stabellini (cherry picked from commit a231538acdeb8cf11a7420de9496815e6bd44bb0) --- .gitlab-ci.yml | 3 +++ automation/gitlab-ci/build.yaml | 4 ++-- automation/gitlab-ci/test.yaml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef4484e09a..941e5822e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +variables: + XEN_REGISTRY: registry.gitlab.com/xen-project/xen + workflow: rules: - if: $CI_COMMIT_BRANCH =~ /^(master|smoke|^coverity-tested\/.*|stable-.*)$/ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index afcab39ff6..d2dec043e2 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -1,6 +1,6 @@ .build-tmpl: &build stage: build - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} script: - ./automation/scripts/build 2>&1 | tee build.log artifacts: @@ -208,7 +208,7 @@ .yocto-test: stage: build - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} script: - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD} ${YOCTO_OUTPUT} variables: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index dbd4a1d6a9..29919e9f43 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,6 @@ .test-jobs-common: stage: test - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:22:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:22:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980490.1366949 (Exim 4.92) (envelope-from ) id 1uDX2v-000459-1X; Fri, 09 May 2025 23:22:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980490.1366949; Fri, 09 May 2025 23:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX2u-00044z-Uz; Fri, 09 May 2025 23:22:24 +0000 Received: by outflank-mailman (input) for mailman id 980490; Fri, 09 May 2025 23:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX2s-00044k-Qe for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX2s-002NgG-2Z for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX2s-003BTK-2O for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23: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=I2ChOP5rkOg+etoey1KxdMgTONw0f0E9TjRinFWjME0=; b=oXf9E3x9AM9V7hl0OzGqRWo9CN x7eDFrUm3p5nszo43TZ9on9AvjeTtThGSzyOENlhwked1q0kTUIYRv6x62ZbJHzcTOkBkMoTnm7mK R+uT71RPGid3SH/Oqp11Rmw7IcqiTkOanQYnplJhXBAq9SQuMvv0uTOoknTCn79VoyUo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] automation: upgrade Linux kernel for arm64 tests to 6.6.74 Message-Id: Date: Fri, 09 May 2025 23:22:22 +0000 commit 62890a1af12355bd3218b975e53869dd76f0bb70 Author: Stefano Stabellini AuthorDate: Fri Jan 31 15:32:53 2025 -0800 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: upgrade Linux kernel for arm64 tests to 6.6.74 Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel (cherry picked from commit 87f87a5586b8c4bcee08ae6b82a985e242ab21dd) --- automation/gitlab-ci/build.yaml | 4 +-- automation/gitlab-ci/test.yaml | 2 +- .../tests-artifacts/kernel/5.19-arm64v8.dockerfile | 37 --------------------- .../kernel/6.6.74-arm64v8.dockerfile | 38 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d2dec043e2..73fabe6f2f 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -269,9 +269,9 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-5.19-arm64-export: +kernel-6.6.74-arm64-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 script: - mkdir binaries && cp /Image binaries/Image artifacts: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 29919e9f43..c8eefc7e01 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -4,7 +4,7 @@ .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export - - kernel-5.19-arm64-export + - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile deleted file mode 100644 index 8e33995ba3..0000000000 --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile new file mode 100644 index 0000000000..73e5145425 --- /dev/null +++ b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile @@ -0,0 +1,38 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=6.6.74 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + bc \ + curl \ + flex \ + bison \ + libssl-dev \ + && \ + \ + # Build the kernel + curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ + sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ + sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ + make -j$(nproc) Image.gz && \ + cp arch/arm64/boot/Image / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:22:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980491.1366953 (Exim 4.92) (envelope-from ) id 1uDX34-00047U-2h; Fri, 09 May 2025 23:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980491.1366953; Fri, 09 May 2025 23: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 1uDX34-00047M-05; Fri, 09 May 2025 23:22:34 +0000 Received: by outflank-mailman (input) for mailman id 980491; Fri, 09 May 2025 23:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX32-000478-Tp for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX32-002NgR-2t for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX32-003BTi-2j for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23: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=cuVFHLn75db8OMiUpzkfkmWIooFgFSL3jeffddCAPIU=; b=zEkiTWIpXJaU+y6OT6w90oSEdv zV4fMxgEYWndiRihJtOwB+u0fjAVHGaV3SSOHwRUocIfmp5r8zkhgVOUcKBYHL4037LW9mj4jr7Np 3Gy4vCuiPwUY0EJS4VvwqJo7UkaK7foyFE530zuBRwHqxvkMFtC8H85OBkuK5S5uLVSo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] automation: upgrade arm32 kernel from bullseye to bookworm Message-Id: Date: Fri, 09 May 2025 23:22:32 +0000 commit 3078218ef1cc2acb110f56a1c6396142c75ae43e Author: Stefano Stabellini AuthorDate: Thu Feb 20 14:56:20 2025 -0800 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: upgrade arm32 kernel from bullseye to bookworm Signed-off-by: Stefano Stabellini Reviewed-by: Roger Pau Monné (cherry picked from commit 80ee4df5df1d89cf4ccaaca0562faee1cfa8c448) --- automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 41f6e5d8e6..0c94e662aa 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -11,7 +11,7 @@ serial_log="$(pwd)/smoke.serial" cd binaries # Use the kernel from Debian -curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz +curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bookworm/main/installer-armhf/current/images/netboot/vmlinuz # Use a tiny initrd based on busybox from Alpine Linux curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:22:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980492.1366956 (Exim 4.92) (envelope-from ) id 1uDX3E-0004AF-41; Fri, 09 May 2025 23:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980492.1366956; Fri, 09 May 2025 23:22: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 1uDX3E-0004A8-1W; Fri, 09 May 2025 23:22:44 +0000 Received: by outflank-mailman (input) for mailman id 980492; Fri, 09 May 2025 23:22:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX3D-00049s-1M for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX3D-002NgV-00 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX3C-003BU6-34 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22: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=dHykq7gA/rD5NJseZwi+0uZsHuOIdGdlbgJfL61RUmg=; b=j8ZTJmct4hT1h+ZMwsdh0O7dYB lXhhSOh83OAgstbUR/ZtiAf8VcIpvbR9js+iOp+pNDWgk54VOOKtkkAgoqQEP9s/aK+aQG6Yz073J h5ZwfRD92uLYj+lvtgDoiIVGRRUPfnT13zHwNaejO5uNKqgoO9ixJ1/573GeijvwQ/o0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] automation: skip building domU if there is no test defined for it Message-Id: Date: Fri, 09 May 2025 23:22:42 +0000 commit 888631e81f32c2a5067aad53383b713564d6f093 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:51 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: skip building domU if there is no test defined for it This will be useful for later tests not using generic domU (unit tests, xtf etc). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit ae521cd96f98adc99df0d897aedd384535b7f21d) --- automation/scripts/qubes-x86-64.sh | 50 +++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8a0b7bfbc0..7eb3ce1bf7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -144,26 +144,28 @@ disk = [ ] ${domU_extra_config} " -# DomU -mkdir -p rootfs -cd rootfs -# fakeroot is needed to preserve device nodes in rootless podman container -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run -echo "#!/bin/sh +if [ -n "$domU_check" ]; then + # DomU + mkdir -p rootfs + cd rootfs + # fakeroot is needed to preserve device nodes in rootless podman container + fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz + mkdir proc + mkdir run + mkdir srv + mkdir sys + rm var/run + echo "#!/bin/sh ${domU_check} " > etc/local.d/xen.start -chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz -cd .. -rm -rf rootfs + chmod +x etc/local.d/xen.start + echo "rc_verbose=yes" >> etc/rc.conf + sed -i -e 's/^Welcome/domU \0/' etc/issue + find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + cd .. + rm -rf rootfs +fi # DOM0 rootfs mkdir -p rootfs @@ -188,11 +190,19 @@ ifconfig eth0 up ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 +" > etc/local.d/xen.start + +if [ -n "$domU_check" ]; then + echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & xl create /etc/xen/domU.cfg ${dom0_check} -" > etc/local.d/xen.start +" >> etc/local.d/xen.start +else + echo "${dom0_check}" >> etc/local.d/xen.start +fi + chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg @@ -201,7 +211,9 @@ echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +if [ -n "$domU_check" ]; then + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +fi find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:22:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980493.1366961 (Exim 4.92) (envelope-from ) id 1uDX3O-0004CX-5c; Fri, 09 May 2025 23:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980493.1366961; Fri, 09 May 2025 23:22: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 1uDX3O-0004CP-2z; Fri, 09 May 2025 23:22:54 +0000 Received: by outflank-mailman (input) for mailman id 980493; Fri, 09 May 2025 23:22:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX3N-0004CI-4V for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX3N-002NgZ-0L for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:22:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX3N-003BUV-0B for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23: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=qdn0q+oWQqPQ/QbSX1PAO0QjLB1B1m7Og9ObvqUDhJc=; b=AHJ0qwp/dSo9oDd9/ol6h+WGdp p3tTjkeru1Jk7fsdWUkd3WJeluSPxqUkQhXPcfkTXZ9u7jimo4nK6L8xOjNtdE3rsqR5DQqIq2z6i okbhhwIovyZyruyUOje36Br+abcLDXqEi5tKXpH+DOYZIRBJWs9pimP3R0eoNkVx03jo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] automation: add jobs running tests from tools/tests/* Message-Id: Date: Fri, 09 May 2025 23:22:53 +0000 commit eb2b48f2dcd1394b6449adc845d36bf2d1e41b7d Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:52 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: add jobs running tests from tools/tests/* There are a bunch of tests in tools/tests/, let them run in CI. For each subdirectory expect "make run" will run the test, and observe its exit code. This way, adding new tests is easy, and they will be automatically picked up. For better visibility, log test output to junit xml format, and let gitlab ingest it. Set SUT_ADDR variable with name/address of the system under test, so a network can be used to extract the file. The actual address is set using DHCP. And for the test internal network, still add the 192.168.0.1 IP (but don't replace the DHCP-provided one). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit fc10d6ecdd64c42dc4e3318ac31cd544a8d84959) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++ automation/scripts/build | 1 + automation/scripts/qubes-x86-64.sh | 28 +++++++++++++++++++++++ automation/scripts/run-tools-tests | 47 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index c8eefc7e01..a2dcf27b1f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -130,6 +130,7 @@ PCIDEV: "03:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1" + SUT_ADDR: test-2.testnet artifacts: paths: - smoke.serial @@ -258,6 +259,28 @@ adl-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +adl-tools-tests-pv-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +adl-tools-tests-pvh-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: diff --git a/automation/scripts/build b/automation/scripts/build index 952599cc25..522efe774e 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -109,5 +109,6 @@ else # even though dist/ contains everything, while some containers don't even # build Xen cp -r dist binaries/ + cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7eb3ce1bf7..7c80e0c233 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -10,6 +10,8 @@ set -ex # - pci-pv PV dom0, PV domU + PCI Passthrough # - pvshim PV dom0, PVSHIM domU # - s3 PV dom0, S3 suspend/resume +# - tools-tests-pv PV dom0, run tests from tools/tests/* +# - tools-tests-pvh PVH dom0, run tests from tools/tests/* test_variant=$1 ### defaults @@ -19,6 +21,7 @@ timeout=120 domU_type="pvh" domU_vif="'bridge=xenbr0'," domU_extra_config= +retrieve_xml= case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM @@ -126,6 +129,21 @@ done " ;; + ### tests: tools-tests-pv, tools-tests-pvh + "tools-tests-pv"|"tools-tests-pvh") + retrieve_xml=1 + passed="test passed" + domU_check="" + dom0_check=" +/tests/run-tools-tests /tests /tmp/tests-junit.xml && echo \"${passed}\" +nc -l -p 8080 < /tmp/tests-junit.xml >/dev/null & +" + if [ "${test_variant}" = "tools-tests-pvh" ]; then + extra_xen_opts="dom0=pvh" + fi + + ;; + *) echo "Unrecognised test_variant '${test_variant}'" >&2 exit 1 @@ -178,6 +196,8 @@ mkdir srv mkdir sys rm var/run cp -ar ../binaries/dist/install/* . +cp -ar ../binaries/tests . +cp -a ../automation/scripts/run-tools-tests tests/ echo "#!/bin/bash @@ -192,6 +212,10 @@ ifconfig xenbr0 192.168.0.1 " > etc/local.d/xen.start +if [ -n "$retrieve_xml" ]; then + echo "timeout 30s udhcpc -i xenbr0" >> etc/local.d/xen.start +fi + if [ -n "$domU_check" ]; then echo " # get domU console content into test log @@ -272,6 +296,10 @@ if [ $timeout -le 0 ]; then exit 1 fi +if [ -n "$retrieve_xml" ]; then + nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml \n' > "$xml_out" +printf '\n' >> "$xml_out" +printf ' \n' >> "$xml_out" +failed= +for dir in "$1"/*; do + [ -d "$dir" ] || continue + echo "Running test in $dir" + printf ' \n' "$dir" >> "$xml_out" + ret= + for f in "$dir"/*; do + [ -f "$f" ] || continue + [ -x "$f" ] || continue + "$f" 2>&1 | tee /tmp/out + ret=$? + if [ "$ret" -ne 0 ]; then + echo "FAILED: $ret" + failed+=" $dir" + printf ' \n' "$f" "$ret" >> "$xml_out" + # TODO: could use xml escaping... but current tests seems to + # produce sane output + cat /tmp/out >> "$xml_out" + printf ' \n' >> "$xml_out" + else + echo "PASSED" + fi + done + if [ -z "$ret" ]; then + printf ' \n' "$dir" >> "$xml_out" + fi + printf ' \n' >> "$xml_out" +done +printf ' \n' >> "$xml_out" +printf '\n' >> "$xml_out" + +if [ -n "$failed" ]; then + exit 1 +fi -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:23:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980494.1366965 (Exim 4.92) (envelope-from ) id 1uDX3Y-0004FT-88; Fri, 09 May 2025 23:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980494.1366965; Fri, 09 May 2025 23:23: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 1uDX3Y-0004FL-5b; Fri, 09 May 2025 23:23:04 +0000 Received: by outflank-mailman (input) for mailman id 980494; Fri, 09 May 2025 23:23:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX3X-0004FB-9Z for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX3X-002Ngr-0q for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX3X-003BVA-0c for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:03 +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=IL803/Iq9x8M+yRz4udug68dOTzjdWOpxXyN0fUam08=; b=sWzYPf6W7V1tzrw4pO1fF18d+o 48EARmufo1TbLT9IqBBH9xYtuz33B1y3fZodoZYkjL5BTkx3P6yhyPIwxCdCHclGWgCnmdfLAo6wi xMU9nBSQA2nh/FYpcmYftC2iKspVhprFPYa/Hf1YyKYfIr2G25cviwqrwi6MucaXyBco=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] automation: allow selecting individual jobs via CI variables Message-Id: Date: Fri, 09 May 2025 23:23:03 +0000 commit b41df85556c74dc90ee77113751bf76db5b13e49 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:53 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: allow selecting individual jobs via CI variables Debugging sometimes involves running specific jobs on different versions. It's useful to easily avoid running all of the not interesting ones (for given case) to save both time and CI resources. Doing so used to require changing the yaml files, usually in several places. Ease this step by adding SELECTED_JOBS_ONLY variable that takes a regex. Note that one needs to satisfy job dependencies on their own (for example if a test job needs a build job, that specific build job needs to be included too). The variable can be specified via Gitlab web UI when scheduling a pipeline, but it can be also set when doing git push directly: git push -o ci.variable=SELECTED_JOBS_ONLY="/job1|job2/" More details at https://docs.gitlab.co.jp/ee/user/project/push_options.html The variable needs to include regex for selecting jobs, including enclosing slashes. A coma/space separated list of jobs to select would be friendlier UX, but unfortunately that is not supported: https://gitlab.com/gitlab-org/gitlab/-/issues/209904 (note the proposed workaround doesn't work for job-level CI_JOB_NAME). On the other hand, the regex is more flexible (one can select for example all arm32 jobs). Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 9d419afa4667ba0369471c4a0e11e0717289c7bf) --- .gitlab-ci.yml | 2 ++ automation/gitlab-ci/build.yaml | 6 ++++++ automation/gitlab-ci/test.yaml | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 941e5822e8..b2fcf6c28f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ variables: XEN_REGISTRY: registry.gitlab.com/xen-project/xen + SELECTED_JOBS_ONLY: + description: "Regex to select only some jobs, must be enclosed with /. For example /job1|job2/" workflow: rules: diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 73fabe6f2f..60b221ee5e 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -12,6 +12,12 @@ - '*/*.log' when: always needs: [] + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + when: always + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .gcc-tmpl: variables: &gcc diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a2dcf27b1f..8f9752e179 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,11 @@ .test-jobs-common: stage: test image: ${XEN_REGISTRY}/${CONTAINER} + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export @@ -99,6 +104,9 @@ - '*.dtb' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,6 +125,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -137,6 +148,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:23:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980495.1366969 (Exim 4.92) (envelope-from ) id 1uDX3i-0004Hy-9f; Fri, 09 May 2025 23:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980495.1366969; Fri, 09 May 2025 23:23: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 1uDX3i-0004Hr-70; Fri, 09 May 2025 23:23:14 +0000 Received: by outflank-mailman (input) for mailman id 980495; Fri, 09 May 2025 23:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX3h-0004Hf-E2 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX3h-002Ngv-1J for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX3h-003BVv-15 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:13 +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=OrtOrl/aHGIdB1RW6A7Rgs+aZknUVRMHoAFsOJ8cGP0=; b=DnRExJvmfReSOA/bdSwMoF9JBf xMhCnJrdiEkIsWMCkj49Y1d58U40mthg+xiqWrI4CS2inuCA5UiYUYBgate21IOGyY2lwybFxKzts mhn4nPIexte+KEKQ5bebaFcm5ebPR+PXZWSb3wpt3ayvRGkqxiW5p9ZvPf7/f7XiDH6c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] automation: add tools/tests jobs on the AMD Zen3+ runner too Message-Id: Date: Fri, 09 May 2025 23:23:13 +0000 commit d80a13f6749ea25014fb5b7f7a010ed05ecc45ea Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:54 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: add tools/tests jobs on the AMD Zen3+ runner too Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit b551aed4ab131e61a13922d07bd7d9e29d694f31) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 8f9752e179..a1bc30c915 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -173,6 +173,7 @@ PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-11.testnet tags: - qubes-hw11 @@ -351,6 +352,28 @@ zen3p-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +zen3p-tools-tests-pv-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen3p-tools-tests-pvh-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:23:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980496.1366974 (Exim 4.92) (envelope-from ) id 1uDX3s-0004Kh-BO; Fri, 09 May 2025 23:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980496.1366974; Fri, 09 May 2025 23:23: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 1uDX3s-0004KZ-8T; Fri, 09 May 2025 23:23:24 +0000 Received: by outflank-mailman (input) for mailman id 980496; Fri, 09 May 2025 23:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX3r-0004KN-It for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX3r-002NhK-1n for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX3r-003BWX-1f for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:23 +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=SEisqoQSViC0HubwprCvT6sK2LFSatwNUXQAW+Hx/yg=; b=RiyEaQVEwOC9waqM7lpVrW2Ftb O+GgwLj3NZ2DCcSGBBpO6fALrWKlFPBisNIfnBVJyhP1BKeYEmpR/g85OC8AdvHcyfwYVCHZMQ+/+ 6TLzVXCDUTXgCY5Dh20y4uu9KUlNCH/kdOoozCDywUkMGwLBls9nRzirOuXBfmOQfxa8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] automation/eclair: Reduce verbosity of ECLAIR logs. Message-Id: Date: Fri, 09 May 2025 23:23:23 +0000 commit c7dbcdaee1b04f5ab281f8104970431596cb03e7 Author: Nicola Vetrini AuthorDate: Tue Mar 4 18:49:36 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation/eclair: Reduce verbosity of ECLAIR logs. While activating verbose logging simplifies debugging, this causes GitLab logs to be truncated, preventing the links to the ECLAIR analysis database to be shown. No functional change. Fixes: c4392ec83244 ("automation: Add ECLAIR utilities and settings") Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini (cherry picked from commit 78f2a5792c68128e3205dd18f0f92fd408bf5cd8) --- automation/eclair_analysis/ECLAIR/analysis.ecl | 2 -- automation/eclair_analysis/ECLAIR/analyze.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 8326156b38..399099938f 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -10,8 +10,6 @@ setq(analysis_kind,getenv("ANALYSIS_KIND")) # strings_map("scheduled-analysis",500,"","^.*$",0) # map_strings("scheduled-analysis",analysis_kind) --verbose - -enable=B.REPORT.ECB -config=B.REPORT.ECB,output=join_paths(data_dir,"FRAME.@FRAME@.ecb") -config=B.REPORT.ECB,preprocessed=show diff --git a/automation/eclair_analysis/ECLAIR/analyze.sh b/automation/eclair_analysis/ECLAIR/analyze.sh index e96456c3c1..ccd052208a 100755 --- a/automation/eclair_analysis/ECLAIR/analyze.sh +++ b/automation/eclair_analysis/ECLAIR/analyze.sh @@ -97,11 +97,13 @@ find "${ECLAIR_DATA_DIR}" -maxdepth 1 -name "FRAME.*.ecb" | sort | xargs cat | "${ECLAIR_BIN_DIR}eclair_report" \ "-create_db='${PROJECT_ECD}'" \ + -quiet \ -load=/dev/stdin > "${ECLAIR_REPORT_LOG}" 2>&1 # Create the Jenkins reports file. "${ECLAIR_BIN_DIR}eclair_report" \ "-db='${PROJECT_ECD}'" \ + -quiet \ "-eval_file='${SCRIPT_DIR}/report.ecl'" \ >> "${ECLAIR_REPORT_LOG}" 2>&1 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:23:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980497.1366977 (Exim 4.92) (envelope-from ) id 1uDX42-0004MY-CP; Fri, 09 May 2025 23:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980497.1366977; Fri, 09 May 2025 23:23: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 1uDX42-0004MQ-9p; Fri, 09 May 2025 23:23:34 +0000 Received: by outflank-mailman (input) for mailman id 980497; Fri, 09 May 2025 23:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX41-0004MK-Mu for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX41-002NhO-2C for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX41-003BXU-1z for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23: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=fgCoLJ+fQLx9AVBPaXahCigQjEBHpfgS3Si8wG7G4YM=; b=Tb2DslQy2kuJbzKg74mk6lQlx7 fUj8tRxJyVzgAtnqIobx09FM9/Ogx3kHnKbDLJK4lOW9QWW03jjci3sknBQ9pTwdVhNzAK30P/DL+ C5pal8NHL9aIn8h6iFbg9wLbnqijkmst9R0OZdUF+p8ORnHABLwmMBccykgf0Pwgbn6M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] ci: create boot.ipxe for legacy boot Message-Id: Date: Fri, 09 May 2025 23:23:33 +0000 commit bf8751513d83a53f73d735e584f287853c3bce68 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:35 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 ci: create boot.ipxe for legacy boot Hardware runners that use legacy boot use iPXE instead of grub2. Create boot.ipxe for those too - with exact same options. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 42beecae0b219fdfa04db729dea2229e05bf4af0) --- automation/scripts/qubes-x86-64.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7c80e0c233..f272964459 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -251,6 +251,14 @@ module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen module2 (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg +echo "#!ipxe + +kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot +module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot +module /gitlab-ci/initrd-dom0 || reboot +boot +" > $TFTP/boot.ipxe + cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:23:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980498.1366981 (Exim 4.92) (envelope-from ) id 1uDX4C-0004Pw-Dn; Fri, 09 May 2025 23:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980498.1366981; Fri, 09 May 2025 23:23: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 1uDX4C-0004Po-BB; Fri, 09 May 2025 23:23:44 +0000 Received: by outflank-mailman (input) for mailman id 980498; Fri, 09 May 2025 23:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4B-0004Ph-Qw for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX4B-002NhV-2c for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX4B-003BXs-2T for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23: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=pt4eKGWpaWf65Xl+WHhccGXmnizDuywGQ7n7K3JZTiw=; b=zPvZONYjDPSWK9Hg6pIy+btTMF 01Bev2N8AOLb1ZB61XkcsD3Hvo/ErPN6ZB/E9MgDk+ybTwBkMmLr7FWWcYoQYOO4T8IIl1aY6gslC BDHdBzb2vPxJoqlvyXAPYoT7sxtHtEg7KH1LgPwOWQLK00m7uEWfX6QHc6tRKmBKRNvk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] ci: add Intel KabyLake HW runner Message-Id: Date: Fri, 09 May 2025 23:23:43 +0000 commit aa53633d6708569e2f21fffb38d2b1a678efaa53 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:36 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 ci: add Intel KabyLake HW runner This is Intel i7-7567U in NUC 7i7BNH. This one is an older one, with no firmware updates (last update from 2023) and no microcode udpates either. While this firmware supports UEFI, network boot works only in legacy mode - thus legacy is used here (via iPXE, instead of grub2.efi). Testing legacy boot path may be a useful thing on its own. Add the same set of tests as on ADL runner. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 911a766f143196a1576c1b009e2e1cde8b921062) --- automation/gitlab-ci/test.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a1bc30c915..903fb113e9 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -155,6 +155,17 @@ tags: - qubes-hw2 +.kbl-x86-64: + # it's really similar to the ADL one + extends: .adl-x86-64 + variables: + PCIDEV: "00:1f.6" + PCIDEV_INTR: "MSI" + CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-3.testnet + tags: + - qubes-hw3 + .zen2-x86-64: # it's really similar to the above extends: .adl-x86-64 @@ -296,6 +307,84 @@ adl-tools-tests-pvh-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +kbl-smoke-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-suspend-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-hvm-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pvshim-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pvh-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:23:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980499.1366984 (Exim 4.92) (envelope-from ) id 1uDX4M-0004Sk-FB; Fri, 09 May 2025 23:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980499.1366984; Fri, 09 May 2025 23:23: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 1uDX4M-0004Sa-CV; Fri, 09 May 2025 23:23:54 +0000 Received: by outflank-mailman (input) for mailman id 980499; Fri, 09 May 2025 23:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4L-0004SU-Tw for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX4L-002NhZ-2u for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX4L-003BYz-2p for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:23: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=3c+3ylHnpc/b65FM8gxkudB3AmaML79Qi231DwZp3cI=; b=47IYZrUAMt+RX31KsO2QAbc115 nWeaGB/i/7tdk2Cem8j4P3lGla77FxPsNeOwxKFWfy1snlgtxKdEA/fHMKJhlpTOhA6fyL/OaTea9 47FxfcII7fGmxPDB95jaaFKKID0Gev3+tffvrdLh8frWmWoSwp1EAuha2bBFM+QSjlTE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: prevent grub unpacking initramfs Message-Id: Date: Fri, 09 May 2025 23:23:53 +0000 commit 45f8d178c7ba6f80bf6bee58217f545e3f03fe06 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:01 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: prevent grub unpacking initramfs It fails on larger initramfs (~250MB one) and sometimes even smaller depending on memory size/memory map, let Linux do it. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 32e6d052c2d88437c6fcec81e5369bc8016ac7e9) --- automation/scripts/qubes-x86-64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index f272964459..8e78b7984e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -248,7 +248,7 @@ CONTROLLER=control@thor.testnet echo " multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (http)/gitlab-ci/initrd-dom0 +module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg echo "#!ipxe -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:24:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:24:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980500.1366989 (Exim 4.92) (envelope-from ) id 1uDX4X-0004VC-Go; Fri, 09 May 2025 23:24:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980500.1366989; Fri, 09 May 2025 23:24:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4X-0004V4-Dx; Fri, 09 May 2025 23:24:05 +0000 Received: by outflank-mailman (input) for mailman id 980500; Fri, 09 May 2025 23:24:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4W-0004Uu-1j for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX4W-002Nhq-05 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX4V-003Bbf-39 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:03 +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=4i+H5O37Dw/BrHqEm4Glm1UfhG8No/myjK/DrGhUqSM=; b=Af5vqiup6vD3vn2OzrJRYQSakX aRq9dJDVfgh4/zCW3CBamAx/IS/KGx72tpnV+OAkgOKiDYOUyyJd2wV0ycjkypihMrVioqXxtzkVP SYanGFLirfz6y3gp7+u35bFTdWxeEoiM60eXg8EoF6JpK6EJlVa36m9TP8MXr00FBYXI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: enable XHCI console in Xen debug build on Alpine Message-Id: Date: Fri, 09 May 2025 23:24:03 +0000 commit 19cc94916a3fc55e5eb5fada0913cf72267392be Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:03 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: enable XHCI console in Xen debug build on Alpine This build is used for hardware tests, and some runners use XHCI console Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 17cf98d73043d4737783781df6526488b90d1565) --- automation/gitlab-ci/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 60b221ee5e..da38023c5d 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -335,6 +335,8 @@ alpine-3.18-gcc-debug: variables: CONTAINER: alpine:3.18 BUILD_QEMU_XEN: y + EXTRA_XEN_CONFIG: | + CONFIG_XHCI=y debian-12-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:24:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:24:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980501.1366993 (Exim 4.92) (envelope-from ) id 1uDX4h-0004Y9-Ja; Fri, 09 May 2025 23:24:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980501.1366993; Fri, 09 May 2025 23:24:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4h-0004Y2-Gi; Fri, 09 May 2025 23:24:15 +0000 Received: by outflank-mailman (input) for mailman id 980501; Fri, 09 May 2025 23:24:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4g-0004Xm-67 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX4g-002NiG-0W for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX4g-003Bdv-0I for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:14 +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=/wOulMA05N927LfkfjoXMZT2etBIO7OV+Dr00Orttq0=; b=Ne/u7kMJhEL3TXD4+EpCeuv0/g TqVE557ggrmj07CSLAntrKI1BmcoFXd2HQ6pZboy3Sriqi4KSQFDTdOFJm8izFD0oXNdFwtyEshJp XWTHIFPTuwA6XXSqg5cCw/AREZCJuNpaTg/h/wG8XA7GpNyfmKU4NcqLexV66wJJ3FB8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: include domU kernel messages in the console output log Message-Id: Date: Fri, 09 May 2025 23:24:14 +0000 commit e3d633390b2eb761db9d0fc90a2e60043912423f Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:04 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: include domU kernel messages in the console output log Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD (cherry picked from commit 1804064f68d52a47f1fc1454a3b254c16abe192b) --- automation/scripts/qubes-x86-64.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8e78b7984e..80000854bc 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -175,6 +175,8 @@ if [ -n "$domU_check" ]; then rm var/run echo "#!/bin/sh +echo 8 > /proc/sys/kernel/printk + ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:24:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:24:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980502.1366997 (Exim 4.92) (envelope-from ) id 1uDX4r-0004aj-Ks; Fri, 09 May 2025 23:24:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980502.1366997; Fri, 09 May 2025 23:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4r-0004ab-IH; Fri, 09 May 2025 23:24:25 +0000 Received: by outflank-mailman (input) for mailman id 980502; Fri, 09 May 2025 23:24:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX4q-0004aT-AB for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX4q-002NiN-0v for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX4q-003BfB-0m for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:24 +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=tNcgPxKIZQbiOMRDJV7ydLcjADQRJoeq0bURsvwf6Ug=; b=l43DRlyXEI4oH86Zzr9d1bP7Ih a4j5yX3E+3IVh606gGxQfAH8MQ4513mPg03tUndC8f7Osvkbd9xmcQAD7yi1cAs5GIh5v1gFKgYH2 J+TnWpc4SQu2r7QDK8lKUpL59ry8D+1uhQ4ydtRxxopOrU5sqSXqchDVadkUMyNRFGfU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: increase verbosity of starting a domain Message-Id: Date: Fri, 09 May 2025 23:24:24 +0000 commit d0e99ffcae99b158db6e2a41a2e313434fde25ac Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:05 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: increase verbosity of starting a domain And start collecting qemu log earlier, so it isn't lost in case of a timeout during domain startup. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit b8d41a9b22bbe9a08c8438eacf7b705500f20cea) --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 1ff689b577..17e2141d62 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index b752424cc2..deed8af795 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -21,7 +21,7 @@ echo "#!/bin/bash xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > ./root/xen.start echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 4d22a124df..8774a87012 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 80000854bc..7867724ebd 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -122,7 +122,6 @@ echo \"${passed}\" " dom0_check=" -tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -222,7 +221,8 @@ if [ -n "$domU_check" ]; then echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & +xl -vvv create /etc/xen/domU.cfg ${dom0_check} " >> etc/local.d/xen.start else diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7027f083ba..ac1eda0fe3 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -94,7 +94,7 @@ ifconfig xenbr0 192.168.0.1 # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:24:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:24:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980503.1367000 (Exim 4.92) (envelope-from ) id 1uDX51-0004dG-MJ; Fri, 09 May 2025 23:24:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980503.1367000; Fri, 09 May 2025 23:24:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX51-0004d8-Jl; Fri, 09 May 2025 23:24:35 +0000 Received: by outflank-mailman (input) for mailman id 980503; Fri, 09 May 2025 23:24:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX50-0004cz-Eb for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX50-002Nia-1M for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX50-003Bg3-1D for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:34 +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=FrH9M7sWy45jMuSpe7Ms7ZFUGg6N1nWaQ4wd6uyf2sk=; b=qxYta1Zz48hCyliN0FeLMvE1bl iDg3DtUrRVIAWz+aMSkab9FkWIBHvSpKIkjI7eOpL4SgRd19FUDXJFEK6F8NAHSRShEFpWdybNjkZ SGOZEloBQNuHSHmpWWlz2pPQ6CewLxGKJiXYKmBzUvJdVbhGJvg9JuunKj7NfJ037BTw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: consistently use DOCKER_CMD in makefiles Message-Id: Date: Fri, 09 May 2025 23:24:34 +0000 commit 694015c8f22f9f8c1c9ad9fbbece754832154cfb Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:06 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: consistently use DOCKER_CMD in makefiles This allows rebuilding containers using podman too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 5606b982acd44cc1f0715c424a11b2e76420aa18) --- automation/build/Makefile | 4 ++-- automation/tests-artifacts/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/build/Makefile b/automation/build/Makefile index 4df43b0407..fedf7524da 100644 --- a/automation/build/Makefile +++ b/automation/build/Makefile @@ -31,8 +31,8 @@ clean: define CLEAN_RULE .PHONY: clean-$(1) clean-$(1): - if [ -n "$$$$(docker image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ - docker image rm $(REGISTRY)/$(subst /,:,$(1)); \ + if [ -n "$$$$($(DOCKER_CMD) image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ + $(DOCKER_CMD) image rm $(REGISTRY)/$(subst /,:,$(1)); \ fi endef diff --git a/automation/tests-artifacts/Makefile b/automation/tests-artifacts/Makefile index d055cd696b..80a60a94f3 100644 --- a/automation/tests-artifacts/Makefile +++ b/automation/tests-artifacts/Makefile @@ -10,9 +10,9 @@ help: @echo "To push container builds, set the env var PUSH" %: %.dockerfile ## Builds containers - docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:24:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980504.1367006 (Exim 4.92) (envelope-from ) id 1uDX5B-0004fa-Oa; Fri, 09 May 2025 23:24:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980504.1367006; Fri, 09 May 2025 23:24: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 1uDX5B-0004fS-L7; Fri, 09 May 2025 23:24:45 +0000 Received: by outflank-mailman (input) for mailman id 980504; Fri, 09 May 2025 23:24:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5A-0004fE-IC for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX5A-002Nif-1k for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX5A-003Bgn-1c for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:44 +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=/hfGUBNuffGpu1OcdFhMEGaTEz45aRFCroFIXoWTWXQ=; b=JyqIkfX4T4SQQngEOu74Bfa5gd E5ToHxi1sfeDCn/bsUiCjmntwFTLLeASrJgVw03PKdlwAu+pMsj2MTs2uo97fZAO333YZBJ7exifx ONdDeFhw45foHJolWIR/J3/XPepYWnV54FUJ7L+9HBBbML6JWE+6sCzNonz6gHyVzZ5w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: wait for the network interface in PCI passthrough tests Message-Id: Date: Fri, 09 May 2025 23:24:44 +0000 commit 3cde61a381f6be298fbc280aa358a6a4e185e850 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:07 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: wait for the network interface in PCI passthrough tests The network driver initializes asynchronously, and it may not be ready yet by the time the startup script is called. This is especially the case for USB network adapter (where the PCI device is the USB controller) in the upcoming runner. Don't bother about separate timeout - test timeout will cover this part too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 6e3fe711fbf3a659160ab7ef2c293dffd62bbda4) --- automation/scripts/qubes-x86-64.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7867724ebd..2b04d281d7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -104,6 +104,7 @@ on_reboot = "destroy" domU_check=" set -x -e interface=eth0 +while ! [ -e \"/sys/class/net/\$interface\" ]; do sleep 1; done ip link set \"\$interface\" up timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:24:55 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:24:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980505.1367009 (Exim 4.92) (envelope-from ) id 1uDX5L-0004hx-PI; Fri, 09 May 2025 23:24:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980505.1367009; Fri, 09 May 2025 23:24: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 1uDX5L-0004hp-Mf; Fri, 09 May 2025 23:24:55 +0000 Received: by outflank-mailman (input) for mailman id 980505; Fri, 09 May 2025 23:24:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5K-0004hf-Lj for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX5K-002Nij-25 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX5K-003BhJ-1x for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:24:54 +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=Xh9pbSGESeNtnezf0fvkUZbzKvOG5Sh6ZSw8X5/7uk0=; b=0PLBUWxwoifzTMzPBJWJjF8lRm SQbqawYDmCK3xtsrbxqyUCCMxc5xsGvFwVwCc6afqhK9i68acNmO4aovTU+/u8qyQd9EVOMKczC4i mA48h6FSCBqdq2d+tlR7oWeQodA/QRcI6uerrBIUpwqkaM+it58vasEho11/1fyuxKFg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: adjust resolving network interface into PCI device Message-Id: Date: Fri, 09 May 2025 23:24:54 +0000 commit 7e23b4e5345e2446de7ae79a93225d27221da45b Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:09 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: adjust resolving network interface into PCI device Change how PCI device lookup is done to handle also USB devices, in which case get the USB controller. Instead of taking basename of the 'device' symlink, resolve the full path (example: /sys/devices/pci0000:00/0000:00:09.0/usb4/4-7/4-7:1.0) and take the first part after pci0000:00. Theoretically it could be a bridge, but VM has flat PCI topology. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 930279d96ca706f05e5860bef4126fc97457d256) --- automation/scripts/qubes-x86-64.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 2b04d281d7..a964ac4b7a 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -110,7 +110,8 @@ timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') ping -c 10 \"\$pingip\" echo domU started -pcidevice=\$(basename \$(readlink /sys/class/net/\$interface/device)) +pcidevice=\$(realpath /sys/class/net/\$interface/device | + sed 's#.*pci0000:00/\\([^/]*\\).*#\\1#') lspci -vs \$pcidevice " if [ -n "$PCIDEV_INTR" ]; then -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:25:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:25:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980506.1367013 (Exim 4.92) (envelope-from ) id 1uDX5V-0004kH-Qn; Fri, 09 May 2025 23:25:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980506.1367013; Fri, 09 May 2025 23:25:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5V-0004k9-O3; Fri, 09 May 2025 23:25:05 +0000 Received: by outflank-mailman (input) for mailman id 980506; Fri, 09 May 2025 23:25:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5U-0004jy-PZ for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX5U-002Niy-2T for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX5U-003Bhu-2L for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:04 +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=4rdTCkTHPPOSW1rdZuLJUQDjD12c9YyHysuq2OMM2ek=; b=v5hj4Jk6zs2ienPDOAsbrFor/D aX5+IKmMngW6gS5l/7CcL3Fb/d8Vx/U02+8z3Lb0+I8VvDsY1P5o4ITGKd4Mfv4CXurlC9Bik3BIB pcx659dvFXzZ1l5jlCSv4NnvfXuaFbAFVoCGzHfMll1YmG5JwgjouTOTdTH0zg912z/I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Message-Id: Date: Fri, 09 May 2025 23:25:04 +0000 commit 24e4156f11946b0368d10493066fa42577d15576 Author: Andrew Cooper AuthorDate: Wed Apr 9 13:50:00 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Linux 6.6.56 was already added to test-artifacts for the argo testing, and this removes one moving part while cleaning things up. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit f8588376648aa87f22cc709453f32473f45923c0) --- automation/gitlab-ci/build.yaml | 13 ------- automation/gitlab-ci/test.yaml | 4 ++- .../tests-artifacts/kernel/6.1.19.dockerfile | 41 ---------------------- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index da38023c5d..16733214c4 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -308,19 +308,6 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 -# x86_64 test artifacts - -kernel-6.1.19-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 - script: - - mkdir binaries && cp /bzImage binaries/bzImage - artifacts: - paths: - - binaries/bzImage - tags: - - x86_64 - # Jobs below this line # Build jobs needed for tests diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 903fb113e9..c3d8075017 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -16,7 +16,9 @@ - qemu-system-aarch64-6.0.0-arm32-export .x86-64-test-needs: &x86-64-test-needs - - kernel-6.1.19-export + - project: xen-project/hardware/test-artifacts + job: linux-6.6.56-x86_64 + ref: master - project: xen-project/hardware/test-artifacts job: x86_64-rootfs-alpine-3.18 ref: master diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile deleted file mode 100644 index 073eaa0e11..0000000000 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.1.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libelf-dev \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -# Build the kernel -RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make xen.config && \ - scripts/config --enable BRIDGE && \ - scripts/config --enable IGC && \ - scripts/config --enable TUN && \ - cp .config .config.orig && \ - cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ - make -j$(nproc) bzImage && \ - cp arch/x86/boot/bzImage / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:25:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:25:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980507.1367017 (Exim 4.92) (envelope-from ) id 1uDX5f-0004mr-SF; Fri, 09 May 2025 23:25:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980507.1367017; Fri, 09 May 2025 23:25:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5f-0004mj-PV; Fri, 09 May 2025 23:25:15 +0000 Received: by outflank-mailman (input) for mailman id 980507; Fri, 09 May 2025 23:25:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5e-0004mW-Td for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX5e-002NjL-2s for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX5e-003Bj4-2l for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:14 +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=gVHxFMwVY1cIoZgytLkLEDHBtzBMHa+9GYpFFYv7RV4=; b=C5dxrw5Z0nyidOJjk+s2KvtbBS Yr/EOOYSk05ktZEpGMi5AfCgyDRKzLXZoz/MpbiqjtLOskAg862LU/I/4VNlrSXm1Zb2de3jiWS5s hZMiguJlBURMxSF3W3fPSze/Cg3zrcjZdra7HKijkL+FcGu0sNltOP703ivSVI/MLzw8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Message-Id: Date: Fri, 09 May 2025 23:25:14 +0000 commit 7ac34d110cb3a6729d5bdadb179ce1c60128509d Author: Andrew Cooper AuthorDate: Wed Apr 9 17:22:54 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Switch over to test-artifacts. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 8b22309c9bae2cb0717651b8b71feb86d8b203f8) --- automation/gitlab-ci/build.yaml | 11 ------- automation/gitlab-ci/test.yaml | 4 ++- .../kernel/6.6.74-arm64v8.dockerfile | 38 ---------------------- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 16733214c4..293f877ec9 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -275,17 +275,6 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-6.6.74-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index c3d8075017..96a49f2547 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -8,8 +8,10 @@ - when: on_success .arm64-test-needs: &arm64-test-needs + - project: xen-project/hardware/test-artifacts + job: linux-6.6.86-arm64 + ref: master - alpine-3.18-arm64-rootfs-export - - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile deleted file mode 100644 index 73e5145425..0000000000 --- a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.6.74 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libssl-dev \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:25:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:25:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980508.1367020 (Exim 4.92) (envelope-from ) id 1uDX5p-0004qB-Um; Fri, 09 May 2025 23:25:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980508.1367020; Fri, 09 May 2025 23:25:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5p-0004q3-SH; Fri, 09 May 2025 23:25:25 +0000 Received: by outflank-mailman (input) for mailman id 980508; Fri, 09 May 2025 23:25:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5p-0004pw-0b for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX5o-002NjP-3D for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX5o-003Bkf-34 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:24 +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=SrlVncHYZLtuZX+KcQ565ZspKOZ+NWPddFQmSE8Nt5M=; b=3EWBlNMSq7jPPWor5u1SL3Bg76 hpsLUCt8KKbtDPodFo7Z9BTc2GaCCmxhUguZ45S1dsUy3oW5BJH4npmVDwpZI6E5YrNXDTvcM18pT nrjqHDCft60OnnBDgHo9N6dblD9BJAR0ulhIw5/+ADCli+arhkuf61L/aBFi4eykIHfI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: Drop stale test-artifacts/alpine/3.18.dockerfile Message-Id: Date: Fri, 09 May 2025 23:25:24 +0000 commit 57112bbb2d8cdf46697be763b4057e8d377f4e19 Author: Andrew Cooper AuthorDate: Mon Apr 7 18:15:32 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Drop stale test-artifacts/alpine/3.18.dockerfile This should have been dropped too, as the authoritative copy lives in another repo now. Fixes: babe11b46c1a ("CI: Drop alpine-3.18-rootfs-export and use test-artefacts") Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 424d20afae9a0d85c17e9dec3922af6448929b8c) --- automation/tests-artifacts/alpine/3.18.dockerfile | 67 ----------------------- 1 file changed, 67 deletions(-) diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile deleted file mode 100644 index 311a92889b..0000000000 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add libgcc && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - apk add pciutils && \ - apk add libelf && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add modules boot && \ - rc-update add killprocs shutdown && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - echo > /etc/modules && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:25:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:25:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980509.1367025 (Exim 4.92) (envelope-from ) id 1uDX60-0004sF-01; Fri, 09 May 2025 23:25:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980509.1367025; Fri, 09 May 2025 23:25:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5z-0004s7-Tg; Fri, 09 May 2025 23:25:35 +0000 Received: by outflank-mailman (input) for mailman id 980509; Fri, 09 May 2025 23:25:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX5z-0004s1-3a for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX5z-002NjX-0H for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX5z-003BlB-0B for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:35 +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=IKnIGtO+cV1SFcO9MNMmJDtd3WM+bm3EnZ0l8U1bWjI=; b=eOnKJHyAHXiE72PEF+Fu+xjfCN TO5tp0GOuMqIBwdh9l3uOQciNJg0IOWCi+q39/9nTWEUOwRzqbHh0RLf944KiCqhsTLemgu+AQ1cV 98CySzgsLBTticfpYf0MBzz+/iRbBgMjDuoAyFAKqztVY3u/Z27NsqmRnijlpNmUWdBU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: wait for Xen to start before waiting for test to complete Message-Id: Date: Fri, 09 May 2025 23:25:35 +0000 commit 3e24eef96810fa2f8f767330feff7afd9066b2ec Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:13 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: wait for Xen to start before waiting for test to complete Add additional stage in console output parsing - wait for first message from Xen. The message is defined via BOOT_MSG variable. This has two effects: - distinguishes failing Xen to load at all from later test failures - resets timeout when Xen starts loading The latter is especially relevant for hardware tests where firmware + network boot may take some time before Xen starts booting. The two-stage timeout is more robust solution than increasing the overall timeout. The issue has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. This patch is a first stage before qubes-x86-64.sh is switched to use expect in the next stage. While at it, consistently use 'expect -re' for all matches. This especially allows matching newlines ("\n"), which will become relevant in the next patch. And document variables used in console.exp. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit 7c96a27e375d8d7cbbb5493ebef0e29f90bfd273) --- automation/scripts/console.exp | 27 ++++++++++++++++++----- automation/scripts/qemu-alpine-x86_64.sh | 1 + automation/scripts/qemu-smoke-dom0-arm32.sh | 1 + automation/scripts/qemu-smoke-dom0-arm64.sh | 1 + automation/scripts/qemu-smoke-dom0less-arm32.sh | 1 + automation/scripts/qemu-xtf-dom0less-arm64.sh | 1 + automation/scripts/xilinx-smoke-dom0-x86_64.sh | 1 + automation/scripts/xilinx-smoke-dom0less-arm64.sh | 1 + 8 files changed, 29 insertions(+), 5 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 31ce97b91b..c27f893dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -1,4 +1,17 @@ #!/usr/bin/env expect +# +# Variables used by this script: +# - TEST_TIMEOUT: timeout between each *_MSG match +# - TEST_TIMEOUT_OVERRIDE: when set, overrides TEST_TIMEOUT +# - TEST_LOG: save console log to this file +# - TEST_CMD: commands that prints test system console output to stdout - in +# qemu tests that's usually qemu itself (with -serial stdio), in hardware +# tests that's a command to read serial console +# - UBOOT_CMD (optional): command to enter at u-boot prompt +# - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - LOG_MSG (optional): final console message to wait for +# - PASSED: message to look for to consider test a success; if LOG_MSG is set, +# both LOG_MSG and PASSED must appear (in any order) for test to succeed if {[info exists env(TEST_TIMEOUT_OVERRIDE)]} { set timeout $env(TEST_TIMEOUT_OVERRIDE) @@ -28,21 +41,25 @@ if {[info exists env(UBOOT_CMD)]} { send "$env(UBOOT_CMD)\r" } +if {[info exists env(BOOT_MSG)]} { + expect -re "$env(BOOT_MSG)" +} + if {[info exists env(LOG_MSG)]} { expect { - "$env(PASSED)" { - expect "$env(LOG_MSG)" + -re "$env(PASSED)" { + expect -re "$env(LOG_MSG)" exit 0 } - "$env(LOG_MSG)" { - expect "$env(PASSED)" + -re "$env(LOG_MSG)" { + expect -re "$env(PASSED)" exit 0 } } } expect { - "$env(PASSED)" { + -re "$env(PASSED)" { exit 0 } } diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 17e2141d62..89bdb4df7d 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -85,6 +85,7 @@ export TEST_CMD="qemu-system-x86_64 \ -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0" export TEST_LOG="smoke.serial" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index deed8af795..97855d8ed2 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -92,6 +92,7 @@ export TEST_CMD="./qemu-system-arm \ export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" export TEST_LOG="${serial_log}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="/ #" diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 8774a87012..51d037b000 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -104,6 +104,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 0c94e662aa..0e2c5496db 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -144,6 +144,7 @@ export TEST_CMD="./qemu-system-arm \ -bios /usr/lib/u-boot/qemu_arm/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="${serial_log}" export LOG_MSG="${dom0_prompt}" export PASSED="${passed}" diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh b/automation/scripts/qemu-xtf-dom0less-arm64.sh index 9608de6ec0..436f460c3c 100755 --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh @@ -61,6 +61,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export PASSED="${passed}" diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index ac1eda0fe3..e448f7e2f5 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -133,6 +133,7 @@ stty -F ${SERIAL_DEV} 57600 # Capture test result and power off board before exiting. export PASSED="${PASS_MSG}" +export BOOT_MSG="Latest ChangeSet: " export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index b24ad11b8c..3e1fcf6bf9 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -140,6 +140,7 @@ stty -F ${SERIAL_DEV} 115200 # Capture test result and power off board before exiting. export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Welcome to Alpine Linux" export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:25:46 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:25:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980510.1367029 (Exim 4.92) (envelope-from ) id 1uDX6A-0004uN-1R; Fri, 09 May 2025 23:25:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980510.1367029; Fri, 09 May 2025 23:25:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX69-0004uF-V8; Fri, 09 May 2025 23:25:45 +0000 Received: by outflank-mailman (input) for mailman id 980510; Fri, 09 May 2025 23:25:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX69-0004u9-6w for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX69-002Njd-0b for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX69-003BlZ-0S for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:45 +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=HZoLChVcSG/cV+UFPaleJSARj9oEel4v0DRuNtnnPqE=; b=bSRy8ffFuaijUeSEXc/i36k20o +9Z4/jA6VyIx5gq2muELgwi7LKlkOhBnI/HeFumHZX0eZ0w8vM9C1DFn2Zhqr8gJ5Pcp4wcRN6O06 +eDwOxvE+skYDpoG7inIXsR/9OuuakI1p4R0oNZOgDfS84AyB8XWeQp5dfkL/rqKSHR4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: fix waiting for final test message Message-Id: Date: Fri, 09 May 2025 23:25:45 +0000 commit cada2a89a818845ed60fe655df40530d211fa342 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:14 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: fix waiting for final test message Expect normally discards initial part of its buffer after matching the patter, before looking for the next one. If both PASSED and LOG_MSG happen to be in the buffer at the same time, depending on their order, only one will be matched and the waiting for the other will timeout. Example expect -d output of this happening (parts eclipsed for brevity): expect: does "\r\r\r\nWelcome to Alpine Linux 3.18\r\r\r\n...\r\r\r\r\n(domU) + echo 'pci test passed'\r\r\r\r\n(domU) pci test passed\r\r\r\r..." (spawn_id exp4) match regular expression "pci test passed"? Gate "pci test passed"? gate=yes re=yes ... Gate keeper glob pattern for '\nWelcome to Alpine Linux' is ' Welcome to Alpine Linux'. Activating booster. expect: does "'\r\r\r\r\n(domU) pci test passed\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) \r\r\r\r\r\n(domU) domU Welcome to Alpine Linux 3.18\r\r\r\r\n(domU) \rKernel 6.6.56 on an x86_64 (/dev/hvc0)\r\r\r\r\n(domU) \r\r\r\r\r\n" (spawn_id exp4) match regular expression "\nWelcome to Alpine Linux"? Gate "\nWelcome to Alpine Linux"? gate=no Fix this by using -notransfer flag to keep matched part in the buffer. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 1e12cbd6af2c92e61a1363ef208f71da1eae47ab) CI: fix waiting for final test message (again) The previous attempt has correct diagnosis, but added -notransfer flag in a wrong place - it should be used in the first (outer) match out of two, not the second (inner) one. Fixes: 1e12cbd6af2c ("CI: fix waiting for final test message") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 79de6507c59021484e7c0b359f45035eab891e88) --- automation/scripts/console.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index c27f893dfb..2414f37fd2 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -47,11 +47,11 @@ if {[info exists env(BOOT_MSG)]} { if {[info exists env(LOG_MSG)]} { expect { - -re "$env(PASSED)" { + -notransfer -re "$env(PASSED)" { expect -re "$env(LOG_MSG)" exit 0 } - -re "$env(LOG_MSG)" { + -notransfer -re "$env(LOG_MSG)" { expect -re "$env(PASSED)" exit 0 } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:25:57 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:25:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980511.1367033 (Exim 4.92) (envelope-from ) id 1uDX6L-0004wc-3C; Fri, 09 May 2025 23:25:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980511.1367033; Fri, 09 May 2025 23:25:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6L-0004wU-0K; Fri, 09 May 2025 23:25:57 +0000 Received: by outflank-mailman (input) for mailman id 980511; Fri, 09 May 2025 23:25:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6J-0004wH-AZ for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX6J-002NpH-0y for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX6J-003BmD-0q for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:25:55 +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=e1/eptSY7gEblR1o24kzRQg7gKdsNxRRSTiKMdX9+lM=; b=bIQMB/G3XEdpvsy43Cx6jKoQXo g23KnJjNEsNN5icccLjKHeJYba3zpgeU/HUxzeUN0CWxdIIGIt8UT+RdQma0iMk2Ou3qwes7iFMVc RByQnmnuypEUwsnxfTZ3WBbWbjUYyAwrxQhfJiapsetCdC1PXELixvFprd9elkOHGEU4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: switch qubes runners to use console.exp Message-Id: Date: Fri, 09 May 2025 23:25:55 +0000 commit 62cba67338ad3f91f7ff99bd81ae1d329a6bb7c7 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:15 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: switch qubes runners to use console.exp It appears as sometimes it takes more time for Xen even start booting, mostly due to firmware and fetching large boot files by grub. In some jobs the current timeout is pretty close to the actual time needed, and sometimes (rarely for now) test fails due to timeout expiring in the middle of dom0 booting. This will be happening more often if the initramfs will grow (and with more complex tests). This has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. Switch to using expect (console.exp) for more robust test output handling. This allows waiting separately for Xen starting to boot and then for the test to complete. For now, set both of those to 120s, which pessimistically bumps timeout for the whole test to 240s (from 120s). Add S3 handling to console.exp via SUSPEND_MSG + WAKEUP_CMD. Signed-off-by: Marek Marczykowski-Górecki (cherry picked from commit d604d774a24bae21e15c831e172455bd4600663d) --- automation/build/alpine/3.18-arm64v8.dockerfile | 1 + automation/scripts/console.exp | 13 +++++++ automation/scripts/qubes-x86-64.sh | 52 +++++++------------------ 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 19fe46f841..b8482d5bf4 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -48,3 +48,4 @@ RUN apk --no-cache add \ # qubes test deps openssh-client \ fakeroot \ + expect \ diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 2414f37fd2..fc80513dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -9,6 +9,10 @@ # tests that's a command to read serial console # - UBOOT_CMD (optional): command to enter at u-boot prompt # - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - SUSPEND_MSG (optional): message signaling system is going to sleep, it's +# trigger for WAKEUP_CMD (see below) +# - WAKEUP_CMD (optional): command to execute to wakeup the system 30s after +# seeing SUSPEND_MSG # - LOG_MSG (optional): final console message to wait for # - PASSED: message to look for to consider test a success; if LOG_MSG is set, # both LOG_MSG and PASSED must appear (in any order) for test to succeed @@ -45,6 +49,15 @@ if {[info exists env(BOOT_MSG)]} { expect -re "$env(BOOT_MSG)" } +if {[info exists env(WAKEUP_CMD)]} { + expect -re "$env(SUSPEND_MSG)" + + # keep it suspended a bit, then wakeup + sleep 30 + + system "$env(WAKEUP_CMD)" +} + if {[info exists env(LOG_MSG)]} { expect { -notransfer -re "$env(PASSED)" { diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index a964ac4b7a..861e302d84 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -ex -o pipefail # One of: # - "" PV dom0, PVH domU @@ -267,52 +267,26 @@ cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -# start logging the serial; this gives interactive console, don't close its -# stdin to not close it; the 'cat' is important, plain redirection would hang -# until somebody opens the pipe; opening and closing the pipe is used to close -# the console -mkfifo /tmp/console-stdin -cat /tmp/console-stdin |\ -ssh $CONTROLLER console | tee smoke.serial | sed 's/\r//' & - # start the system pointing at gitlab-ci predefined config ssh $CONTROLLER gitlabci poweron -trap "ssh $CONTROLLER poweroff; : > /tmp/console-stdin" EXIT +trap "ssh $CONTROLLER poweroff" EXIT if [ -n "$wait_and_wakeup" ]; then - # wait for suspend or a timeout - until grep "$wait_and_wakeup" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) - done - if [ $timeout -le 0 ]; then - echo "ERROR: suspend timeout, aborting" - exit 1 - fi - # keep it suspended a bit, then wakeup - sleep 30 - ssh $CONTROLLER wake + export SUSPEND_MSG="$wait_and_wakeup" + export WAKEUP_CMD="ssh $CONTROLLER wake" fi -set +x -until grep "^Welcome to Alpine Linux" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) -done -set -x - -tail -n 100 smoke.serial - -if [ $timeout -le 0 ]; then - echo "ERROR: test timeout, aborting" - exit 1 -fi +export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " +export LOG_MSG="\nWelcome to Alpine Linux" +export TEST_CMD="ssh $CONTROLLER console" +export TEST_LOG="smoke.serial" +export TEST_TIMEOUT="$timeout" +./automation/scripts/console.exp | sed 's/\r\+$//' +TEST_RESULT=$? if [ -n "$retrieve_xml" ]; then nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:26:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980512.1367037 (Exim 4.92) (envelope-from ) id 1uDX6V-0004zQ-4w; Fri, 09 May 2025 23:26:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980512.1367037; Fri, 09 May 2025 23:26:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6V-0004zJ-1o; Fri, 09 May 2025 23:26:07 +0000 Received: by outflank-mailman (input) for mailman id 980512; Fri, 09 May 2025 23:26:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6T-0004zB-Dh for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX6T-002NpW-1H for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX6T-003BnU-1C for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:05 +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=YC2GWBZSS7d2czUMQTkKtVl9uh8zUblbdQeybrlztI0=; b=KwwwDAR0dczlNz2tFa+bF4Y/g9 8fTLQIBeh/NyCXEjvOpLzeiHVH/u658VYrKFZBSRqtP4AaXI/8pJsqDnoyS+PYGEiDLmUWIUmYrJc Xjg8l3neD+ohnGoaGhPGiC2G1dPnDE7JS4lZI4HdHAT7ipCh8qxGO8eI1SN92nObb4zs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: write whole etc/issue for domU initrd Message-Id: Date: Fri, 09 May 2025 23:26:05 +0000 commit c993d8e4fb33f9b560bca6a84142e027ca2b1abd Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:16 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: write whole etc/issue for domU initrd Upcoming changes won't unpack original rootfs anymore, so sed on existing file cannot be used. Override the whole file instead. No functional change intended. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit f401eae6ec446671ad79deac84421d56808d43f2) --- automation/scripts/qubes-x86-64.sh | 5 ++++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 861e302d84..c4be714642 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -182,7 +182,10 @@ ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf - sed -i -e 's/^Welcome/domU \0/' etc/issue + echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index e448f7e2f5..930b9eccdd 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -65,7 +65,10 @@ ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue +echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:26:17 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:26:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980513.1367040 (Exim 4.92) (envelope-from ) id 1uDX6f-00052S-7L; Fri, 09 May 2025 23:26:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980513.1367040; Fri, 09 May 2025 23:26:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6f-00052K-4n; Fri, 09 May 2025 23:26:17 +0000 Received: by outflank-mailman (input) for mailman id 980513; Fri, 09 May 2025 23:26:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6d-000523-HP for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX6d-002Npq-1f for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX6d-003Bo9-1X for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:15 +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=V8ZeHGHWoQBY4QtAQMBgj5AXTaDpD7rFF2HxLQ6+H6k=; b=tq4v/qkyGD/5pJiX1kAT9T17KY FPeJigx4tGT8wu/yWKdhRG1Za2GkhW58TTTO924fZobWoNUSiZEiJ2e40P4JAcvpCCfogmXRmmq1w 00MqA+zyJiQKJ/mXu8k3qVzoN1S0CSeqaqGM9ovAJt7MAfHVIi6W1cxZbN0V5FvlrSoA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: Rename intermediate artefacts in qemu-* scripts Message-Id: Date: Fri, 09 May 2025 23:26:15 +0000 commit cf8ff5373d6726bb89f5a7ea75de9ad18a668478 Author: Andrew Cooper AuthorDate: Sat Apr 12 15:33:01 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Rename intermediate artefacts in qemu-* scripts Right now, we have initrd.cpio.gz as domU, and initrd.tar.gz as the base for dom0. Rename initrd.cpio.gz to domU-rootfs.cpio.gz, and xen-rootfs.cpio.gz to dom0-rootfs.cpio.gz to make it clearer which is which. Rename the VM from test to domU. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 9caca83404e707694d229853f8158c4c243c575c) --- automation/scripts/qemu-alpine-x86_64.sh | 16 ++++++++-------- automation/scripts/qemu-smoke-dom0-arm64.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 89bdb4df7d..569bd766d3 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -25,7 +25,7 @@ mount -t devtmpfs devtmpfs /dev chmod +x initrd/init # DomU rootfs cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. # initrd.tar.gz is Dom0 rootfs @@ -38,15 +38,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/bzImage\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash set -x @@ -56,13 +56,13 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf # rebuild Dom0 rootfs -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF @@ -70,7 +70,7 @@ cat >> binaries/pxelinux.0 << EOF kernel xen console=com1 console_timestamps=boot module bzImage console=hvc0 -module xen-rootfs.cpio.gz +module dom0-rootfs.cpio.gz boot EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 51d037b000..e8e49ded24 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -24,7 +24,7 @@ mount -t devtmpfs devtmpfs /dev /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. mkdir -p rootfs @@ -36,15 +36,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/Image\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -52,12 +52,12 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded @@ -78,7 +78,7 @@ MEMORY_END="0xC0000000" DEVICE_TREE="virt-gicv2.dtb" XEN="xen" DOM0_KERNEL="Image" -DOM0_RAMDISK="xen-rootfs.cpio.gz" +DOM0_RAMDISK="dom0-rootfs.cpio.gz" XEN_CMD="console=dtuart dom0_mem=1024M console_timestamps=boot" NUM_DOMUS=0 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:26:27 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:26:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980514.1367044 (Exim 4.92) (envelope-from ) id 1uDX6p-00055H-8x; Fri, 09 May 2025 23:26:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980514.1367044; Fri, 09 May 2025 23:26:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6p-000558-6D; Fri, 09 May 2025 23:26:27 +0000 Received: by outflank-mailman (input) for mailman id 980514; Fri, 09 May 2025 23:26:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6n-00054u-L5 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX6n-002Npu-21 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX6n-003Boo-1s for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:25 +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=AuAw0HOFhTWcZprWzrJ3JwqoapvridMBtB4Ih/Y6cRs=; b=wlzJBsU1YqbHTUsO4lva5wd2Mc hTgL5Qh14grYYjG71SJevajAluk9ZfiA0deCJ5wXmuy8/Xrb4MeoxpD3UFOfDdbSxBcr3Mny85v42 oi/uHD/wFVf1+VgvD3W7OH64BwjdTZkEX6SW28AUJfeEdfzKEhgREyXr3XeGFszEdN7k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: avoid repacking initrd as part of the test job Message-Id: Date: Fri, 09 May 2025 23:26:25 +0000 commit 554fb24a8ef432eefc676a84bdfe76151e4d9c3b Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:17 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: avoid repacking initrd as part of the test job Use the new test-artifacts which provide rootfs.cpio.gz rather than initrd.tar.gz. rootfs.cpio.gz also has all the necessary top-level directories, and includes the rc_verbose setting, so these modifications can be dropped. Having that, do not repack the whole initrd, but only pack modified files and rely on Linux handling of concatenated archives. This allows packing just test-related files (which includes the whole toolstack), instead of the whole initrd. For xilinx-smoke-dom0-x86_64.sh, this involves instructing grub not to unzip the archive, as doing so corrupts it. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 786f3238094f9460f59bce9f250adbf426f89297) --- automation/gitlab-ci/test.yaml | 6 +++-- automation/scripts/qemu-alpine-x86_64.sh | 16 +++++------ automation/scripts/qemu-smoke-dom0-arm64.sh | 14 +++++----- automation/scripts/qemu-smoke-dom0less-arm64.sh | 15 +++++------ automation/scripts/qubes-x86-64.sh | 32 +++++++++------------- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 33 +++++++++-------------- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 30 +++++++++------------ 7 files changed, 59 insertions(+), 87 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 96a49f2547..649e80c4dd 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -11,7 +11,9 @@ - project: xen-project/hardware/test-artifacts job: linux-6.6.86-arm64 ref: master - - alpine-3.18-arm64-rootfs-export + - project: xen-project/hardware/test-artifacts + job: alpine-3.18-arm64-rootfs + ref: master - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs @@ -22,7 +24,7 @@ job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master .qemu-arm64: diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 569bd766d3..c7dd121978 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -28,16 +28,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. -# initrd.tar.gz is Dom0 rootfs +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root echo "name=\"domU\" @@ -60,9 +58,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -# rebuild Dom0 rootfs -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index e8e49ded24..c0cf61ff8f 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -27,15 +27,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root echo "name=\"domU\" @@ -56,8 +55,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 83e1866ca6..48c424922d 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -111,16 +111,14 @@ cd initrd find . | cpio --create --format='newc' | gzip > ../binaries/initrd cd .. -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash @@ -139,8 +137,7 @@ xl network-attach 1 type=vif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # ImageBuilder diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index c4be714642..e2376cb51c 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -164,16 +164,13 @@ ${domU_extra_config} " if [ -n "$domU_check" ]; then - # DomU + # DomU rootfs + cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + + # test-local configuration mkdir -p rootfs cd rootfs - # fakeroot is needed to preserve device nodes in rootless podman container - fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz - mkdir proc - mkdir run - mkdir srv - mkdir sys - rm var/run + mkdir -p etc/local.d echo "#!/bin/sh echo 8 > /proc/sys/kernel/printk @@ -181,26 +178,22 @@ echo 8 > /proc/sys/kernel/printk ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start - echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue - find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs fi -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir boot -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -237,7 +230,6 @@ fi chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console @@ -245,7 +237,7 @@ cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU fi -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 930b9eccdd..d823b57012 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -50,39 +50,33 @@ else fatal "Unknown test: ${TEST}" fi -# Set up domU rootfs. +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# Set up dom0 rootfs. +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir boot -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . echo "#!/bin/bash @@ -102,13 +96,12 @@ ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "${DOMU_CFG}" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # Load software into TFTP server directory. @@ -121,7 +114,7 @@ echo " net_default_server=10.0.6.1 multiboot2 (tftp)/${TEST_BOARD}/xen ${XEN_CMDLINE} module2 (tftp)/${TEST_BOARD}/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (tftp)/${TEST_BOARD}/initrd-dom0 +module2 --nounzip (tftp)/${TEST_BOARD}/initrd-dom0 boot " > ${TFTP}/${TEST_BOARD}/grub.cfg diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 3e1fcf6bf9..a3031ecab0 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -38,36 +38,31 @@ echo \"${passed}\" " fi -# DomU +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -78,8 +73,7 @@ bash /etc/init.d/xencommons start ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Fri May 09 23:26:37 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 May 2025 23:26:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980515.1367050 (Exim 4.92) (envelope-from ) id 1uDX6z-00057w-Ah; Fri, 09 May 2025 23:26:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980515.1367050; Fri, 09 May 2025 23:26:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6z-00057o-7g; Fri, 09 May 2025 23:26:37 +0000 Received: by outflank-mailman (input) for mailman id 980515; Fri, 09 May 2025 23:26:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDX6x-00057g-P2 for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDX6x-002Npy-2Q for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDX6x-003BpC-2H for xen-changelog@lists.xenproject.org; Fri, 09 May 2025 23:26:35 +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=gkSIf8GFJzXLITSQvN1VL0bqgrI3RBJ0TbwPv+wWE/k=; b=ZDORobW9WxEmOnC9l5mXJfeDDr 8Sn3sE0xG7nhq4Q/Z4scx3PjTBxJ8M5GWt9+mieYcN9+Dgl4wifJnaPwrLZFxFFUKae9UAS1s5n6c o0lg76qvqp6huzBYx6guJI/MA/zZCU92KMtuI0885D/wDF12HIYoxPQ16aI+wjste9zc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] CI: remove now unused alpine-3.18-arm64-rootfs job and its container Message-Id: Date: Fri, 09 May 2025 23:26:35 +0000 commit cdb61d7ee8948beda86f4530bb687062e4572638 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 15:47:22 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: remove now unused alpine-3.18-arm64-rootfs job and its container This got moved to test-artifacts. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper Acked-by: Anthony PERARD (cherry picked from commit 93f12111c749962b77eb4671d740d3d010429174) --- automation/gitlab-ci/build.yaml | 11 ---- .../tests-artifacts/alpine/3.18-arm64v8.dockerfile | 66 ---------------------- 2 files changed, 77 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 293f877ec9..781334d74f 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -264,17 +264,6 @@ # Arm test artifacts -alpine-3.18-arm64-rootfs-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8 - script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - artifacts: - paths: - - binaries/initrd.tar.gz - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index a4542f7039..0000000000 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add networking sysinit && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add killprocs shutdown && \ - rc-update add modloop sysinit && \ - rc-update add modules boot && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add sysctl boot && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:33:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980568.1367103 (Exim 4.92) (envelope-from ) id 1uDY9H-0000AW-P0; Sat, 10 May 2025 00:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980568.1367103; Sat, 10 May 2025 00: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 1uDY9H-0000AN-MH; Sat, 10 May 2025 00:33:03 +0000 Received: by outflank-mailman (input) for mailman id 980568; Sat, 10 May 2025 00:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDY9G-0000AH-QH for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDY9G-002QKu-1y for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDY9G-003Dvc-1i for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00: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=Vd9QpA1WlAqzIztANJ9LIyLmJlSs4GsNnIW3Z44pXE4=; b=08ouQ28SLNJqnjBKkfWYhRw+74 tj8/F18RBEMw0SmCUyT+8E9XfzMZ/8D2PApk9zvDXziP4CqqQ4wkL/5GHROkcLjwrIFKxZDqqYTgY GD8WmO1ZMmJA1IgdWTsvmIpp9X2XmkUs3uFxSdPCDOzA16uAXgB5prHt0pU3K3g2sAiU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: Remove deprecated "only:variables" in favor of "rules:if" Message-Id: Date: Sat, 10 May 2025 00:33:02 +0000 commit 7efd283a6fdad20a54ec54646ab83e4aa739b050 Author: Anthony PERARD AuthorDate: Tue Nov 19 10:15:27 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Remove deprecated "only:variables" in favor of "rules:if" Also, this prevent using "rules", like in the ".test-jobs-common" template. https://docs.gitlab.com/ee/ci/yaml/#only--except Signed-off-by: Anthony PERARD Reviewed-by: Stefano Stabellini (cherry picked from commit 5726d8e5ef1852be90c9c05f08259b6a4f0ebb5e) --- automation/gitlab-ci/test.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 325be5dc49..dbd4a1d6a9 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -98,9 +98,8 @@ - '*.log' - '*.dtb' when: always - only: - variables: - - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,9 +116,8 @@ - smoke.serial - '*.log' when: always - only: - variables: - - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -137,9 +135,8 @@ - smoke.serial - '*.log' when: always - only: - variables: - - $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980569.1367106 (Exim 4.92) (envelope-from ) id 1uDY9R-0000C8-QF; Sat, 10 May 2025 00:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980569.1367106; Sat, 10 May 2025 00: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 1uDY9R-0000C1-Nd; Sat, 10 May 2025 00:33:13 +0000 Received: by outflank-mailman (input) for mailman id 980569; Sat, 10 May 2025 00:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDY9Q-0000Bn-O2 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDY9Q-002QKz-2H for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDY9Q-003Dw6-29 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00: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=ohu1sSf8iO4ldX+sTFM722QpNTTmWEX5RR8H/0zYIa4=; b=DI00JAEkvg5IH7qqdcSw+imtq/ 598zJhtzDdJuX/UvBsXMBJYW+BNMtaxtHZt6xVEW781n4PuecxdkVfDF44CH6t+tx1DIGrBurg2W6 Yv3Bl5XkEyrUfE9KPZDltmxpZPkPZ80aeoc5KIAQt51J4SHn60A1+fP0K0rYm5UP8tsQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: Define XEN_REGISTRY variable Message-Id: Date: Sat, 10 May 2025 00:33:12 +0000 commit 683100709ee8be4ec8cba36a9eed0df11618c49d Author: Anthony PERARD AuthorDate: Tue Nov 19 10:15:27 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Define XEN_REGISTRY variable This allow to change the registry used for container in a single place, and could be controlled via other mean. Signed-off-by: Anthony PERARD Reviewed-by: Stefano Stabellini (cherry picked from commit a231538acdeb8cf11a7420de9496815e6bd44bb0) --- .gitlab-ci.yml | 3 +++ automation/gitlab-ci/build.yaml | 4 ++-- automation/gitlab-ci/test.yaml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef4484e09a..941e5822e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +variables: + XEN_REGISTRY: registry.gitlab.com/xen-project/xen + workflow: rules: - if: $CI_COMMIT_BRANCH =~ /^(master|smoke|^coverity-tested\/.*|stable-.*)$/ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index afcab39ff6..d2dec043e2 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -1,6 +1,6 @@ .build-tmpl: &build stage: build - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} script: - ./automation/scripts/build 2>&1 | tee build.log artifacts: @@ -208,7 +208,7 @@ .yocto-test: stage: build - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} script: - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD} ${YOCTO_OUTPUT} variables: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index dbd4a1d6a9..29919e9f43 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,6 @@ .test-jobs-common: stage: test - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980570.1367111 (Exim 4.92) (envelope-from ) id 1uDY9b-0000FF-TJ; Sat, 10 May 2025 00:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980570.1367111; Sat, 10 May 2025 00:33: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 1uDY9b-0000F7-Qd; Sat, 10 May 2025 00:33:23 +0000 Received: by outflank-mailman (input) for mailman id 980570; Sat, 10 May 2025 00:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDY9a-0000F1-RK for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDY9a-002QLP-2b for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDY9a-003DwV-2S for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33: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=RioE5Rj9AQeNS3HOgQTNhcMVfcxLa99+B1eae+8l9kw=; b=D4ZIJUANsY0Rd5biTgCAVXI1yC 3yW/P0eTen3b8rq4VrogRhxgKVzmGDsve3uukKBuO/M66wFU2pGVKruKJRatXOZAZENuuWHpk+fi5 5Q3arBIfZFkUOYoGRiHRALsjkF5N+vhxItzPl20KZzuAUyY8S6e58muoMDqe9eYfd9Z8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] automation: upgrade Linux kernel for arm64 tests to 6.6.74 Message-Id: Date: Sat, 10 May 2025 00:33:22 +0000 commit 62890a1af12355bd3218b975e53869dd76f0bb70 Author: Stefano Stabellini AuthorDate: Fri Jan 31 15:32:53 2025 -0800 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: upgrade Linux kernel for arm64 tests to 6.6.74 Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel (cherry picked from commit 87f87a5586b8c4bcee08ae6b82a985e242ab21dd) --- automation/gitlab-ci/build.yaml | 4 +-- automation/gitlab-ci/test.yaml | 2 +- .../tests-artifacts/kernel/5.19-arm64v8.dockerfile | 37 --------------------- .../kernel/6.6.74-arm64v8.dockerfile | 38 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d2dec043e2..73fabe6f2f 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -269,9 +269,9 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-5.19-arm64-export: +kernel-6.6.74-arm64-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 script: - mkdir binaries && cp /Image binaries/Image artifacts: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 29919e9f43..c8eefc7e01 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -4,7 +4,7 @@ .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export - - kernel-5.19-arm64-export + - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile deleted file mode 100644 index 8e33995ba3..0000000000 --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile new file mode 100644 index 0000000000..73e5145425 --- /dev/null +++ b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile @@ -0,0 +1,38 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=6.6.74 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + bc \ + curl \ + flex \ + bison \ + libssl-dev \ + && \ + \ + # Build the kernel + curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ + sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ + sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ + make -j$(nproc) Image.gz && \ + cp arch/arm64/boot/Image / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:33:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980571.1367115 (Exim 4.92) (envelope-from ) id 1uDY9l-0000Hg-V5; Sat, 10 May 2025 00:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980571.1367115; Sat, 10 May 2025 00:33: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 1uDY9l-0000HY-SA; Sat, 10 May 2025 00:33:33 +0000 Received: by outflank-mailman (input) for mailman id 980571; Sat, 10 May 2025 00:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDY9k-0000HO-UU for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDY9k-002QLV-2x for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDY9k-003Dwz-2n for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33: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=Iv3CGtSkOQnpaT7h5GJoLvp0nC8uHqlIDexK/ljzlAw=; b=3bDgb250MwD3WJ5btxlKSLlh+P Y/sFLGHrVcwsyDBn9lVY1XEoAF+oR9OUTswt982gN/BJ0epgDwFI0n4B/a9eIUi99UczpL8E2mEPV Poyd/vWLz9KwfRbj9Hxe/7k33Mr6o1mWMFmDDwg7mdcO7e8KLXQi0+E0ZZJ02i7szXCk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] automation: upgrade arm32 kernel from bullseye to bookworm Message-Id: Date: Sat, 10 May 2025 00:33:32 +0000 commit 3078218ef1cc2acb110f56a1c6396142c75ae43e Author: Stefano Stabellini AuthorDate: Thu Feb 20 14:56:20 2025 -0800 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: upgrade arm32 kernel from bullseye to bookworm Signed-off-by: Stefano Stabellini Reviewed-by: Roger Pau Monné (cherry picked from commit 80ee4df5df1d89cf4ccaaca0562faee1cfa8c448) --- automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 41f6e5d8e6..0c94e662aa 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -11,7 +11,7 @@ serial_log="$(pwd)/smoke.serial" cd binaries # Use the kernel from Debian -curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz +curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bookworm/main/installer-armhf/current/images/netboot/vmlinuz # Use a tiny initrd based on busybox from Alpine Linux curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980572.1367118 (Exim 4.92) (envelope-from ) id 1uDY9v-0000Kh-WA; Sat, 10 May 2025 00:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980572.1367118; Sat, 10 May 2025 00:33: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 1uDY9v-0000KZ-Tc; Sat, 10 May 2025 00:33:43 +0000 Received: by outflank-mailman (input) for mailman id 980572; Sat, 10 May 2025 00:33:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDY9v-0000KQ-0y for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDY9v-002QLe-00 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDY9u-003DxM-37 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33: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=fwIF4OGILM7/WcW98sfZYz2+x42Rmdv0n8YSO9t7dDg=; b=ky8i4SByBZJXWsjP+izYYfnr5G jzBT/SQbBUu7RqXuHWorNwfrBFJHsG3x8NkompU1NyOuXdSYP+JOnPFO192LoCovJh/Gbomq+dAEf 0jCBOWzkJh8th9pvFgZtEt6piXR9I6q2zmq1xeYBj/SCQVfn6bnEx4dcFLCxIZWbzKIQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] automation: skip building domU if there is no test defined for it Message-Id: Date: Sat, 10 May 2025 00:33:42 +0000 commit 888631e81f32c2a5067aad53383b713564d6f093 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:51 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: skip building domU if there is no test defined for it This will be useful for later tests not using generic domU (unit tests, xtf etc). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit ae521cd96f98adc99df0d897aedd384535b7f21d) --- automation/scripts/qubes-x86-64.sh | 50 +++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8a0b7bfbc0..7eb3ce1bf7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -144,26 +144,28 @@ disk = [ ] ${domU_extra_config} " -# DomU -mkdir -p rootfs -cd rootfs -# fakeroot is needed to preserve device nodes in rootless podman container -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run -echo "#!/bin/sh +if [ -n "$domU_check" ]; then + # DomU + mkdir -p rootfs + cd rootfs + # fakeroot is needed to preserve device nodes in rootless podman container + fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz + mkdir proc + mkdir run + mkdir srv + mkdir sys + rm var/run + echo "#!/bin/sh ${domU_check} " > etc/local.d/xen.start -chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz -cd .. -rm -rf rootfs + chmod +x etc/local.d/xen.start + echo "rc_verbose=yes" >> etc/rc.conf + sed -i -e 's/^Welcome/domU \0/' etc/issue + find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + cd .. + rm -rf rootfs +fi # DOM0 rootfs mkdir -p rootfs @@ -188,11 +190,19 @@ ifconfig eth0 up ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 +" > etc/local.d/xen.start + +if [ -n "$domU_check" ]; then + echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & xl create /etc/xen/domU.cfg ${dom0_check} -" > etc/local.d/xen.start +" >> etc/local.d/xen.start +else + echo "${dom0_check}" >> etc/local.d/xen.start +fi + chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg @@ -201,7 +211,9 @@ echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +if [ -n "$domU_check" ]; then + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +fi find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:33:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980573.1367122 (Exim 4.92) (envelope-from ) id 1uDYA6-0000NZ-1U; Sat, 10 May 2025 00:33:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980573.1367122; Sat, 10 May 2025 00:33: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 1uDYA5-0000NR-VC; Sat, 10 May 2025 00:33:53 +0000 Received: by outflank-mailman (input) for mailman id 980573; Sat, 10 May 2025 00:33:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYA5-0000ND-4J for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYA5-002QLl-0L for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYA5-003Dxj-0C for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:33: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=tmiaGnRAOE1pThrRyKURTdO1EGxI89y2pfvuiItDccE=; b=0EW3gIVtkqmEbRr6vCsytOvh6S 4/xULcrQ1+TlImvSgbslqESH52J3FC75g85LfTu19eb3PU8yADppmZvVxgwQVkDfYzjrZkFjVM1vX E1v1TnF5YadCCjjPgLaWVc5+JIvClI1XrtpPbElmXcLQYJ+HnByEjbTkUuksEThUVfOU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] automation: add jobs running tests from tools/tests/* Message-Id: Date: Sat, 10 May 2025 00:33:53 +0000 commit eb2b48f2dcd1394b6449adc845d36bf2d1e41b7d Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:52 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: add jobs running tests from tools/tests/* There are a bunch of tests in tools/tests/, let them run in CI. For each subdirectory expect "make run" will run the test, and observe its exit code. This way, adding new tests is easy, and they will be automatically picked up. For better visibility, log test output to junit xml format, and let gitlab ingest it. Set SUT_ADDR variable with name/address of the system under test, so a network can be used to extract the file. The actual address is set using DHCP. And for the test internal network, still add the 192.168.0.1 IP (but don't replace the DHCP-provided one). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit fc10d6ecdd64c42dc4e3318ac31cd544a8d84959) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++ automation/scripts/build | 1 + automation/scripts/qubes-x86-64.sh | 28 +++++++++++++++++++++++ automation/scripts/run-tools-tests | 47 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index c8eefc7e01..a2dcf27b1f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -130,6 +130,7 @@ PCIDEV: "03:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1" + SUT_ADDR: test-2.testnet artifacts: paths: - smoke.serial @@ -258,6 +259,28 @@ adl-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +adl-tools-tests-pv-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +adl-tools-tests-pvh-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: diff --git a/automation/scripts/build b/automation/scripts/build index 952599cc25..522efe774e 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -109,5 +109,6 @@ else # even though dist/ contains everything, while some containers don't even # build Xen cp -r dist binaries/ + cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7eb3ce1bf7..7c80e0c233 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -10,6 +10,8 @@ set -ex # - pci-pv PV dom0, PV domU + PCI Passthrough # - pvshim PV dom0, PVSHIM domU # - s3 PV dom0, S3 suspend/resume +# - tools-tests-pv PV dom0, run tests from tools/tests/* +# - tools-tests-pvh PVH dom0, run tests from tools/tests/* test_variant=$1 ### defaults @@ -19,6 +21,7 @@ timeout=120 domU_type="pvh" domU_vif="'bridge=xenbr0'," domU_extra_config= +retrieve_xml= case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM @@ -126,6 +129,21 @@ done " ;; + ### tests: tools-tests-pv, tools-tests-pvh + "tools-tests-pv"|"tools-tests-pvh") + retrieve_xml=1 + passed="test passed" + domU_check="" + dom0_check=" +/tests/run-tools-tests /tests /tmp/tests-junit.xml && echo \"${passed}\" +nc -l -p 8080 < /tmp/tests-junit.xml >/dev/null & +" + if [ "${test_variant}" = "tools-tests-pvh" ]; then + extra_xen_opts="dom0=pvh" + fi + + ;; + *) echo "Unrecognised test_variant '${test_variant}'" >&2 exit 1 @@ -178,6 +196,8 @@ mkdir srv mkdir sys rm var/run cp -ar ../binaries/dist/install/* . +cp -ar ../binaries/tests . +cp -a ../automation/scripts/run-tools-tests tests/ echo "#!/bin/bash @@ -192,6 +212,10 @@ ifconfig xenbr0 192.168.0.1 " > etc/local.d/xen.start +if [ -n "$retrieve_xml" ]; then + echo "timeout 30s udhcpc -i xenbr0" >> etc/local.d/xen.start +fi + if [ -n "$domU_check" ]; then echo " # get domU console content into test log @@ -272,6 +296,10 @@ if [ $timeout -le 0 ]; then exit 1 fi +if [ -n "$retrieve_xml" ]; then + nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml \n' > "$xml_out" +printf '\n' >> "$xml_out" +printf ' \n' >> "$xml_out" +failed= +for dir in "$1"/*; do + [ -d "$dir" ] || continue + echo "Running test in $dir" + printf ' \n' "$dir" >> "$xml_out" + ret= + for f in "$dir"/*; do + [ -f "$f" ] || continue + [ -x "$f" ] || continue + "$f" 2>&1 | tee /tmp/out + ret=$? + if [ "$ret" -ne 0 ]; then + echo "FAILED: $ret" + failed+=" $dir" + printf ' \n' "$f" "$ret" >> "$xml_out" + # TODO: could use xml escaping... but current tests seems to + # produce sane output + cat /tmp/out >> "$xml_out" + printf ' \n' >> "$xml_out" + else + echo "PASSED" + fi + done + if [ -z "$ret" ]; then + printf ' \n' "$dir" >> "$xml_out" + fi + printf ' \n' >> "$xml_out" +done +printf ' \n' >> "$xml_out" +printf '\n' >> "$xml_out" + +if [ -n "$failed" ]; then + exit 1 +fi -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:34:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:34:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980574.1367127 (Exim 4.92) (envelope-from ) id 1uDYAH-0000QE-37; Sat, 10 May 2025 00:34:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980574.1367127; Sat, 10 May 2025 00:34:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAH-0000Q6-0R; Sat, 10 May 2025 00:34:05 +0000 Received: by outflank-mailman (input) for mailman id 980574; Sat, 10 May 2025 00:34:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAF-0000Po-87 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYAF-002QM2-0g for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYAF-003Dyd-0X for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:03 +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=nNxLgNeIpPgURc5AZmG3UZ9+Ilf1ss8ZRIMEenFsXZU=; b=bvbeh/I9wX+7293E5NEgrfwQie A9c4VVrLAx2AEQKT2bU9yRXHhTEELhJ4GZmmJVclqVrSkQecH9DiEhCnnoz46ZHwhlSZ+TabkbyrA u1qTmT4tHGY8w/CmBR15O0ZsTqV21lScpRKwU1gHpMM5skM87++3XyY+mbRMCLh/r4X4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] automation: allow selecting individual jobs via CI variables Message-Id: Date: Sat, 10 May 2025 00:34:03 +0000 commit b41df85556c74dc90ee77113751bf76db5b13e49 Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:53 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: allow selecting individual jobs via CI variables Debugging sometimes involves running specific jobs on different versions. It's useful to easily avoid running all of the not interesting ones (for given case) to save both time and CI resources. Doing so used to require changing the yaml files, usually in several places. Ease this step by adding SELECTED_JOBS_ONLY variable that takes a regex. Note that one needs to satisfy job dependencies on their own (for example if a test job needs a build job, that specific build job needs to be included too). The variable can be specified via Gitlab web UI when scheduling a pipeline, but it can be also set when doing git push directly: git push -o ci.variable=SELECTED_JOBS_ONLY="/job1|job2/" More details at https://docs.gitlab.co.jp/ee/user/project/push_options.html The variable needs to include regex for selecting jobs, including enclosing slashes. A coma/space separated list of jobs to select would be friendlier UX, but unfortunately that is not supported: https://gitlab.com/gitlab-org/gitlab/-/issues/209904 (note the proposed workaround doesn't work for job-level CI_JOB_NAME). On the other hand, the regex is more flexible (one can select for example all arm32 jobs). Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 9d419afa4667ba0369471c4a0e11e0717289c7bf) --- .gitlab-ci.yml | 2 ++ automation/gitlab-ci/build.yaml | 6 ++++++ automation/gitlab-ci/test.yaml | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 941e5822e8..b2fcf6c28f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ variables: XEN_REGISTRY: registry.gitlab.com/xen-project/xen + SELECTED_JOBS_ONLY: + description: "Regex to select only some jobs, must be enclosed with /. For example /job1|job2/" workflow: rules: diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 73fabe6f2f..60b221ee5e 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -12,6 +12,12 @@ - '*/*.log' when: always needs: [] + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + when: always + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .gcc-tmpl: variables: &gcc diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a2dcf27b1f..8f9752e179 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,11 @@ .test-jobs-common: stage: test image: ${XEN_REGISTRY}/${CONTAINER} + rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never + - when: on_success .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export @@ -99,6 +104,9 @@ - '*.dtb' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,6 +125,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -137,6 +148,9 @@ - '*.log' when: always rules: + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:34:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:34:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980575.1367131 (Exim 4.92) (envelope-from ) id 1uDYAR-0000TD-5e; Sat, 10 May 2025 00:34:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980575.1367131; Sat, 10 May 2025 00:34:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAR-0000T5-33; Sat, 10 May 2025 00:34:15 +0000 Received: by outflank-mailman (input) for mailman id 980575; Sat, 10 May 2025 00:34:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAP-0000Sn-Aq for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYAP-002QMD-0z for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYAP-003DzF-0s for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:13 +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=fZCPzeZZr5/da6RWjxOePcAUIpuIFjZTb7c9FXLEngY=; b=QNzHhl6jS5Y/EhBI8xg5n3dHrC GJ3sXXRIVaOB2zgkentp15Fn7alAajuzyMHfjIMAJIKU+uJdMcpDHHSPOlwfF5IxDLbHGDmF4BQej szPWgvajX/VDwxoXZtBk8MzidcfG6C5kuGHuv4nzl4p9IwyLDPLWjhFFsiGU1Q1ZMYUQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] automation: add tools/tests jobs on the AMD Zen3+ runner too Message-Id: Date: Sat, 10 May 2025 00:34:13 +0000 commit d80a13f6749ea25014fb5b7f7a010ed05ecc45ea Author: Marek Marczykowski-Górecki AuthorDate: Wed Feb 19 03:56:54 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation: add tools/tests jobs on the AMD Zen3+ runner too Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit b551aed4ab131e61a13922d07bd7d9e29d694f31) --- automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 8f9752e179..a1bc30c915 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -173,6 +173,7 @@ PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-11.testnet tags: - qubes-hw11 @@ -351,6 +352,28 @@ zen3p-pvshim-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +zen3p-tools-tests-pv-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen3p-tools-tests-pvh-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:34:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:34:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980576.1367135 (Exim 4.92) (envelope-from ) id 1uDYAb-0000Vs-70; Sat, 10 May 2025 00:34:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980576.1367135; Sat, 10 May 2025 00:34:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAb-0000Vj-4Q; Sat, 10 May 2025 00:34:25 +0000 Received: by outflank-mailman (input) for mailman id 980576; Sat, 10 May 2025 00:34:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAZ-0000VT-Dk for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYAZ-002QMY-1G for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYAZ-003E0E-1A for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:23 +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=CYEp1rZX7FbSmm1sN1p3WWftwVKA7ibI9biywg6i9dI=; b=l3lYaK2Yp7USM32p1GZaCSDtMg e0L47hWuv6nVuwd4+UMD0flHrPRV23K0RWA62/RP51OlGKjEcf8xqLpUH7TtQJUj9ytyxA8uJUvgB SBuul2jw7juillP86UDgCjUEJchBYWR91OmXArPUMQFkzqiQkLNXuETf8JDm1DvRvpaw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] automation/eclair: Reduce verbosity of ECLAIR logs. Message-Id: Date: Sat, 10 May 2025 00:34:23 +0000 commit c7dbcdaee1b04f5ab281f8104970431596cb03e7 Author: Nicola Vetrini AuthorDate: Tue Mar 4 18:49:36 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 automation/eclair: Reduce verbosity of ECLAIR logs. While activating verbose logging simplifies debugging, this causes GitLab logs to be truncated, preventing the links to the ECLAIR analysis database to be shown. No functional change. Fixes: c4392ec83244 ("automation: Add ECLAIR utilities and settings") Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini (cherry picked from commit 78f2a5792c68128e3205dd18f0f92fd408bf5cd8) --- automation/eclair_analysis/ECLAIR/analysis.ecl | 2 -- automation/eclair_analysis/ECLAIR/analyze.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 8326156b38..399099938f 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -10,8 +10,6 @@ setq(analysis_kind,getenv("ANALYSIS_KIND")) # strings_map("scheduled-analysis",500,"","^.*$",0) # map_strings("scheduled-analysis",analysis_kind) --verbose - -enable=B.REPORT.ECB -config=B.REPORT.ECB,output=join_paths(data_dir,"FRAME.@FRAME@.ecb") -config=B.REPORT.ECB,preprocessed=show diff --git a/automation/eclair_analysis/ECLAIR/analyze.sh b/automation/eclair_analysis/ECLAIR/analyze.sh index e96456c3c1..ccd052208a 100755 --- a/automation/eclair_analysis/ECLAIR/analyze.sh +++ b/automation/eclair_analysis/ECLAIR/analyze.sh @@ -97,11 +97,13 @@ find "${ECLAIR_DATA_DIR}" -maxdepth 1 -name "FRAME.*.ecb" | sort | xargs cat | "${ECLAIR_BIN_DIR}eclair_report" \ "-create_db='${PROJECT_ECD}'" \ + -quiet \ -load=/dev/stdin > "${ECLAIR_REPORT_LOG}" 2>&1 # Create the Jenkins reports file. "${ECLAIR_BIN_DIR}eclair_report" \ "-db='${PROJECT_ECD}'" \ + -quiet \ "-eval_file='${SCRIPT_DIR}/report.ecl'" \ >> "${ECLAIR_REPORT_LOG}" 2>&1 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:34:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:34:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980577.1367139 (Exim 4.92) (envelope-from ) id 1uDYAl-0000YL-8G; Sat, 10 May 2025 00:34:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980577.1367139; Sat, 10 May 2025 00:34:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAl-0000YD-5m; Sat, 10 May 2025 00:34:35 +0000 Received: by outflank-mailman (input) for mailman id 980577; Sat, 10 May 2025 00:34:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAj-0000Y4-HE for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYAj-002QMs-1c for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYAj-003E0l-1S for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34: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=wzh84h5yaC4UMuO3EAieS4dOl2ZHLO6WGwEBnsupve8=; b=jzTompXpI54mY7HepRC6VyamSr jAhRFJboDim0h3TIUOScPcgMo4iqRKraRz1rQTIOsIgCoKRVQKX7kgC5t9V2kXPDg9y3NZB/bI4Lt LUQarRlukuAxVED4k6ZfUOYvW7VAxmGTZbBjgnkK4S31Klal82K/PowOFSW8uVMVcMQA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] ci: create boot.ipxe for legacy boot Message-Id: Date: Sat, 10 May 2025 00:34:33 +0000 commit bf8751513d83a53f73d735e584f287853c3bce68 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:35 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 ci: create boot.ipxe for legacy boot Hardware runners that use legacy boot use iPXE instead of grub2. Create boot.ipxe for those too - with exact same options. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 42beecae0b219fdfa04db729dea2229e05bf4af0) --- automation/scripts/qubes-x86-64.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7c80e0c233..f272964459 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -251,6 +251,14 @@ module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen module2 (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg +echo "#!ipxe + +kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot +module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot +module /gitlab-ci/initrd-dom0 || reboot +boot +" > $TFTP/boot.ipxe + cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:34:45 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:34:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980578.1367143 (Exim 4.92) (envelope-from ) id 1uDYAv-0000ao-AA; Sat, 10 May 2025 00:34:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980578.1367143; Sat, 10 May 2025 00:34: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 1uDYAv-0000ag-7D; Sat, 10 May 2025 00:34:45 +0000 Received: by outflank-mailman (input) for mailman id 980578; Sat, 10 May 2025 00:34:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYAt-0000aO-KO for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYAt-002QMy-1t for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYAt-003E19-1n for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34: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=8CXH/uIixv84QZ7Rzfib+mstShw3OoS0a+cfr2kMELE=; b=YYVZurzFbnYs+jfYoJSc1RJpG6 MBARpdbO+Z/rIjkVlnC48ERkCoEKUlKf312jLTMYv7jnXvUYTxDkCkZPp+YZUqsUlFMyuhsTV4Sgs Zkn/GR/dJ4C4tVJ4uE+46YkWqV+KWSKUvCs5zynECTfjLCEnizuWb3exCmlS4s2ic+Pc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] ci: add Intel KabyLake HW runner Message-Id: Date: Sat, 10 May 2025 00:34:43 +0000 commit aa53633d6708569e2f21fffb38d2b1a678efaa53 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 1 01:41:36 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 ci: add Intel KabyLake HW runner This is Intel i7-7567U in NUC 7i7BNH. This one is an older one, with no firmware updates (last update from 2023) and no microcode udpates either. While this firmware supports UEFI, network boot works only in legacy mode - thus legacy is used here (via iPXE, instead of grub2.efi). Testing legacy boot path may be a useful thing on its own. Add the same set of tests as on ADL runner. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 911a766f143196a1576c1b009e2e1cde8b921062) --- automation/gitlab-ci/test.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a1bc30c915..903fb113e9 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -155,6 +155,17 @@ tags: - qubes-hw2 +.kbl-x86-64: + # it's really similar to the ADL one + extends: .adl-x86-64 + variables: + PCIDEV: "00:1f.6" + PCIDEV_INTR: "MSI" + CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi" + SUT_ADDR: test-3.testnet + tags: + - qubes-hw3 + .zen2-x86-64: # it's really similar to the above extends: .adl-x86-64 @@ -296,6 +307,84 @@ adl-tools-tests-pvh-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +kbl-smoke-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-suspend-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pci-hvm-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-pvshim-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pv-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +kbl-tools-tests-pvh-x86-64-gcc-debug: + extends: .kbl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:34:55 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:34:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980579.1367148 (Exim 4.92) (envelope-from ) id 1uDYB5-0000dH-Bx; Sat, 10 May 2025 00:34:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980579.1367148; Sat, 10 May 2025 00:34: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 1uDYB5-0000d9-8W; Sat, 10 May 2025 00:34:55 +0000 Received: by outflank-mailman (input) for mailman id 980579; Sat, 10 May 2025 00:34:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYB3-0000cw-Ms for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYB3-002QN6-29 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYB3-003E1Y-24 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:34: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=qlgzekqwRKN1jZaeDIh/6GXYtDYpY2Zv8aEB09u7e+M=; b=cfgKBORf+SrsWndOVV4R335R5g VqV6h8ouU79897Jt7cRY6P60/xq/Gy6TV3ZyZB5p+T5bGesD/jR4m8Nwas83fbGkdOEpDWXh8KxA4 MdJjxbO5PLzIpdYCGImirvlxNLkd6Ku1+yE2px8DaiHp79AvvzH69XVB+9cCUtwM7P08=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: prevent grub unpacking initramfs Message-Id: Date: Sat, 10 May 2025 00:34:53 +0000 commit 45f8d178c7ba6f80bf6bee58217f545e3f03fe06 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:01 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: prevent grub unpacking initramfs It fails on larger initramfs (~250MB one) and sometimes even smaller depending on memory size/memory map, let Linux do it. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 32e6d052c2d88437c6fcec81e5369bc8016ac7e9) --- automation/scripts/qubes-x86-64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index f272964459..8e78b7984e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -248,7 +248,7 @@ CONTROLLER=control@thor.testnet echo " multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (http)/gitlab-ci/initrd-dom0 +module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg echo "#!ipxe -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:35:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:35:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980580.1367151 (Exim 4.92) (envelope-from ) id 1uDYBF-0000fZ-Ct; Sat, 10 May 2025 00:35:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980580.1367151; Sat, 10 May 2025 00:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBF-0000fN-9w; Sat, 10 May 2025 00:35:05 +0000 Received: by outflank-mailman (input) for mailman id 980580; Sat, 10 May 2025 00:35:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBD-0000fC-Pm for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYBD-002QNN-2U for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYBD-003E2g-2M for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:03 +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=5p331nN0JJTpAjsiKJuOIJVjL6lUglid0ATDUyK+Q3E=; b=H3lu8jQBQa0SRpOKbvBXDNwWVf BH6StIHBzvVCzbTcuSImTvM9+0iywwCGYHnU9ciUIGEoA3/3zx/Cn7oxyCCvY3LyQsa5FVHEJtRHB W3ZPUjHnFUjMt+DXaa7oifPun+8WuSVWGlIGR46ejWKqS4j7z/9PKkOo26Rw8D9UcCrA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: enable XHCI console in Xen debug build on Alpine Message-Id: Date: Sat, 10 May 2025 00:35:03 +0000 commit 19cc94916a3fc55e5eb5fada0913cf72267392be Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:03 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: enable XHCI console in Xen debug build on Alpine This build is used for hardware tests, and some runners use XHCI console Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini (cherry picked from commit 17cf98d73043d4737783781df6526488b90d1565) --- automation/gitlab-ci/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 60b221ee5e..da38023c5d 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -335,6 +335,8 @@ alpine-3.18-gcc-debug: variables: CONTAINER: alpine:3.18 BUILD_QEMU_XEN: y + EXTRA_XEN_CONFIG: | + CONFIG_XHCI=y debian-12-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:35:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:35:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980581.1367154 (Exim 4.92) (envelope-from ) id 1uDYBP-0000i7-Dy; Sat, 10 May 2025 00:35:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980581.1367154; Sat, 10 May 2025 00:35:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBP-0000hz-BS; Sat, 10 May 2025 00:35:15 +0000 Received: by outflank-mailman (input) for mailman id 980581; Sat, 10 May 2025 00:35:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBN-0000hn-SQ for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYBN-002QNR-2l for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYBN-003E33-2f for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:13 +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=xBvRymDPlAqziHjOcxJ/0Re4XgyNX/qm34lemJXwroI=; b=bLJ76SEhiJNWvHrBSDq2geyeWW nhifaJ3iMFRp9LI0m2SC61PZpxLc+c4jeWmZpa5K686FTPtOpCjQwDZcguBBBL+eHOQxEZpSPukq2 VLq3DiWIto1mHvWpLeS5v1l8VBYZ2Ng9HZAzK/f7sae2qeLMZ9x1NX5WTZCcuFcC7SsM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: include domU kernel messages in the console output log Message-Id: Date: Sat, 10 May 2025 00:35:13 +0000 commit e3d633390b2eb761db9d0fc90a2e60043912423f Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:04 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: include domU kernel messages in the console output log Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD (cherry picked from commit 1804064f68d52a47f1fc1454a3b254c16abe192b) --- automation/scripts/qubes-x86-64.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8e78b7984e..80000854bc 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -175,6 +175,8 @@ if [ -n "$domU_check" ]; then rm var/run echo "#!/bin/sh +echo 8 > /proc/sys/kernel/printk + ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:35:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:35:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980582.1367159 (Exim 4.92) (envelope-from ) id 1uDYBZ-0000kp-Fy; Sat, 10 May 2025 00:35:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980582.1367159; Sat, 10 May 2025 00:35:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBZ-0000kg-Cm; Sat, 10 May 2025 00:35:25 +0000 Received: by outflank-mailman (input) for mailman id 980582; Sat, 10 May 2025 00:35:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBX-0000kO-Vh for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYBX-002QNs-35 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYBX-003E3R-2z for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:23 +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=N8BXsKZ7vvc0HH4PYAOITKunTK01jLtAyZpvjgvrfls=; b=p4zlkGA6Ruwd7X/2dfiQ+Dg9Lg 7QAQW803b4JvWTRQRd0bocBBg56hlAG411Z7A7/5Bkop8ZLe9G/6QI0xdZNh3qRpwt/TYNcCdh+sI 6xU50fYO/bZXzy28fXRw0F2125PkPOJKpfQMGSJGCP7ViYG7/lyKhlG8bhWtoJ3dLrLY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: increase verbosity of starting a domain Message-Id: Date: Sat, 10 May 2025 00:35:23 +0000 commit d0e99ffcae99b158db6e2a41a2e313434fde25ac Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:05 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: increase verbosity of starting a domain And start collecting qemu log earlier, so it isn't lost in case of a timeout during domain startup. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit b8d41a9b22bbe9a08c8438eacf7b705500f20cea) --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 1ff689b577..17e2141d62 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index b752424cc2..deed8af795 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -21,7 +21,7 @@ echo "#!/bin/bash xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > ./root/xen.start echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 4d22a124df..8774a87012 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 80000854bc..7867724ebd 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -122,7 +122,6 @@ echo \"${passed}\" " dom0_check=" -tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -222,7 +221,8 @@ if [ -n "$domU_check" ]; then echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & +xl -vvv create /etc/xen/domU.cfg ${dom0_check} " >> etc/local.d/xen.start else diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7027f083ba..ac1eda0fe3 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -94,7 +94,7 @@ ifconfig xenbr0 192.168.0.1 # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:35:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:35:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980583.1367163 (Exim 4.92) (envelope-from ) id 1uDYBj-0000nY-JD; Sat, 10 May 2025 00:35:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980583.1367163; Sat, 10 May 2025 00:35:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBj-0000nQ-GY; Sat, 10 May 2025 00:35:35 +0000 Received: by outflank-mailman (input) for mailman id 980583; Sat, 10 May 2025 00:35:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBi-0000nI-2B for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYBi-002QNy-08 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYBi-003E5q-01 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:34 +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=lE9Lsj83SvobosmiypiJJYL4+hqXu5E4asH+jAnwtoY=; b=z6BxjG4Zj8pJJy4guJa7jycbPT fchcm9BTkf4fbrKA6nJ9paY4K5zQT1KyHcQOw4urPu7v0RqvY9X8HI6baaZOIu1mCoMsRBZlsPE1F /MGS90m9q0ALV0rk/AZ1gGNxWfhO7NDBAdFjjDA6VkQZoHT7IbELr9Ja4vV82fPocwmo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: consistently use DOCKER_CMD in makefiles Message-Id: Date: Sat, 10 May 2025 00:35:34 +0000 commit 694015c8f22f9f8c1c9ad9fbbece754832154cfb Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:06 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: consistently use DOCKER_CMD in makefiles This allows rebuilding containers using podman too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 5606b982acd44cc1f0715c424a11b2e76420aa18) --- automation/build/Makefile | 4 ++-- automation/tests-artifacts/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/build/Makefile b/automation/build/Makefile index 4df43b0407..fedf7524da 100644 --- a/automation/build/Makefile +++ b/automation/build/Makefile @@ -31,8 +31,8 @@ clean: define CLEAN_RULE .PHONY: clean-$(1) clean-$(1): - if [ -n "$$$$(docker image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ - docker image rm $(REGISTRY)/$(subst /,:,$(1)); \ + if [ -n "$$$$($(DOCKER_CMD) image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ + $(DOCKER_CMD) image rm $(REGISTRY)/$(subst /,:,$(1)); \ fi endef diff --git a/automation/tests-artifacts/Makefile b/automation/tests-artifacts/Makefile index d055cd696b..80a60a94f3 100644 --- a/automation/tests-artifacts/Makefile +++ b/automation/tests-artifacts/Makefile @@ -10,9 +10,9 @@ help: @echo "To push container builds, set the env var PUSH" %: %.dockerfile ## Builds containers - docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:35:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980584.1367167 (Exim 4.92) (envelope-from ) id 1uDYBt-0000ph-KJ; Sat, 10 May 2025 00:35:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980584.1367167; Sat, 10 May 2025 00:35: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 1uDYBt-0000pa-Hu; Sat, 10 May 2025 00:35:45 +0000 Received: by outflank-mailman (input) for mailman id 980584; Sat, 10 May 2025 00:35:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYBs-0000pQ-5z for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYBs-002QO2-0V for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYBs-003E6G-0M for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:44 +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=KiJ5G8DQrLEb5vx6NtDDvVMbHp4ldpcYzjb5zrT7Tu4=; b=bztWDhpYDL02Kca05hAN4HQOXL ZYAMq0/enXvlmFfdMazvYhtyABbQc+Bqd9n323wR5bqLU/f1VvKYYdWYg6UqAwjfogxAPq/5iGsky 2cLwPpYSclLnxFHRhbosxl7WCIEuabjW5+R7WZKRt7XRCDmDXPqUuDXBlfoX5qW8pwPs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: wait for the network interface in PCI passthrough tests Message-Id: Date: Sat, 10 May 2025 00:35:44 +0000 commit 3cde61a381f6be298fbc280aa358a6a4e185e850 Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:07 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: wait for the network interface in PCI passthrough tests The network driver initializes asynchronously, and it may not be ready yet by the time the startup script is called. This is especially the case for USB network adapter (where the PCI device is the USB controller) in the upcoming runner. Don't bother about separate timeout - test timeout will cover this part too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 6e3fe711fbf3a659160ab7ef2c293dffd62bbda4) --- automation/scripts/qubes-x86-64.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7867724ebd..2b04d281d7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -104,6 +104,7 @@ on_reboot = "destroy" domU_check=" set -x -e interface=eth0 +while ! [ -e \"/sys/class/net/\$interface\" ]; do sleep 1; done ip link set \"\$interface\" up timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:35:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:35:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980585.1367171 (Exim 4.92) (envelope-from ) id 1uDYC2-0000sH-Lt; Sat, 10 May 2025 00:35:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980585.1367171; Sat, 10 May 2025 00:35: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 1uDYC2-0000s9-JI; Sat, 10 May 2025 00:35:54 +0000 Received: by outflank-mailman (input) for mailman id 980585; Sat, 10 May 2025 00:35:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYC2-0000ry-9G for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYC2-002QT7-0q for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYC2-003E6c-0l for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:35:54 +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=TUwF0OEs92mvhFycknMiL8OVotekZKANUbld0im2Wno=; b=MkehNIoQ2U3ZEPJP90H5QwhdGO FlCJJ2tbvq2TxPp4aLSR69CK8LVEzPk0VE2sNT5ZW3JJRpKim3QXkJp7a4KBt1BIpkJGDJLLyYUTS 0+XVzIOIlibWruxoJhinLPE6yDrPoszDwc4kyCg5LNid6dFgh+uUsJOZfI21zyHd/2rk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: adjust resolving network interface into PCI device Message-Id: Date: Sat, 10 May 2025 00:35:54 +0000 commit 7e23b4e5345e2446de7ae79a93225d27221da45b Author: Marek Marczykowski-Górecki AuthorDate: Mon Apr 7 14:31:09 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: adjust resolving network interface into PCI device Change how PCI device lookup is done to handle also USB devices, in which case get the USB controller. Instead of taking basename of the 'device' symlink, resolve the full path (example: /sys/devices/pci0000:00/0000:00:09.0/usb4/4-7/4-7:1.0) and take the first part after pci0000:00. Theoretically it could be a bridge, but VM has flat PCI topology. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini (cherry picked from commit 930279d96ca706f05e5860bef4126fc97457d256) --- automation/scripts/qubes-x86-64.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 2b04d281d7..a964ac4b7a 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -110,7 +110,8 @@ timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') ping -c 10 \"\$pingip\" echo domU started -pcidevice=\$(basename \$(readlink /sys/class/net/\$interface/device)) +pcidevice=\$(realpath /sys/class/net/\$interface/device | + sed 's#.*pci0000:00/\\([^/]*\\).*#\\1#') lspci -vs \$pcidevice " if [ -n "$PCIDEV_INTR" ]; then -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:36:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:36:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980586.1367175 (Exim 4.92) (envelope-from ) id 1uDYCC-0000ut-NI; Sat, 10 May 2025 00:36:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980586.1367175; Sat, 10 May 2025 00:36: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 1uDYCC-0000um-Kj; Sat, 10 May 2025 00:36:04 +0000 Received: by outflank-mailman (input) for mailman id 980586; Sat, 10 May 2025 00:36:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCC-0000uf-CH for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYCC-002QTv-18 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYCC-003E7k-12 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:04 +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=xoTWE3xE9aSKWv6yWs7FH3hkwe52XgfCVmb/6FpROf4=; b=IXMfdOzFtzN9Qa8Lcfvvehfeub AiOLXxQVapX9kwK9ZNqTWH3/TNqnAlr9HAgeayu+5rG/tnRa7akwn1bAycL0rUfgM4avmCkDrXq4M 2JlRTPfxW1+Amt3I4qH3VgdG0DUC/F0t/XhB/X3hNBHOFKHQzg+cofEoL1Kdrgno5GWI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Message-Id: Date: Sat, 10 May 2025 00:36:04 +0000 commit 24e4156f11946b0368d10493066fa42577d15576 Author: Andrew Cooper AuthorDate: Wed Apr 9 13:50:00 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Update x86 tests from Linux 6.1.19 to 6.6.56 Linux 6.6.56 was already added to test-artifacts for the argo testing, and this removes one moving part while cleaning things up. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit f8588376648aa87f22cc709453f32473f45923c0) --- automation/gitlab-ci/build.yaml | 13 ------- automation/gitlab-ci/test.yaml | 4 ++- .../tests-artifacts/kernel/6.1.19.dockerfile | 41 ---------------------- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index da38023c5d..16733214c4 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -308,19 +308,6 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 -# x86_64 test artifacts - -kernel-6.1.19-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 - script: - - mkdir binaries && cp /bzImage binaries/bzImage - artifacts: - paths: - - binaries/bzImage - tags: - - x86_64 - # Jobs below this line # Build jobs needed for tests diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 903fb113e9..c3d8075017 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -16,7 +16,9 @@ - qemu-system-aarch64-6.0.0-arm32-export .x86-64-test-needs: &x86-64-test-needs - - kernel-6.1.19-export + - project: xen-project/hardware/test-artifacts + job: linux-6.6.56-x86_64 + ref: master - project: xen-project/hardware/test-artifacts job: x86_64-rootfs-alpine-3.18 ref: master diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile deleted file mode 100644 index 073eaa0e11..0000000000 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.1.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libelf-dev \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -# Build the kernel -RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make xen.config && \ - scripts/config --enable BRIDGE && \ - scripts/config --enable IGC && \ - scripts/config --enable TUN && \ - cp .config .config.orig && \ - cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ - make -j$(nproc) bzImage && \ - cp arch/x86/boot/bzImage / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:36:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:36:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980587.1367179 (Exim 4.92) (envelope-from ) id 1uDYCN-0000xN-Ox; Sat, 10 May 2025 00:36:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980587.1367179; Sat, 10 May 2025 00:36:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCN-0000xF-MK; Sat, 10 May 2025 00:36:15 +0000 Received: by outflank-mailman (input) for mailman id 980587; Sat, 10 May 2025 00:36:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCM-0000x6-F0 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYCM-002QTz-1Q for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYCM-003E8n-1K for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:14 +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=QJDPDLUiCyaWA8Yy01ANgxB1DIXzGQ+OxXo3upZu+fE=; b=kznzL/vlBv8fA0JeZbQVWFIKAT J8XHH+jfyUJQwX8iBdTZMwY4/COzZIjJOA/eIZiF+xQaJY5XqbWFmKNzXNzowP02c689UcvflK7gC ILxZ7JkI2ikREPAhNl+NLLKKY0j0CTLrggQ1P8tHwDlzCJrIQEODMGSLHKGXv5PQMLvk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Message-Id: Date: Sat, 10 May 2025 00:36:14 +0000 commit 7ac34d110cb3a6729d5bdadb179ce1c60128509d Author: Andrew Cooper AuthorDate: Wed Apr 9 17:22:54 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Update ARM64 tests from Linux 6.6.74 to 6.6.86 Switch over to test-artifacts. Drop the associated export job, and dockerfile. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 8b22309c9bae2cb0717651b8b71feb86d8b203f8) --- automation/gitlab-ci/build.yaml | 11 ------- automation/gitlab-ci/test.yaml | 4 ++- .../kernel/6.6.74-arm64v8.dockerfile | 38 ---------------------- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 16733214c4..293f877ec9 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -275,17 +275,6 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-6.6.74-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index c3d8075017..96a49f2547 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -8,8 +8,10 @@ - when: on_success .arm64-test-needs: &arm64-test-needs + - project: xen-project/hardware/test-artifacts + job: linux-6.6.86-arm64 + ref: master - alpine-3.18-arm64-rootfs-export - - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile deleted file mode 100644 index 73e5145425..0000000000 --- a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.6.74 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - bc \ - curl \ - flex \ - bison \ - libssl-dev \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:36:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:36:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980588.1367183 (Exim 4.92) (envelope-from ) id 1uDYCX-0000zz-QO; Sat, 10 May 2025 00:36:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980588.1367183; Sat, 10 May 2025 00:36:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCX-0000zs-Nl; Sat, 10 May 2025 00:36:25 +0000 Received: by outflank-mailman (input) for mailman id 980588; Sat, 10 May 2025 00:36:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCW-0000zk-Hq for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYCW-002QUK-1h for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYCW-003E9s-1b for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:24 +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=1Xg5xbr+cF+gs7pPPqvnq91dDAd8ClzLQWfC1NlRNRs=; b=Sk+Q6+muvk2nQe+Z423scYZEw6 PYH/yfJau6jKiHUZZ9Nw2cRVeHq3LOlJy5PezMzs4cz8IeVPqozF6nCrUATKmx2XXSDLe0BoA99pr 77OPgVcq/FhI+ywPwo6a093XVpzR6bl7uvmNTdPoou4X24BxT+LKbOQ3195hIbCaLcs0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: Drop stale test-artifacts/alpine/3.18.dockerfile Message-Id: Date: Sat, 10 May 2025 00:36:24 +0000 commit 57112bbb2d8cdf46697be763b4057e8d377f4e19 Author: Andrew Cooper AuthorDate: Mon Apr 7 18:15:32 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Drop stale test-artifacts/alpine/3.18.dockerfile This should have been dropped too, as the authoritative copy lives in another repo now. Fixes: babe11b46c1a ("CI: Drop alpine-3.18-rootfs-export and use test-artefacts") Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki (cherry picked from commit 424d20afae9a0d85c17e9dec3922af6448929b8c) --- automation/tests-artifacts/alpine/3.18.dockerfile | 67 ----------------------- 1 file changed, 67 deletions(-) diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile deleted file mode 100644 index 311a92889b..0000000000 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add libgcc && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - apk add pciutils && \ - apk add libelf && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add modules boot && \ - rc-update add killprocs shutdown && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - echo > /etc/modules && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:36:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:36:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980589.1367187 (Exim 4.92) (envelope-from ) id 1uDYCh-00012R-Ru; Sat, 10 May 2025 00:36:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980589.1367187; Sat, 10 May 2025 00:36:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCh-00012J-PE; Sat, 10 May 2025 00:36:35 +0000 Received: by outflank-mailman (input) for mailman id 980589; Sat, 10 May 2025 00:36:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCg-000126-Ks for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYCg-002QUQ-1z for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYCg-003EAv-1t for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:34 +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=03CA1rDmY83vb+yODbWt/TS7HZ401ZbdLbZHZePUY0I=; b=zhE3gQ+pjXZzMczLE02i2VYoe/ NxYhrqw1iJAFzulQF3m70Ze6yFn5tRrrgNPUPMymvYzNKC4/Xirzfv86rv4RzJd/k7tAzs6F85SEn Wo+D7NTa/gdphPhpDauLMhX28uh5wtRaYd9eJGD6vjWdyC5D4Tzk2c55zLk/pus47FXY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: wait for Xen to start before waiting for test to complete Message-Id: Date: Sat, 10 May 2025 00:36:34 +0000 commit 3e24eef96810fa2f8f767330feff7afd9066b2ec Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:13 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: wait for Xen to start before waiting for test to complete Add additional stage in console output parsing - wait for first message from Xen. The message is defined via BOOT_MSG variable. This has two effects: - distinguishes failing Xen to load at all from later test failures - resets timeout when Xen starts loading The latter is especially relevant for hardware tests where firmware + network boot may take some time before Xen starts booting. The two-stage timeout is more robust solution than increasing the overall timeout. The issue has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. This patch is a first stage before qubes-x86-64.sh is switched to use expect in the next stage. While at it, consistently use 'expect -re' for all matches. This especially allows matching newlines ("\n"), which will become relevant in the next patch. And document variables used in console.exp. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit 7c96a27e375d8d7cbbb5493ebef0e29f90bfd273) --- automation/scripts/console.exp | 27 ++++++++++++++++++----- automation/scripts/qemu-alpine-x86_64.sh | 1 + automation/scripts/qemu-smoke-dom0-arm32.sh | 1 + automation/scripts/qemu-smoke-dom0-arm64.sh | 1 + automation/scripts/qemu-smoke-dom0less-arm32.sh | 1 + automation/scripts/qemu-xtf-dom0less-arm64.sh | 1 + automation/scripts/xilinx-smoke-dom0-x86_64.sh | 1 + automation/scripts/xilinx-smoke-dom0less-arm64.sh | 1 + 8 files changed, 29 insertions(+), 5 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 31ce97b91b..c27f893dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -1,4 +1,17 @@ #!/usr/bin/env expect +# +# Variables used by this script: +# - TEST_TIMEOUT: timeout between each *_MSG match +# - TEST_TIMEOUT_OVERRIDE: when set, overrides TEST_TIMEOUT +# - TEST_LOG: save console log to this file +# - TEST_CMD: commands that prints test system console output to stdout - in +# qemu tests that's usually qemu itself (with -serial stdio), in hardware +# tests that's a command to read serial console +# - UBOOT_CMD (optional): command to enter at u-boot prompt +# - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - LOG_MSG (optional): final console message to wait for +# - PASSED: message to look for to consider test a success; if LOG_MSG is set, +# both LOG_MSG and PASSED must appear (in any order) for test to succeed if {[info exists env(TEST_TIMEOUT_OVERRIDE)]} { set timeout $env(TEST_TIMEOUT_OVERRIDE) @@ -28,21 +41,25 @@ if {[info exists env(UBOOT_CMD)]} { send "$env(UBOOT_CMD)\r" } +if {[info exists env(BOOT_MSG)]} { + expect -re "$env(BOOT_MSG)" +} + if {[info exists env(LOG_MSG)]} { expect { - "$env(PASSED)" { - expect "$env(LOG_MSG)" + -re "$env(PASSED)" { + expect -re "$env(LOG_MSG)" exit 0 } - "$env(LOG_MSG)" { - expect "$env(PASSED)" + -re "$env(LOG_MSG)" { + expect -re "$env(PASSED)" exit 0 } } } expect { - "$env(PASSED)" { + -re "$env(PASSED)" { exit 0 } } diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 17e2141d62..89bdb4df7d 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -85,6 +85,7 @@ export TEST_CMD="qemu-system-x86_64 \ -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0" export TEST_LOG="smoke.serial" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index deed8af795..97855d8ed2 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -92,6 +92,7 @@ export TEST_CMD="./qemu-system-arm \ export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" export TEST_LOG="${serial_log}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="/ #" diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 8774a87012..51d037b000 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -104,6 +104,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 0c94e662aa..0e2c5496db 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -144,6 +144,7 @@ export TEST_CMD="./qemu-system-arm \ -bios /usr/lib/u-boot/qemu_arm/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="${serial_log}" export LOG_MSG="${dom0_prompt}" export PASSED="${passed}" diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh b/automation/scripts/qemu-xtf-dom0less-arm64.sh index 9608de6ec0..436f460c3c 100755 --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh @@ -61,6 +61,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export PASSED="${passed}" diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index ac1eda0fe3..e448f7e2f5 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -133,6 +133,7 @@ stty -F ${SERIAL_DEV} 57600 # Capture test result and power off board before exiting. export PASSED="${PASS_MSG}" +export BOOT_MSG="Latest ChangeSet: " export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index b24ad11b8c..3e1fcf6bf9 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -140,6 +140,7 @@ stty -F ${SERIAL_DEV} 115200 # Capture test result and power off board before exiting. export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Welcome to Alpine Linux" export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:36:45 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:36:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980590.1367191 (Exim 4.92) (envelope-from ) id 1uDYCr-00015J-Um; Sat, 10 May 2025 00:36:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980590.1367191; Sat, 10 May 2025 00:36: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 1uDYCr-00015B-S7; Sat, 10 May 2025 00:36:45 +0000 Received: by outflank-mailman (input) for mailman id 980590; Sat, 10 May 2025 00:36:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYCq-000153-NO for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYCq-002QUV-2F for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYCq-003EBv-2A for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:44 +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=+NtMD7RqjHPlx28f1uv7yZ/4n5f48wAJ+wQucRTrjpQ=; b=gt/GYXVTzn6kZtE7Cykirz14KJ YdHsI0dHM4kipEpqiX2eWjPg6wPYpk53/nmGxjhOF6dWj+6FmBdjw1UaLAdHsAR+f2BGUVMbaxzFO q2Iml00yEAT7F8qjlZHYKM5hqtijUt01+2ow9+0Dht09qlalLgRw8BaCh4eeiOyMwpF4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: fix waiting for final test message Message-Id: Date: Sat, 10 May 2025 00:36:44 +0000 commit cada2a89a818845ed60fe655df40530d211fa342 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:14 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: fix waiting for final test message Expect normally discards initial part of its buffer after matching the patter, before looking for the next one. If both PASSED and LOG_MSG happen to be in the buffer at the same time, depending on their order, only one will be matched and the waiting for the other will timeout. Example expect -d output of this happening (parts eclipsed for brevity): expect: does "\r\r\r\nWelcome to Alpine Linux 3.18\r\r\r\n...\r\r\r\r\n(domU) + echo 'pci test passed'\r\r\r\r\n(domU) pci test passed\r\r\r\r..." (spawn_id exp4) match regular expression "pci test passed"? Gate "pci test passed"? gate=yes re=yes ... Gate keeper glob pattern for '\nWelcome to Alpine Linux' is ' Welcome to Alpine Linux'. Activating booster. expect: does "'\r\r\r\r\n(domU) pci test passed\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) \r\r\r\r\r\n(domU) domU Welcome to Alpine Linux 3.18\r\r\r\r\n(domU) \rKernel 6.6.56 on an x86_64 (/dev/hvc0)\r\r\r\r\n(domU) \r\r\r\r\r\n" (spawn_id exp4) match regular expression "\nWelcome to Alpine Linux"? Gate "\nWelcome to Alpine Linux"? gate=no Fix this by using -notransfer flag to keep matched part in the buffer. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 1e12cbd6af2c92e61a1363ef208f71da1eae47ab) CI: fix waiting for final test message (again) The previous attempt has correct diagnosis, but added -notransfer flag in a wrong place - it should be used in the first (outer) match out of two, not the second (inner) one. Fixes: 1e12cbd6af2c ("CI: fix waiting for final test message") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit 79de6507c59021484e7c0b359f45035eab891e88) --- automation/scripts/console.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index c27f893dfb..2414f37fd2 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -47,11 +47,11 @@ if {[info exists env(BOOT_MSG)]} { if {[info exists env(LOG_MSG)]} { expect { - -re "$env(PASSED)" { + -notransfer -re "$env(PASSED)" { expect -re "$env(LOG_MSG)" exit 0 } - -re "$env(LOG_MSG)" { + -notransfer -re "$env(LOG_MSG)" { expect -re "$env(PASSED)" exit 0 } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:36:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:36:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980591.1367195 (Exim 4.92) (envelope-from ) id 1uDYD1-00017e-W3; Sat, 10 May 2025 00:36:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980591.1367195; Sat, 10 May 2025 00:36: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 1uDYD1-00017X-TP; Sat, 10 May 2025 00:36:55 +0000 Received: by outflank-mailman (input) for mailman id 980591; Sat, 10 May 2025 00:36:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYD0-00017P-Q9 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYD0-002QUd-2W for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYD0-003ED0-2S for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:36:54 +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=RST1QoHUxUW1KMoWHhfVPBBjjFFU11E+cjSJEDjWbW4=; b=pl1H0jzmLFljKeRuOVGDZQF+eW 6tWh5/4YDVgUvtAAci14JcpInepnN4CziffGbybgAxmFVB9Zs+MdIXBClzprnUSWIsKSmIWZ5rMy2 RQcNyyutMr4FT2BUffkruO5s2fllPYXBYsndM2H0ZY8Vx3F44k1jdRO4wkdRzit672lU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: switch qubes runners to use console.exp Message-Id: Date: Sat, 10 May 2025 00:36:54 +0000 commit 62cba67338ad3f91f7ff99bd81ae1d329a6bb7c7 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:15 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: switch qubes runners to use console.exp It appears as sometimes it takes more time for Xen even start booting, mostly due to firmware and fetching large boot files by grub. In some jobs the current timeout is pretty close to the actual time needed, and sometimes (rarely for now) test fails due to timeout expiring in the middle of dom0 booting. This will be happening more often if the initramfs will grow (and with more complex tests). This has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. Switch to using expect (console.exp) for more robust test output handling. This allows waiting separately for Xen starting to boot and then for the test to complete. For now, set both of those to 120s, which pessimistically bumps timeout for the whole test to 240s (from 120s). Add S3 handling to console.exp via SUSPEND_MSG + WAKEUP_CMD. Signed-off-by: Marek Marczykowski-Górecki (cherry picked from commit d604d774a24bae21e15c831e172455bd4600663d) --- automation/build/alpine/3.18-arm64v8.dockerfile | 1 + automation/scripts/console.exp | 13 +++++++ automation/scripts/qubes-x86-64.sh | 52 +++++++------------------ 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 19fe46f841..b8482d5bf4 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -48,3 +48,4 @@ RUN apk --no-cache add \ # qubes test deps openssh-client \ fakeroot \ + expect \ diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 2414f37fd2..fc80513dfb 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -9,6 +9,10 @@ # tests that's a command to read serial console # - UBOOT_CMD (optional): command to enter at u-boot prompt # - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - SUSPEND_MSG (optional): message signaling system is going to sleep, it's +# trigger for WAKEUP_CMD (see below) +# - WAKEUP_CMD (optional): command to execute to wakeup the system 30s after +# seeing SUSPEND_MSG # - LOG_MSG (optional): final console message to wait for # - PASSED: message to look for to consider test a success; if LOG_MSG is set, # both LOG_MSG and PASSED must appear (in any order) for test to succeed @@ -45,6 +49,15 @@ if {[info exists env(BOOT_MSG)]} { expect -re "$env(BOOT_MSG)" } +if {[info exists env(WAKEUP_CMD)]} { + expect -re "$env(SUSPEND_MSG)" + + # keep it suspended a bit, then wakeup + sleep 30 + + system "$env(WAKEUP_CMD)" +} + if {[info exists env(LOG_MSG)]} { expect { -notransfer -re "$env(PASSED)" { diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index a964ac4b7a..861e302d84 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -ex -o pipefail # One of: # - "" PV dom0, PVH domU @@ -267,52 +267,26 @@ cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -# start logging the serial; this gives interactive console, don't close its -# stdin to not close it; the 'cat' is important, plain redirection would hang -# until somebody opens the pipe; opening and closing the pipe is used to close -# the console -mkfifo /tmp/console-stdin -cat /tmp/console-stdin |\ -ssh $CONTROLLER console | tee smoke.serial | sed 's/\r//' & - # start the system pointing at gitlab-ci predefined config ssh $CONTROLLER gitlabci poweron -trap "ssh $CONTROLLER poweroff; : > /tmp/console-stdin" EXIT +trap "ssh $CONTROLLER poweroff" EXIT if [ -n "$wait_and_wakeup" ]; then - # wait for suspend or a timeout - until grep "$wait_and_wakeup" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) - done - if [ $timeout -le 0 ]; then - echo "ERROR: suspend timeout, aborting" - exit 1 - fi - # keep it suspended a bit, then wakeup - sleep 30 - ssh $CONTROLLER wake + export SUSPEND_MSG="$wait_and_wakeup" + export WAKEUP_CMD="ssh $CONTROLLER wake" fi -set +x -until grep "^Welcome to Alpine Linux" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) -done -set -x - -tail -n 100 smoke.serial - -if [ $timeout -le 0 ]; then - echo "ERROR: test timeout, aborting" - exit 1 -fi +export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " +export LOG_MSG="\nWelcome to Alpine Linux" +export TEST_CMD="ssh $CONTROLLER console" +export TEST_LOG="smoke.serial" +export TEST_TIMEOUT="$timeout" +./automation/scripts/console.exp | sed 's/\r\+$//' +TEST_RESULT=$? if [ -n "$retrieve_xml" ]; then nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:37:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980592.1367199 (Exim 4.92) (envelope-from ) id 1uDYDC-0001AG-1S; Sat, 10 May 2025 00:37:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980592.1367199; Sat, 10 May 2025 00:37:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDB-0001A8-Uw; Sat, 10 May 2025 00:37:05 +0000 Received: by outflank-mailman (input) for mailman id 980592; Sat, 10 May 2025 00:37:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDA-00019z-Sn for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYDA-002QUt-2m for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYDA-003EEE-2h for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:04 +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=B9ScHiGOv1Gz7dkbcpadoux6/qhdKQDJis+wMLMG+QQ=; b=fd5X0pJmFScMfQQFa8wAuehAk4 x9+JqkjsfQLVZ9Ej9Nii7Q4DCZVuRsK4D0EXgggjfOB6ccy87kr0MEAT58sfANjilLu3mB++3c3RU Cp2hTe/Z+uTNAcZHHZPBWv4mWK08qiBBuu6NPvjo9397dhXZ0toyZIoGj9tZ7KRdUzYc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: write whole etc/issue for domU initrd Message-Id: Date: Sat, 10 May 2025 00:37:04 +0000 commit c993d8e4fb33f9b560bca6a84142e027ca2b1abd Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:16 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: write whole etc/issue for domU initrd Upcoming changes won't unpack original rootfs anymore, so sed on existing file cannot be used. Override the whole file instead. No functional change intended. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper (cherry picked from commit f401eae6ec446671ad79deac84421d56808d43f2) --- automation/scripts/qubes-x86-64.sh | 5 ++++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 861e302d84..c4be714642 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -182,7 +182,10 @@ ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf - sed -i -e 's/^Welcome/domU \0/' etc/issue + echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index e448f7e2f5..930b9eccdd 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -65,7 +65,10 @@ ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue +echo "domU Welcome to Alpine Linux +Kernel \r on an \m (\l) + +" > etc/issue find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:37:16 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:37:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980593.1367202 (Exim 4.92) (envelope-from ) id 1uDYDM-0001E3-2Z; Sat, 10 May 2025 00:37:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980593.1367202; Sat, 10 May 2025 00:37:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDM-0001Dv-01; Sat, 10 May 2025 00:37:16 +0000 Received: by outflank-mailman (input) for mailman id 980593; Sat, 10 May 2025 00:37:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDK-0001Dl-VN for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYDK-002QVI-33 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYDK-003EEq-2y for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:14 +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=22XcERoLdhB/Vhkwr/kHn+sQKx+DWe5HKA4KvYVQEbI=; b=VTQYVsBMU4eqTRMpDE08HFGjrE 1cjBF+EZMLXGjw5VKBg2XwOuIq4xLMs3SwAA60tMymwoVaMl51Eh2lMLOzClvjCg/lFUy5fZIc4pT 5bu4SaHw6P5XmQBdE74lnO3yRul9SEtDWyoyGvltt4NFuxfSwVrtrPmijEVTNir6RA5I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: Rename intermediate artefacts in qemu-* scripts Message-Id: Date: Sat, 10 May 2025 00:37:14 +0000 commit cf8ff5373d6726bb89f5a7ea75de9ad18a668478 Author: Andrew Cooper AuthorDate: Sat Apr 12 15:33:01 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: Rename intermediate artefacts in qemu-* scripts Right now, we have initrd.cpio.gz as domU, and initrd.tar.gz as the base for dom0. Rename initrd.cpio.gz to domU-rootfs.cpio.gz, and xen-rootfs.cpio.gz to dom0-rootfs.cpio.gz to make it clearer which is which. Rename the VM from test to domU. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 9caca83404e707694d229853f8158c4c243c575c) --- automation/scripts/qemu-alpine-x86_64.sh | 16 ++++++++-------- automation/scripts/qemu-smoke-dom0-arm64.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 89bdb4df7d..569bd766d3 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -25,7 +25,7 @@ mount -t devtmpfs devtmpfs /dev chmod +x initrd/init # DomU rootfs cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. # initrd.tar.gz is Dom0 rootfs @@ -38,15 +38,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/bzImage\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash set -x @@ -56,13 +56,13 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf # rebuild Dom0 rootfs -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF @@ -70,7 +70,7 @@ cat >> binaries/pxelinux.0 << EOF kernel xen console=com1 console_timestamps=boot module bzImage console=hvc0 -module xen-rootfs.cpio.gz +module dom0-rootfs.cpio.gz boot EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 51d037b000..e8e49ded24 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -24,7 +24,7 @@ mount -t devtmpfs devtmpfs /dev /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. mkdir -p rootfs @@ -36,15 +36,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root -echo "name=\"test\" +echo "name=\"domU\" memory=512 vcpus=1 kernel=\"/root/Image\" -ramdisk=\"/root/initrd.cpio.gz\" +ramdisk=\"/root/domU-rootfs.cpio.gz\" extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -52,12 +52,12 @@ bash /etc/init.d/xencommons start xl list -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded @@ -78,7 +78,7 @@ MEMORY_END="0xC0000000" DEVICE_TREE="virt-gicv2.dtb" XEN="xen" DOM0_KERNEL="Image" -DOM0_RAMDISK="xen-rootfs.cpio.gz" +DOM0_RAMDISK="dom0-rootfs.cpio.gz" XEN_CMD="console=dtuart dom0_mem=1024M console_timestamps=boot" NUM_DOMUS=0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:37:26 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:37:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980594.1367206 (Exim 4.92) (envelope-from ) id 1uDYDW-0001Gn-47; Sat, 10 May 2025 00:37:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980594.1367206; Sat, 10 May 2025 00:37:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDW-0001Gf-1S; Sat, 10 May 2025 00:37:26 +0000 Received: by outflank-mailman (input) for mailman id 980594; Sat, 10 May 2025 00:37:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDV-0001GV-29 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYDV-002QVN-07 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYDV-003EFY-01 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:25 +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=Qw192D1uSDSwYye6HzGVnZ/ndlc2iCvHd2txzJZnEdI=; b=Bps/E6DGvm2rm/Eh++qpjvgjLV X8vtAgah6uNQFtoZLHxt295ZAyAu9d4i6rLu3QW+4iLuQTBNrIya3BOfUmRseIilPLDFJvhCIo1MG 4BOevzMCE20qpb3HoqA47CppvpccBkIo2DRg937cxblPkzAga/ltwzF8p2IXrwVqrIDo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: avoid repacking initrd as part of the test job Message-Id: Date: Sat, 10 May 2025 00:37:25 +0000 commit 554fb24a8ef432eefc676a84bdfe76151e4d9c3b Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 22:32:17 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: avoid repacking initrd as part of the test job Use the new test-artifacts which provide rootfs.cpio.gz rather than initrd.tar.gz. rootfs.cpio.gz also has all the necessary top-level directories, and includes the rc_verbose setting, so these modifications can be dropped. Having that, do not repack the whole initrd, but only pack modified files and rely on Linux handling of concatenated archives. This allows packing just test-related files (which includes the whole toolstack), instead of the whole initrd. For xilinx-smoke-dom0-x86_64.sh, this involves instructing grub not to unzip the archive, as doing so corrupts it. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD (cherry picked from commit 786f3238094f9460f59bce9f250adbf426f89297) --- automation/gitlab-ci/test.yaml | 6 +++-- automation/scripts/qemu-alpine-x86_64.sh | 16 +++++------ automation/scripts/qemu-smoke-dom0-arm64.sh | 14 +++++----- automation/scripts/qemu-smoke-dom0less-arm64.sh | 15 +++++------ automation/scripts/qubes-x86-64.sh | 32 +++++++++------------- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 33 +++++++++-------------- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 30 +++++++++------------ 7 files changed, 59 insertions(+), 87 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 96a49f2547..649e80c4dd 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -11,7 +11,9 @@ - project: xen-project/hardware/test-artifacts job: linux-6.6.86-arm64 ref: master - - alpine-3.18-arm64-rootfs-export + - project: xen-project/hardware/test-artifacts + job: alpine-3.18-arm64-rootfs + ref: master - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs @@ -22,7 +24,7 @@ job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master .qemu-arm64: diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 569bd766d3..c7dd121978 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -28,16 +28,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. -# initrd.tar.gz is Dom0 rootfs +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root echo "name=\"domU\" @@ -60,9 +58,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -# rebuild Dom0 rootfs -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index e8e49ded24..c0cf61ff8f 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -27,15 +27,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root echo "name=\"domU\" @@ -56,8 +55,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 83e1866ca6..48c424922d 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -111,16 +111,14 @@ cd initrd find . | cpio --create --format='newc' | gzip > ../binaries/initrd cd .. -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash @@ -139,8 +137,7 @@ xl network-attach 1 type=vif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # ImageBuilder diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index c4be714642..e2376cb51c 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -164,16 +164,13 @@ ${domU_extra_config} " if [ -n "$domU_check" ]; then - # DomU + # DomU rootfs + cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + + # test-local configuration mkdir -p rootfs cd rootfs - # fakeroot is needed to preserve device nodes in rootless podman container - fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz - mkdir proc - mkdir run - mkdir srv - mkdir sys - rm var/run + mkdir -p etc/local.d echo "#!/bin/sh echo 8 > /proc/sys/kernel/printk @@ -181,26 +178,22 @@ echo 8 > /proc/sys/kernel/printk ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start - echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue - find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs fi -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir boot -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -237,7 +230,6 @@ fi chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console @@ -245,7 +237,7 @@ cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU fi -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 930b9eccdd..d823b57012 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -50,39 +50,33 @@ else fatal "Unknown test: ${TEST}" fi -# Set up domU rootfs. +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# Set up dom0 rootfs. +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir boot -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . echo "#!/bin/bash @@ -102,13 +96,12 @@ ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "${DOMU_CFG}" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # Load software into TFTP server directory. @@ -121,7 +114,7 @@ echo " net_default_server=10.0.6.1 multiboot2 (tftp)/${TEST_BOARD}/xen ${XEN_CMDLINE} module2 (tftp)/${TEST_BOARD}/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (tftp)/${TEST_BOARD}/initrd-dom0 +module2 --nounzip (tftp)/${TEST_BOARD}/initrd-dom0 boot " > ${TFTP}/${TEST_BOARD}/grub.cfg diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 3e1fcf6bf9..a3031ecab0 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -38,36 +38,31 @@ echo \"${passed}\" " fi -# DomU +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -78,8 +73,7 @@ bash /etc/init.d/xencommons start ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 00:37:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 00:37:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980595.1367210 (Exim 4.92) (envelope-from ) id 1uDYDg-0001Jz-6i; Sat, 10 May 2025 00:37:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980595.1367210; Sat, 10 May 2025 00:37:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDg-0001Jr-4F; Sat, 10 May 2025 00:37:36 +0000 Received: by outflank-mailman (input) for mailman id 980595; Sat, 10 May 2025 00:37:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYDf-0001Jf-4i for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYDf-002QVT-0O for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYDf-003EG2-0J for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 00:37:35 +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=W3Hg2rPSw6KTymNgWiTtkJ6jOkASFh+pKx4bP2VVcdE=; b=ySg7UAIDUtjYsljXL5r4Um6k7B tPptClKX9kqsM4aNBSCS8emhTVpBCbn/CLQIp3QAFQX/jF5VmzvkmidcgjQBqLW1mZp6OqlaVWJC0 LjZoltmLUU3bO/Ux/IEbN258zKVoGcyrJzgDcNJT9C8HNDEwpbOXKq3TGksk3mCk6j1U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] CI: remove now unused alpine-3.18-arm64-rootfs job and its container Message-Id: Date: Sat, 10 May 2025 00:37:35 +0000 commit cdb61d7ee8948beda86f4530bb687062e4572638 Author: Marek Marczykowski-Górecki AuthorDate: Fri Apr 11 15:47:22 2025 +0200 Commit: Andrew Cooper CommitDate: Fri May 9 22:45:20 2025 +0100 CI: remove now unused alpine-3.18-arm64-rootfs job and its container This got moved to test-artifacts. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper Acked-by: Anthony PERARD (cherry picked from commit 93f12111c749962b77eb4671d740d3d010429174) --- automation/gitlab-ci/build.yaml | 11 ---- .../tests-artifacts/alpine/3.18-arm64v8.dockerfile | 66 ---------------------- 2 files changed, 77 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 293f877ec9..781334d74f 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -264,17 +264,6 @@ # Arm test artifacts -alpine-3.18-arm64-rootfs-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8 - script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - artifacts: - paths: - - binaries/initrd.tar.gz - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index a4542f7039..0000000000 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add networking sysinit && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add killprocs shutdown && \ - rc-update add modloop sysinit && \ - rc-update add modules boot && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add sysctl boot && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Sat May 10 01:00:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 01:00:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980596.1367214 (Exim 4.92) (envelope-from ) id 1uDYZP-0004z8-O5; Sat, 10 May 2025 01:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980596.1367214; Sat, 10 May 2025 01: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 1uDYZP-0004yZ-Kx; Sat, 10 May 2025 01:00:03 +0000 Received: by outflank-mailman (input) for mailman id 980596; Sat, 10 May 2025 01:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYZO-00048E-9D for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYZN-002RK2-36 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYZN-003F3J-2v for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01: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=j3RkyiL+EJjN64ZeLHCZc1eu1K/CDb7EHOY0scqpdJc=; b=iPcZy9NG2iVWpDh9hcUsfVWa9+ 6jYaY6ofAZo0BMQhcIZUlrKQGQmYb9I+h0+FO4OPGUXlYKi2kvDm6cmrHspVh8I18fBXXTP+Gmdgz w7WKjxuB413m+ntCm5ww38belzsTOpKtW6COA1WY6vzrMU/ZmuK6SXmFbYa50n8WScQk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: x86_emulate: address violations of MISRA C Rule 19.1 Message-Id: Date: Sat, 10 May 2025 01:00:01 +0000 commit 8808f9a2afc7eab67b761145c84fc32580c51c2f Author: Nicola Vetrini AuthorDate: Fri May 2 16:35:34 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 15:54:31 2025 -0700 x86: x86_emulate: address violations of MISRA C Rule 19.1 Rule 19.1 states: "An object shall not be assigned or copied to an overlapping object". In the function like macro "get_rep_prefix", one member of a union is assigned the value of another member. Reading from one member and writing to the other violates the rule, while not causing Undefined Behavior due to their relative sizes. Instead, use casts combined with exactly overlapping accesses to address violations. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8e14ebb35b..a588435b5e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -527,8 +527,8 @@ static inline void put_loop_count( if ( !amd_like(ctxt) && mode_64bit() && ad_bytes == 4 ) \ { \ _regs.r(cx) = 0; \ - if ( extend_si ) _regs.r(si) = _regs.esi; \ - if ( extend_di ) _regs.r(di) = _regs.edi; \ + if ( extend_si ) _regs.r(si) = (uint32_t)_regs.r(si); \ + if ( extend_di ) _regs.r(di) = (uint32_t)_regs.r(di); \ } \ goto complete_insn; \ } \ @@ -2029,7 +2029,7 @@ x86_emulate( switch ( op_bytes ) { case 2: _regs.ax = (int8_t)_regs.ax; break; /* cbw */ - case 4: _regs.r(ax) = (uint32_t)(int16_t)_regs.ax; break; /* cwde */ + case 4: _regs.r(ax) = (uint32_t)(int16_t)_regs.r(ax); break; /* cwde */ case 8: _regs.r(ax) = (int32_t)_regs.r(ax); break; /* cdqe */ } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 10 01:00:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 01:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980597.1367219 (Exim 4.92) (envelope-from ) id 1uDYZY-00007K-P1; Sat, 10 May 2025 01:00:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980597.1367219; Sat, 10 May 2025 01:00: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 1uDYZY-00006p-MP; Sat, 10 May 2025 01:00:12 +0000 Received: by outflank-mailman (input) for mailman id 980597; Sat, 10 May 2025 01:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYZY-0008Ki-2c for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYZY-002US2-0A for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYZY-003F3p-03 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00: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=KRN0djB6Ni6JPsclTCvB4ZwdEo7jEPl4JTn9ZKccbIY=; b=zaHJV/S0tx2F9LwCeghbI+4aI1 9phYsCTBGHIHQyA1hA4EXYwhKDMMCYb08/WrkuvYv3ILhwcXLkWdcYVXYoS3XmgZcoW3pPljj5mRF zqtA70U1BPg48UyBCps9jh8NTRcHc8VR+0Ifc9Gn+Z3MW5RdFBEj01HsYI8VFKoZg0rA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: tag Rule 19.1 as clean Message-Id: Date: Sat, 10 May 2025 01:00:12 +0000 commit 044e3ca4c2ccafeecf637f7e41c76cbeb6ddc96d Author: Federico Serafini AuthorDate: Fri May 2 16:35:35 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 15:54:37 2025 -0700 automation/eclair: tag Rule 19.1 as clean Tag MISRA C Rule 19.1 as clean to avoid regressions. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index 1d078d8905..dab3c51faa 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -78,6 +78,7 @@ MC3A2.R17.5|| MC3A2.R17.6|| MC3A2.R18.6|| MC3A2.R18.8|| +MC3A2.R19.1|| MC3A2.R20.2|| MC3A2.R20.3|| MC3A2.R20.4|| -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 10 01:00:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 01:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980598.1367223 (Exim 4.92) (envelope-from ) id 1uDYZj-0003pZ-RF; Sat, 10 May 2025 01:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980598.1367223; Sat, 10 May 2025 01:00: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 1uDYZj-0003pK-Nn; Sat, 10 May 2025 01:00:23 +0000 Received: by outflank-mailman (input) for mailman id 980598; Sat, 10 May 2025 01:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYZi-0003GE-5i for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYZi-002XdO-0T for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYZi-003F4s-0M for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00: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=FHmmRnv4QQ47cvavuupksuyKCPlj2SY47bgdj6bwdtY=; b=QDijwg0TBgkjMPFf4FoZBJAHz3 BjM/v1kEyF1NYU0Mc+pv+Z7Zlyx2LjKPnEeFjhhQ6/Rx3v3jLOkh9YATX61fngTDDIuYSVWDNr0OI NAIvhp5M0KuXn+kh2kCDSx2gAXJENcehACsuD//YE+ATHWcsPfiV05SRNOPPD1jk90LM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/page_alloc: address violation of Rule 14.3 Message-Id: Date: Sat, 10 May 2025 01:00:22 +0000 commit ec050fb80ce5cb4f0c720897c04ae6ad38411329 Author: Federico Serafini AuthorDate: Fri May 9 16:28:07 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 16:29:15 2025 -0700 xen/page_alloc: address violation of Rule 14.3 MISRA C Rule 14.3 states that "Controlling expressions shall not be invariant". Change the #define to static inline to resolve the violation. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/common/page_alloc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index bd4538c28d..e57a287133 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2005,7 +2005,10 @@ static unsigned long __initdata buddy_alloc_size = MB(CONFIG_BUDDY_ALLOCATOR_SIZE); size_param("buddy-alloc-size", buddy_alloc_size); #else -#define domain_num_llc_colors(d) 0 +static inline unsigned int domain_num_llc_colors(const struct domain *d) +{ + return 0; +} #define domain_llc_color(d, i) 0 #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 10 01:00:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 01:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980599.1367227 (Exim 4.92) (envelope-from ) id 1uDYZt-0007aD-Ss; Sat, 10 May 2025 01:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980599.1367227; Sat, 10 May 2025 01:00: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 1uDYZt-0007Zf-Q6; Sat, 10 May 2025 01:00:33 +0000 Received: by outflank-mailman (input) for mailman id 980599; Sat, 10 May 2025 01:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYZs-00073a-8E for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYZs-002aYg-0j for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYZs-003F5X-0d for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00: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=gGyZAUrLigIjpSUWNHewxaAFY/qoJTudrmQNzmwX938=; b=AnIXnCo1ccHUoi82I0BmmV/iov R35Uxj6vq3tPr8QXsKKzzakNIoyvYC7RtwUmHygVCqPNo5c5v4pN2HUmSJYaahTexLoeC/KXWfoAq dIOzt+RDYNA7zT/7ofmOYcsnHkBvmKHCNScaWjpmIHSnSxYFwVkJSkjL/+C4WCl0q0Bs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: add Rule 14.3 to the monitored set Message-Id: Date: Sat, 10 May 2025 01:00:32 +0000 commit 9225b24d86ba59bce4ca65e0d44a9b040582505d Author: Federico Serafini AuthorDate: Fri Apr 25 17:00:10 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 16:29:52 2025 -0700 automation/eclair: add Rule 14.3 to the monitored set MISRA C Rule 14.3 is already tagged as clean: add it to the monitored set to avoid regressions. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/monitored.ecl | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 8351996ec8..ca2f5e3c7f 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -53,6 +53,7 @@ -enable=MC3A2.R13.2 -enable=MC3A2.R13.6 -enable=MC3A2.R14.1 +-enable=MC3A2.R14.3 -enable=MC3A2.R14.4 -enable=MC3A2.R16.2 -enable=MC3A2.R16.3 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 10 01:00:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 01:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980600.1367230 (Exim 4.92) (envelope-from ) id 1uDYa3-0002qz-UL; Sat, 10 May 2025 01:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980600.1367230; Sat, 10 May 2025 01:00: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 1uDYa3-0002qs-RW; Sat, 10 May 2025 01:00:43 +0000 Received: by outflank-mailman (input) for mailman id 980600; Sat, 10 May 2025 01:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYa2-0002E2-BV for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYa2-002dZ0-13 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYa2-003F8v-0w for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00: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=QmqXM+BPWDq9ulVwkijCCH1Kxswavu87oOC0EVAijGA=; b=YGhCX/+2SYW5n1wZaOiVgpUhSN x7lu9OBCFQtb5IrlrKKJXJ525qCkDvL0WHzIGRI01F0zD8CzYwdGhYaBRN5+j1hgH6UlpOXOvg3Wg FtMtIkQmWc3K5iunoOLuMjxW0mGv4TJ0AjkNeSYhV7jVEwDMI7c/wCa1ycW+ayveKUi4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/emul: Work around MISRA R13.2 complaint Message-Id: Date: Sat, 10 May 2025 01:00:42 +0000 commit e1e0d0bad78ea5e8c5ef22baf1b4f31553f21901 Author: Andrew Cooper AuthorDate: Sat May 10 01:18:48 2025 +0100 Commit: Stefano Stabellini CommitDate: Fri May 9 17:56:21 2025 -0700 x86/emul: Work around MISRA R13.2 complaint Rule 13.2 states: "The value of an expression and its persistent side effects shall be the same under all permitted evaluation orders". Eclair complains about a Rule 13.2 violations because validate_far_branch() assigns to rc, and the entirety of commit_far_branch() is also assigned to rc. I'm unsure that the complaint is accurate, but rewriting commit_far_branch() to use the comma operator seems to make Eclair happy. Reported-by: Nicola Vetrini Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/arch/x86/x86_emulate/x86_emulate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index a588435b5e..7d68ebe7ea 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -333,12 +333,14 @@ do { \ : (ip) > (cs)->limit, X86_EXC_GP, 0); \ }) -#define commit_far_branch(cs, newip) ({ \ - validate_far_branch(cs, newip); \ - _regs.r(ip) = (newip); \ - singlestep = _regs.eflags & X86_EFLAGS_TF; \ - ops->write_segment(x86_seg_cs, cs, ctxt); \ -}) +#define commit_far_branch(cs, newip) ( \ + ({ \ + validate_far_branch(cs, newip); \ + _regs.r(ip) = (newip); \ + singlestep = _regs.eflags & X86_EFLAGS_TF; \ + }), \ + ops->write_segment(x86_seg_cs, cs, ctxt) \ + ) int x86emul_get_fpu( enum x86_emulate_fpu_type type, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 10 01:00:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 01:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980601.1367234 (Exim 4.92) (envelope-from ) id 1uDYaD-0006nu-W6; Sat, 10 May 2025 01:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980601.1367234; Sat, 10 May 2025 01:00: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 1uDYaD-0006nK-TD; Sat, 10 May 2025 01:00:53 +0000 Received: by outflank-mailman (input) for mailman id 980601; Sat, 10 May 2025 01:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDYaC-0006A5-Ds for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDYaC-002ghj-1I for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDYaC-003FA6-1E for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 01:00: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=XkxuA5CzMaUEIo5qVJ2K+SNaS7iG7uaiL+3h3JfDzqI=; b=0u8Rg6HZk8UrGl4VF7jYUffE5I luh0bYQNK/6/hnwwx4zWdtpLKg/McW0+I5pjQiRjyrsuOG5bWM4bugt6pl/mGp1vzCwImhO/5/vyH z/4pKeSGJM5dzi4LfzPlcLWxKHqGHr2Pd9Y8TDCiE708LvCRenv4xx3k0xwYaWZQ+xGw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: tag Rule 13.2 as clean Message-Id: Date: Sat, 10 May 2025 01:00:52 +0000 commit c45e57f59d6913e386bda4e882b75f0ba0160398 Author: Federico Serafini AuthorDate: Wed May 7 15:46:40 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 17:56:21 2025 -0700 automation/eclair: tag Rule 13.2 as clean Update ECLAIR configuration to consider Rule 13.2 as clean so as to avoid regressions. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index dab3c51faa..5bc35db1fd 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -63,6 +63,7 @@ MC3A2.R11.6|| MC3A2.R11.7|| MC3A2.R11.9|| MC3A2.R12.5|| +MC3A2.R13.2|| MC3A2.R13.6|| MC3A2.R14.1|| MC3A2.R14.3|| -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 10 11:22:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 11:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980635.1367249 (Exim 4.92) (envelope-from ) id 1uDiHL-00005J-3Z; Sat, 10 May 2025 11:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980635.1367249; Sat, 10 May 2025 11: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 1uDiHL-00005A-0R; Sat, 10 May 2025 11:22:03 +0000 Received: by outflank-mailman (input) for mailman id 980635; Sat, 10 May 2025 11:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDiHK-000050-Jd for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDiHK-0003R8-1c for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDiHK-008LTL-0k for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11: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=pVfVifZsX/nqV/loVX+nx9c2UCTEjQNcdavInNUAleY=; b=jZSPhjXXPBXhF/kjwMBMIQAB3U MdtSUN+C3VDTF4Na9kG4yOsFBOe6Gsb6m77FNdS2201E9PvJUgcT962soCwExsQ62/YYUSs+avpNp p0djhCR8fmdxsun2+7QKkC55gPdVpMmRLIA63yeFHcTjsm1m5wgPfjtpl/YMEP7bj3HA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: x86_emulate: address violations of MISRA C Rule 19.1 Message-Id: Date: Sat, 10 May 2025 11:22:02 +0000 commit 8808f9a2afc7eab67b761145c84fc32580c51c2f Author: Nicola Vetrini AuthorDate: Fri May 2 16:35:34 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 15:54:31 2025 -0700 x86: x86_emulate: address violations of MISRA C Rule 19.1 Rule 19.1 states: "An object shall not be assigned or copied to an overlapping object". In the function like macro "get_rep_prefix", one member of a union is assigned the value of another member. Reading from one member and writing to the other violates the rule, while not causing Undefined Behavior due to their relative sizes. Instead, use casts combined with exactly overlapping accesses to address violations. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8e14ebb35b..a588435b5e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -527,8 +527,8 @@ static inline void put_loop_count( if ( !amd_like(ctxt) && mode_64bit() && ad_bytes == 4 ) \ { \ _regs.r(cx) = 0; \ - if ( extend_si ) _regs.r(si) = _regs.esi; \ - if ( extend_di ) _regs.r(di) = _regs.edi; \ + if ( extend_si ) _regs.r(si) = (uint32_t)_regs.r(si); \ + if ( extend_di ) _regs.r(di) = (uint32_t)_regs.r(di); \ } \ goto complete_insn; \ } \ @@ -2029,7 +2029,7 @@ x86_emulate( switch ( op_bytes ) { case 2: _regs.ax = (int8_t)_regs.ax; break; /* cbw */ - case 4: _regs.r(ax) = (uint32_t)(int16_t)_regs.ax; break; /* cwde */ + case 4: _regs.r(ax) = (uint32_t)(int16_t)_regs.r(ax); break; /* cwde */ case 8: _regs.r(ax) = (int32_t)_regs.r(ax); break; /* cdqe */ } break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 10 11:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 11:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980636.1367253 (Exim 4.92) (envelope-from ) id 1uDiHV-00007X-63; Sat, 10 May 2025 11:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980636.1367253; Sat, 10 May 2025 11: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 1uDiHV-00007P-3I; Sat, 10 May 2025 11:22:13 +0000 Received: by outflank-mailman (input) for mailman id 980636; Sat, 10 May 2025 11:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDiHU-00007F-DO for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDiHU-0003RW-1v for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDiHU-008LfF-16 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11: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=aQc6WIbOTR6au2R5l7kbY1VgYV7UtCuVfvDn7GSjhAQ=; b=fQ/WEV8r9yJN9FmVzxMRKmBypM 3UZDhbZKN85piJxwbEeqT3cD8GPyTYQvNns+RrZ0OnVRw7bH32H95n4kzHUUM9T/f1Z3506BPQpKm RJQN8tApbMkV4Wj3hV4A6BaabBlrel72KgMPacQ3Fgpki7PbNzx7nt6fCaiNgrP3DCp4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: tag Rule 19.1 as clean Message-Id: Date: Sat, 10 May 2025 11:22:12 +0000 commit 044e3ca4c2ccafeecf637f7e41c76cbeb6ddc96d Author: Federico Serafini AuthorDate: Fri May 2 16:35:35 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 15:54:37 2025 -0700 automation/eclair: tag Rule 19.1 as clean Tag MISRA C Rule 19.1 as clean to avoid regressions. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index 1d078d8905..dab3c51faa 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -78,6 +78,7 @@ MC3A2.R17.5|| MC3A2.R17.6|| MC3A2.R18.6|| MC3A2.R18.8|| +MC3A2.R19.1|| MC3A2.R20.2|| MC3A2.R20.3|| MC3A2.R20.4|| -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 10 11:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 11:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980637.1367259 (Exim 4.92) (envelope-from ) id 1uDiHf-0000AF-8g; Sat, 10 May 2025 11:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980637.1367259; Sat, 10 May 2025 11: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 1uDiHf-0000A1-4k; Sat, 10 May 2025 11:22:23 +0000 Received: by outflank-mailman (input) for mailman id 980637; Sat, 10 May 2025 11:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDiHe-00009r-Gk for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDiHe-0003Ri-2E for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDiHe-008Llv-1P for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11: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=3pNErqskZ8aBqenHlun8K/lHzl3MxRgdZWzgwXLfK9w=; b=Gom5eqcQmrmo5WVXKfDtRKwcgc mY3VnnfvvLYHYjVopfoxsoLgnA1EoUsedhcoT0e2iZHQCuX3lOX6dkii+qZNEK9ymeXETds77PbfB 5WzyI2/y0u3Cui7fk35xT/tSQ8vBWQdOMUT/zWkRgOpDeYRONV/TT6F//xQrvtywHFHs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/page_alloc: address violation of Rule 14.3 Message-Id: Date: Sat, 10 May 2025 11:22:22 +0000 commit ec050fb80ce5cb4f0c720897c04ae6ad38411329 Author: Federico Serafini AuthorDate: Fri May 9 16:28:07 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 16:29:15 2025 -0700 xen/page_alloc: address violation of Rule 14.3 MISRA C Rule 14.3 states that "Controlling expressions shall not be invariant". Change the #define to static inline to resolve the violation. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/common/page_alloc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index bd4538c28d..e57a287133 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2005,7 +2005,10 @@ static unsigned long __initdata buddy_alloc_size = MB(CONFIG_BUDDY_ALLOCATOR_SIZE); size_param("buddy-alloc-size", buddy_alloc_size); #else -#define domain_num_llc_colors(d) 0 +static inline unsigned int domain_num_llc_colors(const struct domain *d) +{ + return 0; +} #define domain_llc_color(d, i) 0 #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 10 11:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 11:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980638.1367261 (Exim 4.92) (envelope-from ) id 1uDiHp-0000Cm-9I; Sat, 10 May 2025 11:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980638.1367261; Sat, 10 May 2025 11: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 1uDiHp-0000Ce-6P; Sat, 10 May 2025 11:22:33 +0000 Received: by outflank-mailman (input) for mailman id 980638; Sat, 10 May 2025 11:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDiHo-0000CV-N6 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDiHo-0003Rp-2o for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDiHo-008Luz-1i for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11: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=P0ONIkS+bwRTM4+IJpzi/8zRg3UaEmqOapZhXMgUgzM=; b=ZWJ+1DnCmLdmGIJFFqGO48oPO0 PHDqKpZhwhaDFKG3mei3jcG/mXZrFYnNTc9wlrn3pz8x1FCWoSTwbQ4lz7NDiaq/zKFaIyeSNL+NH htVJI/pbCjj8J4dFvjQPGXIn4KHmly5s+zqb7a8pgEUbQdo2cpuWyD1rX2uRuG9+nHaA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: add Rule 14.3 to the monitored set Message-Id: Date: Sat, 10 May 2025 11:22:32 +0000 commit 9225b24d86ba59bce4ca65e0d44a9b040582505d Author: Federico Serafini AuthorDate: Fri Apr 25 17:00:10 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 16:29:52 2025 -0700 automation/eclair: add Rule 14.3 to the monitored set MISRA C Rule 14.3 is already tagged as clean: add it to the monitored set to avoid regressions. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/monitored.ecl | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 8351996ec8..ca2f5e3c7f 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -53,6 +53,7 @@ -enable=MC3A2.R13.2 -enable=MC3A2.R13.6 -enable=MC3A2.R14.1 +-enable=MC3A2.R14.3 -enable=MC3A2.R14.4 -enable=MC3A2.R16.2 -enable=MC3A2.R16.3 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 10 11:22:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 11:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980639.1367265 (Exim 4.92) (envelope-from ) id 1uDiI0-0000F4-Ab; Sat, 10 May 2025 11:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980639.1367265; Sat, 10 May 2025 11:22: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 1uDiI0-0000Ex-7t; Sat, 10 May 2025 11:22:44 +0000 Received: by outflank-mailman (input) for mailman id 980639; Sat, 10 May 2025 11:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDiHy-0000Ek-Qi for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDiHz-0003Ru-00 for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDiHy-008Lzs-2L for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22: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=S/DdBHHVn0H3urWLQBQbryff7cmng7FYKOx8h5b5JOE=; b=1iN1lCA/4omUEdEdy2w8Fm7NOi DudLgrWJCZhp7jVEq1DLPlU6IvQmpSVRYGkRaXIcpL2Xg3xD6D47Rzns00ZGGX2ca37qUGLNdyoWU Hd7yzbcGrgwmkv4NKHKl8P8+H58hLWJA+DQ4itW3PJ6yJHSS2jePWz7bA9mrYEZ9zUwo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/emul: Work around MISRA R13.2 complaint Message-Id: Date: Sat, 10 May 2025 11:22:42 +0000 commit e1e0d0bad78ea5e8c5ef22baf1b4f31553f21901 Author: Andrew Cooper AuthorDate: Sat May 10 01:18:48 2025 +0100 Commit: Stefano Stabellini CommitDate: Fri May 9 17:56:21 2025 -0700 x86/emul: Work around MISRA R13.2 complaint Rule 13.2 states: "The value of an expression and its persistent side effects shall be the same under all permitted evaluation orders". Eclair complains about a Rule 13.2 violations because validate_far_branch() assigns to rc, and the entirety of commit_far_branch() is also assigned to rc. I'm unsure that the complaint is accurate, but rewriting commit_far_branch() to use the comma operator seems to make Eclair happy. Reported-by: Nicola Vetrini Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/arch/x86/x86_emulate/x86_emulate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index a588435b5e..7d68ebe7ea 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -333,12 +333,14 @@ do { \ : (ip) > (cs)->limit, X86_EXC_GP, 0); \ }) -#define commit_far_branch(cs, newip) ({ \ - validate_far_branch(cs, newip); \ - _regs.r(ip) = (newip); \ - singlestep = _regs.eflags & X86_EFLAGS_TF; \ - ops->write_segment(x86_seg_cs, cs, ctxt); \ -}) +#define commit_far_branch(cs, newip) ( \ + ({ \ + validate_far_branch(cs, newip); \ + _regs.r(ip) = (newip); \ + singlestep = _regs.eflags & X86_EFLAGS_TF; \ + }), \ + ops->write_segment(x86_seg_cs, cs, ctxt) \ + ) int x86emul_get_fpu( enum x86_emulate_fpu_type type, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 10 11:22:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 May 2025 11:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.980640.1367270 (Exim 4.92) (envelope-from ) id 1uDiIA-0000IL-Cl; Sat, 10 May 2025 11:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 980640.1367270; Sat, 10 May 2025 11:22: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 1uDiIA-0000IA-9k; Sat, 10 May 2025 11:22:54 +0000 Received: by outflank-mailman (input) for mailman id 980640; Sat, 10 May 2025 11:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDiI8-0000Hw-Tr for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uDiI9-0003S1-0J for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uDiI8-008MEO-2i for xen-changelog@lists.xenproject.org; Sat, 10 May 2025 11:22: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=e+01G7BCheSohggJ13A+hRIYCyT6wj4ZfLE/ZSQ3hLY=; b=wjKSZvHnItstb2Y7heIFQIs5Hk +DkHiBvFVvo6WYSFpeIyNrmVSy8OCglAD9or2MSWayOFNjwY0SH32hgA5XisoCrYixnFoWqIU5pCQ X4Zx63s4RPAsSw8AbqcjnllqsK3oEOg6CCwLlOftSnGE+iQwEVQN7W6pdSSaKsC9lN7M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: tag Rule 13.2 as clean Message-Id: Date: Sat, 10 May 2025 11:22:52 +0000 commit c45e57f59d6913e386bda4e882b75f0ba0160398 Author: Federico Serafini AuthorDate: Wed May 7 15:46:40 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 9 17:56:21 2025 -0700 automation/eclair: tag Rule 13.2 as clean Update ECLAIR configuration to consider Rule 13.2 as clean so as to avoid regressions. Signed-off-by: Federico Serafini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index dab3c51faa..5bc35db1fd 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -63,6 +63,7 @@ MC3A2.R11.6|| MC3A2.R11.7|| MC3A2.R11.9|| MC3A2.R12.5|| +MC3A2.R13.2|| MC3A2.R13.6|| MC3A2.R14.1|| MC3A2.R14.3|| -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981886.1368272 (Exim 4.92) (envelope-from ) id 1uEWgB-00089Q-Gc; Mon, 12 May 2025 17:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981886.1368272; Mon, 12 May 2025 17: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 1uEWgB-00089I-E0; Mon, 12 May 2025 17:11:03 +0000 Received: by outflank-mailman (input) for mailman id 981886; Mon, 12 May 2025 17:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWgA-000896-NR for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWgA-004Ggk-1z for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWgA-002mmT-1B for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=GRtHa51XC/4v2J8blySlQgSbaV/pyeJHddBrDwOmKk0=; b=XhOx3xHubvKqf7stbrfNn5orab 8AYlqmVmPSlpAM3BTew2LIt9FKvOYowe1zisls3HHUZceUesxTmrLQ0BNRIWc4fml3TrxGQxemUy2 X1HV20eJUO5ZY3OQ0jtBQU93Wo9Ky8wW81GdpDes+9au8GTMRSAcPtvGcXpfOXUzYnAg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 17:11:02 +0000 commit 328ed39c59e0af06d594f5e64a52b57aa0b02340 Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative-asm.h | 2 +- xen/arch/x86/include/asm/alternative.h | 11 +++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 43b009888c..4d1bbe7313 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -228,6 +228,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -245,11 +247,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -271,8 +273,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, if ( a->priv ) continue; + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative-asm.h b/xen/arch/x86/include/asm/alternative-asm.h index 22da9f89f1..3eb0f4e8a0 100644 --- a/xen/arch/x86/include/asm/alternative-asm.h +++ b/xen/arch/x86/include/asm/alternative-asm.h @@ -12,7 +12,7 @@ * instruction. See apply_alternatives(). */ .macro altinstruction_entry orig, repl, feature, orig_len, repl_len, pad_len - .if \feature >= NCAPINTS * 32 + .if ((\feature) & ~ALT_FLAG_NOT) >= NCAPINTS * 32 .error "alternative feature outside of featureset range" .endif .long \orig - . diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 29c3d724b0..b9ea49bd1c 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -14,7 +21,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ @@ -61,7 +68,7 @@ extern void alternative_instructions(void); alt_repl_len(n2)) "-" alt_orig_len) #define ALTINSTR_ENTRY(feature, num) \ - " .if " STR(feature) " >= " STR(NCAPINTS * 32) "\n" \ + " .if (" STR(feature & ~ALT_FLAG_NOT) ") >= " STR(NCAPINTS * 32) "\n" \ " .error \"alternative feature outside of featureset range\"\n" \ " .endif\n" \ " .long .LXEN%=_orig_s - .\n" /* label */ \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981887.1368276 (Exim 4.92) (envelope-from ) id 1uEWgL-0008DE-I7; Mon, 12 May 2025 17:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981887.1368276; Mon, 12 May 2025 17: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 1uEWgL-0008D6-FP; Mon, 12 May 2025 17:11:13 +0000 Received: by outflank-mailman (input) for mailman id 981887; Mon, 12 May 2025 17:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWgK-0008Cq-HN for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWgK-004Ggu-2K for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWgK-002mvb-1U for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=MZWY0R72mWHeKRWVyfaQjbg4yA+UC3rHCEAHVBmFLcI=; b=ERkz4pdSRGEgyoAMK+aBLKxNpv jCIbORH1A7GP2+jDTx9RmPy8Yv3s75M0YMTCS2oNEoXSRrQefHRzzx978EA7x+i42UZn2GpMcxD9d avZcLOZqByO+9yi4uL1LfTUsUGBpAlrfLZIsStESrFFKfu+um2u71S5nHqyed/x3Y4W8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 17:11:12 +0000 commit ef30ffe0a0f79313c00720793c475c45a9e490ff Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 50 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 76 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 +++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++---- 6 files changed, 112 insertions(+), 89 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..05e429794c --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +FUNC(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall +END(early_hypercall) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 7ab55fc1f6..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - -DATA(hypercall_page, PAGE_SIZE) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 -END(hypercall_page) - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index c17f5c447a..5c9f393c75 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void asmlinkage __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981889.1368280 (Exim 4.92) (envelope-from ) id 1uEWgV-0008GW-Je; Mon, 12 May 2025 17:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981889.1368280; Mon, 12 May 2025 17: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 1uEWgV-0008GO-Gq; Mon, 12 May 2025 17:11:23 +0000 Received: by outflank-mailman (input) for mailman id 981889; Mon, 12 May 2025 17:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWgU-0008GA-Kn for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWgU-004GhA-2g for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWgU-002mxK-1o for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=gz90+MZinYCKGdxe6eJtRCrAgJWqUMpXz4Ai/nWRTq0=; b=SSKjVgt9gmIy3oFVZd4bJOZo8L 1tEgH5uL5jVOruSmIB030f8940pGUgKS40lqHcZUcxOMqYY/ZgN1cp6bCxj0JKSNXtYgL7+1XeKYO osA26HjvrIy8LsRTHLWc+a6aHAgEYL2fGHpIsVvEcUWygQp2hNeNTM2pFuBDNx7MimJo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:11:22 +0000 commit d293cc9da9021a51915e058acd1f05e83a462aa9 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/indirect-thunk.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index fd5493c22b..c4b978d67b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,10 @@ #include +/* Alignment is dealt with explicitly here; override the respective macro. */ +#undef SYM_ALIGN +#define SYM_ALIGN(align...) + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -35,6 +39,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + FUNC(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981891.1368285 (Exim 4.92) (envelope-from ) id 1uEWgf-0008JV-Lj; Mon, 12 May 2025 17:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981891.1368285; Mon, 12 May 2025 17:11: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 1uEWgf-0008JL-IM; Mon, 12 May 2025 17:11:33 +0000 Received: by outflank-mailman (input) for mailman id 981891; Mon, 12 May 2025 17:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWge-0008J4-Nu for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWge-004GhK-2z for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWge-002n3U-2B for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11: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=+/fQoLuWK8LhHrJGtwn64PW86eD9iGBRBw4dROT8Ru4=; b=XFGtTUBgxcXwKV4vf8f4Fz4Z13 zr/5dhTR6kmpWefmO9ECY5Z4MZAUzkE4iao8/m4+TR8pl9+eiuStry6U/JO6Lg1XNuycZsKrNwH+8 jH058vO8z1wAuedLwOALXeVLfzzOWlXOtmWvV2My/Qn04tOFA6MnojxBpRPbKPZG+eW4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:11:32 +0000 commit c0db07031a41ff892f57756b7e2b4ef98df72588 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index f5ac41834b..7175778bdd 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -50,7 +50,12 @@ END(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -66,12 +71,14 @@ FUNC(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -83,7 +90,7 @@ FUNC(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981892.1368288 (Exim 4.92) (envelope-from ) id 1uEWgq-0008MX-Ok; Mon, 12 May 2025 17:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981892.1368288; Mon, 12 May 2025 17:11: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 1uEWgq-0008MP-Lz; Mon, 12 May 2025 17:11:44 +0000 Received: by outflank-mailman (input) for mailman id 981892; Mon, 12 May 2025 17:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWgo-0008MD-UT for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWgp-004GhR-0H for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWgo-002n5W-2Y for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11: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=mg2PFZw0Yna/+UNRqcpI79VPNLR8D5CzVE1xzAjPpLA=; b=6M7Lxed5Ex/MegFKOil7R2oZPF WFWvhmX0W8VNMa0mXgnE4L1/mGptPLPzcXqoFUtsIOSAC+PdVuSTSNocqk7T2tc23mvE8KkMQ+Dcs bbbIF2z7QOv07hYIp4EjsOgIDxnma/agLAdUC8w6o8/deNfWI0UEK728tkykkeTGyUF4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 17:11:42 +0000 commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 929c1a72ae..4c292ac338 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -77,6 +77,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cpu_policy; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c2f1dcf301..c32aba029d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -41,7 +39,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 4d1bbe7313..0449b9c1b7 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -135,6 +135,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 705cf9eb94..1572efa69a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -151,20 +151,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210UL, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -183,6 +183,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index b9ea49bd1c..e17be8ddfd 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -33,6 +33,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 54c8621421..9cc37a1d8e 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 7d68ebe7ea..0a98b43476 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1400,7 +1400,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3633,7 +3633,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3700,7 +3700,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3774,7 +3774,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4010,7 +4010,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4407,7 +4407,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4444,7 +4444,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4639,7 +4639,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4973,7 +4973,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5016,7 +5016,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5046,7 +5046,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5614,7 +5614,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5732,7 +5732,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6012,7 +6012,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6286,7 +6286,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6385,7 +6385,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6455,7 +6455,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6511,7 +6511,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6576,7 +6576,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6590,7 +6590,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6666,7 +6666,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6743,7 +6743,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6941,7 +6941,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -6977,7 +6977,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7218,7 +7218,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7385,7 +7385,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7631,7 +7631,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7977,7 +7977,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8086,7 +8086,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8182,12 +8182,12 @@ x86_emulate( if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } @@ -8511,7 +8511,7 @@ int x86_emul_rmw( pvex->reg = 0xf; /* rAX */ buf[3] = ctxt->opcode; buf[4] = 0x11; /* reg=rDX r/m=(%RCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); *eflags &= ~EFLAGS_MASK; invoke_stub("", -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981893.1368291 (Exim 4.92) (envelope-from ) id 1uEWh0-0008Oy-Qn; Mon, 12 May 2025 17:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981893.1368291; Mon, 12 May 2025 17:11: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 1uEWh0-0008Oq-Na; Mon, 12 May 2025 17:11:54 +0000 Received: by outflank-mailman (input) for mailman id 981893; Mon, 12 May 2025 17:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWgz-0008Oc-2G for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWgz-004GhW-0h for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWgy-002n7Q-33 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:11: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=gxJ1Izg9vjHa62JLfLpBzWoCu94UHGQ6k9Zm8Q1RgkM=; b=gcQ248v25t7oXHSFfnr66p21hB gpLmuba3W4P+jf6qacy2KyFiscfxGDOQb/mobGxHt/xLsPwXlNtHpONjJUOrW2X77mo+nS4WvXafw H1nUkjWcwto+pb385nA9B5rxaM34B0GL11VW021HCfmLrEhus0wwIfBk/Wcl7fdKoMng=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 17:11:52 +0000 commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 4 +++- xen/arch/x86/copy_page.S | 4 +++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 24 ++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ xen/lib/x86-generic-hweightl.c | 4 ++++ 19 files changed, 106 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index de2fa37f08..7afe879710 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -39,9 +39,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c32aba029d..bedb97cbee 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a741d58b91..92af6230b3 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ LABEL(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET END(do_suspend_lowlevel) .data diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 0449b9c1b7..ecc56964bd 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -135,16 +135,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 09b6d8758e..4991545125 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -34,6 +34,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 7175778bdd..606b378d84 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ FUNC(clear_bhb_tsx) xabort $0 int3 1: - ret + RET END(clear_bhb_tsx) /* diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d6c076f1d8..dc3c3c26bf 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include FUNC(clear_page_sse2) @@ -16,5 +18,5 @@ FUNC(clear_page_sse2) jnz 0b sfence - ret + RET END(clear_page_sse2) diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index c3c436545b..e43e5370c8 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include #define src_reg %rsi @@ -41,5 +43,5 @@ FUNC(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET END(copy_page_sse2) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 1b821db49c..96370dd92a 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -36,6 +36,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index c4b978d67b..26dad15f12 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -15,6 +15,8 @@ #undef SYM_ALIGN #define SYM_ALIGN(align...) +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -62,3 +64,25 @@ END(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +FUNC(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ +END(__x86_return_thunk) + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 5409ad3b14..362b5d2416 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ FUNC(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET END(load_guest_gprs) /* Save guest GPRs. Parameter on the stack above the return address. */ @@ -48,5 +48,5 @@ FUNC(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET END(save_guest_gprs) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index ced8475001..fe27e82a47 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -571,6 +571,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 1e87652f4b..d7b381ea54 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -180,7 +180,7 @@ FUNC(cr4_pv32_restore) or cr4_pv32_mask(%rip), %rax mov %rax, %cr4 mov %rax, (%rcx) - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -198,7 +198,7 @@ FUNC(cr4_pv32_restore) 1: #endif xor %eax, %eax - ret + RET END(cr4_pv32_restore) FUNC(compat_syscall) @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index d81a626d16..39c7b9d17f 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -604,7 +604,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 53bafc98a5..bf956b6c5f 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -85,6 +85,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index bf7b081ad0..6d43be2e6e 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -172,6 +172,17 @@ config INDIRECT_THUNK by choosing a hardware-dependent instruction sequence to implement (e.g. function pointers) safely. "Retpoline" is one such sequence. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y diff --git a/xen/lib/x86-generic-hweightl.c b/xen/lib/x86-generic-hweightl.c index 123a5b4392..1cab68952a 100644 --- a/xen/lib/x86-generic-hweightl.c +++ b/xen/lib/x86-generic-hweightl.c @@ -51,7 +51,11 @@ asm ( "pop %rdx\n\t" "pop %rdi\n\t" +#ifdef CONFIG_RETURN_THUNK + "jmp __x86_return_thunk\n\t" +#else "ret\n\t" +#endif ".size arch_generic_hweightl, . - arch_generic_hweightl\n\t" ); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:12:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981894.1368296 (Exim 4.92) (envelope-from ) id 1uEWhA-0008Sx-Td; Mon, 12 May 2025 17:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981894.1368296; Mon, 12 May 2025 17:12: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 1uEWhA-0008Sp-R0; Mon, 12 May 2025 17:12:04 +0000 Received: by outflank-mailman (input) for mailman id 981894; Mon, 12 May 2025 17:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWh9-0008SS-7H for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWh9-004GiE-1E for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWh9-002nBl-0C for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:03 +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=WM/eFKtjx7nJ3Aao5v3eifFr0WNMfo5k+7XEo50ZTZo=; b=jcY6ktzPLqQi+t9bf4pVUBIu4P jeHzn+/l53HHGLoNpppA5fc1uuDVlWbQVCjK4rBpMrSjN8GStTkyCqlws54s/zdAW56cfa9tEAP5W 1iPVLfC/wrtGef16e3yEvNYDZu6wfXSMyBJoOojevmX/6VBLBOYYRXzHxL5b7i1sb/OI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 17:12:03 +0000 commit f6042f38e621525feff86bb101dc751d2d87cff8 Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 05399fb9c9..397a04af41 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -219,6 +219,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index fe27e82a47..0a635025e4 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1760,6 +1760,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2316,6 +2400,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index c290d16683..a6d4a0cba7 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -391,7 +391,8 @@ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by V XEN_CPUFEATURE(IGN_UMONITOR, 16*32+29) /* MCU_OPT_CTRL.IGN_UMONITOR */ XEN_CPUFEATURE(MON_UMON_MITG, 16*32+30) /* MCU_OPT_CTRL.MON_UMON_MITG */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index a77cb30bdb..163b105bc6 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!|]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981895.1368299 (Exim 4.92) (envelope-from ) id 1uEWhK-0008Vm-V0; Mon, 12 May 2025 17:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981895.1368299; Mon, 12 May 2025 17:12: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 1uEWhK-0008Ve-SQ; Mon, 12 May 2025 17:12:14 +0000 Received: by outflank-mailman (input) for mailman id 981895; Mon, 12 May 2025 17:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWhJ-0008VM-PK for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWhJ-004GiP-38 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWhJ-002nFT-1z for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:13 +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=M2DM3ia6HQ8hblMso3Zn2hzLT+ACeVr9B0lirWr5pIQ=; b=Ds2Hfwejf1Jlmtg2/y80zqjjn/ SpbcLTFU3TSZHYzJgsbGJ68ZzpMFVhRHjGlbX+5cbZWpZMSI7v3PLiMCAOk5abC7d6hh0Xs6lMOPb uksx+pyHIL+nKQcm8JLIa7My3UeUbfjeVEb04C1rhgSR6ktJSI4myALQP9+UjrxVNyaQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 17:12:13 +0000 commit cf818880122c257c6c79506aacc69ee190a1e11e Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative-asm.h | 2 +- xen/arch/x86/include/asm/alternative.h | 11 +++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 1ba35cb9ed..88c90044c2 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -197,6 +197,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -214,11 +216,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -243,8 +245,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative-asm.h b/xen/arch/x86/include/asm/alternative-asm.h index 83e8594f0e..ed3f4cb055 100644 --- a/xen/arch/x86/include/asm/alternative-asm.h +++ b/xen/arch/x86/include/asm/alternative-asm.h @@ -12,7 +12,7 @@ * instruction. See apply_alternatives(). */ .macro altinstruction_entry orig, repl, feature, orig_len, repl_len, pad_len - .if \feature >= NCAPINTS * 32 + .if ((\feature) & ~ALT_FLAG_NOT) >= NCAPINTS * 32 .error "alternative feature outside of featureset range" .endif .long \orig - . diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 38472fb58e..ef63e257ad 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -12,7 +19,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ @@ -60,7 +67,7 @@ extern void alternative_branches(void); alt_repl_len(n2)) "-" alt_orig_len) #define ALTINSTR_ENTRY(feature, num) \ - " .if " STR(feature) " >= " STR(NCAPINTS * 32) "\n" \ + " .if (" STR(feature & ~ALT_FLAG_NOT) ") >= " STR(NCAPINTS * 32) "\n" \ " .error \"alternative feature outside of featureset range\"\n" \ " .endif\n" \ " .long .LXEN%=_orig_s - .\n" /* label */ \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:12:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:12:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981898.1368304 (Exim 4.92) (envelope-from ) id 1uEWhV-00007E-0P; Mon, 12 May 2025 17:12:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981898.1368304; Mon, 12 May 2025 17:12: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 1uEWhU-000077-Tr; Mon, 12 May 2025 17:12:24 +0000 Received: by outflank-mailman (input) for mailman id 981898; Mon, 12 May 2025 17:12:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWhT-00006s-VK for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWhU-004GiY-0P for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWhT-002nKq-2f for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:23 +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=yyobzQaxbl43f8hQDnBzvocGx4Yld+i85VcN7bpCW5g=; b=vO9f8B7mauqqOJDMdGMiWPZdqW y1pMNDULZtni34TnAxxzSyjO0IBQG/NCGAVDVwV2ci/T208bSir2F4bBev7Vty60RlU7orxNrPZ1V uqrug8fX1tgFFifYus2sK9dwmhVpQBgCNiKrmCAzNeH+dvfl9uWB9KiSnt3FCDOqoIW8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 17:12:23 +0000 commit 5992d3ab9f7ffd73a753fb72284550aa3d7981ba Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 50 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 76 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 +++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++---- 6 files changed, 112 insertions(+), 89 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..05e429794c --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +FUNC(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall +END(early_hypercall) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 7ab55fc1f6..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - -DATA(hypercall_page, PAGE_SIZE) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 -END(hypercall_page) - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index c17f5c447a..5c9f393c75 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void asmlinkage __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:12:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:12:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981899.1368307 (Exim 4.92) (envelope-from ) id 1uEWhg-0000A4-1v; Mon, 12 May 2025 17:12:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981899.1368307; Mon, 12 May 2025 17:12:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWhf-00009s-VM; Mon, 12 May 2025 17:12:35 +0000 Received: by outflank-mailman (input) for mailman id 981899; Mon, 12 May 2025 17:12:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWhe-00009Z-23 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWhe-004Gig-0l for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWhd-002nOB-37 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12: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=29NSt8SaTC05d978wO9ErYkt47ocrPuMLPfi4gEoQ6M=; b=Rpb/EfBquAjaqW6Cd2qzACmPNo 6IFgzURCp1P84MfgYOd1Hg668jyjQCSaFLwuAFKdAWHNi7MTCrc6+oukHqvLltWAVNegejdgaXHX5 WTTAw5mVp94QuaINTmE6CctcHy2Rxnau/BMoAVy1r8Ro9Itzpe3ELHIaexjIJtbSoBgo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:12:33 +0000 commit f81f44393f9cccd8673a9b55849ee232bf29d724 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index fd5493c22b..c4b978d67b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,10 @@ #include +/* Alignment is dealt with explicitly here; override the respective macro. */ +#undef SYM_ALIGN +#define SYM_ALIGN(align...) + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -35,6 +39,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + FUNC(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:12:46 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:12:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981900.1368313 (Exim 4.92) (envelope-from ) id 1uEWhq-0000DQ-6F; Mon, 12 May 2025 17:12:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981900.1368313; Mon, 12 May 2025 17:12:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWhq-0000DJ-2H; Mon, 12 May 2025 17:12:46 +0000 Received: by outflank-mailman (input) for mailman id 981900; Mon, 12 May 2025 17:12:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWho-0000D0-6T for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWho-004Gin-1C for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWho-002nUW-0G for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:44 +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=WTxpDutpGHUjgYgsLbQNm8JNZ64J9f3OD8kZbcWCLX4=; b=Wd91KlCcYA6tXYZfnQ0LH2b7fu 21PnBsD+4d6hUu9A5prrAH9sOhIUcPVD61NmOlpVQvy1VCIcJ6rxvC50zu90KyuN6grj/bH4UUfvA y8ijg+bLnO2PvlRrC4ngU+g3qprDXrcuSMIKCAuOPeVJNS5MKviKQRUp3cXEDN+jPoOg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:12:44 +0000 commit c6a2b5e9d0c5fdbb6aadce7773ca81ad8a07dcf9 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 678c00c5d0..52625f4e2c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -50,7 +50,12 @@ END(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -66,12 +71,14 @@ FUNC(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -83,7 +90,7 @@ FUNC(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:12:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:12:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981901.1368316 (Exim 4.92) (envelope-from ) id 1uEWi0-0000Fx-6p; Mon, 12 May 2025 17:12:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981901.1368316; Mon, 12 May 2025 17:12:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWi0-0000Fp-3s; Mon, 12 May 2025 17:12:56 +0000 Received: by outflank-mailman (input) for mailman id 981901; Mon, 12 May 2025 17:12:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWhy-0000Fb-B8 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWhy-004Giu-1f for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWhy-002nZT-0k for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:12:54 +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=z5sn89cmA4WohSRtGLV+99dMIw6xrRm6EAU/hM/3rOA=; b=kWtBbkSMC1CwnnV1CYUkefDFbn BnM2Ht1qU2l0+dG39Rr4Y77dVrF1/dCyvi0B68O75pC0+XIwPH3hS3V/AY63MYiTb+DdO0WaT3P41 mZtLk9FMCMDuqapoLrhH8/niBFGYpJYLnZIFPYARyDSYXg1EO8FrI+ksxde+NrbtY/ZQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 17:12:54 +0000 commit cda26aed40cec7e8ff7fc0b22d97e1a0ba8d38a7 Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 929c1a72ae..4c292ac338 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -77,6 +77,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cpu_policy; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 0ded68d069..02ab235de7 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -41,7 +39,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 88c90044c2..ec451d962c 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,6 +137,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 705cf9eb94..1572efa69a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -151,20 +151,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210UL, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -183,6 +183,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index ef63e257ad..28d4ec0f9c 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -31,6 +31,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 54c8621421..9cc37a1d8e 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e8cba5a27f..a6a1c9937f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1398,7 +1398,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3631,7 +3631,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3698,7 +3698,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3772,7 +3772,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4008,7 +4008,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4405,7 +4405,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4442,7 +4442,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4637,7 +4637,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4971,7 +4971,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5014,7 +5014,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5044,7 +5044,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5612,7 +5612,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5730,7 +5730,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6010,7 +6010,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6284,7 +6284,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6383,7 +6383,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6453,7 +6453,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6509,7 +6509,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6574,7 +6574,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6588,7 +6588,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6664,7 +6664,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6741,7 +6741,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6940,7 +6940,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -6976,7 +6976,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7217,7 +7217,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7384,7 +7384,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7630,7 +7630,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7976,7 +7976,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8085,7 +8085,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8181,12 +8181,12 @@ x86_emulate( if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } @@ -8510,7 +8510,7 @@ int x86_emul_rmw( pvex->reg = 0xf; /* rAX */ buf[3] = ctxt->opcode; buf[4] = 0x11; /* reg=rDX r/m=(%RCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); *eflags &= ~EFLAGS_MASK; invoke_stub("", -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:13:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:13:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981902.1368321 (Exim 4.92) (envelope-from ) id 1uEWiA-0000Ix-8f; Mon, 12 May 2025 17:13:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981902.1368321; Mon, 12 May 2025 17:13:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWiA-0000Ip-5R; Mon, 12 May 2025 17:13:06 +0000 Received: by outflank-mailman (input) for mailman id 981902; Mon, 12 May 2025 17:13:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWi8-0000IX-Ek for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWi8-004GjT-1y for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWi8-002nhW-1C for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:04 +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=RfAbc27RUWFM4FryAXH82kBEcWEgJIamol39N6ZYzsA=; b=Cw0W/cqaoTLSuwDZNBrtlz2PCm xVK0LPhMxozZJ+H84bM15tAK0fznKN8NiQA9iJUQTqdm0K2pkI3Z2k+mo3gU5jlZx0AI9I+/48N4S PbjAEPsLXczgIOoioo1gbHdwXyWdQURHYHBoOHuQEbl43OG8nMW96EmxgFlPmSZBcx0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 17:13:04 +0000 commit b9e8204ab1ebf4536c53db07e7daf8567e3e9328 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 4 +++- xen/arch/x86/copy_page.S | 4 +++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 24 ++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ xen/lib/x86-generic-hweightl.c | 4 ++++ 19 files changed, 106 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 9cdd04721a..96fd1c3272 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -38,9 +38,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 02ab235de7..a0954a6a8c 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a741d58b91..92af6230b3 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ LABEL(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET END(do_suspend_lowlevel) .data diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index ec451d962c..1b71ae959a 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,16 +137,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index cb47d72991..efdbdb6045 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -44,6 +44,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 52625f4e2c..7f92201a3c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ FUNC(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET END(clear_bhb_tsx) /* diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d6c076f1d8..dc3c3c26bf 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include FUNC(clear_page_sse2) @@ -16,5 +18,5 @@ FUNC(clear_page_sse2) jnz 0b sfence - ret + RET END(clear_page_sse2) diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index c3c436545b..e43e5370c8 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include #define src_reg %rsi @@ -41,5 +43,5 @@ FUNC(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET END(copy_page_sse2) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 32d6b44910..97ebe21298 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -58,6 +58,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index c4b978d67b..26dad15f12 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -15,6 +15,8 @@ #undef SYM_ALIGN #define SYM_ALIGN(align...) +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -62,3 +64,25 @@ END(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +FUNC(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ +END(__x86_return_thunk) + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 5409ad3b14..362b5d2416 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ FUNC(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET END(load_guest_gprs) /* Save guest GPRs. Parameter on the stack above the return address. */ @@ -48,5 +48,5 @@ FUNC(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET END(save_guest_gprs) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index ced8475001..fe27e82a47 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -571,6 +571,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 1e87652f4b..d7b381ea54 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -180,7 +180,7 @@ FUNC(cr4_pv32_restore) or cr4_pv32_mask(%rip), %rax mov %rax, %cr4 mov %rax, (%rcx) - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -198,7 +198,7 @@ FUNC(cr4_pv32_restore) 1: #endif xor %eax, %eax - ret + RET END(cr4_pv32_restore) FUNC(compat_syscall) @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 40d094d5b2..6efc6bab1e 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -604,7 +604,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 42217eaf24..e6c71a8e3e 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -83,6 +83,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 6166327f4d..7d9442ec05 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -136,6 +136,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y diff --git a/xen/lib/x86-generic-hweightl.c b/xen/lib/x86-generic-hweightl.c index 123a5b4392..1cab68952a 100644 --- a/xen/lib/x86-generic-hweightl.c +++ b/xen/lib/x86-generic-hweightl.c @@ -51,7 +51,11 @@ asm ( "pop %rdx\n\t" "pop %rdi\n\t" +#ifdef CONFIG_RETURN_THUNK + "jmp __x86_return_thunk\n\t" +#else "ret\n\t" +#endif ".size arch_generic_hweightl, . - arch_generic_hweightl\n\t" ); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:13:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:13:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981904.1368324 (Exim 4.92) (envelope-from ) id 1uEWiJ-0000M1-Bz; Mon, 12 May 2025 17:13:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981904.1368324; Mon, 12 May 2025 17:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWiJ-0000Lt-8p; Mon, 12 May 2025 17:13:15 +0000 Received: by outflank-mailman (input) for mailman id 981904; Mon, 12 May 2025 17:13:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWiI-0000Li-IA for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWiI-004Gja-2F for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWiI-002nkS-1U for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:14 +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=WU0awu0I58R4WpRRJRfHNbumCv3fh9vOeV1JPAnSdHo=; b=yw/2+0Q/spkqrBEvohG4NrEgeu qWpGGfLUVtBrCN+WF5oqfnnWmmPn6zdud0Dv4ruPGcHV7wsYG0RqVRT84Yhv7cX/8LBafnQu7/nW0 EQL1GFfSFQxYDPcToluoFcjGE7Wkzdh4A7iHirMEMwckhBoeT53ksTXNGD5zgenflBt0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 17:13:14 +0000 commit 45056fe5c5bf866208bf8bfe712c166950b5ba54 Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 3a06b6f297..24b021eeff 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -218,6 +218,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index fe27e82a47..0a635025e4 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1760,6 +1760,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2316,6 +2400,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 16207e3817..1e0e870c5c 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -379,7 +379,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index a77cb30bdb..163b105bc6 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!|]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:13:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:13:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981905.1368328 (Exim 4.92) (envelope-from ) id 1uEWiT-0000OM-D7; Mon, 12 May 2025 17:13:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981905.1368328; Mon, 12 May 2025 17:13:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWiT-0000OE-AQ; Mon, 12 May 2025 17:13:25 +0000 Received: by outflank-mailman (input) for mailman id 981905; Mon, 12 May 2025 17:13:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWiT-0000O6-0Y for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWiT-004Gjj-0b for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWiS-002nxo-2y for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:24 +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=kV90mVoNN7fQDVlc6Z7SWGD0URYhae3iGBWa9WVv4Pk=; b=SDfEaqnLZ+lEXppTI6oPJDAYSU 6D4MK/1/2Q0e4z1+Vp6Dyax1MZgumBOFcZ/trUgLaU8YovffsqJE1gJ4HCQdRKWgsu68wmIy9AgrU RVPjtE8tC16dyxaQoa0qAVT0DKyXic63umjUhPyfg86kIaQcITwipEVHx0gdblD7GjYk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 17:13:24 +0000 commit 246ed397e3dd3008808db7bff2e73c18e9a2cb81 Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative.h | 9 ++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 1ba35cb9ed..88c90044c2 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -197,6 +197,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -214,11 +216,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -243,8 +245,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 69555d781e..89b7bdcb82 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -11,7 +18,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:13:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:13:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981906.1368332 (Exim 4.92) (envelope-from ) id 1uEWid-0000RS-ES; Mon, 12 May 2025 17:13:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981906.1368332; Mon, 12 May 2025 17:13:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWid-0000RK-Bq; Mon, 12 May 2025 17:13:35 +0000 Received: by outflank-mailman (input) for mailman id 981906; Mon, 12 May 2025 17:13:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWid-0000RC-3Y for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWid-004Gjq-0x for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWid-002o1y-06 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:35 +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=EFSFClrTwVyxat2G704BTXUL0W2p+a1HhxDt0GcLqaE=; b=K1NWiVI1kMvHjpeD9RAaaGsGm1 zxsqlMqwUkIseuJhEhfwU1ZrdUSeGK6KVt/P2YRRaQNMtZHkSc6PEHlJz9ICtSvrdQvqs/ASWqs5t l+pusDgh8vY3jK1FVvvAI/b00cCRaxkP1LeTXOTRwzLaGMFavYVa7gPaAnBfRV210REw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 17:13:35 +0000 commit 4da237fe92689fbbb865b47311b3215f40787547 Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 50 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 76 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 +++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++---- 6 files changed, 112 insertions(+), 89 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..05e429794c --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +FUNC(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall +END(early_hypercall) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 7ab55fc1f6..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - -DATA(hypercall_page, PAGE_SIZE) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 -END(hypercall_page) - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 7484b3f73a..2c30db05df 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void asmlinkage __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:13:46 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:13:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981907.1368336 (Exim 4.92) (envelope-from ) id 1uEWio-0000U9-Fz; Mon, 12 May 2025 17:13:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981907.1368336; Mon, 12 May 2025 17:13:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWio-0000U1-DK; Mon, 12 May 2025 17:13:46 +0000 Received: by outflank-mailman (input) for mailman id 981907; Mon, 12 May 2025 17:13:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWin-0000Tm-79 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWin-004Gk0-1D for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWin-002o6s-0R for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:45 +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=8Wx0P+jsZ/aalNPCHyNJQ01uoZ8YrL6xkn1gccQmm+o=; b=v6crbUuJusnbNFAxHZ80BOoEEZ j7HNTW3aCwa8WfB32ItTO2oxdzH/ZlOw05kRg3GxAqBQuDQ1bLpG8sxuUfYWPEfFSfzbPrTySOO3j uEkS/9sEYixD3IKP/TKOCmBJD3tuz16u2/5XFGKYXsBa27zooIk3rl2Lr4GhBJQxOzKw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:13:45 +0000 commit 545eba29ac798305e2c5cb1fe5112771b6890907 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index fd5493c22b..c4b978d67b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,10 @@ #include +/* Alignment is dealt with explicitly here; override the respective macro. */ +#undef SYM_ALIGN +#define SYM_ALIGN(align...) + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -35,6 +39,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + FUNC(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:13:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:13:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981908.1368339 (Exim 4.92) (envelope-from ) id 1uEWiy-0000XV-Ig; Mon, 12 May 2025 17:13:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981908.1368339; Mon, 12 May 2025 17:13:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWiy-0000XO-G6; Mon, 12 May 2025 17:13:56 +0000 Received: by outflank-mailman (input) for mailman id 981908; Mon, 12 May 2025 17:13:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWix-0000XA-B4 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWix-004Gk8-1f for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWix-002oCb-0h for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:13:55 +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=HXmfIBxYYCDF6f/JZ140Td8j7DTDC3EtBqPoKU6KwXM=; b=KCt4agRH9m59L+OHzdXuiEEhqb oxhXp4E8NRbLqrd/mVoL5GKjCrCIWtx2WGVMfmX198WVTXdaoDswr8JjSGZDWjas3Pqc88Zn2TeKl 5G+uD+88zQfy4+s9krFRhGnfpBkDVOBQ+Z28K6FffZaC6nvdmRyHLeEeNDnd/wtVU1e8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:13:55 +0000 commit 556ca37970cd992a113936cf66076caf2dcf4b09 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 678c00c5d0..52625f4e2c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -50,7 +50,12 @@ END(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -66,12 +71,14 @@ FUNC(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -83,7 +90,7 @@ FUNC(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:14:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:14:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981909.1368343 (Exim 4.92) (envelope-from ) id 1uEWj8-0000av-KL; Mon, 12 May 2025 17:14:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981909.1368343; Mon, 12 May 2025 17:14:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWj8-0000ai-Hh; Mon, 12 May 2025 17:14:06 +0000 Received: by outflank-mailman (input) for mailman id 981909; Mon, 12 May 2025 17:14:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWj7-0000aT-FQ for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWj7-004Gkj-28 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWj7-002oML-1D for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:05 +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=68uBafLzvemFyg5i4lJ3/37GQuSS6wKpA0p97GpWdCQ=; b=lr2BGvABXPhnP3H3ZO2eACXyq3 dpUVbpO7QvigdUDDnhUcAoVbbQlu2oMFMYj7z/NrSCFp44JGBRB9hUBXDm/3pybDkCZRoOwyUwV2f wQV/SWkErckvxlemKshqu8+8ss+JEQOq2+fiez5gOcRyK++sF+sNIvIUhwxEedGo769w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 17:14:05 +0000 commit 20719483154f9635d888ae7e12adb2985852758c Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 8f8accfe3e..946aaa9d66 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -68,6 +68,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cp; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c1e64278ce..a7e5a82689 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -41,7 +39,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 88c90044c2..ec451d962c 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,6 +137,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 705cf9eb94..1572efa69a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -151,20 +151,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210UL, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -183,6 +183,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 89b7bdcb82..841a63ebf1 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -30,6 +30,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 480d879657..03612d00a2 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b1d192cbbf..f407096824 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1396,7 +1396,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3627,7 +3627,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3694,7 +3694,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3768,7 +3768,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4004,7 +4004,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4401,7 +4401,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4438,7 +4438,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4633,7 +4633,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4967,7 +4967,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5010,7 +5010,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5040,7 +5040,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5608,7 +5608,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5726,7 +5726,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6006,7 +6006,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6290,7 +6290,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6389,7 +6389,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6459,7 +6459,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6515,7 +6515,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6580,7 +6580,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6594,7 +6594,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6688,7 +6688,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6766,7 +6766,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6848,7 +6848,7 @@ x86_emulate( pevex->r = !mode_64bit() || !(state->sib_index & 0x08); pevex->R = !mode_64bit() || !(state->sib_index & 0x10); pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (index) : "a" (&index)); put_stub(stub); @@ -7058,7 +7058,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -7094,7 +7094,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7335,7 +7335,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7502,7 +7502,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7748,7 +7748,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -8094,7 +8094,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8203,7 +8203,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8293,12 +8293,12 @@ x86_emulate( BUG(); if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:14:16 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:14:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981910.1368348 (Exim 4.92) (envelope-from ) id 1uEWjI-0000dm-MD; Mon, 12 May 2025 17:14:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981910.1368348; Mon, 12 May 2025 17:14:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjI-0000dd-JH; Mon, 12 May 2025 17:14:16 +0000 Received: by outflank-mailman (input) for mailman id 981910; Mon, 12 May 2025 17:14:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjH-0000dT-JL for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWjH-004Gks-2X for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWjH-002oYi-1f for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:15 +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=F022LYeCi99twvwImz5SkKX8rGJzPEdyK+MSdEfCf9U=; b=Jix9oAYG8pVP9GIHGMQg0hKQBj T8SA1padnmc9+OWr8X+w3MG9oHtHZn1jW7iRM7wNMdKbx2mlU5qN1A6KeFQTXouNmIAtGDAnjxS9W 2Ege0ODB7jlmJZdp+kEwPyXDuoNQ1ttCRG/SK/fyVU4nTcfnWIhXK7ojj06IwLLgL+w0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 17:14:15 +0000 commit 58ab9fcc3f80ee6eeb7f6db4ca922f79a84e18b8 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 4 +++- xen/arch/x86/copy_page.S | 4 +++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 24 ++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ 18 files changed, 102 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 7e03e4bc55..4542ea8408 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -37,9 +37,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index a7e5a82689..27806a81ac 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 66f7993399..97bd676aae 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ ENTRY(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET .data .align 16 diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index ec451d962c..1b71ae959a 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,16 +137,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index b88d097a84..85d3e7cbfe 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -46,6 +46,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 52625f4e2c..7f92201a3c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ FUNC(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET END(clear_bhb_tsx) /* diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d6c076f1d8..dc3c3c26bf 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include FUNC(clear_page_sse2) @@ -16,5 +18,5 @@ FUNC(clear_page_sse2) jnz 0b sfence - ret + RET END(clear_page_sse2) diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index c3c436545b..e43e5370c8 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include #define src_reg %rsi @@ -41,5 +43,5 @@ FUNC(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET END(copy_page_sse2) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 32d6b44910..97ebe21298 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -58,6 +58,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index c4b978d67b..26dad15f12 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -15,6 +15,8 @@ #undef SYM_ALIGN #define SYM_ALIGN(align...) +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -62,3 +64,25 @@ END(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +FUNC(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ +END(__x86_return_thunk) + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 5409ad3b14..362b5d2416 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ FUNC(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET END(load_guest_gprs) /* Save guest GPRs. Parameter on the stack above the return address. */ @@ -48,5 +48,5 @@ FUNC(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET END(save_guest_gprs) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 35351044f9..019a0a81f4 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -569,6 +569,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index a99646c0cd..18f46c78cf 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -180,7 +180,7 @@ FUNC(cr4_pv32_restore) or cr4_pv32_mask(%rip), %rax mov %rax, %cr4 mov %rax, (%rcx) - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -198,7 +198,7 @@ FUNC(cr4_pv32_restore) 1: #endif xor %eax, %eax - ret + RET END(cr4_pv32_restore) FUNC(compat_syscall) @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 9b0cdb7640..eb62e7c329 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -604,7 +604,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 9a1dfe1b34..5069938675 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -82,6 +82,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 565ceda741..da0fa75276 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -130,6 +130,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:14:26 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:14:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981911.1368352 (Exim 4.92) (envelope-from ) id 1uEWjS-0000gy-Ou; Mon, 12 May 2025 17:14:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981911.1368352; Mon, 12 May 2025 17:14:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjS-0000gq-MA; Mon, 12 May 2025 17:14:26 +0000 Received: by outflank-mailman (input) for mailman id 981911; Mon, 12 May 2025 17:14:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjR-0000gg-M2 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWjR-004Gl0-2o for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWjR-002ohc-23 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:25 +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=JVZMkvfbdGDKdM1cmFl/Wz7g3b3Y3wE3+Y1X3MU2+Ng=; b=kcu1jtBzNPz1J4OFqD7MbS6yTv NBMLDXO6X2zJIB0/jQzN3sYpy1+HxIQ16izqT0PBmh5jFym2fdEEn67Yt3a/CLOsbET7rBOw08Cde nLeUpbTaCU9irjY1TexPFNWM15zCp+0Mpt62KkdOt0dzyQeAmaKhkz5Qod56HDbG6IJQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 17:14:25 +0000 commit 27135987a5865baf140f92da06f9caa65630402d Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 9bc553681f..1729ba0c30 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -216,6 +216,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 019a0a81f4..94cdbd521c 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1781,6 +1781,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2331,6 +2415,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 9c98e49928..4d9e468af6 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -365,7 +365,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 601eec6089..dc33ca3181 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!|]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:14:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:14:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981912.1368356 (Exim 4.92) (envelope-from ) id 1uEWjc-0000jt-QD; Mon, 12 May 2025 17:14:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981912.1368356; Mon, 12 May 2025 17:14:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjc-0000jl-Nf; Mon, 12 May 2025 17:14:36 +0000 Received: by outflank-mailman (input) for mailman id 981912; Mon, 12 May 2025 17:14:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjc-0000jY-4t for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWjc-004Gl7-15 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWjc-002oon-0J for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:36 +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=v0VwlkK65hLhCh7/GgwMBARwTXwIJMfICt8XCd6pYAg=; b=Vg6oryQnGKUwjCEHZX7QapwV9U kB/V/Qp7HAxaZ+8sXKJHPf65tuNOkKRI6XrZCF3NGP29PFoxNXWJn6qPB9C9p5Snr2TtjUtrng/kT YqzWJEPFShu5gd5PM3bXtD4f6M96ymyWksrjdifv1lkoDE165wQbFerorw35tKJnMzw0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 17:14:36 +0000 commit 232be2140aaa2643f3991df5edd3e6387146234e Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative.h | 9 ++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 91b60865bf..90bf9a92bf 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -197,6 +197,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -214,11 +216,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -243,8 +245,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 69555d781e..89b7bdcb82 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -11,7 +18,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:14:46 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:14:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981913.1368359 (Exim 4.92) (envelope-from ) id 1uEWjm-0000mM-Ra; Mon, 12 May 2025 17:14:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981913.1368359; Mon, 12 May 2025 17:14:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjm-0000mF-P7; Mon, 12 May 2025 17:14:46 +0000 Received: by outflank-mailman (input) for mailman id 981913; Mon, 12 May 2025 17:14:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjm-0000m6-7a for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWjm-004GlG-1M for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWjm-002oro-0Z for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:46 +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=13ODUvsbFmciRWNHc75pFmaqCwFnfkwOahv+hCERNng=; b=RFsSaIO4q26Lh34q8LieAoSGM0 ZFCbiP495QwNXjCr/sXd43yd1m+GoInp+NmXle9VrKLKQNSMehq2fzVU+V5hKKBjQCTsF+rp0klYX D0qVgfnySebZCKKItC1fWExIR42UUYHTw1IvBW4o61Tt1zsMxrm2D4+FcJdUsi+dFFtw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 17:14:46 +0000 commit 7b506c53acb295d7dd840b8d4fd8356f7bf1aeb0 Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 52 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 78 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 ++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++--- 6 files changed, 114 insertions(+), 91 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..47ab685cf8 --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +ENTRY(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall + + .type early_hypercall, @function + .size early_hypercall, . - early_hypercall diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 9958d02cfd..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,78 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - .p2align PAGE_SHIFT - -GLOBAL(hypercall_page) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 - .type hypercall_page, STT_OBJECT - .size hypercall_page, PAGE_SIZE - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 44a689d439..306f88ef6a 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:14:57 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:14:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981914.1368364 (Exim 4.92) (envelope-from ) id 1uEWjx-0000om-TH; Mon, 12 May 2025 17:14:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981914.1368364; Mon, 12 May 2025 17:14:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjx-0000oe-Qd; Mon, 12 May 2025 17:14:57 +0000 Received: by outflank-mailman (input) for mailman id 981914; Mon, 12 May 2025 17:14:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWjw-0000oQ-Ai for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWjw-004Gne-1f for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWjw-002oyL-0s for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:14:56 +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=+mU8ejfRr5x5skyjkgazHjhor8QtjYsl/46Cv5lYSSs=; b=mpNMa0mXyRFTyYSGHKq18cHhQO nOBAvZTr6yYJ9JIiw9+IRfA1lSyfW5tB1QG8ps4Eu/tYCfOoef9sSuWMZ+LZZjmtUuUsBqevr0Usj A9OKubCwvR9m2HALdJeTwZL7JgEuLh+FLq/3RSsiwcaXV8YdSCG8+Ta2Vs5Yw9G7SV0s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:14:56 +0000 commit 74738ce473dbb5a71b7e0c40e8d095d0ab81d2cb Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index de6aef6068..e7ef104d3b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -35,6 +35,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + ENTRY(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:15:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:15:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981915.1368367 (Exim 4.92) (envelope-from ) id 1uEWk7-0000s3-Vz; Mon, 12 May 2025 17:15:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981915.1368367; Mon, 12 May 2025 17:15:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWk7-0000rv-TL; Mon, 12 May 2025 17:15:07 +0000 Received: by outflank-mailman (input) for mailman id 981915; Mon, 12 May 2025 17:15:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWk6-0000rf-DI for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWk6-004Go5-1w for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWk6-002pET-1A for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:06 +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=DQmOh1UsfCvWaVo/DNq77hGHkZoejUh4Q/m++gEdAxw=; b=ksb+F5JBzfn2M97nC35NJrS7KZ VAMg7N1KdksmzPhrmjEtkqi16eRSYEfIBB68PIzuNQGk5vt38y4AzH+O/Q/dVsqqNi+lGuUV6cAGJ 4jIO3unGg7ZJT3DXoINfOS4VXaL5VInchlUtZnUfebD4olQD704qwUn4Pr9zDrl3Rtac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:15:06 +0000 commit d992f242c1d21aa474f69dacf51d20b8089cbad5 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 7e866784f7..05f1043df7 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -52,7 +52,12 @@ ENTRY(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -68,12 +73,14 @@ ENTRY(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -85,7 +92,7 @@ ENTRY(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:15:18 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:15:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981916.1368372 (Exim 4.92) (envelope-from ) id 1uEWkI-0000uR-1K; Mon, 12 May 2025 17:15:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981916.1368372; Mon, 12 May 2025 17:15: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 1uEWkH-0000uJ-Ul; Mon, 12 May 2025 17:15:17 +0000 Received: by outflank-mailman (input) for mailman id 981916; Mon, 12 May 2025 17:15:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkG-0000u7-Gd for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWkG-004GoC-2F for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWkG-002pIu-1U for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:16 +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=NGNiM+K4rhVVpRxMV5Wkqnt/5AGMq2NHGfDQ1QUp+HY=; b=dOHkoqVLumqNorIkWFgExrwXYg hVRLdVAk3BU8jeF1Wu2MQYKCCOJM3IZYQONn1jqMkS+zYsX2bJPx1vBUlc68gjTNRPtj18F2BE24M qqL1xy6kKTseQ6xYV9eah0/K1L0bWCrgnHKpGzZiJ5ddZ0irWL+IGb25kaTL4jXl1Oww=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 17:15:16 +0000 commit b51f2c8fcd2995e2b8517f73568d5f0e0f8aae64 Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 34f0855114..1483a5a888 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -68,6 +68,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cp; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index e8a4bf59c3..7df877a09d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -42,7 +40,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 90bf9a92bf..be19577234 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,6 +137,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 12cc9935d8..16bf2cc62b 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -135,20 +135,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -167,6 +167,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 89b7bdcb82..841a63ebf1 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -30,6 +30,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 480d879657..03612d00a2 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index ef2598d4ca..dd5b65afe0 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1396,7 +1396,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3627,7 +3627,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3694,7 +3694,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3768,7 +3768,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4004,7 +4004,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4401,7 +4401,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4438,7 +4438,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4633,7 +4633,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4967,7 +4967,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5010,7 +5010,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5040,7 +5040,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5608,7 +5608,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5726,7 +5726,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6006,7 +6006,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6290,7 +6290,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6389,7 +6389,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6459,7 +6459,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6515,7 +6515,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6580,7 +6580,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6594,7 +6594,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6688,7 +6688,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6766,7 +6766,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6848,7 +6848,7 @@ x86_emulate( pevex->r = !mode_64bit() || !(state->sib_index & 0x08); pevex->R = !mode_64bit() || !(state->sib_index & 0x10); pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (index) : "a" (&index)); put_stub(stub); @@ -7026,7 +7026,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -7062,7 +7062,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7303,7 +7303,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7470,7 +7470,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7716,7 +7716,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -8056,7 +8056,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8165,7 +8165,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8255,12 +8255,12 @@ x86_emulate( BUG(); if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:15:28 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:15:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981917.1368375 (Exim 4.92) (envelope-from ) id 1uEWkS-0000wg-2y; Mon, 12 May 2025 17:15:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981917.1368375; Mon, 12 May 2025 17:15:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkS-0000wX-08; Mon, 12 May 2025 17:15:28 +0000 Received: by outflank-mailman (input) for mailman id 981917; Mon, 12 May 2025 17:15:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkQ-0000wL-Jc for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWkQ-004GoW-2Y for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWkQ-002pPc-1n for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:26 +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=rgqkBWngUr9uemb2YN4B48hI5Dh4NtFlEeH27XvLmto=; b=jyS3VtH7S4jVUBmCjYskoL/hSy plL+0nwU/Yy7+Fbb0R1iGXScd2tI3G+YYwLxQQmQ0qtdhHWZFkDYXiKnA1F9gGYxKt+v32rPbAD1+ YZ8PKVSUAYsln7car5b/Iulv56534tFyYh6GWGeQmmsH197N/ih9zfLKv7yCmppsdwVE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 17:15:26 +0000 commit cf4c900be3852d08081603c15a03b34122d3426a Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:56 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 3 ++- xen/arch/x86/copy_page.S | 3 ++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 27 +++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 5 ++--- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ 18 files changed, 103 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 1acdffc51c..9611b80761 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -35,9 +35,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7df877a09d..fc984d629e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 66f7993399..97bd676aae 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ ENTRY(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET .data .align 16 diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index be19577234..ccb9985a76 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,16 +137,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 28217c9ace..21a753b639 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -46,6 +46,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 05f1043df7..472da481dd 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ ENTRY(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET .size clear_bhb_tsx, . - clear_bhb_tsx .type clear_bhb_tsx, @function diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index 5b5622cc52..fd4c8c0b2a 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include ENTRY(clear_page_sse2) @@ -15,7 +16,7 @@ ENTRY(clear_page_sse2) jnz 0b sfence - ret + RET .type clear_page_sse2, @function .size clear_page_sse2, . - clear_page_sse2 diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index ddb6e0ebbb..184127c11d 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include #define src_reg %rsi @@ -40,7 +41,7 @@ ENTRY(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET .type copy_page_sse2, @function .size copy_page_sse2, . - copy_page_sse2 diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 32d6b44910..97ebe21298 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -58,6 +58,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index e7ef104d3b..239cf7dc77 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,9 @@ #include + +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -60,3 +63,27 @@ ENTRY(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +ENTRY(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ + + .size __x86_return_thunk, . - __x86_return_thunk + .type __x86_return_thunk, @function + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index e7f5bfcd2d..bf830a78f8 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,12 +26,11 @@ ENTRY(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET .size load_guest_gprs, . - load_guest_gprs .type load_guest_gprs, STT_FUNC - /* Save guest GPRs. Parameter on the stack above the return address. */ ENTRY(save_guest_gprs) pushq %rdi @@ -51,7 +50,7 @@ ENTRY(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET .size save_guest_gprs, . - save_guest_gprs .type save_guest_gprs, STT_FUNC diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 51a66a144e..8daa28e1ea 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -569,6 +569,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 3c544e9a14..dfa1152b60 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -183,7 +183,7 @@ ENTRY(cr4_pv32_restore) mov %rax, %cr4 mov %rax, (%rdx) pop %rdx - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -202,7 +202,7 @@ ENTRY(cr4_pv32_restore) #endif pop %rdx xor %eax, %eax - ret + RET ENTRY(compat_syscall) /* Fix up reported %cs/%ss for compat domains. */ @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index df3f3b4ea7..ccf058ae55 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -598,7 +598,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 8930e14fc4..b66e708ebf 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -86,6 +86,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 3361a6d892..2c103c2c47 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -127,6 +127,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:15:37 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:15:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981924.1368392 (Exim 4.92) (envelope-from ) id 1uEWkb-0001H2-7j; Mon, 12 May 2025 17:15:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981924.1368392; Mon, 12 May 2025 17:15:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkb-0001Gu-4Y; Mon, 12 May 2025 17:15:37 +0000 Received: by outflank-mailman (input) for mailman id 981924; Mon, 12 May 2025 17:15:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWka-0001Gf-MG for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWka-004Goj-2q for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWka-002pSe-24 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:36 +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=CYHLY2zU8lRh5E+UQ6eSeTS/qDFPWWBAP6ZAl+e0AlQ=; b=woZpVAee6JWaImjhMq0/oK6XS4 nK10IUjsFqZpDwMRM9UqkT9u41Fh85aJzOp0TF/QDqhXp9gOf8WzF3BnYOxdRcHV1b5nooShKZra9 QQhAn/P8YfVfva7Dwx0XKXVhcPpPwdp+X01lUCuZdkPgc5d1pL0gJxoSLXQyU0sMD8oo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 17:15:36 +0000 commit f132c82fa65d17545d7ca94bc1c27e1d1f18a2aa Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:56 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 3c57f55de0..1048f16e0c 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -211,6 +211,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 8daa28e1ea..46681d10ae 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1781,6 +1781,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2331,6 +2415,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 603a448cb3..6fa7777409 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -344,7 +344,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 415d644db5..61d236058a 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:15:48 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:15:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981925.1368396 (Exim 4.92) (envelope-from ) id 1uEWkm-0001Oj-8g; Mon, 12 May 2025 17:15:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981925.1368396; Mon, 12 May 2025 17:15:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkm-0001OX-65; Mon, 12 May 2025 17:15:48 +0000 Received: by outflank-mailman (input) for mailman id 981925; Mon, 12 May 2025 17:15:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkl-0001O1-54 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWkl-004GpB-17 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWkl-002pXf-0L for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:47 +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=dAMSWrfggUhQW1WqGWS32KS6dG3JTsOsLEkh6BXZjXA=; b=0AZfR1T5y7mwlN5lPchRRMXG/U O1Zzf+wgWfJdMmmsBYQk5TEuqm2Olg8MKmN6wPEgmnao4TIjgN6/4+CmN5TITLSwvTs5YOTx+dLxv IwuRmUm+855Ycz3mAaCzTc0sfeHE98lw1fdEtaIf+7zqtdc7iXVQsYmOvNAqS1kPn838=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 17:15:47 +0000 commit 2aa9922c89839e8e28051db472cd02e91e0a6795 Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 12 ++++++++++-- xen/arch/x86/include/asm/alternative.h | 9 ++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 8356414be7..6eee6e501a 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -209,10 +209,12 @@ static void init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; BUG_ON(a->repl_len > total_len); BUG_ON(total_len > sizeof(buf)); - BUG_ON(a->cpuid >= NCAPINTS * 32); + BUG_ON(feat >= NCAPINTS * 32); /* * Detect sequences of alt_instr's patching the same origin site, and @@ -235,8 +237,14 @@ static void init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index ee4cbe92cc..388e595786 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -11,7 +18,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:15:58 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:15:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981932.1368401 (Exim 4.92) (envelope-from ) id 1uEWkw-0001Z1-AG; Mon, 12 May 2025 17:15:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981932.1368401; Mon, 12 May 2025 17:15:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkw-0001Yt-7d; Mon, 12 May 2025 17:15:58 +0000 Received: by outflank-mailman (input) for mailman id 981932; Mon, 12 May 2025 17:15:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWkv-0001Yc-7q for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWkv-004GpZ-1N for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWkv-002pdD-0c for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:15:57 +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=hTR/wGuCxi1QKZjLlfTs55BxCZXsQYGhOvC2f+VuDg8=; b=xeYy+dYUKuTcKmjp/TfyaqzSk7 6kZweTv2otaT8W+u19TO567nbPuZLp/fTLK5DLIdz2wAAo5t70CoIxHJZECB7O+czS6IjqeSP9aRI 0oYkb4IFRXRRIuTgoGMVN9uzQ+kexEfMbcYomwTn90V6b1eBZ1o28QGq8uGyJcOwwmT0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 17:15:57 +0000 commit 15bb4cccf50dbba738d158c01b0bd48ab5d75ce6 Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 52 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 78 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 ++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++--- 6 files changed, 114 insertions(+), 91 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..47ab685cf8 --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +ENTRY(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall + + .type early_hypercall, @function + .size early_hypercall, . - early_hypercall diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 9958d02cfd..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,78 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - .p2align PAGE_SHIFT - -GLOBAL(hypercall_page) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 - .type hypercall_page, STT_OBJECT - .size hypercall_page, PAGE_SIZE - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index c4cb16df38..0d1e6d0658 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -38,7 +38,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -47,6 +46,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -349,9 +392,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 03d5868a9e..a7e90adbaf 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -41,9 +41,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -53,10 +55,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -66,10 +70,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -80,10 +86,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:16:10 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:16:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981937.1368405 (Exim 4.92) (envelope-from ) id 1uEWl6-0001eP-C4; Mon, 12 May 2025 17:16:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981937.1368405; Mon, 12 May 2025 17:16: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 1uEWl6-0001eH-96; Mon, 12 May 2025 17:16:08 +0000 Received: by outflank-mailman (input) for mailman id 981937; Mon, 12 May 2025 17:16:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWl5-0001dt-GJ for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWl5-004Gpr-1e for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWl5-002pmm-0r for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:07 +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=X2Kxb5Ryaav8QbuZXMyzyO8bYEVXU581WisBaKJ7yuE=; b=3JKKVyIgFIrfC8a7tg010bVspa QPC+pHdaU8oSlTZIo88fuOj1A2Ak+3ZvnYrQexRvZbrioZ48NzLtsANtLqBNUwd72C8ijw1bW7647 hAW4g3tvkj0GK+fJ0AC4RVQxgZSdPQRx7p6Mhz13ImczdhhEPjyOIrRx3VxSkaOTVtZQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:16:07 +0000 commit ebf61f7699ad2b97f3a641a80f8b117122514f34 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index de6aef6068..e7ef104d3b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -35,6 +35,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + ENTRY(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:16:18 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:16:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981939.1368410 (Exim 4.92) (envelope-from ) id 1uEWlG-0001nM-Fi; Mon, 12 May 2025 17:16:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981939.1368410; Mon, 12 May 2025 17:16: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 1uEWlG-0001nE-Ce; Mon, 12 May 2025 17:16:18 +0000 Received: by outflank-mailman (input) for mailman id 981939; Mon, 12 May 2025 17:16:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWlF-0001n6-D4 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWlF-004GqC-1v for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWlF-002ppZ-19 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16: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=pFmeqTPYuCaLDKP+kqHYre6ISZvVSufcyMglSXrmPt4=; b=wkTx0IzymHdWOKgJNR3/gRSIvC kriFl2uUpZuVzyPAkM+A64CjcERaOaZh9/gU+8qNGMwKe6eWWySlttmK2B3Y2fIFVc/MoahPk7d2y +Gi11Jk8qXVAK7yeYf6J9jRQ4mUY1I4UAkbko8Os6rfo4gC6wy41FO7MQ+OYswPUSwM0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:16:17 +0000 commit 1d4361b041d70edc2287d7bb748c17c56569bf2f Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 7e866784f7..05f1043df7 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -52,7 +52,12 @@ ENTRY(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -68,12 +73,14 @@ ENTRY(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -85,7 +92,7 @@ ENTRY(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:16:28 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:16:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981941.1368413 (Exim 4.92) (envelope-from ) id 1uEWlQ-0001qe-H5; Mon, 12 May 2025 17:16:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981941.1368413; Mon, 12 May 2025 17:16:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWlQ-0001qU-EH; Mon, 12 May 2025 17:16:28 +0000 Received: by outflank-mailman (input) for mailman id 981941; Mon, 12 May 2025 17:16:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWlP-0001qI-GT for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWlP-004GqK-2F for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWlP-002ptv-1T for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16: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=W1yFVrMo7AKRyp8+pLOpAlGRYvQPkK6qG4xDWayHqAQ=; b=mQC1IrRVBRKUtI9GNHQOjEU+Sm JQXNic24qdtqlUKbfzZ9WMPjaqKw70bQLm+HmM2yN6LURf3VGF3rvr2o1nW2ZIIjwzBzDWoiW+4BQ smRt4iqAzgAYQVL/VH1/LH73T1JBRan2b8qS89UKSjvSGRIdpBK6ISNctoK9GQcUWhoM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 17:16:27 +0000 commit ddc5c1e0aafb9b21faa6da94d74be89bc0158ed8 Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 +++ xen/arch/x86/Makefile | 6 +-- xen/arch/x86/alternative.c | 14 ++++++ xen/arch/x86/extable.c | 11 ++--- xen/arch/x86/include/asm/alternative.h | 2 + xen/arch/x86/pv/emul-priv-op.c | 5 ++- xen/arch/x86/x86_emulate/x86_emulate.c | 82 ++++++++++++++++++---------------- 7 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 58760f096d..65ae95e624 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -67,6 +67,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cp; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 6a070a8cf8..882408ccaf 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -10,9 +10,7 @@ obj-$(CONFIG_XENOPROF) += oprofile/ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -40,7 +38,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 6eee6e501a..88082f68a9 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -149,6 +149,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index f05c16def6..adfd439d3a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -135,20 +135,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = TRAP_invalid_op }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = TRAP_gp_fault }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210, .res.fields.trapnr = TRAP_stack_error }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = TRAP_int3 }, #undef endbr64 }; @@ -167,6 +167,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 388e595786..28e69e988a 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -30,6 +30,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index f216c26412..28ea7cc580 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -88,7 +88,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -138,11 +137,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 995670cbc8..b5eca13410 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1533,36 +1533,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (_regs.eflags), [tmp] "=&r" (tmp_) \ @@ -3852,7 +3858,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -6751,7 +6757,7 @@ x86_emulate( evex.lr = 0; opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6816,7 +6822,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -6884,7 +6890,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -7113,7 +7119,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, EXC_UD); @@ -7510,7 +7516,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -7538,7 +7544,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -7733,7 +7739,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -8058,7 +8064,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -8101,7 +8107,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -8131,7 +8137,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -9027,7 +9033,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -9145,7 +9151,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -9424,7 +9430,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -9684,7 +9690,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -9783,7 +9789,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -9853,7 +9859,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -9909,7 +9915,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -9974,7 +9980,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -9988,7 +9994,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -10082,7 +10088,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -10160,7 +10166,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -10229,7 +10235,7 @@ x86_emulate( pevex->r = !mode_64bit() || !(state->sib_index & 0x08); pevex->R = !mode_64bit() || !(state->sib_index & 0x10); pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (index) : "a" (&index)); put_stub(stub); @@ -10404,7 +10410,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -10438,7 +10444,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -10670,7 +10676,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -10837,7 +10843,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -11065,7 +11071,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -11225,7 +11231,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -11334,7 +11340,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -11401,12 +11407,12 @@ x86_emulate( BUG(); if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:16:38 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:16:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981943.1368416 (Exim 4.92) (envelope-from ) id 1uEWla-0001tP-IN; Mon, 12 May 2025 17:16:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981943.1368416; Mon, 12 May 2025 17:16:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWla-0001tH-Fl; Mon, 12 May 2025 17:16:38 +0000 Received: by outflank-mailman (input) for mailman id 981943; Mon, 12 May 2025 17:16:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWlZ-0001t6-Jk for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWlZ-004GqU-2Z for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWlZ-002pz2-1n for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:37 +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=Gk65EXsnmjcB1qZrJUn6/7kwaR1OzZ5F8sqG00FdL+0=; b=CDTTNfDcjJOt8XeUNvWf5esAX0 eN+UJlBf+O5PbNwKrEaLL3aeqCsT6tbnZEaYQyPGvSuqzpLkcOOUOoguWgcP3dXqoneTqe0OT5D45 rKIi4xnyrMlcpDCyV67Ogl2S1A3JlDa+rbECEV/iZUEB7XAbTcZ/c/Vrtbcjk39avDc8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 17:16:37 +0000 commit 3c31a87bcbdf04fda9019d46236436ead53b0c1e Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 3 ++- xen/arch/x86/copy_page.S | 3 ++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 27 +++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ 18 files changed, 103 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 471cfd8a80..370558756f 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -35,9 +35,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 882408ccaf..22293d969b 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 3855ff1ddb..cd4682b9f9 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -131,7 +131,7 @@ ENTRY(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET .data .align 16 diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 88082f68a9..151df73583 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -149,16 +149,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 227d439a45..379317c013 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -50,6 +50,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + ifdef CONFIG_XEN_IBT # Force -fno-jump-tables to work around # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104816 diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 05f1043df7..472da481dd 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ ENTRY(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET .size clear_bhb_tsx, . - clear_bhb_tsx .type clear_bhb_tsx, @function diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d9d524c79e..ea70bd9167 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include ENTRY(clear_page_sse2) @@ -15,4 +16,4 @@ ENTRY(clear_page_sse2) jnz 0b sfence - ret + RET diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index 2da81126c5..bb79c5fc79 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include #define src_reg %rsi @@ -40,4 +41,4 @@ ENTRY(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 7e22fcb9c0..a9ca0d05ec 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -47,6 +47,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index e7ef104d3b..239cf7dc77 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,9 @@ #include + +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -60,3 +63,27 @@ ENTRY(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +ENTRY(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ + + .size __x86_return_thunk, . - __x86_return_thunk + .type __x86_return_thunk, @function + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 28ea7cc580..872a89db76 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -143,7 +143,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index e7f5bfcd2d..d90435be88 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ ENTRY(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET .size load_guest_gprs, . - load_guest_gprs .type load_guest_gprs, STT_FUNC @@ -51,7 +51,7 @@ ENTRY(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET .size save_guest_gprs, . - save_guest_gprs .type save_guest_gprs, STT_FUNC diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index b1e47a849e..2f777e8a7e 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -575,6 +575,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index ff462a92e0..57e54dc75f 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -183,7 +183,7 @@ ENTRY(cr4_pv32_restore) mov %rax, %cr4 mov %rax, (%rdx) pop %rdx - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -202,7 +202,7 @@ ENTRY(cr4_pv32_restore) #endif pop %rdx xor %eax, %eax - ret + RET ENTRY(compat_syscall) /* Fix up reported %cs/%ss for compat domains. */ @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 7bb0cc708a..fd63ee2e4c 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -598,7 +598,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 8930e14fc4..b66e708ebf 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -86,6 +86,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index cd73851538..c82bee92f4 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -112,6 +112,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:16:48 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:16:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981945.1368420 (Exim 4.92) (envelope-from ) id 1uEWlk-0001wf-LN; Mon, 12 May 2025 17:16:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981945.1368420; Mon, 12 May 2025 17:16:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWlk-0001wX-Ij; Mon, 12 May 2025 17:16:48 +0000 Received: by outflank-mailman (input) for mailman id 981945; Mon, 12 May 2025 17:16:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEWlj-0001wP-Mi for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEWlj-004Gqi-2s for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEWlj-002q4A-25 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:16:47 +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=/i7B46/ppSx7+PXOnuyP0AneYYQ3/PBkHjzTDD8eNmQ=; b=RAQ2bF8EyPpZk0qhpir3JAfbZL kax3jlV8hmpI9N3UOiLtYVanqc4OritYpdBaMsapLDA3HNoDI1tPFfejHRxcz/9IMqZcZJr5qt5UY Bu/NJtd3C2pbYJq1fnnVvcvkaLx2QjQSdArQ4E+TUDYGYfP/fT83VOkd7xOyOywqXyws=; 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: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 17:16:47 +0000 commit 015a7e3ab2296f5b7f668537fb3fa3bb23f974c9 Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index a6b8af1296..d9aedfc25a 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -164,6 +164,7 @@ #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 2f777e8a7e..559ee90b44 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1766,6 +1766,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2316,6 +2400,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 0004fd4bf5..99c4dc1ffd 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -334,7 +334,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 415b8b1d68..05b1c13ec4 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:44:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:44:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981968.1368437 (Exim 4.92) (envelope-from ) id 1uEXC7-00065B-4B; Mon, 12 May 2025 17:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981968.1368437; Mon, 12 May 2025 17: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 1uEXC7-000652-1M; Mon, 12 May 2025 17:44:03 +0000 Received: by outflank-mailman (input) for mailman id 981968; Mon, 12 May 2025 17:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXC6-00064s-EH for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXC6-004HIC-1d for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXC6-003712-0N for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=XGsK8W7PA/hfb0QkB8ElDth9EAnKSUxsENdh37a5JRM=; b=nWSXT1p0OduZkiAyIzI0svl4Br VjU9sCUXqtPocPagqNil1jBW2/KINq3CuTUio9b4otoZZhFljiFPQVXLFeUHbpWlTnqeFuffrG+T8 neC13l3FewzFQJdz2ZepPKNHkP/zJHoLWnIZh4LC5n8eukciPUg9qcf4ctsDoaKwMJlw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 17:44:02 +0000 commit 328ed39c59e0af06d594f5e64a52b57aa0b02340 Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative-asm.h | 2 +- xen/arch/x86/include/asm/alternative.h | 11 +++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 43b009888c..4d1bbe7313 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -228,6 +228,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -245,11 +247,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -271,8 +273,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, if ( a->priv ) continue; + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative-asm.h b/xen/arch/x86/include/asm/alternative-asm.h index 22da9f89f1..3eb0f4e8a0 100644 --- a/xen/arch/x86/include/asm/alternative-asm.h +++ b/xen/arch/x86/include/asm/alternative-asm.h @@ -12,7 +12,7 @@ * instruction. See apply_alternatives(). */ .macro altinstruction_entry orig, repl, feature, orig_len, repl_len, pad_len - .if \feature >= NCAPINTS * 32 + .if ((\feature) & ~ALT_FLAG_NOT) >= NCAPINTS * 32 .error "alternative feature outside of featureset range" .endif .long \orig - . diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 29c3d724b0..b9ea49bd1c 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -14,7 +21,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ @@ -61,7 +68,7 @@ extern void alternative_instructions(void); alt_repl_len(n2)) "-" alt_orig_len) #define ALTINSTR_ENTRY(feature, num) \ - " .if " STR(feature) " >= " STR(NCAPINTS * 32) "\n" \ + " .if (" STR(feature & ~ALT_FLAG_NOT) ") >= " STR(NCAPINTS * 32) "\n" \ " .error \"alternative feature outside of featureset range\"\n" \ " .endif\n" \ " .long .LXEN%=_orig_s - .\n" /* label */ \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981970.1368440 (Exim 4.92) (envelope-from ) id 1uEXCH-00067x-5M; Mon, 12 May 2025 17:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981970.1368440; Mon, 12 May 2025 17: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 1uEXCH-00067p-2o; Mon, 12 May 2025 17:44:13 +0000 Received: by outflank-mailman (input) for mailman id 981970; Mon, 12 May 2025 17:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXCG-00067c-HS for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXCG-004HII-2E for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXCG-0037FK-18 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=h+pIzvkatUX2+AzvVil/oDsA9DDxhYwPotNIlChckto=; b=1YuRNW9/XXWp3oP2knPanj1n67 M9gm9R09f0Yjtdxm70KiL00+egWcrbTRcI9TzQmMBcQkSYbr0HdkvBrvEdGr90ZCIZOAQ6KT05Wtw CV3S7Uza29/9v7bmvo1VVv79CqBN3+GUUve17owU7+NdpcuNLW+VKwnlroCpL3xbe+9k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 17:44:12 +0000 commit ef30ffe0a0f79313c00720793c475c45a9e490ff Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 50 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 76 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 +++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++---- 6 files changed, 112 insertions(+), 89 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..05e429794c --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +FUNC(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall +END(early_hypercall) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 7ab55fc1f6..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - -DATA(hypercall_page, PAGE_SIZE) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 -END(hypercall_page) - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index c17f5c447a..5c9f393c75 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void asmlinkage __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981971.1368445 (Exim 4.92) (envelope-from ) id 1uEXCR-0006Ad-6q; Mon, 12 May 2025 17:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981971.1368445; Mon, 12 May 2025 17: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 1uEXCR-0006AV-4H; Mon, 12 May 2025 17:44:23 +0000 Received: by outflank-mailman (input) for mailman id 981971; Mon, 12 May 2025 17:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXCQ-0006AL-Ms for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXCQ-004HIM-2q for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXCQ-0037RJ-1o for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=x5uWFto13ZP8C39DVeBVsRCK+ioIFw2U4l064HR4r18=; b=QwhiC/G/oEglnihWXdnXxoe3OT +VU2q3Qx4/lw0y1EFh9S5BS2NXS69yJ26yjtiWmnObYeJqnWRJQzaCpWF7GirFCuQmg0jWGY9ulZe aRSnhoFa3cXqkE70WErD5NQmLVWXcGMQoVUu5hssjG7MPq8+JOasImEzwyZ2RX/OEBgY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:44:22 +0000 commit d293cc9da9021a51915e058acd1f05e83a462aa9 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/indirect-thunk.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index fd5493c22b..c4b978d67b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,10 @@ #include +/* Alignment is dealt with explicitly here; override the respective macro. */ +#undef SYM_ALIGN +#define SYM_ALIGN(align...) + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -35,6 +39,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + FUNC(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981972.1368449 (Exim 4.92) (envelope-from ) id 1uEXCb-0006EE-9a; Mon, 12 May 2025 17:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981972.1368449; Mon, 12 May 2025 17: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 1uEXCb-0006E6-6w; Mon, 12 May 2025 17:44:33 +0000 Received: by outflank-mailman (input) for mailman id 981972; Mon, 12 May 2025 17:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXCa-0006Dz-SX for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXCb-004HIQ-07 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXCa-0037Us-2N for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=G+FAbt1v3mjgu622bX+iscgIn7zTbBrMMMDTAL23zw8=; b=oZegin+HUjEEv+zgz2EfytNVwb YLsRD1n/LnQcTC/PuVS8YR4cn9rkz8ob/ejxPYulb8KATyOnXk89fh4g5GHbAEyzx5BpeYtjI3SoM W4J5SHZb+/H/BtLsNU5fEpk+dSIUHQog4j7WQcSpQcma0Bue5XBNo7n78Rw8SX3S4jl8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 17:44:32 +0000 commit c0db07031a41ff892f57756b7e2b4ef98df72588 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index f5ac41834b..7175778bdd 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -50,7 +50,12 @@ END(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -66,12 +71,14 @@ FUNC(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -83,7 +90,7 @@ FUNC(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981975.1368453 (Exim 4.92) (envelope-from ) id 1uEXCm-0006HV-B4; Mon, 12 May 2025 17:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981975.1368453; Mon, 12 May 2025 17: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 1uEXCm-0006HL-8M; Mon, 12 May 2025 17:44:44 +0000 Received: by outflank-mailman (input) for mailman id 981975; Mon, 12 May 2025 17:44:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXCl-0006H9-2O for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXCl-004HIX-0g for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXCk-0037Wx-2t for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17: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=1PKpZnlQwoCkqEztWU6eKPZAyEbUJZ/A1M9iJI0eaJ8=; b=jROw+4bht/7LjsPnaNkn3iUmeD 33rIXfYU0nOBbZAJ1J+MCAbry48DDhzb6sd+SXt/3VXdkLNEDHHv3w34jSfO+GlFe80bE4EHritP5 hZ2qs9oxFN3OQtcviWlGQNMIaFMLTXREHtDo6qPA1zHmNtzPrXmrzqfacWEX13SZQba4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 17:44:42 +0000 commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 929c1a72ae..4c292ac338 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -77,6 +77,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cpu_policy; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c2f1dcf301..c32aba029d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -41,7 +39,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 4d1bbe7313..0449b9c1b7 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -135,6 +135,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 705cf9eb94..1572efa69a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -151,20 +151,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210UL, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -183,6 +183,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index b9ea49bd1c..e17be8ddfd 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -33,6 +33,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 54c8621421..9cc37a1d8e 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 7d68ebe7ea..0a98b43476 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1400,7 +1400,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3633,7 +3633,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3700,7 +3700,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3774,7 +3774,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4010,7 +4010,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4407,7 +4407,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4444,7 +4444,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4639,7 +4639,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4973,7 +4973,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5016,7 +5016,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5046,7 +5046,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5614,7 +5614,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5732,7 +5732,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6012,7 +6012,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6286,7 +6286,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6385,7 +6385,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6455,7 +6455,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6511,7 +6511,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6576,7 +6576,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6590,7 +6590,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6666,7 +6666,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6743,7 +6743,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6941,7 +6941,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -6977,7 +6977,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7218,7 +7218,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7385,7 +7385,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7631,7 +7631,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7977,7 +7977,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8086,7 +8086,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8182,12 +8182,12 @@ x86_emulate( if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } @@ -8511,7 +8511,7 @@ int x86_emul_rmw( pvex->reg = 0xf; /* rAX */ buf[3] = ctxt->opcode; buf[4] = 0x11; /* reg=rDX r/m=(%RCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); *eflags &= ~EFLAGS_MASK; invoke_stub("", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981976.1368457 (Exim 4.92) (envelope-from ) id 1uEXCw-0006KF-Cl; Mon, 12 May 2025 17:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981976.1368457; Mon, 12 May 2025 17: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 1uEXCw-0006K1-9m; Mon, 12 May 2025 17:44:54 +0000 Received: by outflank-mailman (input) for mailman id 981976; Mon, 12 May 2025 17:44:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXCv-0006Jp-63 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXCv-004HJf-19 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXCv-0037cE-0E for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:44: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=05nBHf0qNSC5xS7emJgzj9Qnr542xPSbawZM1EoBpFA=; b=0UIItCw+584UQC5ZeBa/Aud2MX 76UTArIUG0QdKNnuG5kpuTlGPMjmwKAPuErXITo9XbmGa3hQSfJ3Ct5IUVb+Zl0wBydtLwDH9orRC mB86A75+k/6dCC0cGzJYTEPc51emly+USxfmE39eB8BDUk7A+Z62X3HFV3scZHrhNYE8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 17:44:53 +0000 commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 4 +++- xen/arch/x86/copy_page.S | 4 +++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 24 ++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ xen/lib/x86-generic-hweightl.c | 4 ++++ 19 files changed, 106 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index de2fa37f08..7afe879710 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -39,9 +39,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c32aba029d..bedb97cbee 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a741d58b91..92af6230b3 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ LABEL(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET END(do_suspend_lowlevel) .data diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 0449b9c1b7..ecc56964bd 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -135,16 +135,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 09b6d8758e..4991545125 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -34,6 +34,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 7175778bdd..606b378d84 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ FUNC(clear_bhb_tsx) xabort $0 int3 1: - ret + RET END(clear_bhb_tsx) /* diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d6c076f1d8..dc3c3c26bf 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include FUNC(clear_page_sse2) @@ -16,5 +18,5 @@ FUNC(clear_page_sse2) jnz 0b sfence - ret + RET END(clear_page_sse2) diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index c3c436545b..e43e5370c8 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include #define src_reg %rsi @@ -41,5 +43,5 @@ FUNC(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET END(copy_page_sse2) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 1b821db49c..96370dd92a 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -36,6 +36,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index c4b978d67b..26dad15f12 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -15,6 +15,8 @@ #undef SYM_ALIGN #define SYM_ALIGN(align...) +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -62,3 +64,25 @@ END(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +FUNC(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ +END(__x86_return_thunk) + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 5409ad3b14..362b5d2416 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ FUNC(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET END(load_guest_gprs) /* Save guest GPRs. Parameter on the stack above the return address. */ @@ -48,5 +48,5 @@ FUNC(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET END(save_guest_gprs) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index ced8475001..fe27e82a47 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -571,6 +571,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 1e87652f4b..d7b381ea54 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -180,7 +180,7 @@ FUNC(cr4_pv32_restore) or cr4_pv32_mask(%rip), %rax mov %rax, %cr4 mov %rax, (%rcx) - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -198,7 +198,7 @@ FUNC(cr4_pv32_restore) 1: #endif xor %eax, %eax - ret + RET END(cr4_pv32_restore) FUNC(compat_syscall) @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index d81a626d16..39c7b9d17f 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -604,7 +604,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 53bafc98a5..bf956b6c5f 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -85,6 +85,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index bf7b081ad0..6d43be2e6e 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -172,6 +172,17 @@ config INDIRECT_THUNK by choosing a hardware-dependent instruction sequence to implement (e.g. function pointers) safely. "Retpoline" is one such sequence. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y diff --git a/xen/lib/x86-generic-hweightl.c b/xen/lib/x86-generic-hweightl.c index 123a5b4392..1cab68952a 100644 --- a/xen/lib/x86-generic-hweightl.c +++ b/xen/lib/x86-generic-hweightl.c @@ -51,7 +51,11 @@ asm ( "pop %rdx\n\t" "pop %rdi\n\t" +#ifdef CONFIG_RETURN_THUNK + "jmp __x86_return_thunk\n\t" +#else "ret\n\t" +#endif ".size arch_generic_hweightl, . - arch_generic_hweightl\n\t" ); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 17:45:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 17:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.981977.1368461 (Exim 4.92) (envelope-from ) id 1uEXD6-0006Np-FO; Mon, 12 May 2025 17:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 981977.1368461; Mon, 12 May 2025 17: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 1uEXD6-0006Ni-Ca; Mon, 12 May 2025 17:45:04 +0000 Received: by outflank-mailman (input) for mailman id 981977; Mon, 12 May 2025 17:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXD5-0006NX-Bb for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:45:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXD5-004HLI-1b for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:45:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXD5-0037lf-0g for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 17:45:03 +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=EApvd7INqFD7tl/dwUQpBxSLe0BoJpPgvI0gUcRzOjE=; b=WwlRyt9F7t68UesIZ1Vh41QJgz ps7W7P/mk/bcwAUytTdCJHhtuDhk1Kw01skXNXj6DlCS8pNWFx1ltLi3Ztk27ga7qeuYy94jwZqQi Yx/vDGo7rMA7M7Zm7ZTH0vQOeuIunnW01Hzbp9doJJMoQz0fqLz9eF5BgHqZwyUeQOb0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 17:45:03 +0000 commit f6042f38e621525feff86bb101dc751d2d87cff8 Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:17:38 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 05399fb9c9..397a04af41 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -219,6 +219,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index fe27e82a47..0a635025e4 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1760,6 +1760,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2316,6 +2400,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index c290d16683..a6d4a0cba7 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -391,7 +391,8 @@ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by V XEN_CPUFEATURE(IGN_UMONITOR, 16*32+29) /* MCU_OPT_CTRL.IGN_UMONITOR */ XEN_CPUFEATURE(MON_UMON_MITG, 16*32+30) /* MCU_OPT_CTRL.MON_UMON_MITG */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index a77cb30bdb..163b105bc6 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!|]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982074.1368554 (Exim 4.92) (envelope-from ) id 1uEXxX-000108-QB; Mon, 12 May 2025 18:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982074.1368554; Mon, 12 May 2025 18: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 1uEXxX-0000zx-NG; Mon, 12 May 2025 18:33:03 +0000 Received: by outflank-mailman (input) for mailman id 982074; Mon, 12 May 2025 18:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXxW-0000zb-Sn for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXxW-004IEb-2S for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXxW-003eYS-1H for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18: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=ApEISly/7q7B3Q4WZa1GxJcLbZ88kJuGgHQXwch1wRk=; b=alfGgS3H+Nn6LA8/noEm338Usk eXKd7aCKSxi3qdaoX3MIT0/5sLjzEqP9k5WufyXRtm9NhkmGTLBEMCEgeAn6GUFgiXt0g0SuAA1zs +Seamy0u+tNfLVFesVxhuIb55t975zJ54wWdVjtjfvtm5+2wY/JzBlmEa2Fbvvik9GFk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 18:33:02 +0000 commit 246ed397e3dd3008808db7bff2e73c18e9a2cb81 Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative.h | 9 ++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 1ba35cb9ed..88c90044c2 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -197,6 +197,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -214,11 +216,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -243,8 +245,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 69555d781e..89b7bdcb82 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -11,7 +18,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982075.1368559 (Exim 4.92) (envelope-from ) id 1uEXxh-00011h-RO; Mon, 12 May 2025 18:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982075.1368559; Mon, 12 May 2025 18: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 1uEXxh-00011Z-Ol; Mon, 12 May 2025 18:33:13 +0000 Received: by outflank-mailman (input) for mailman id 982075; Mon, 12 May 2025 18:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXxg-00011T-Px for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXxg-004IEf-32 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXxg-003ecp-1w for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18: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=p9qmX0LL04G+9ZhDHgrydhC7iIqNOQERNRI1RhOQxeE=; b=cBwIsu6Xn6oVVgW1NY0dayHlOE KcFeZfE2E7oEvSrSIEeC2cILgSnJZXHS+EeJv3n4v1/6uc3bEQtYr1oeTJL0/15tYwr6N7nh4Ro4n YcQ0PkXOOHujoibXz2mQBNbw7HQCkPuxln/oMJHCf88ML3gDltnyzXVH+s4qVp0OyK+o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 18:33:12 +0000 commit 4da237fe92689fbbb865b47311b3215f40787547 Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 50 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 76 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 +++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++---- 6 files changed, 112 insertions(+), 89 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..05e429794c --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +FUNC(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall +END(early_hypercall) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 7ab55fc1f6..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - -DATA(hypercall_page, PAGE_SIZE) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 -END(hypercall_page) - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 7484b3f73a..2c30db05df 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void asmlinkage __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982076.1368563 (Exim 4.92) (envelope-from ) id 1uEXxr-000144-TK; Mon, 12 May 2025 18:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982076.1368563; Mon, 12 May 2025 18:33: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 1uEXxr-00013w-QF; Mon, 12 May 2025 18:33:23 +0000 Received: by outflank-mailman (input) for mailman id 982076; Mon, 12 May 2025 18:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXxq-00013o-US for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXxr-004IEl-0K for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXxq-003efK-2W for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33: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=E/nN4CVfnZvQzhgFChk8Aw+RpBN17GtiRzgC+2TPY9s=; b=4FLbb5XudSKjBVsx6H00oaCx5s zyXijPNBGnv5v88s7Cg5b5RWw1a3A/yVuzDOgUoTf/Fe2YN5UqD75/M52vzzfcznUnSNsGFZ365Z7 jFk1/9iRLQNWC7Z53XaoIhbwUQF6f+w+O0zDHpZYXyfsbt8mzPK3Cye5l11GFUEJU/ks=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 18:33:22 +0000 commit 545eba29ac798305e2c5cb1fe5112771b6890907 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index fd5493c22b..c4b978d67b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,10 @@ #include +/* Alignment is dealt with explicitly here; override the respective macro. */ +#undef SYM_ALIGN +#define SYM_ALIGN(align...) + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -35,6 +39,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + FUNC(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:33:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982077.1368566 (Exim 4.92) (envelope-from ) id 1uEXy1-000179-VV; Mon, 12 May 2025 18:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982077.1368566; Mon, 12 May 2025 18:33: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 1uEXy1-000171-T1; Mon, 12 May 2025 18:33:33 +0000 Received: by outflank-mailman (input) for mailman id 982077; Mon, 12 May 2025 18:33:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXy1-00016t-19 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXy1-004IEr-0f for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXy0-003ejZ-31 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33: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=zzl4oYJ02uzPefoXvOBZ2QpW+u6j8nabkUuOz/sRgWU=; b=N6Eiz5lzjRm09pUIwfNGhJAfr+ whMnTyFQCX3/YZ6pWj2WudVfUpUk6yppa3XAolb8E+YOXOCGeYFr2sGDX8suURVhucLLFVzCg3o0F OK2QcJLTPl05P2DEqefIXmhm3dhiMI3dYWy/ZXGjZmhk9CuoF1P/GC3/MXg6eAkex96o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 18:33:32 +0000 commit 556ca37970cd992a113936cf66076caf2dcf4b09 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 678c00c5d0..52625f4e2c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -50,7 +50,12 @@ END(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -66,12 +71,14 @@ FUNC(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -83,7 +90,7 @@ FUNC(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982078.1368573 (Exim 4.92) (envelope-from ) id 1uEXyC-00019L-1S; Mon, 12 May 2025 18:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982078.1368573; Mon, 12 May 2025 18:33: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 1uEXyB-00019B-UQ; Mon, 12 May 2025 18:33:43 +0000 Received: by outflank-mailman (input) for mailman id 982078; Mon, 12 May 2025 18:33:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXyB-000193-7Y for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXyB-004IEv-1G for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXyB-003ewl-0E for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33: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=xoH4TGK/w4vjFPzdoXp4s+4nCqjq894LlYLgV1TnD0s=; b=kOyNFGCWOqvVRmO0zr4RvWPaf0 J424DWMSdFQxO46WCoNoari5+x6Gz3dNwLnQ9DLDYXuy9/VkLWd0VP3uYKdVqSUwDletdUsYCj8Jz tddbFyRQsotLHiqL/kvyItoGtCKhqltkdl7pc3FI6+4H9DQh/FRxeyotBUTPmNkvHo1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 18:33:43 +0000 commit 20719483154f9635d888ae7e12adb2985852758c Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 8f8accfe3e..946aaa9d66 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -68,6 +68,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cp; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c1e64278ce..a7e5a82689 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -41,7 +39,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 88c90044c2..ec451d962c 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,6 +137,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 705cf9eb94..1572efa69a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -151,20 +151,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210UL, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -183,6 +183,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 89b7bdcb82..841a63ebf1 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -30,6 +30,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 480d879657..03612d00a2 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b1d192cbbf..f407096824 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1396,7 +1396,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3627,7 +3627,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3694,7 +3694,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3768,7 +3768,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4004,7 +4004,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4401,7 +4401,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4438,7 +4438,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4633,7 +4633,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4967,7 +4967,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5010,7 +5010,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5040,7 +5040,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5608,7 +5608,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5726,7 +5726,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6006,7 +6006,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6290,7 +6290,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6389,7 +6389,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6459,7 +6459,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6515,7 +6515,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6580,7 +6580,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6594,7 +6594,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6688,7 +6688,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6766,7 +6766,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6848,7 +6848,7 @@ x86_emulate( pevex->r = !mode_64bit() || !(state->sib_index & 0x08); pevex->R = !mode_64bit() || !(state->sib_index & 0x10); pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (index) : "a" (&index)); put_stub(stub); @@ -7058,7 +7058,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -7094,7 +7094,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7335,7 +7335,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7502,7 +7502,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7748,7 +7748,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -8094,7 +8094,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8203,7 +8203,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8293,12 +8293,12 @@ x86_emulate( BUG(); if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:33:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982079.1368576 (Exim 4.92) (envelope-from ) id 1uEXyM-0001Bg-3J; Mon, 12 May 2025 18:33:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982079.1368576; Mon, 12 May 2025 18:33: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 1uEXyL-0001BW-Vw; Mon, 12 May 2025 18:33:53 +0000 Received: by outflank-mailman (input) for mailman id 982079; Mon, 12 May 2025 18:33:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXyL-0001BO-Ea for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXyL-004IF3-1r for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXyL-003fLl-0x for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:33: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=7iA8WK89OEtlTYes6N2G3MB80OmGYZTrbIw/Q+EdY+E=; b=4MTpsX+ZKb6V0skXZBtK5MMgrk 1ts8vDqOTTep3ct80HBBZaViSLJ3dfF9YLZzHKDzViM24r24ySLY6vcolzlPu+Xhi5yQFCXLzFA2l B1hNPrEnKji+ab0pzxI3ddrbdxxNbxzzjZtflm3CqjV1JqfzHgzYFZWBjHnFR6oizliE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 18:33:53 +0000 commit 58ab9fcc3f80ee6eeb7f6db4ca922f79a84e18b8 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 4 +++- xen/arch/x86/copy_page.S | 4 +++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 24 ++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ 18 files changed, 102 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 7e03e4bc55..4542ea8408 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -37,9 +37,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index a7e5a82689..27806a81ac 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 66f7993399..97bd676aae 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ ENTRY(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET .data .align 16 diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index ec451d962c..1b71ae959a 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,16 +137,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index b88d097a84..85d3e7cbfe 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -46,6 +46,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 52625f4e2c..7f92201a3c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ FUNC(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET END(clear_bhb_tsx) /* diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d6c076f1d8..dc3c3c26bf 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include FUNC(clear_page_sse2) @@ -16,5 +18,5 @@ FUNC(clear_page_sse2) jnz 0b sfence - ret + RET END(clear_page_sse2) diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index c3c436545b..e43e5370c8 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include #define src_reg %rsi @@ -41,5 +43,5 @@ FUNC(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET END(copy_page_sse2) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 32d6b44910..97ebe21298 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -58,6 +58,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index c4b978d67b..26dad15f12 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -15,6 +15,8 @@ #undef SYM_ALIGN #define SYM_ALIGN(align...) +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -62,3 +64,25 @@ END(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +FUNC(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ +END(__x86_return_thunk) + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 5409ad3b14..362b5d2416 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ FUNC(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET END(load_guest_gprs) /* Save guest GPRs. Parameter on the stack above the return address. */ @@ -48,5 +48,5 @@ FUNC(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET END(save_guest_gprs) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 35351044f9..019a0a81f4 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -569,6 +569,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index a99646c0cd..18f46c78cf 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -180,7 +180,7 @@ FUNC(cr4_pv32_restore) or cr4_pv32_mask(%rip), %rax mov %rax, %cr4 mov %rax, (%rcx) - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -198,7 +198,7 @@ FUNC(cr4_pv32_restore) 1: #endif xor %eax, %eax - ret + RET END(cr4_pv32_restore) FUNC(compat_syscall) @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 9b0cdb7640..eb62e7c329 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -604,7 +604,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 9a1dfe1b34..5069938675 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -82,6 +82,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 565ceda741..da0fa75276 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -130,6 +130,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:34:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:34:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982080.1368578 (Exim 4.92) (envelope-from ) id 1uEXyW-0001Ez-59; Mon, 12 May 2025 18:34:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982080.1368578; Mon, 12 May 2025 18:34: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 1uEXyW-0001Et-2b; Mon, 12 May 2025 18:34:04 +0000 Received: by outflank-mailman (input) for mailman id 982080; Mon, 12 May 2025 18:34:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEXyV-0001Ej-IS for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:34:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEXyV-004IFb-2L for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:34:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEXyV-003fcJ-1N for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:34:03 +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=p5UpeRdTymhUswxNAmD7ac6bywjZc0b7tCK8/2NtPoA=; b=ly0J8J2z2cmNSdyhg54NEYwL8V D+7qGrBqOoqeT7TNsDdIeabU+Rdeu7dM8PIlMpcAZILPMRennWDvzv4cDGcajdtIZxTpddB4gdO5O pSUyg4jsizIAGmaWJHAknxJaH/I3rKKJ7UIdl6BOcD2K379thN6Wx+Tmw8YyCCeEnMfQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 18:34:03 +0000 commit 27135987a5865baf140f92da06f9caa65630402d Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:29:13 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 9bc553681f..1729ba0c30 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -216,6 +216,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 019a0a81f4..94cdbd521c 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1781,6 +1781,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2331,6 +2415,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 9c98e49928..4d9e468af6 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -365,7 +365,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 601eec6089..dc33ca3181 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!|]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982081.1368583 (Exim 4.92) (envelope-from ) id 1uEYIp-0003rm-K9; Mon, 12 May 2025 18:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982081.1368583; Mon, 12 May 2025 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 1uEYIp-0003re-HP; Mon, 12 May 2025 18:55:03 +0000 Received: by outflank-mailman (input) for mailman id 982081; Mon, 12 May 2025 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 1uEYIo-0003rI-B1 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 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 1uEYIo-004IiC-0L for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYIn-003wLH-28 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18: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=fzNOuPJrDhZ47MtPa3jatRCx3ZSMzOq+O4e0Rv+W1lU=; b=t0+BedetPy/Xcn9twbZNEWre3Z zFl5/94et4RzTfgIq+/cPZvTJqpVtVZiLEpUyLTGinsBYXGsqcemVgDo+7VFUXTYHV6WEGLbzkwbR 2FDaKJ2PfKPqY/OP45ILrnLqrVDuV69yKZ9PZBRkrv5ExOgP54nPf8ndZOEOrbRJ/XQU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 18:55:01 +0000 commit 232be2140aaa2643f3991df5edd3e6387146234e Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative.h | 9 ++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 91b60865bf..90bf9a92bf 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -197,6 +197,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -214,11 +216,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -243,8 +245,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 69555d781e..89b7bdcb82 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -11,7 +18,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982082.1368586 (Exim 4.92) (envelope-from ) id 1uEYIz-00041D-LQ; Mon, 12 May 2025 18:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982082.1368586; Mon, 12 May 2025 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 1uEYIz-000415-In; Mon, 12 May 2025 18:55:13 +0000 Received: by outflank-mailman (input) for mailman id 982082; Mon, 12 May 2025 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 1uEYIy-00040p-46 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 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 1uEYIy-004IiZ-0u for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYIx-003wPs-34 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18: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=94ea7rxSsTQKYMuTupwqjZXjzkmojfQ9gI4V3o478/g=; b=UPZz2Oo2OsuogMG7YSNM0sJILM NdA2XiC2yG5iZRWeS78TGEsdInndN0YA9M1dm4rxsba4zecIT9ty4yKf/3oRfNt42FDAUl4yfzgoD Sh11VX401DOFppPEQv9pg9Tbyoy4ZQK8+4LCJKG25aNvUMPTS6i5aW2Oq6sVcDp79ou4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 18:55:11 +0000 commit 7b506c53acb295d7dd840b8d4fd8356f7bf1aeb0 Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 52 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 78 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 ++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++--- 6 files changed, 114 insertions(+), 91 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..47ab685cf8 --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +ENTRY(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall + + .type early_hypercall, @function + .size early_hypercall, . - early_hypercall diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 9958d02cfd..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,78 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - .p2align PAGE_SHIFT - -GLOBAL(hypercall_page) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 - .type hypercall_page, STT_OBJECT - .size hypercall_page, PAGE_SIZE - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 44a689d439..306f88ef6a 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982083.1368590 (Exim 4.92) (envelope-from ) id 1uEYJ9-00043i-Mw; Mon, 12 May 2025 18:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982083.1368590; Mon, 12 May 2025 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 1uEYJ9-00043b-KH; Mon, 12 May 2025 18:55:23 +0000 Received: by outflank-mailman (input) for mailman id 982083; Mon, 12 May 2025 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 1uEYJ8-00043P-Ac for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 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 1uEYJ8-004Iiv-1V for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYJ8-003wj8-0O for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 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=bt4MVWAyvLlHDiZE/m7a6pT2M3wj7n9rFIkkkvFiO2w=; b=W1HZg4NDLF4xpgPV9w2ahG/bhv hJiaTWLTjp7odDGWcxZvWBhJkZiT4bwCWcZDXRaGQidYlIWHkYa2jwF8xfcbKXGaQvfObg77eanJS TXa9kb4p0m535kaG367fLN1a+Gh5/NvLjzHnBDYFuTPd9eJvk5uUkD7Ng59G2P6p4kYc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 18:55:22 +0000 commit 74738ce473dbb5a71b7e0c40e8d095d0ab81d2cb Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index de6aef6068..e7ef104d3b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -35,6 +35,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + ENTRY(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982084.1368594 (Exim 4.92) (envelope-from ) id 1uEYJJ-00046e-QJ; Mon, 12 May 2025 18:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982084.1368594; Mon, 12 May 2025 18:55: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 1uEYJJ-00046U-Nd; Mon, 12 May 2025 18:55:33 +0000 Received: by outflank-mailman (input) for mailman id 982084; Mon, 12 May 2025 18:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYJI-00046K-G0 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYJI-004IjH-26 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYJI-003x4Q-13 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55: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=9tt50ER5ARXZy4IY1A9kvx70U7K3Su0paKuoDruOtuY=; b=eKp29E9Heuxg2LMxMFvR2Iv212 Rg2QDH658ZwGdJStcvd1X6JrjjrrK2Ljb9IGFcVwRYod852f7snhcx5zO/Zhd4fDlvzlr6lXi8Pec n7VGgtXYah+RpmDZXf3htWn+vwqBzNYfE/ddSLg6jhd6rSOKoEpEs8jTJIcw3lTdfmvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 18:55:32 +0000 commit d992f242c1d21aa474f69dacf51d20b8089cbad5 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 7e866784f7..05f1043df7 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -52,7 +52,12 @@ ENTRY(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -68,12 +73,14 @@ ENTRY(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -85,7 +92,7 @@ ENTRY(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982085.1368599 (Exim 4.92) (envelope-from ) id 1uEYJT-00048f-Rh; Mon, 12 May 2025 18:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982085.1368599; Mon, 12 May 2025 18:55: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 1uEYJT-00048Y-P4; Mon, 12 May 2025 18:55:43 +0000 Received: by outflank-mailman (input) for mailman id 982085; Mon, 12 May 2025 18:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYJS-00048Q-La for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYJS-004Ijd-2f for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYJS-003xCa-1e for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55: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=a9E4zq+fpJW2qEj9LP1qMQKABv7zKum9089nZM6Scd4=; b=0X9jD1H13rYy47IObu/X/yFlg3 SJ8kDxYKb/7nb4UW8ELp1n0bx8XZ7JKFs+9CghqImPCTV7cMMdNon2sMdRj6EYUexlx6TNge+TUVQ +H24z/LU181vqps9wp3eJu9YOarBHmfHoccrk6xkOrF3OctEw6dj9oYHHO9qN29ObovA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 18:55:42 +0000 commit b51f2c8fcd2995e2b8517f73568d5f0e0f8aae64 Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:55 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 34f0855114..1483a5a888 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -68,6 +68,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cp; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index e8a4bf59c3..7df877a09d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -42,7 +40,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 90bf9a92bf..be19577234 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,6 +137,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 12cc9935d8..16bf2cc62b 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -135,20 +135,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -167,6 +167,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 89b7bdcb82..841a63ebf1 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -30,6 +30,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 480d879657..03612d00a2 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index ef2598d4ca..dd5b65afe0 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1396,7 +1396,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3627,7 +3627,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3694,7 +3694,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3768,7 +3768,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4004,7 +4004,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4401,7 +4401,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4438,7 +4438,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4633,7 +4633,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4967,7 +4967,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5010,7 +5010,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5040,7 +5040,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5608,7 +5608,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5726,7 +5726,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6006,7 +6006,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6290,7 +6290,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6389,7 +6389,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6459,7 +6459,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6515,7 +6515,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6580,7 +6580,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6594,7 +6594,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6688,7 +6688,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6766,7 +6766,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6848,7 +6848,7 @@ x86_emulate( pevex->r = !mode_64bit() || !(state->sib_index & 0x08); pevex->R = !mode_64bit() || !(state->sib_index & 0x10); pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (index) : "a" (&index)); put_stub(stub); @@ -7026,7 +7026,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -7062,7 +7062,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7303,7 +7303,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7470,7 +7470,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7716,7 +7716,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -8056,7 +8056,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8165,7 +8165,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8255,12 +8255,12 @@ x86_emulate( BUG(); if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:55:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982086.1368602 (Exim 4.92) (envelope-from ) id 1uEYJd-0004Av-Td; Mon, 12 May 2025 18:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982086.1368602; Mon, 12 May 2025 18:55: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 1uEYJd-0004Ao-Qo; Mon, 12 May 2025 18:55:53 +0000 Received: by outflank-mailman (input) for mailman id 982086; Mon, 12 May 2025 18:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYJc-0004Ae-Sy for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYJd-004Ik3-07 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYJc-003xIA-2C for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:55: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=PoPX0w0NdDV7Z86lD6urfmxu2eCZgPnFG8pmDwKcL+M=; b=1ZNOsXD6LNsrCQKhKH050rCnCJ 3sO5l561O10bTov6/ndXR8Va2EqwYYt50LgBK/NMOkfxiEzuzjcSBOH4M4m9KvUqPT0AENMNfsZMj OgOAIlwnCbED8kQzT0Fg2orT0XRRcKSzXqONED4eqboxi3V3bS69tPelbh8qjKwoFm5E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 18:55:52 +0000 commit cf4c900be3852d08081603c15a03b34122d3426a Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:56 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 3 ++- xen/arch/x86/copy_page.S | 3 ++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 27 +++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 5 ++--- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ 18 files changed, 103 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 1acdffc51c..9611b80761 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -35,9 +35,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7df877a09d..fc984d629e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 66f7993399..97bd676aae 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ ENTRY(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET .data .align 16 diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index be19577234..ccb9985a76 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,16 +137,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 28217c9ace..21a753b639 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -46,6 +46,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 05f1043df7..472da481dd 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ ENTRY(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET .size clear_bhb_tsx, . - clear_bhb_tsx .type clear_bhb_tsx, @function diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index 5b5622cc52..fd4c8c0b2a 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include ENTRY(clear_page_sse2) @@ -15,7 +16,7 @@ ENTRY(clear_page_sse2) jnz 0b sfence - ret + RET .type clear_page_sse2, @function .size clear_page_sse2, . - clear_page_sse2 diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index ddb6e0ebbb..184127c11d 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include #define src_reg %rsi @@ -40,7 +41,7 @@ ENTRY(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET .type copy_page_sse2, @function .size copy_page_sse2, . - copy_page_sse2 diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 32d6b44910..97ebe21298 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -58,6 +58,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index e7ef104d3b..239cf7dc77 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,9 @@ #include + +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -60,3 +63,27 @@ ENTRY(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +ENTRY(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ + + .size __x86_return_thunk, . - __x86_return_thunk + .type __x86_return_thunk, @function + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index e7f5bfcd2d..bf830a78f8 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,12 +26,11 @@ ENTRY(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET .size load_guest_gprs, . - load_guest_gprs .type load_guest_gprs, STT_FUNC - /* Save guest GPRs. Parameter on the stack above the return address. */ ENTRY(save_guest_gprs) pushq %rdi @@ -51,7 +50,7 @@ ENTRY(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET .size save_guest_gprs, . - save_guest_gprs .type save_guest_gprs, STT_FUNC diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 51a66a144e..8daa28e1ea 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -569,6 +569,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 3c544e9a14..dfa1152b60 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -183,7 +183,7 @@ ENTRY(cr4_pv32_restore) mov %rax, %cr4 mov %rax, (%rdx) pop %rdx - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -202,7 +202,7 @@ ENTRY(cr4_pv32_restore) #endif pop %rdx xor %eax, %eax - ret + RET ENTRY(compat_syscall) /* Fix up reported %cs/%ss for compat domains. */ @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index df3f3b4ea7..ccf058ae55 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -598,7 +598,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 8930e14fc4..b66e708ebf 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -86,6 +86,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 3361a6d892..2c103c2c47 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -127,6 +127,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 18:56:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 18:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982087.1368607 (Exim 4.92) (envelope-from ) id 1uEYJo-0004EE-03; Mon, 12 May 2025 18:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982087.1368607; Mon, 12 May 2025 18:56: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 1uEYJn-0004E6-Tj; Mon, 12 May 2025 18:56:03 +0000 Received: by outflank-mailman (input) for mailman id 982087; Mon, 12 May 2025 18:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYJm-0004Dx-VZ for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYJn-004Ikt-0X for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYJm-003xLt-2q for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 18:56: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=QZMnRRTt7Z44ovvqsfg6IT3AjVm3mRiFGuhhJFUmF/o=; b=XQzSeZrjhnlE42wfzPE78Sfb2O tT6oKpjL+s68MpO4iANhqQDnyQiHK+bwQ/6MLGpKPDTEtKKYoq+MNZKCxg8QIol0Tj5cACGZoPMIl /H1ISVcYN1IbPAVCvb+hkgDqMA02Q4VuLShNmGIzpFj8wRnnPpfYGqjCLIvb+psZpBb8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 18:56:02 +0000 commit f132c82fa65d17545d7ca94bc1c27e1d1f18a2aa Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:30:56 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 3c57f55de0..1048f16e0c 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -211,6 +211,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 8daa28e1ea..46681d10ae 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1781,6 +1781,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2331,6 +2415,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 603a448cb3..6fa7777409 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -344,7 +344,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 415d644db5..61d236058a 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Mon May 12 19:00:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 19:00:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982088.1368611 (Exim 4.92) (envelope-from ) id 1uEYNf-0004eo-AG; Mon, 12 May 2025 19:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982088.1368611; Mon, 12 May 2025 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 1uEYNf-0004eg-7I; Mon, 12 May 2025 19:00:03 +0000 Received: by outflank-mailman (input) for mailman id 982088; Mon, 12 May 2025 19:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYNe-0004TG-9h for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYNe-004IxS-1S for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYNe-0040zH-0T for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00: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=X9liuhZrSBKueAMa5783D6ZTRgJuyVCpM1YmUCLIqhw=; b=vOyPkdMbUn0HqVBia9nYEier4V SGO9fnSVOjKc2JSNEXtVP8w1j/P4irOBFjEmBoDy5FGnaHi8LDuYJEQDoaa/7hxC6kEm0Kxo0fmgb RIGRs3B6SyUaWBwBGZc6LZD5TbWhFgWAn+VK26u1OfCI6KzCwamw53HRgdjwOlkC5ToI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Mon, 12 May 2025 19:00:02 +0000 commit 2aa9922c89839e8e28051db472cd02e91e0a6795 Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 12 ++++++++++-- xen/arch/x86/include/asm/alternative.h | 9 ++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 8356414be7..6eee6e501a 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -209,10 +209,12 @@ static void init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; BUG_ON(a->repl_len > total_len); BUG_ON(total_len > sizeof(buf)); - BUG_ON(a->cpuid >= NCAPINTS * 32); + BUG_ON(feat >= NCAPINTS * 32); /* * Detect sequences of alt_instr's patching the same origin site, and @@ -235,8 +237,14 @@ static void init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index ee4cbe92cc..388e595786 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -11,7 +18,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 19:00:16 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 19:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982089.1368615 (Exim 4.92) (envelope-from ) id 1uEYNq-0005L3-BL; Mon, 12 May 2025 19:00:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982089.1368615; Mon, 12 May 2025 19:00: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 1uEYNq-0005Kv-8i; Mon, 12 May 2025 19:00:14 +0000 Received: by outflank-mailman (input) for mailman id 982089; Mon, 12 May 2025 19:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYNo-0005Kg-OT for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYNo-004Ixp-1v for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYNo-00415n-0x for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00: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=x0wNhhrqsnJ+I3xeHqlOwwnFUTXZzYZNKwXRM5BwdIc=; b=j7yA1Vw5E65qf26K66N0Tstw9N tA0YHNv0YrELLjo+MMCghTN0Il1exzeXOB1j4V4Tr3eNnTEOoZH64V2m0plv7YAhjDRjX6+ziC8ec UWRx+tEaD2zvqKaj+DG5pnMT6hXkehar1yHPdgdR4k9vVlSi0mN4cVjDL9156m106F3Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Mon, 12 May 2025 19:00:12 +0000 commit 15bb4cccf50dbba738d158c01b0bd48ab5d75ce6 Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 52 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 78 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 ++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++--- 6 files changed, 114 insertions(+), 91 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..47ab685cf8 --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +ENTRY(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall + + .type early_hypercall, @function + .size early_hypercall, . - early_hypercall diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 9958d02cfd..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,78 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - .p2align PAGE_SHIFT - -GLOBAL(hypercall_page) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 - .type hypercall_page, STT_OBJECT - .size hypercall_page, PAGE_SIZE - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index c4cb16df38..0d1e6d0658 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -38,7 +38,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -47,6 +46,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -349,9 +392,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 03d5868a9e..a7e90adbaf 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -41,9 +41,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -53,10 +55,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -66,10 +70,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -80,10 +86,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 19:00:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 19:00:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982090.1368619 (Exim 4.92) (envelope-from ) id 1uEYO0-0005NG-D2; Mon, 12 May 2025 19:00:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982090.1368619; Mon, 12 May 2025 19:00: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 1uEYO0-0005N8-A7; Mon, 12 May 2025 19:00:24 +0000 Received: by outflank-mailman (input) for mailman id 982090; Mon, 12 May 2025 19:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYNy-0005Ms-Jj for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYNy-004Ixz-2T for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYNy-0041Ea-1Q for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00: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=ju+QSa2nfbDamiVIwti9KxGmRxx3NKujA1nnWLmNRmc=; b=sRBrUDwvbjCVbgX6xjwaAfvvSj zvjAVHYFmqDn/3UmZX4sypTWWf135NXJjRCK9iPt+lTlhRzg/AN8H75BcPeOGg9h+7j0P0dczKJd9 frpKdocEE5qlvJ+LVjJYFFFLC86HDpWtWew/+2UnvQ1W36IyiLBVuoVaOgo/HEB7POTc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Mon, 12 May 2025 19:00:22 +0000 commit ebf61f7699ad2b97f3a641a80f8b117122514f34 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index de6aef6068..e7ef104d3b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -35,6 +35,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + ENTRY(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 19:00:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 19:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982091.1368622 (Exim 4.92) (envelope-from ) id 1uEYOA-0005Q4-Fr; Mon, 12 May 2025 19:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982091.1368622; Mon, 12 May 2025 19:00: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 1uEYOA-0005Pw-DJ; Mon, 12 May 2025 19:00:34 +0000 Received: by outflank-mailman (input) for mailman id 982091; Mon, 12 May 2025 19:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYO8-0005Pn-Ni for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYO8-004IyL-2p for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYO8-0041Gf-1x for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00: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=H6WeZe+wOQFTpH0QOF7YUI/PGhYNZzF/tOvvShwonc8=; b=G+f0vnHYnvGDZIEvH/fd7ZY3CA w5fpRiYsjF02k3j6clpN7vv7qFirVd4syG84XgOyn255V3lzqgW33E6uJmNpWW3k0XYSAQiK3bxev +tudbIAXGPslPr4rAfLkQXIGPKLgNsYNnEmMAXgSoEAl8eUgKr3jHzerPZQzkIjWJ8G4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Mon, 12 May 2025 19:00:32 +0000 commit 1d4361b041d70edc2287d7bb748c17c56569bf2f Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 7e866784f7..05f1043df7 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -52,7 +52,12 @@ ENTRY(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -68,12 +73,14 @@ ENTRY(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -85,7 +92,7 @@ ENTRY(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 19:00:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 19:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982092.1368628 (Exim 4.92) (envelope-from ) id 1uEYOK-0005ST-Hn; Mon, 12 May 2025 19:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982092.1368628; Mon, 12 May 2025 19:00: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 1uEYOK-0005SL-Ei; Mon, 12 May 2025 19:00:44 +0000 Received: by outflank-mailman (input) for mailman id 982092; Mon, 12 May 2025 19:00:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYOI-0005S6-UH for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYOJ-004Iyj-04 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYOI-0041NI-2N for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00: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=2XjVAwaeW0C6TokUeLZmbRRoemNvqxpPRTBq5DZYV4Y=; b=yDM4DProaHOyuFpZ+KcD91+5IB 3ewhjIM5iTrxO/zNJ0EUXsAdcdUFxDFWvSy9vXXSqfk9FC68H/r59o5WQAXY2PI8r7ANeUbBrjxns cQvq72jo597Yi16sZUAtgqzXLiqFuv/zASmTrIOmVOhPJJcMFsPX8kNiSl87n1eDe+ek=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Mon, 12 May 2025 19:00:42 +0000 commit ddc5c1e0aafb9b21faa6da94d74be89bc0158ed8 Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 +++ xen/arch/x86/Makefile | 6 +-- xen/arch/x86/alternative.c | 14 ++++++ xen/arch/x86/extable.c | 11 ++--- xen/arch/x86/include/asm/alternative.h | 2 + xen/arch/x86/pv/emul-priv-op.c | 5 ++- xen/arch/x86/x86_emulate/x86_emulate.c | 82 ++++++++++++++++++---------------- 7 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 58760f096d..65ae95e624 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -67,6 +67,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cp; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 6a070a8cf8..882408ccaf 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -10,9 +10,7 @@ obj-$(CONFIG_XENOPROF) += oprofile/ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -40,7 +38,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 6eee6e501a..88082f68a9 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -149,6 +149,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index f05c16def6..adfd439d3a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -135,20 +135,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = TRAP_invalid_op }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = TRAP_gp_fault }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210, .res.fields.trapnr = TRAP_stack_error }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = TRAP_int3 }, #undef endbr64 }; @@ -167,6 +167,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 388e595786..28e69e988a 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -30,6 +30,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index f216c26412..28ea7cc580 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -88,7 +88,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -138,11 +137,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 995670cbc8..b5eca13410 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1533,36 +1533,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (_regs.eflags), [tmp] "=&r" (tmp_) \ @@ -3852,7 +3858,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -6751,7 +6757,7 @@ x86_emulate( evex.lr = 0; opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6816,7 +6822,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -6884,7 +6890,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -7113,7 +7119,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, EXC_UD); @@ -7510,7 +7516,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -7538,7 +7544,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -7733,7 +7739,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -8058,7 +8064,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -8101,7 +8107,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -8131,7 +8137,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -9027,7 +9033,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -9145,7 +9151,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -9424,7 +9430,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -9684,7 +9690,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -9783,7 +9789,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -9853,7 +9859,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -9909,7 +9915,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -9974,7 +9980,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -9988,7 +9994,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -10082,7 +10088,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -10160,7 +10166,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -10229,7 +10235,7 @@ x86_emulate( pevex->r = !mode_64bit() || !(state->sib_index & 0x08); pevex->R = !mode_64bit() || !(state->sib_index & 0x10); pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (index) : "a" (&index)); put_stub(stub); @@ -10404,7 +10410,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -10438,7 +10444,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -10670,7 +10676,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -10837,7 +10843,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -11065,7 +11071,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -11225,7 +11231,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -11334,7 +11340,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -11401,12 +11407,12 @@ x86_emulate( BUG(); if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 19:00:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 19:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982093.1368631 (Exim 4.92) (envelope-from ) id 1uEYOU-0005Uz-J3; Mon, 12 May 2025 19:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982093.1368631; Mon, 12 May 2025 19:00: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 1uEYOU-0005Us-GD; Mon, 12 May 2025 19:00:54 +0000 Received: by outflank-mailman (input) for mailman id 982093; Mon, 12 May 2025 19:00:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYOT-0005Ue-21 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYOT-004Iz7-0h for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYOS-0041eb-2q for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:00: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=JrQbxon2mWCsjQ4Q9drYwmpklocEMdrrh2EwgL88A/g=; b=2hVaL4ZqpRdUW77GDbYND+T9Wk cYvbqQnFqyLx390PTo8BUT8FtD/0pB+y0DyAU65YcWEOt+pmZVKSoYs6r1Oa5OlYgyiSoVEneBqxt GSr8Fo2AaC2P497u6WhFeyV83GPEncY5PDhBosiNueXQmLow19tRVhUQqwZMBqC5V4bE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Mon, 12 May 2025 19:00:52 +0000 commit 3c31a87bcbdf04fda9019d46236436ead53b0c1e Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 3 ++- xen/arch/x86/copy_page.S | 3 ++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 27 +++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ 18 files changed, 103 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 471cfd8a80..370558756f 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -35,9 +35,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 882408ccaf..22293d969b 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 3855ff1ddb..cd4682b9f9 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -131,7 +131,7 @@ ENTRY(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET .data .align 16 diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 88082f68a9..151df73583 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -149,16 +149,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 227d439a45..379317c013 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -50,6 +50,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + ifdef CONFIG_XEN_IBT # Force -fno-jump-tables to work around # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104816 diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 05f1043df7..472da481dd 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ ENTRY(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET .size clear_bhb_tsx, . - clear_bhb_tsx .type clear_bhb_tsx, @function diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d9d524c79e..ea70bd9167 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include ENTRY(clear_page_sse2) @@ -15,4 +16,4 @@ ENTRY(clear_page_sse2) jnz 0b sfence - ret + RET diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index 2da81126c5..bb79c5fc79 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include #define src_reg %rsi @@ -40,4 +41,4 @@ ENTRY(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 7e22fcb9c0..a9ca0d05ec 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -47,6 +47,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index e7ef104d3b..239cf7dc77 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,9 @@ #include + +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -60,3 +63,27 @@ ENTRY(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +ENTRY(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ + + .size __x86_return_thunk, . - __x86_return_thunk + .type __x86_return_thunk, @function + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 28ea7cc580..872a89db76 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -143,7 +143,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index e7f5bfcd2d..d90435be88 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ ENTRY(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET .size load_guest_gprs, . - load_guest_gprs .type load_guest_gprs, STT_FUNC @@ -51,7 +51,7 @@ ENTRY(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET .size save_guest_gprs, . - save_guest_gprs .type save_guest_gprs, STT_FUNC diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index b1e47a849e..2f777e8a7e 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -575,6 +575,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index ff462a92e0..57e54dc75f 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -183,7 +183,7 @@ ENTRY(cr4_pv32_restore) mov %rax, %cr4 mov %rax, (%rdx) pop %rdx - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -202,7 +202,7 @@ ENTRY(cr4_pv32_restore) #endif pop %rdx xor %eax, %eax - ret + RET ENTRY(compat_syscall) /* Fix up reported %cs/%ss for compat domains. */ @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 7bb0cc708a..fd63ee2e4c 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -598,7 +598,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 8930e14fc4..b66e708ebf 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -86,6 +86,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index cd73851538..c82bee92f4 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -112,6 +112,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon May 12 19:01:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 May 2025 19:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982094.1368634 (Exim 4.92) (envelope-from ) id 1uEYOe-0005Y8-LY; Mon, 12 May 2025 19:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982094.1368634; Mon, 12 May 2025 19:01: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 1uEYOe-0005Y1-J5; Mon, 12 May 2025 19:01:04 +0000 Received: by outflank-mailman (input) for mailman id 982094; Mon, 12 May 2025 19:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEYOd-0005Xs-6V for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEYOd-004Izu-19 for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:01:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEYOd-00423o-0E for xen-changelog@lists.xenproject.org; Mon, 12 May 2025 19:01:03 +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=ElXZ8sYmBZMbBF9F/z27UBNQ31Ze8Q21397XOd/KKHg=; b=WYQ3cxINcWtsh8NbBT0ci/RQQ0 R7Hdaf9GL2iiHsMadhw4ha4+mMixxICQhpJk8PKLX5N87ph58ia8sGxtdVFOXOyRBGLOzKzb8K7GT kociq3KMB0mUWwl/63D8A9jKJB1TP6RLQRoeTzwd4fkXh9xqJ0uRolOFDATq/NchPryY=; 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: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Mon, 12 May 2025 19:01:03 +0000 commit 015a7e3ab2296f5b7f668537fb3fa3bb23f974c9 Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:32:24 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index a6b8af1296..d9aedfc25a 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -164,6 +164,7 @@ #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 2f777e8a7e..559ee90b44 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1766,6 +1766,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2316,6 +2400,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 0004fd4bf5..99c4dc1ffd 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -334,7 +334,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 415b8b1d68..05b1c13ec4 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:11:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982780.1369109 (Exim 4.92) (envelope-from ) id 1uEoTP-0006dR-0C; Tue, 13 May 2025 12:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982780.1369109; Tue, 13 May 2025 12: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 1uEoTO-0006dJ-Th; Tue, 13 May 2025 12:11:02 +0000 Received: by outflank-mailman (input) for mailman id 982780; Tue, 13 May 2025 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 1uEoTO-0006dD-BE for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 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 1uEoTO-006Dua-0S for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoTN-00A34M-2R for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12: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=4ic6rVBMdYyGNXijw6p4eZlr0y4A8alZ5ShxwBbK4dE=; b=sQjs9vJaWpjh4KlMXz/YY14WbK eDwaxVYYnQQmBD0szvmJAPpKdSi3N3t+gWQWvJA7DrOsaUCa9Ok3NvazAz2coWrLBJxaDskR6sytn Ob1wpUu5YIgYRacaxRhC1FWxzJLtGmqkjJ3RkOvjiMTbWPD8FpJ6CIZtZ9NbXqD+m7fQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Message-Id: Date: Tue, 13 May 2025 12:11:01 +0000 commit d58800f13d6eb15569f245c012749c469a4a8727 Author: Andrew Cooper AuthorDate: Tue May 13 13:55:12 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:55:12 2025 +0200 xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Building Xen with Clang-17 yields the following warning: ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: ./.xen.efi.0xffff82d040000000.0:/4: section below image base ld: ./.xen.efi.0xffff82d040000000.1:/4: section below image base ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: xen.efi:/4: section below image base Set the alignment to 4 as it holds 4-byte values, despite the fact that Clang appears to only use 1. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a88b99300aedea103884b4ef8c66a5a94206feb5 master date: 2025-04-28 19:46:46 +0100 --- xen/include/xen/xen.lds.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/xen.lds.h b/xen/include/xen/xen.lds.h index 16a9b1ba03..793d0e1145 100644 --- a/xen/include/xen/xen.lds.h +++ b/xen/include/xen/xen.lds.h @@ -56,6 +56,7 @@ DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1) \ DECL_DEBUG(.debug_types, 1) \ DECL_DEBUG(.debug_str, 1) \ + DECL_DEBUG(.debug_str_offsets, 4) \ DECL_DEBUG2(.debug_line, .debug_line.*, 1) \ DECL_DEBUG(.debug_line_str, 1) \ DECL_DEBUG(.debug_names, 4) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982781.1369114 (Exim 4.92) (envelope-from ) id 1uEoTZ-0006gV-2Z; Tue, 13 May 2025 12:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982781.1369114; Tue, 13 May 2025 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 1uEoTY-0006gN-VB; Tue, 13 May 2025 12:11:12 +0000 Received: by outflank-mailman (input) for mailman id 982781; Tue, 13 May 2025 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 1uEoTY-0006gF-63 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 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 1uEoTY-006Duu-0w for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoTX-00A3D8-3A for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12: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=WkZHBWU44GqZq+loReytteCz1OR09x/jXdVcE1TxMH8=; b=cPNKyEsowP1N0S07+ccFlxmR+L HlnWdZ59pLLDxP9CCRbG/ogXp/UK6nVAe1YxA+0KSxFM6UjOTeFut2izU3aaMCFsls9cbAHlcsUHn cc3JsAMbzSf08AHPQBPDp20Jsu8pPmircjQ5fSMDflkt0uFlsMd8ZfAE2UbRRuTsruQM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86emul: avoid UB shifts in FLDENV/FRSTOR handling Message-Id: Date: Tue, 13 May 2025 12:11:11 +0000 commit 68506161ef5c4b6784d3cfe1d47d01ad2c7b779d Author: Jan Beulich AuthorDate: Tue May 13 13:56:04 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:56:04 2025 +0200 x86emul: avoid UB shifts in FLDENV/FRSTOR handling 16-bit quantities, no matter whether expressed as uint16_t or as bitfield, will be promoted to plain int before doing any arithmetic on them. Shifting such values by 16 will therefore shift into the sign bit, which is UB if that bit becomes set. To account for all reads and all writes accessing opposite members of the same union, introduce yet more local variables to reduce the shift counts to 12. Fixes: be55ed744ed8 ("x86emul: support FLDENV and FRSTOR") Reported-by: Fabian Specht Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: d00fc019b6eba68bd7f2186a6427e5a005ce989f master date: 2025-04-30 08:46:21 +0200 --- xen/arch/x86/x86_emulate/blk.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_emulate/blk.c b/xen/arch/x86/x86_emulate/blk.c index 08a05f8453..9ed1b7c96c 100644 --- a/xen/arch/x86/x86_emulate/blk.c +++ b/xen/arch/x86/x86_emulate/blk.c @@ -81,17 +81,19 @@ int x86_emul_blk( if ( !s->rex_prefix ) { /* Convert 32-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = fpstate.env.mode.real.fip_lo + - (fpstate.env.mode.real.fip_hi << 16); - unsigned int fdp = fpstate.env.mode.real.fdp_lo + - (fpstate.env.mode.real.fdp_hi << 16); + unsigned int fip = fpstate.env.mode.real.fip_lo & 0xf; + unsigned int fcs = (fpstate.env.mode.real.fip_lo >> 4) | + (fpstate.env.mode.real.fip_hi << 12); + unsigned int fdp = fpstate.env.mode.real.fdp_lo & 0xf; + unsigned int fds = (fpstate.env.mode.real.fdp_lo >> 4) | + (fpstate.env.mode.real.fdp_hi << 12); unsigned int fop = fpstate.env.mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(fpstate.env) ) @@ -121,17 +123,19 @@ int x86_emul_blk( else { /* Convert 16-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = env->mode.real.fip_lo + - (env->mode.real.fip_hi << 16); - unsigned int fdp = env->mode.real.fdp_lo + - (env->mode.real.fdp_hi << 16); + unsigned int fip = env->mode.real.fip_lo & 0xf; + unsigned int fcs = (env->mode.real.fip_lo >> 4) | + (env->mode.real.fip_hi << 12); + unsigned int fdp = env->mode.real.fdp_lo & 0xf; + unsigned int fds = (env->mode.real.fdp_lo >> 4) | + (env->mode.real.fdp_hi << 12); unsigned int fop = env->mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(*env) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982782.1369117 (Exim 4.92) (envelope-from ) id 1uEoTj-0006jC-2v; Tue, 13 May 2025 12:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982782.1369117; Tue, 13 May 2025 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 1uEoTj-0006j4-0O; Tue, 13 May 2025 12:11:23 +0000 Received: by outflank-mailman (input) for mailman id 982782; Tue, 13 May 2025 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 1uEoTi-0006ir-Ae for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 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 1uEoTi-006Dv1-1W for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoTi-00A3Fg-0Q for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 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=1xt2JdvdtTYgnMPsBIfDVLW3cBvxGHE4iXB8r/6ENoI=; b=oPuXPOfAKzXY8R6R+PuNxnka7F K+X53iec6Qfg+ov/NR+ut46gQkP1q3ditqI5VlHs2uj5TZpFYSMyvRNdFbpeveSehrqlkGo9+ufh4 rYcnc0NNEbVBBGdmf8wfO4dkIMCdsSxWzGQneP1the/WbRjLAj88weCliYawrFzk8HcQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] cpufreq: don't leave stale statistics pointer Message-Id: Date: Tue, 13 May 2025 12:11:22 +0000 commit b1eeea44cd129ca5e03c20757e27351563384e5c Author: Jan Beulich AuthorDate: Tue May 13 13:56:21 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:56:21 2025 +0200 cpufreq: don't leave stale statistics pointer Error paths of cpufreq_statistic_init() correctly free the base structure pointer, but the per-CPU variable would still hold it, mis- guiding e.g. cpufreq_statistic_update(). Defer installing of the pointer there until the structure was fully populated. Fixes: 755af07edba1 ("x86/cpufreq: don't use static array for large per-CPU data structures") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: a1ce987411f61dbf5fe64bba0cd3d36d7cc0311f master date: 2025-04-30 08:47:49 +0200 --- xen/drivers/cpufreq/utility.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index e690a484f1..d9caf31aa2 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -113,7 +113,6 @@ int cpufreq_statistic_init(unsigned int cpu) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -139,6 +138,8 @@ int cpufreq_statistic_init(unsigned int cpu) pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982783.1369121 (Exim 4.92) (envelope-from ) id 1uEoTu-0006ls-4V; Tue, 13 May 2025 12:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982783.1369121; Tue, 13 May 2025 12:11: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 1uEoTu-0006lk-1l; Tue, 13 May 2025 12:11:34 +0000 Received: by outflank-mailman (input) for mailman id 982783; Tue, 13 May 2025 12:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoTs-0006lU-PG for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEoTs-006Dv8-31 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoTs-00A3Px-29 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11: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=SW9JdLj7Pf/6Vh66Uo4VnNet2DsokQ7cp9R096CGXOA=; b=cWj6W7uVJtfoQDp4SRCiT5JEAP a6ZWkO7my86+3igwgSBEUNEUdy2E/CI74Z98S3jB9W98LVr+hZFCLmkGocfJBv9KGWtpnNiuszujZ EEl/+YWL9KhNNiOkcrTzU4Zx5gTYGibBaygtoyHBM5MoSEuwAYK/raihu50kgV9+29zs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Message-Id: Date: Tue, 13 May 2025 12:11:32 +0000 commit 294bea99c9e21f89c288f96647695455058a0055 Author: Andrew Cooper AuthorDate: Tue May 13 13:57:37 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:57:37 2025 +0200 xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Building Xen with Clang-17 yields the following warning: ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: ./.xen.efi.0xffff82d040000000.0:/4: section below image base ld: ./.xen.efi.0xffff82d040000000.1:/4: section below image base ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: xen.efi:/4: section below image base Set the alignment to 4 as it holds 4-byte values, despite the fact that Clang appears to only use 1. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a88b99300aedea103884b4ef8c66a5a94206feb5 master date: 2025-04-28 19:46:46 +0100 --- xen/include/xen/xen.lds.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/xen.lds.h b/xen/include/xen/xen.lds.h index a17810bb28..acc1e332fb 100644 --- a/xen/include/xen/xen.lds.h +++ b/xen/include/xen/xen.lds.h @@ -50,6 +50,7 @@ DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1) \ DECL_DEBUG(.debug_types, 1) \ DECL_DEBUG(.debug_str, 1) \ + DECL_DEBUG(.debug_str_offsets, 4) \ DECL_DEBUG2(.debug_line, .debug_line.*, 1) \ DECL_DEBUG(.debug_line_str, 1) \ DECL_DEBUG(.debug_names, 4) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982784.1369124 (Exim 4.92) (envelope-from ) id 1uEoU4-0006oJ-5n; Tue, 13 May 2025 12:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982784.1369124; Tue, 13 May 2025 12:11: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 1uEoU4-0006oB-3E; Tue, 13 May 2025 12:11:44 +0000 Received: by outflank-mailman (input) for mailman id 982784; Tue, 13 May 2025 12:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoU2-0006o2-UL for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEoU3-006DvC-0G for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoU2-00A3RF-2V for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11: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=IQ+GuFU/ciJa1/jBAU9l9X/INH1kDocpVB+Hw9BoxZU=; b=V/33/nc5xhe2IgRlboGzpmxMpr gqY7ZCqNYioJ6adYj6F3tkJr/+oX4Pqz8sHc/ZtzN1Zj3pJhoR5hbI+bB/Z9irjroGEtqcIPUFrbQ 6NbPqK/LxrAmQL6EjGLnXrrUjJ8mgUIGQCqJw0CVbK1JeAk7Dt2oqnB6UvgJvUEUH2QU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86emul: avoid UB shifts in FLDENV/FRSTOR handling Message-Id: Date: Tue, 13 May 2025 12:11:42 +0000 commit f33ff85f21e301157522c89b1ae74262138b5c40 Author: Jan Beulich AuthorDate: Tue May 13 13:58:17 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:58:17 2025 +0200 x86emul: avoid UB shifts in FLDENV/FRSTOR handling 16-bit quantities, no matter whether expressed as uint16_t or as bitfield, will be promoted to plain int before doing any arithmetic on them. Shifting such values by 16 will therefore shift into the sign bit, which is UB if that bit becomes set. To account for all reads and all writes accessing opposite members of the same union, introduce yet more local variables to reduce the shift counts to 12. Fixes: be55ed744ed8 ("x86emul: support FLDENV and FRSTOR") Reported-by: Fabian Specht Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: d00fc019b6eba68bd7f2186a6427e5a005ce989f master date: 2025-04-30 08:46:21 +0200 --- xen/arch/x86/x86_emulate/blk.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_emulate/blk.c b/xen/arch/x86/x86_emulate/blk.c index e790f4f900..fe0122ddc6 100644 --- a/xen/arch/x86/x86_emulate/blk.c +++ b/xen/arch/x86/x86_emulate/blk.c @@ -81,17 +81,19 @@ int x86_emul_blk( if ( !s->rex_prefix ) { /* Convert 32-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = fpstate.env.mode.real.fip_lo + - (fpstate.env.mode.real.fip_hi << 16); - unsigned int fdp = fpstate.env.mode.real.fdp_lo + - (fpstate.env.mode.real.fdp_hi << 16); + unsigned int fip = fpstate.env.mode.real.fip_lo & 0xf; + unsigned int fcs = (fpstate.env.mode.real.fip_lo >> 4) | + (fpstate.env.mode.real.fip_hi << 12); + unsigned int fdp = fpstate.env.mode.real.fdp_lo & 0xf; + unsigned int fds = (fpstate.env.mode.real.fdp_lo >> 4) | + (fpstate.env.mode.real.fdp_hi << 12); unsigned int fop = fpstate.env.mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(fpstate.env) ) @@ -121,17 +123,19 @@ int x86_emul_blk( else { /* Convert 16-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = env->mode.real.fip_lo + - (env->mode.real.fip_hi << 16); - unsigned int fdp = env->mode.real.fdp_lo + - (env->mode.real.fdp_hi << 16); + unsigned int fip = env->mode.real.fip_lo & 0xf; + unsigned int fcs = (env->mode.real.fip_lo >> 4) | + (env->mode.real.fip_hi << 12); + unsigned int fdp = env->mode.real.fdp_lo & 0xf; + unsigned int fds = (env->mode.real.fdp_lo >> 4) | + (env->mode.real.fdp_hi << 12); unsigned int fop = env->mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(*env) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982785.1369129 (Exim 4.92) (envelope-from ) id 1uEoUE-0006qg-7N; Tue, 13 May 2025 12:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982785.1369129; Tue, 13 May 2025 12:11: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 1uEoUE-0006qY-4c; Tue, 13 May 2025 12:11:54 +0000 Received: by outflank-mailman (input) for mailman id 982785; Tue, 13 May 2025 12:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoUD-0006qO-2v for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEoUD-006DvH-0n for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoUC-00A3TJ-2z for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:11: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=mx0+enU3b7HyHT7L/t8mayo/YvG5LkUFRuJo+VwYI7A=; b=sPcUc5pWR64UNIZ9XGMnniLyqv h91ZZw/R5Q9nhsOWeeGn5lgcLBwsnKCUoUCmYWkjyHWYEksYtTfT53Iiow82w7Wfm2tKBeM1OXqUO yWF+Q9uF+v8Hduxq2ivwl5xIJRT3IWSBs8ml/t0kTrYKGuzU8E6cVO3dD4ArmuCBE80k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] cpufreq: don't leave stale statistics pointer Message-Id: Date: Tue, 13 May 2025 12:11:52 +0000 commit 2b92925c6d8bc6dae1bd09255413ef9de5d79af6 Author: Jan Beulich AuthorDate: Tue May 13 13:58:33 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:58:33 2025 +0200 cpufreq: don't leave stale statistics pointer Error paths of cpufreq_statistic_init() correctly free the base structure pointer, but the per-CPU variable would still hold it, mis- guiding e.g. cpufreq_statistic_update(). Defer installing of the pointer there until the structure was fully populated. Fixes: 755af07edba1 ("x86/cpufreq: don't use static array for large per-CPU data structures") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: a1ce987411f61dbf5fe64bba0cd3d36d7cc0311f master date: 2025-04-30 08:47:49 +0200 --- xen/drivers/cpufreq/utility.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index e690a484f1..d9caf31aa2 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -113,7 +113,6 @@ int cpufreq_statistic_init(unsigned int cpu) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -139,6 +138,8 @@ int cpufreq_statistic_init(unsigned int cpu) pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:12:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982786.1369133 (Exim 4.92) (envelope-from ) id 1uEoUO-0006tE-8d; Tue, 13 May 2025 12:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982786.1369133; Tue, 13 May 2025 12:12: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 1uEoUO-0006t7-5z; Tue, 13 May 2025 12:12:04 +0000 Received: by outflank-mailman (input) for mailman id 982786; Tue, 13 May 2025 12:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoUN-0006su-JM for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEoUN-006Dvf-2X for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoUN-00A3Zx-1O for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:03 +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=jCu/iYDkOa0UfHFs1FATop8OVv/ZLm7lzeQz7DzW32M=; b=F/p2nJssGpih17eJr1498CFHOR krl+uobfdcjGMR9CsCsi7ix+SKiLFzIOq8xlzIi77apNH5j+6l/rTC1seKXywvp1Txoh9Zm4lpCgG stDtaLi7KPzQcrHv/gCgo1dM6XYAqUk7QTJ+qCaYhI8Gij4gPfMAbRwirLqtHJ7Esuck=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86: allow non-BIGMEM configs to boot on >= 16Tb systems Message-Id: Date: Tue, 13 May 2025 12:12:03 +0000 commit 96b9bb0afdd66354f5fbc057e43036e4afe961d7 Author: Jan Beulich AuthorDate: Tue May 13 14:00:00 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:00:00 2025 +0200 x86: allow non-BIGMEM configs to boot on >= 16Tb systems While frame table setup, directmap init, and boot allocator population respect all intended bounds, the logic passing memory to the heap allocator which wasn't passed to the boot allocator fails to respect max_{pdx,pfn}. This then typically triggers the BUG() in free_heap_pages() after checking page state, because of hitting a struct page_info instance which was set to all ~0. Of course all the memory above the 16Tb boundary is still going to remain unused; using it requires BIGMEM=y. And of course this fix similarly ought to help BIGMEM=y configurations on >= 123Tb systems (where all the memory beyond that boundary continues to be unused). Fixes: bac2000063ba ("x86-64: reduce range spanned by 1:1 mapping and frame table indexes") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 64d32b75e6e3b093828623d5ce30b4826bb6b1df master date: 2023-12-19 13:47:38 +0100 --- xen/arch/x86/setup.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 98d18f237a..8a79fc1d8c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1713,15 +1713,15 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( max_page - 1 > virt_to_mfn(HYPERVISOR_VIRT_END - 1) ) { - unsigned long limit = virt_to_mfn(HYPERVISOR_VIRT_END - 1); + unsigned long lo = virt_to_mfn(HYPERVISOR_VIRT_END - 1); uint64_t mask = PAGE_SIZE - 1; if ( !highmem_start ) - xenheap_max_mfn(limit); + xenheap_max_mfn(lo); end_boot_allocator(); - /* Pass the remaining memory to the allocator. */ + /* Pass the remaining memory in (lo, max_page) to the allocator. */ for ( i = 0; i < boot_e820.nr_map; i++ ) { uint64_t s, e; @@ -1730,10 +1730,12 @@ void __init noreturn __start_xen(unsigned long mbi_p) continue; s = (boot_e820.map[i].addr + mask) & ~mask; e = (boot_e820.map[i].addr + boot_e820.map[i].size) & ~mask; - if ( PFN_DOWN(e) <= limit ) + if ( PFN_DOWN(e) <= lo || PFN_DOWN(s) >= max_page ) continue; - if ( PFN_DOWN(s) <= limit ) - s = pfn_to_paddr(limit + 1); + if ( PFN_DOWN(s) <= lo ) + s = pfn_to_paddr(lo + 1); + if ( PFN_DOWN(e) > max_page ) + e = pfn_to_paddr(max_page); init_domheap_pages(s, e); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982787.1369137 (Exim 4.92) (envelope-from ) id 1uEoUY-0006wS-Bk; Tue, 13 May 2025 12:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982787.1369137; Tue, 13 May 2025 12:12: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 1uEoUY-0006wK-96; Tue, 13 May 2025 12:12:14 +0000 Received: by outflank-mailman (input) for mailman id 982787; Tue, 13 May 2025 12:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoUX-0006vs-My for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEoUX-006Dw6-2t for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoUX-00A3g3-24 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:13 +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=m0AjdLpI8lr3ZT2/7u821O9aRLCIYTKwBcgIm3XNIyk=; b=NGUjdQibgrzKIAHm0drcLbFjjd bEJ/xaaQlYAW8MsGxbzxLQo5jLelBHY3Om2b+eFub56nu+m/SgHYXL7EnICZlaT/T2v79YGjycpCu M4kAO0CghfER7gI2GsVclzLaAe6ruuXa80yL6Fdc6F3WmohWdXNoJnUPRmLn76RoaP3o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Message-Id: Date: Tue, 13 May 2025 12:12:13 +0000 commit 545f2d528cd815acd353fae7292a67ac5af9c73f Author: Andrew Cooper AuthorDate: Tue May 13 14:00:26 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:00:26 2025 +0200 xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Building Xen with Clang-17 yields the following warning: ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: ./.xen.efi.0xffff82d040000000.0:/4: section below image base ld: ./.xen.efi.0xffff82d040000000.1:/4: section below image base ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: xen.efi:/4: section below image base Set the alignment to 4 as it holds 4-byte values, despite the fact that Clang appears to only use 1. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a88b99300aedea103884b4ef8c66a5a94206feb5 master date: 2025-04-28 19:46:46 +0100 --- xen/include/xen/xen.lds.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/xen.lds.h b/xen/include/xen/xen.lds.h index 06b7110837..08979e23a0 100644 --- a/xen/include/xen/xen.lds.h +++ b/xen/include/xen/xen.lds.h @@ -40,6 +40,7 @@ DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1) \ DECL_DEBUG(.debug_types, 1) \ DECL_DEBUG(.debug_str, 1) \ + DECL_DEBUG(.debug_str_offsets, 4) \ DECL_DEBUG2(.debug_line, .debug_line.*, 1) \ DECL_DEBUG(.debug_line_str, 1) \ DECL_DEBUG(.debug_names, 4) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:12:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:12:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982788.1369141 (Exim 4.92) (envelope-from ) id 1uEoUj-0006yq-D9; Tue, 13 May 2025 12:12:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982788.1369141; Tue, 13 May 2025 12:12:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoUj-0006yj-AW; Tue, 13 May 2025 12:12:25 +0000 Received: by outflank-mailman (input) for mailman id 982788; Tue, 13 May 2025 12:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoUh-0006yV-TX for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEoUi-006DwC-0H for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoUh-00A3jH-2N for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:23 +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=BtS2AqQnXxFGrPlabPurmuOdn2lDtuoWlMf6Zh8e6LM=; b=grDhjPIHHAHDyhLWl64hYLB4sJ I82tKtnHiTSRg7Oo5wq029Pc0uYcayOhP8E/F1lJW3u9oSfqUy1sswHAsqC7FK3RB7j/VB3dLDupd K60FOzy7DFt08hnoEB/IxAvfHmPYoPKikR1X9PfGoWcbCXOd88cwOVjFpk+P9mcyCqDo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86emul: avoid UB shifts in FLDENV/FRSTOR handling Message-Id: Date: Tue, 13 May 2025 12:12:23 +0000 commit a150ecceeee899aac70a1dbe731675e2cb4dae18 Author: Jan Beulich AuthorDate: Tue May 13 14:00:41 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:00:41 2025 +0200 x86emul: avoid UB shifts in FLDENV/FRSTOR handling 16-bit quantities, no matter whether expressed as uint16_t or as bitfield, will be promoted to plain int before doing any arithmetic on them. Shifting such values by 16 will therefore shift into the sign bit, which is UB if that bit becomes set. To account for all reads and all writes accessing opposite members of the same union, introduce yet more local variables to reduce the shift counts to 12. Fixes: be55ed744ed8 ("x86emul: support FLDENV and FRSTOR") Reported-by: Fabian Specht Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: d00fc019b6eba68bd7f2186a6427e5a005ce989f master date: 2025-04-30 08:46:21 +0200 --- xen/arch/x86/x86_emulate/blk.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_emulate/blk.c b/xen/arch/x86/x86_emulate/blk.c index e790f4f900..fe0122ddc6 100644 --- a/xen/arch/x86/x86_emulate/blk.c +++ b/xen/arch/x86/x86_emulate/blk.c @@ -81,17 +81,19 @@ int x86_emul_blk( if ( !s->rex_prefix ) { /* Convert 32-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = fpstate.env.mode.real.fip_lo + - (fpstate.env.mode.real.fip_hi << 16); - unsigned int fdp = fpstate.env.mode.real.fdp_lo + - (fpstate.env.mode.real.fdp_hi << 16); + unsigned int fip = fpstate.env.mode.real.fip_lo & 0xf; + unsigned int fcs = (fpstate.env.mode.real.fip_lo >> 4) | + (fpstate.env.mode.real.fip_hi << 12); + unsigned int fdp = fpstate.env.mode.real.fdp_lo & 0xf; + unsigned int fds = (fpstate.env.mode.real.fdp_lo >> 4) | + (fpstate.env.mode.real.fdp_hi << 12); unsigned int fop = fpstate.env.mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(fpstate.env) ) @@ -121,17 +123,19 @@ int x86_emul_blk( else { /* Convert 16-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = env->mode.real.fip_lo + - (env->mode.real.fip_hi << 16); - unsigned int fdp = env->mode.real.fdp_lo + - (env->mode.real.fdp_hi << 16); + unsigned int fip = env->mode.real.fip_lo & 0xf; + unsigned int fcs = (env->mode.real.fip_lo >> 4) | + (env->mode.real.fip_hi << 12); + unsigned int fdp = env->mode.real.fdp_lo & 0xf; + unsigned int fds = (env->mode.real.fdp_lo >> 4) | + (env->mode.real.fdp_hi << 12); unsigned int fop = env->mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(*env) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 12:12:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 12:12:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982789.1369145 (Exim 4.92) (envelope-from ) id 1uEoUt-000718-Eh; Tue, 13 May 2025 12:12:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982789.1369145; Tue, 13 May 2025 12:12:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoUt-000710-Bz; Tue, 13 May 2025 12:12:35 +0000 Received: by outflank-mailman (input) for mailman id 982789; Tue, 13 May 2025 12:12:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEoUs-00070n-2S for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEoUs-006DwI-0n for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEoUr-00A3oV-2z for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 12:12: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=hy9uEnZ0sVTrGQ0/JHTVNQBw6cHJvuwNOWMQbNK2HOA=; b=t6B2Ui4soO79QeLXYh9Bc3rF4g sg3jJJR6cUc4SUhzBy5RT7+0qm75qJ0o9jAiZoTRC5kqXWb8BjV+fO3jlGLMz8xIuhwePU4p5D2v2 Jpu3fVW28tx9Xon9hHCA84KMoafuKHDYNA1W9e/CC6fdSUkNisk6oP1DnTO2W608jQX0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] cpufreq: don't leave stale statistics pointer Message-Id: Date: Tue, 13 May 2025 12:12:33 +0000 commit 0bf71d5c2243de64a62d077312a3215136e00fe0 Author: Jan Beulich AuthorDate: Tue May 13 14:01:00 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:01:00 2025 +0200 cpufreq: don't leave stale statistics pointer Error paths of cpufreq_statistic_init() correctly free the base structure pointer, but the per-CPU variable would still hold it, mis- guiding e.g. cpufreq_statistic_update(). Defer installing of the pointer there until the structure was fully populated. Fixes: 755af07edba1 ("x86/cpufreq: don't use static array for large per-CPU data structures") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: a1ce987411f61dbf5fe64bba0cd3d36d7cc0311f master date: 2025-04-30 08:47:49 +0200 --- xen/drivers/cpufreq/utility.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index dbf8985969..7b708c9bf9 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -114,7 +114,6 @@ int cpufreq_statistic_init(unsigned int cpuid) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpuid) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -140,6 +139,8 @@ int cpufreq_statistic_init(unsigned int cpuid) pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpuid); + per_cpu(cpufreq_statistic_data, cpuid) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 13:55:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 13:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982890.1369249 (Exim 4.92) (envelope-from ) id 1uEq65-0006hl-FP; Tue, 13 May 2025 13:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982890.1369249; Tue, 13 May 2025 13:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEq65-0006hd-Ch; Tue, 13 May 2025 13:55:05 +0000 Received: by outflank-mailman (input) for mailman id 982890; Tue, 13 May 2025 13:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEq64-0006hH-4p for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 13:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEq64-006Fsu-0W for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 13:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEq63-00BtVK-2R for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 13:55:03 +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=v0nX0IIUA4DxGiZegr8HlhPp03Vlb7mll7OM892iItk=; b=67dAdybBYRKmM0W4TXpSYLF1Kf XY4FWCyfJ0oB/Ty6yJtGDa/NQ9/rKur/h21HQJgxOMSCEHcBys7nBW7f6JIUbneMpVE1lVGQSYIpe x0QSCokxTxEMl7cGiqUDdBspSZICXKlWIxPa9por1QVIhUN10FmK325WjQRF/8uFJ3X4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/smp: Drop booting_cpu Message-Id: Date: Tue, 13 May 2025 13:55:03 +0000 commit 5f5d5da236b6510dc5928bcfc13af433e1c9c338 Author: Andrew Cooper AuthorDate: Sun May 11 00:27:05 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 13 14:49:12 2025 +0100 x86/smp: Drop booting_cpu Since commit 434596bbd44a ("x86/smpboot: Write the top-of-stack block in cpu_smpboot_alloc()"), smp_processor_id() is unconditionally usable on APs. Drop the global variable. Also drop the parameter from start_secondary(). It was introduced as unused in commit e9ac3bbccab0 ("Move initial stack-pointer adjustment into assembly bootstrap code.") in 2005. At the time, the caller was a shared codepath with __start_xen() with a parameter on the stack, but that never mattered for start_secondary() which ultimately reset_stack_and_jump()'s out of context. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/smpboot.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 54207e6d88..49e1110182 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -226,8 +226,6 @@ static void smp_callin(void) cpu_relax(); } -static int booting_cpu; - /* CPUs for which sibling maps can be computed. */ static cpumask_t cpu_sibling_setup_map; @@ -315,15 +313,10 @@ static void set_cpu_sibling_map(unsigned int cpu) } } -void asmlinkage start_secondary(void *unused) +void asmlinkage start_secondary(void) { struct cpu_info *info = get_cpu_info(); - - /* - * Dont put anything before smp_callin(), SMP booting is so fragile that we - * want to limit the things done here to the most necessary things. - */ - unsigned int cpu = booting_cpu; + unsigned int cpu = smp_processor_id(); /* Critical region without IDT or TSS. Any fault is deadly! */ @@ -571,8 +564,6 @@ static int do_boot_cpu(int apicid, int cpu) */ mtrr_save_state(); - booting_cpu = cpu; - start_eip = bootsym_phys(entry_SIPI16); /* start_eip needs be page aligned, and below the 1M boundary. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 13 13:55:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 13:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982893.1369253 (Exim 4.92) (envelope-from ) id 1uEq6F-0006mk-H3; Tue, 13 May 2025 13:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982893.1369253; Tue, 13 May 2025 13:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEq6F-0006mY-EM; Tue, 13 May 2025 13:55:15 +0000 Received: by outflank-mailman (input) for mailman id 982893; Tue, 13 May 2025 13:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEq6E-0006ly-NZ for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 13:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEq6E-006FtI-2n for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 13:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEq6E-00BtvK-1W for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 13:55:14 +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=i4abcERF76YJ25inMLHJ3QBebp7xWJfBr1zG+nqRfuk=; b=2p9nhGmab/5nkEEJwP6u36Fzps chzRzE3GaSCtdeqCA93WIcuLR49ssV/nX/jJUZ9A+IOjGjA1RugoJ1sRH7Qdcz4ItMCVUD2QoGrxx 2Om7tIS/AYcd6gGp3gnHicpGl1a12Jpw4eATWhc6+t/Wyht+RsMpGcS3nJ9GC7PMjLRg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Tue, 13 May 2025 13:55:14 +0000 commit 5873740e41acb8593f92623ddd03caebda2718f6 Author: Andrew Cooper AuthorDate: Thu Apr 24 16:51:00 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 13 14:49:12 2025 +0100 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 89db6e83be..b0eadd2c5d 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2470,7 +2470,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2626,6 +2626,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 3196a33b19..095ca391ad 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -306,6 +306,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 12c3ff65e0..ef9368167a 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 397a04af41..6c5f5ce0cf 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -219,6 +219,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 22d9e76e55..6f2c3147e3 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 75af7ea3c4..eacd425c53 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -470,6 +470,9 @@ static inline void tsx_init(void) {} void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 49e1110182..0189d6c332 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -376,6 +376,7 @@ void asmlinkage start_secondary(void) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 0a635025e4..3027f1db6b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -369,6 +371,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2494,6 +2498,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index a6d4a0cba7..044230bfe8 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -392,6 +392,7 @@ XEN_CPUFEATURE(IGN_UMONITOR, 16*32+29) /* MCU_OPT_CTRL.IGN_UMONITOR */ XEN_CPUFEATURE(MON_UMON_MITG, 16*32+30) /* MCU_OPT_CTRL.MON_UMON_MITG */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 13 14:22:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 14:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982907.1369256 (Exim 4.92) (envelope-from ) id 1uEqWD-0002c7-AS; Tue, 13 May 2025 14:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982907.1369256; Tue, 13 May 2025 14:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWD-0002c0-7o; Tue, 13 May 2025 14:22:05 +0000 Received: by outflank-mailman (input) for mailman id 982907; Tue, 13 May 2025 14:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWC-0002bu-5N for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEqWC-006Gyy-0H for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEqWB-00DGbT-1p for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:03 +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=ngfXxvTbnj2xytJHNfMd1D4Sre3m56R2GvN7r0vQlaI=; b=r4VFX20xmFNXJ/zPLO6IC6NXY3 vKyOZ70XJuXwcOOt+iBD3+PE+jrWthnGbGYIYrRbB4xc6rGMEsuT8zUYF+6if8X6XR7HtNi+FW4DL iniQ5GDCJ8ePREx3ph7Y8alv2uXIMgSEhLenH/iYTh3L6NPTM/0kRSJeJvYdU6KGiOKo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86: allow non-BIGMEM configs to boot on >= 16Tb systems Message-Id: Date: Tue, 13 May 2025 14:22:03 +0000 commit 96b9bb0afdd66354f5fbc057e43036e4afe961d7 Author: Jan Beulich AuthorDate: Tue May 13 14:00:00 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:00:00 2025 +0200 x86: allow non-BIGMEM configs to boot on >= 16Tb systems While frame table setup, directmap init, and boot allocator population respect all intended bounds, the logic passing memory to the heap allocator which wasn't passed to the boot allocator fails to respect max_{pdx,pfn}. This then typically triggers the BUG() in free_heap_pages() after checking page state, because of hitting a struct page_info instance which was set to all ~0. Of course all the memory above the 16Tb boundary is still going to remain unused; using it requires BIGMEM=y. And of course this fix similarly ought to help BIGMEM=y configurations on >= 123Tb systems (where all the memory beyond that boundary continues to be unused). Fixes: bac2000063ba ("x86-64: reduce range spanned by 1:1 mapping and frame table indexes") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 64d32b75e6e3b093828623d5ce30b4826bb6b1df master date: 2023-12-19 13:47:38 +0100 --- xen/arch/x86/setup.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 98d18f237a..8a79fc1d8c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1713,15 +1713,15 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( max_page - 1 > virt_to_mfn(HYPERVISOR_VIRT_END - 1) ) { - unsigned long limit = virt_to_mfn(HYPERVISOR_VIRT_END - 1); + unsigned long lo = virt_to_mfn(HYPERVISOR_VIRT_END - 1); uint64_t mask = PAGE_SIZE - 1; if ( !highmem_start ) - xenheap_max_mfn(limit); + xenheap_max_mfn(lo); end_boot_allocator(); - /* Pass the remaining memory to the allocator. */ + /* Pass the remaining memory in (lo, max_page) to the allocator. */ for ( i = 0; i < boot_e820.nr_map; i++ ) { uint64_t s, e; @@ -1730,10 +1730,12 @@ void __init noreturn __start_xen(unsigned long mbi_p) continue; s = (boot_e820.map[i].addr + mask) & ~mask; e = (boot_e820.map[i].addr + boot_e820.map[i].size) & ~mask; - if ( PFN_DOWN(e) <= limit ) + if ( PFN_DOWN(e) <= lo || PFN_DOWN(s) >= max_page ) continue; - if ( PFN_DOWN(s) <= limit ) - s = pfn_to_paddr(limit + 1); + if ( PFN_DOWN(s) <= lo ) + s = pfn_to_paddr(lo + 1); + if ( PFN_DOWN(e) > max_page ) + e = pfn_to_paddr(max_page); init_domheap_pages(s, e); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 14:22:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 14:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982909.1369261 (Exim 4.92) (envelope-from ) id 1uEqWN-0002eZ-DQ; Tue, 13 May 2025 14:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982909.1369261; Tue, 13 May 2025 14:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWN-0002eR-Ad; Tue, 13 May 2025 14:22:15 +0000 Received: by outflank-mailman (input) for mailman id 982909; Tue, 13 May 2025 14:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWM-0002eH-GE for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEqWM-006Gzm-23 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEqWM-00DH2y-0d for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:14 +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=1suWRlaZkEe5qfshoFsa71tARN6pQSa8mJUIDyCheaY=; b=yr0NXjV2FS98wWy1fySg/WDW84 80m/JALfWRQjsvAi8sr3ZJA480XL6jWPJVC1bR2nMEEU0vfyFPcI44CS8ier02SW5916AquhgeKfZ uufVZcMSqguurNgNmNtERAl73GWukej6Cdmhw4V5or0lTBacmGC0Il+Svneav+nZKuvE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Message-Id: Date: Tue, 13 May 2025 14:22:14 +0000 commit 545f2d528cd815acd353fae7292a67ac5af9c73f Author: Andrew Cooper AuthorDate: Tue May 13 14:00:26 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:00:26 2025 +0200 xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Building Xen with Clang-17 yields the following warning: ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: ./.xen.efi.0xffff82d040000000.0:/4: section below image base ld: ./.xen.efi.0xffff82d040000000.1:/4: section below image base ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: xen.efi:/4: section below image base Set the alignment to 4 as it holds 4-byte values, despite the fact that Clang appears to only use 1. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a88b99300aedea103884b4ef8c66a5a94206feb5 master date: 2025-04-28 19:46:46 +0100 --- xen/include/xen/xen.lds.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/xen.lds.h b/xen/include/xen/xen.lds.h index 06b7110837..08979e23a0 100644 --- a/xen/include/xen/xen.lds.h +++ b/xen/include/xen/xen.lds.h @@ -40,6 +40,7 @@ DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1) \ DECL_DEBUG(.debug_types, 1) \ DECL_DEBUG(.debug_str, 1) \ + DECL_DEBUG(.debug_str_offsets, 4) \ DECL_DEBUG2(.debug_line, .debug_line.*, 1) \ DECL_DEBUG(.debug_line_str, 1) \ DECL_DEBUG(.debug_names, 4) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 14:22:26 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 14:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982910.1369264 (Exim 4.92) (envelope-from ) id 1uEqWY-0002hZ-Em; Tue, 13 May 2025 14:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982910.1369264; Tue, 13 May 2025 14:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWY-0002hS-CJ; Tue, 13 May 2025 14:22:26 +0000 Received: by outflank-mailman (input) for mailman id 982910; Tue, 13 May 2025 14:22:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWX-0002hC-2x for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEqWX-006H0A-0k for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEqWW-00DHec-2b for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:24 +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=X7W4P9go0IKCOR1uZ/m9wUTYYIOeRGG0lVGf+ar+YO0=; b=K8ggBAvzlDU5sFbVVBE+Y01hv5 kUMvwgvxH99kM9yiRq2dO4zhrdywwDD/7vJbQd+DjjeReXY/ClcvARrBW1HM/LMCZ8yrfkRVszCU4 Hf7grW5I79I/kKgDcaoeRmS1bC9fsB3jmDCFsvdkeeSJhVUFEwZAeu81v3bdQfpmKIGE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86emul: avoid UB shifts in FLDENV/FRSTOR handling Message-Id: Date: Tue, 13 May 2025 14:22:24 +0000 commit a150ecceeee899aac70a1dbe731675e2cb4dae18 Author: Jan Beulich AuthorDate: Tue May 13 14:00:41 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:00:41 2025 +0200 x86emul: avoid UB shifts in FLDENV/FRSTOR handling 16-bit quantities, no matter whether expressed as uint16_t or as bitfield, will be promoted to plain int before doing any arithmetic on them. Shifting such values by 16 will therefore shift into the sign bit, which is UB if that bit becomes set. To account for all reads and all writes accessing opposite members of the same union, introduce yet more local variables to reduce the shift counts to 12. Fixes: be55ed744ed8 ("x86emul: support FLDENV and FRSTOR") Reported-by: Fabian Specht Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: d00fc019b6eba68bd7f2186a6427e5a005ce989f master date: 2025-04-30 08:46:21 +0200 --- xen/arch/x86/x86_emulate/blk.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_emulate/blk.c b/xen/arch/x86/x86_emulate/blk.c index e790f4f900..fe0122ddc6 100644 --- a/xen/arch/x86/x86_emulate/blk.c +++ b/xen/arch/x86/x86_emulate/blk.c @@ -81,17 +81,19 @@ int x86_emul_blk( if ( !s->rex_prefix ) { /* Convert 32-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = fpstate.env.mode.real.fip_lo + - (fpstate.env.mode.real.fip_hi << 16); - unsigned int fdp = fpstate.env.mode.real.fdp_lo + - (fpstate.env.mode.real.fdp_hi << 16); + unsigned int fip = fpstate.env.mode.real.fip_lo & 0xf; + unsigned int fcs = (fpstate.env.mode.real.fip_lo >> 4) | + (fpstate.env.mode.real.fip_hi << 12); + unsigned int fdp = fpstate.env.mode.real.fdp_lo & 0xf; + unsigned int fds = (fpstate.env.mode.real.fdp_lo >> 4) | + (fpstate.env.mode.real.fdp_hi << 12); unsigned int fop = fpstate.env.mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(fpstate.env) ) @@ -121,17 +123,19 @@ int x86_emul_blk( else { /* Convert 16-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = env->mode.real.fip_lo + - (env->mode.real.fip_hi << 16); - unsigned int fdp = env->mode.real.fdp_lo + - (env->mode.real.fdp_hi << 16); + unsigned int fip = env->mode.real.fip_lo & 0xf; + unsigned int fcs = (env->mode.real.fip_lo >> 4) | + (env->mode.real.fip_hi << 12); + unsigned int fdp = env->mode.real.fdp_lo & 0xf; + unsigned int fds = (env->mode.real.fdp_lo >> 4) | + (env->mode.real.fdp_hi << 12); unsigned int fop = env->mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(*env) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 14:22:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 14:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982911.1369269 (Exim 4.92) (envelope-from ) id 1uEqWi-0002k0-GP; Tue, 13 May 2025 14:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982911.1369269; Tue, 13 May 2025 14:22:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWi-0002js-Dn; Tue, 13 May 2025 14:22:36 +0000 Received: by outflank-mailman (input) for mailman id 982911; Tue, 13 May 2025 14:22:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqWh-0002jg-Hq for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEqWh-006H0a-2L for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEqWh-00DIJV-12 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:22:35 +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=iusVE+NiIjY5z0K0p1lFxLljOtm9YWIoZQZMrqXTpxs=; b=ZOm0vPyPTRF1b/I5rEJ79fRpdS NBrtiUkqBIbFkMrm+wTwpfWEDj7xPEuAFbPdcrKLZdqziwSXHJYZNOOMqdm8xZmLmAigGKnUT+m1L MunUFm1IOTTzbXgrMuJXvoG6zZX8eTja8rLBoxCHTPOnmgyFWsGJViv1d924NVRoDPO0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] cpufreq: don't leave stale statistics pointer Message-Id: Date: Tue, 13 May 2025 14:22:35 +0000 commit 0bf71d5c2243de64a62d077312a3215136e00fe0 Author: Jan Beulich AuthorDate: Tue May 13 14:01:00 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 14:01:00 2025 +0200 cpufreq: don't leave stale statistics pointer Error paths of cpufreq_statistic_init() correctly free the base structure pointer, but the per-CPU variable would still hold it, mis- guiding e.g. cpufreq_statistic_update(). Defer installing of the pointer there until the structure was fully populated. Fixes: 755af07edba1 ("x86/cpufreq: don't use static array for large per-CPU data structures") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: a1ce987411f61dbf5fe64bba0cd3d36d7cc0311f master date: 2025-04-30 08:47:49 +0200 --- xen/drivers/cpufreq/utility.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index dbf8985969..7b708c9bf9 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -114,7 +114,6 @@ int cpufreq_statistic_init(unsigned int cpuid) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpuid) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -140,6 +139,8 @@ int cpufreq_statistic_init(unsigned int cpuid) pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpuid); + per_cpu(cpufreq_statistic_data, cpuid) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 13 14:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 14:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982981.1369343 (Exim 4.92) (envelope-from ) id 1uEqgp-0007xG-5S; Tue, 13 May 2025 14:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982981.1369343; Tue, 13 May 2025 14: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 1uEqgp-0007xA-2a; Tue, 13 May 2025 14:33:03 +0000 Received: by outflank-mailman (input) for mailman id 982981; Tue, 13 May 2025 14:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqgo-0007wz-GY for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEqgo-006HVX-1r for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEqgo-00DsRp-0o for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14: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=XJvHaGsFTeq2t0sLK7atuDF0reOPgYAqOYBpnxlOPY0=; b=VfBbpcYzh4Am8VaDlvbm6xjHt/ oNGl4QfowItpG16horj93voe2gWbIalUpsHOgCAm5AUXPlZ3C5AsmymI4fqoNYN+SEE3NIdgrfHxy wKWDQ13Ja0luShElbj5GUybvBwphf3ZUZKn8fKTWlzuQ7IcemPWGV790vIVqS8COmfpM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Message-Id: Date: Tue, 13 May 2025 14:33:02 +0000 commit 294bea99c9e21f89c288f96647695455058a0055 Author: Andrew Cooper AuthorDate: Tue May 13 13:57:37 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:57:37 2025 +0200 xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Building Xen with Clang-17 yields the following warning: ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: ./.xen.efi.0xffff82d040000000.0:/4: section below image base ld: ./.xen.efi.0xffff82d040000000.1:/4: section below image base ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: xen.efi:/4: section below image base Set the alignment to 4 as it holds 4-byte values, despite the fact that Clang appears to only use 1. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a88b99300aedea103884b4ef8c66a5a94206feb5 master date: 2025-04-28 19:46:46 +0100 --- xen/include/xen/xen.lds.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/xen.lds.h b/xen/include/xen/xen.lds.h index a17810bb28..acc1e332fb 100644 --- a/xen/include/xen/xen.lds.h +++ b/xen/include/xen/xen.lds.h @@ -50,6 +50,7 @@ DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1) \ DECL_DEBUG(.debug_types, 1) \ DECL_DEBUG(.debug_str, 1) \ + DECL_DEBUG(.debug_str_offsets, 4) \ DECL_DEBUG2(.debug_line, .debug_line.*, 1) \ DECL_DEBUG(.debug_line_str, 1) \ DECL_DEBUG(.debug_names, 4) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Tue May 13 14:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 14:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982982.1369347 (Exim 4.92) (envelope-from ) id 1uEqgz-0007zq-6q; Tue, 13 May 2025 14:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982982.1369347; Tue, 13 May 2025 14: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 1uEqgz-0007zi-3z; Tue, 13 May 2025 14:33:13 +0000 Received: by outflank-mailman (input) for mailman id 982982; Tue, 13 May 2025 14:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqgy-0007zZ-QM for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEqgy-006HVv-38 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEqgy-00Dsw5-1z for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14: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=sFe0464r3hsxMzlzW4Ib39OXZiz1HKNdTkD3E72Rbgs=; b=zOHPJhNw2vU9EBm+FwyNwP9jOY MJCvYMN7ac+w4aGpTBhSyYyBq3V+itHuQlSzpJpV1Bh6yqwXygYbqDmSLNTFbrYb3MuGV8MXRx0EF hUacDM1XirTwDeKuabV3o79ocSdUb8+RYjpAeeepezhcklT1UhmhxhCwzMViLFMIUSVw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86emul: avoid UB shifts in FLDENV/FRSTOR handling Message-Id: Date: Tue, 13 May 2025 14:33:12 +0000 commit f33ff85f21e301157522c89b1ae74262138b5c40 Author: Jan Beulich AuthorDate: Tue May 13 13:58:17 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:58:17 2025 +0200 x86emul: avoid UB shifts in FLDENV/FRSTOR handling 16-bit quantities, no matter whether expressed as uint16_t or as bitfield, will be promoted to plain int before doing any arithmetic on them. Shifting such values by 16 will therefore shift into the sign bit, which is UB if that bit becomes set. To account for all reads and all writes accessing opposite members of the same union, introduce yet more local variables to reduce the shift counts to 12. Fixes: be55ed744ed8 ("x86emul: support FLDENV and FRSTOR") Reported-by: Fabian Specht Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: d00fc019b6eba68bd7f2186a6427e5a005ce989f master date: 2025-04-30 08:46:21 +0200 --- xen/arch/x86/x86_emulate/blk.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_emulate/blk.c b/xen/arch/x86/x86_emulate/blk.c index e790f4f900..fe0122ddc6 100644 --- a/xen/arch/x86/x86_emulate/blk.c +++ b/xen/arch/x86/x86_emulate/blk.c @@ -81,17 +81,19 @@ int x86_emul_blk( if ( !s->rex_prefix ) { /* Convert 32-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = fpstate.env.mode.real.fip_lo + - (fpstate.env.mode.real.fip_hi << 16); - unsigned int fdp = fpstate.env.mode.real.fdp_lo + - (fpstate.env.mode.real.fdp_hi << 16); + unsigned int fip = fpstate.env.mode.real.fip_lo & 0xf; + unsigned int fcs = (fpstate.env.mode.real.fip_lo >> 4) | + (fpstate.env.mode.real.fip_hi << 12); + unsigned int fdp = fpstate.env.mode.real.fdp_lo & 0xf; + unsigned int fds = (fpstate.env.mode.real.fdp_lo >> 4) | + (fpstate.env.mode.real.fdp_hi << 12); unsigned int fop = fpstate.env.mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(fpstate.env) ) @@ -121,17 +123,19 @@ int x86_emul_blk( else { /* Convert 16-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = env->mode.real.fip_lo + - (env->mode.real.fip_hi << 16); - unsigned int fdp = env->mode.real.fdp_lo + - (env->mode.real.fdp_hi << 16); + unsigned int fip = env->mode.real.fip_lo & 0xf; + unsigned int fcs = (env->mode.real.fip_lo >> 4) | + (env->mode.real.fip_hi << 12); + unsigned int fdp = env->mode.real.fdp_lo & 0xf; + unsigned int fds = (env->mode.real.fdp_lo >> 4) | + (env->mode.real.fdp_hi << 12); unsigned int fop = env->mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(*env) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Tue May 13 14:33:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 14:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.982984.1369350 (Exim 4.92) (envelope-from ) id 1uEqhA-00082z-7z; Tue, 13 May 2025 14:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 982984.1369350; Tue, 13 May 2025 14:33: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 1uEqhA-00082r-5Q; Tue, 13 May 2025 14:33:24 +0000 Received: by outflank-mailman (input) for mailman id 982984; Tue, 13 May 2025 14:33:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEqh9-00082l-60 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:33:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEqh9-006HWj-13 for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:33:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEqh8-00DtMP-3A for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 14:33: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=NYTOvFqhljU+pl/vC2mmoUstxMMU1+pgS8YLxV7MRTQ=; b=ggsLpNhaoV4D3jUoyXdIBP3Mik G3gf0SfjlayA2yFSOTIjSuwguukNwYcjOZ9lIFBY6loVBoRXXqo+vixhp0NUA9smsBkKT3K+C4L3I 77XQ4UckvTe//R5ABXRocyQOcgZtXjiG6QGc7obdXn1IK6wm2QASlSGn0bBt7q3twxgA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] cpufreq: don't leave stale statistics pointer Message-Id: Date: Tue, 13 May 2025 14:33:22 +0000 commit 2b92925c6d8bc6dae1bd09255413ef9de5d79af6 Author: Jan Beulich AuthorDate: Tue May 13 13:58:33 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:58:33 2025 +0200 cpufreq: don't leave stale statistics pointer Error paths of cpufreq_statistic_init() correctly free the base structure pointer, but the per-CPU variable would still hold it, mis- guiding e.g. cpufreq_statistic_update(). Defer installing of the pointer there until the structure was fully populated. Fixes: 755af07edba1 ("x86/cpufreq: don't use static array for large per-CPU data structures") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: a1ce987411f61dbf5fe64bba0cd3d36d7cc0311f master date: 2025-04-30 08:47:49 +0200 --- xen/drivers/cpufreq/utility.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index e690a484f1..d9caf31aa2 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -113,7 +113,6 @@ int cpufreq_statistic_init(unsigned int cpu) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -139,6 +138,8 @@ int cpufreq_statistic_init(unsigned int cpu) pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Tue May 13 17:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 17:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.983428.1369782 (Exim 4.92) (envelope-from ) id 1uEtKP-0003w7-GQ; Tue, 13 May 2025 17:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 983428.1369782; Tue, 13 May 2025 17:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEtKP-0003vz-D5; Tue, 13 May 2025 17:22:05 +0000 Received: by outflank-mailman (input) for mailman id 983428; Tue, 13 May 2025 17:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEtKN-0003uI-QV for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 17:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEtKN-006PCp-2o for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 17:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEtKN-005L2z-1R for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 17:22:03 +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=GfzgWnSsdM6pRS+Zclcm4CYUVFVEjFiSe+fS7BZHxHE=; b=wFQipjnr50+mfgZFhCynbBfCDs YN2agsoEHpn1+efZ1GSwhhrvGxcgm0N0jfKRrfc9bp26dMNA8EiDbq46qs1HuSdA7Cn8lbEtRELlf Q3tnbmIpAD6/T5YcfrOuFf8Yqn319TZ1ft7fRwlcestPYG8GmfJ9Uv3mRGpV+jZ661HQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/smp: Drop booting_cpu Message-Id: Date: Tue, 13 May 2025 17:22:03 +0000 commit 5f5d5da236b6510dc5928bcfc13af433e1c9c338 Author: Andrew Cooper AuthorDate: Sun May 11 00:27:05 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 13 14:49:12 2025 +0100 x86/smp: Drop booting_cpu Since commit 434596bbd44a ("x86/smpboot: Write the top-of-stack block in cpu_smpboot_alloc()"), smp_processor_id() is unconditionally usable on APs. Drop the global variable. Also drop the parameter from start_secondary(). It was introduced as unused in commit e9ac3bbccab0 ("Move initial stack-pointer adjustment into assembly bootstrap code.") in 2005. At the time, the caller was a shared codepath with __start_xen() with a parameter on the stack, but that never mattered for start_secondary() which ultimately reset_stack_and_jump()'s out of context. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/smpboot.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 54207e6d88..49e1110182 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -226,8 +226,6 @@ static void smp_callin(void) cpu_relax(); } -static int booting_cpu; - /* CPUs for which sibling maps can be computed. */ static cpumask_t cpu_sibling_setup_map; @@ -315,15 +313,10 @@ static void set_cpu_sibling_map(unsigned int cpu) } } -void asmlinkage start_secondary(void *unused) +void asmlinkage start_secondary(void) { struct cpu_info *info = get_cpu_info(); - - /* - * Dont put anything before smp_callin(), SMP booting is so fragile that we - * want to limit the things done here to the most necessary things. - */ - unsigned int cpu = booting_cpu; + unsigned int cpu = smp_processor_id(); /* Critical region without IDT or TSS. Any fault is deadly! */ @@ -571,8 +564,6 @@ static int do_boot_cpu(int apicid, int cpu) */ mtrr_save_state(); - booting_cpu = cpu; - start_eip = bootsym_phys(entry_SIPI16); /* start_eip needs be page aligned, and below the 1M boundary. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 13 17:22:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 May 2025 17:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.983430.1369787 (Exim 4.92) (envelope-from ) id 1uEtKZ-000419-JE; Tue, 13 May 2025 17:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 983430.1369787; Tue, 13 May 2025 17:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEtKZ-000411-GN; Tue, 13 May 2025 17:22:15 +0000 Received: by outflank-mailman (input) for mailman id 983430; Tue, 13 May 2025 17:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uEtKY-00040o-Ds for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 17:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uEtKY-006PD0-1t for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 17:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uEtKY-005LhX-0W for xen-changelog@lists.xenproject.org; Tue, 13 May 2025 17:22:14 +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=qj47/N6vefmipFI0cJNrZPPOQdDrg5+inzqm5/q4yKA=; b=eobfy8AztfS5S/P4nS/M/Aee4/ Esjc9YLUuFx+PNkqmwh46A4x9QFM/ed5oo6IzdE2bVGohebuN1gSY97v0/FDQhNj/vrYa0PYSZPiv LmULlAVWIT5FTYoia7gWopK/Db2vY0QbqcDS5KL0S7fc+RHdMO86rz08FNi1EJpoE6a0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Tue, 13 May 2025 17:22:14 +0000 commit 5873740e41acb8593f92623ddd03caebda2718f6 Author: Andrew Cooper AuthorDate: Thu Apr 24 16:51:00 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 13 14:49:12 2025 +0100 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 89db6e83be..b0eadd2c5d 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2470,7 +2470,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2626,6 +2626,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 3196a33b19..095ca391ad 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -306,6 +306,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 12c3ff65e0..ef9368167a 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 397a04af41..6c5f5ce0cf 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -219,6 +219,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 22d9e76e55..6f2c3147e3 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 75af7ea3c4..eacd425c53 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -470,6 +470,9 @@ static inline void tsx_init(void) {} void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 49e1110182..0189d6c332 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -376,6 +376,7 @@ void asmlinkage start_secondary(void) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 0a635025e4..3027f1db6b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -369,6 +371,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2494,6 +2498,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index a6d4a0cba7..044230bfe8 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -392,6 +392,7 @@ XEN_CPUFEATURE(IGN_UMONITOR, 16*32+29) /* MCU_OPT_CTRL.IGN_UMONITOR */ XEN_CPUFEATURE(MON_UMON_MITG, 16*32+30) /* MCU_OPT_CTRL.MON_UMON_MITG */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 14 08:44:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 08:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984082.1370241 (Exim 4.92) (envelope-from ) id 1uF7if-0005k6-4e; Wed, 14 May 2025 08:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984082.1370241; Wed, 14 May 2025 08:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF7if-0005jy-1Z; Wed, 14 May 2025 08:44:05 +0000 Received: by outflank-mailman (input) for mailman id 984082; Wed, 14 May 2025 08:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF7ie-0005js-DH for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 08:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF7ie-008IFY-1a for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 08:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF7ie-00HFtK-0L for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 08:44:04 +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=LWXlrkdG2mSikxQhY4+tadZl4+eVikpR1iEE6zChtdM=; b=Whk9GzVCBd20CypADJSxblhl66 lWlbB3+GEpmJNrQQvUUG8j9mHiM7ELU+V8DNwvraDnHILNFupyKxmmxxkkUxaRDlTCqZ1NNBoc/lT rf4oq4MgOXxQ6cMOdqk7No+Ro1ldltbTRz7f160yzLTGXoWCZk5aFshJ1XsHK+/fJS0k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] livepatch: Pass buffer size to list sysctl Message-Id: Date: Wed, 14 May 2025 08:44:04 +0000 commit 4c3ce492ede17902d086ef925dd120c25d974a87 Author: Kevin Lampis AuthorDate: Thu May 8 18:01:56 2025 +0100 Commit: Roger Pau Monne CommitDate: Tue May 13 19:43:48 2025 +0200 livepatch: Pass buffer size to list sysctl The livepatch list sysctl writes metadata into a buffer provided by the caller. The caller is expected to allocate an appropriately sized buffer but this is racy and may result in Xen writing beyond the end of the buffer should the metadata size change. The name buffer is expected to be an array of elements with size XEN_LIVEPATCH_NAME_SIZE to avoid this kind of race but the xen-livepatch tool allocates only as many bytes as needed, therefore encountering the same potential race condition. Fix both these issues by requiring the caller to pass in the size of the name and metadata buffers and then not writing beyond the allocated size. The sysctl interface version is bumped due to the change in semantics of the fields. Signed-off-by: Kevin Lampis Signed-off-by: Ross Lagerwall Fixes: b145b4a39c13 ('livepatch: Handle arbitrary size names with the list operation') Fixes: 5083e0ff939d ('livepatch: Add metadata runtime retrieval mechanism') Reviewed-by: Roger Pau Monné --- tools/libs/ctrl/xc_misc.c | 3 +++ xen/common/livepatch.c | 23 ++++++++++++++++++----- xen/include/public/sysctl.h | 12 ++++++++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/tools/libs/ctrl/xc_misc.c b/tools/libs/ctrl/xc_misc.c index 6a60216bda..33e87bac28 100644 --- a/tools/libs/ctrl/xc_misc.c +++ b/tools/libs/ctrl/xc_misc.c @@ -867,6 +867,9 @@ int xc_livepatch_list(xc_interface *xch, const unsigned int max, set_xen_guest_handle(sysctl.u.livepatch.u.list.metadata, metadata); set_xen_guest_handle(sysctl.u.livepatch.u.list.metadata_len, metadata_len); + sysctl.u.livepatch.u.list.name_total_size = name_sz; + sysctl.u.livepatch.u.list.metadata_total_size = metadata_sz; + rc = do_sysctl(xch, &sysctl); /* * From here on we MUST call xc_hypercall_bounce. If rc < 0 we diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index be9b7e3675..9a0df5363b 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -1311,11 +1311,10 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) return -EINVAL; } - list->name_total_size = 0; - list->metadata_total_size = 0; if ( list->nr ) { size_t name_offset = 0, metadata_offset = 0; + size_t name_total_copied = 0, metadata_total_copied = 0; list_for_each_entry( data, &payload_list, list ) { @@ -1328,10 +1327,15 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) status.rc = data->rc; name_len = strlen(data->name) + 1; - list->name_total_size += name_len; - metadata_len = data->metadata.len; - list->metadata_total_size += metadata_len; + + if ( (name_total_copied + name_len) > list->name_total_size || + (metadata_total_copied + metadata_len) > + list->metadata_total_size ) + { + rc = -ENOBUFS; + break; + } if ( !guest_handle_subrange_okay(list->name, name_offset, name_offset + name_len - 1) || @@ -1355,6 +1359,9 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) break; } + name_total_copied += name_len; + metadata_total_copied += metadata_len; + idx++; name_offset += name_len; metadata_offset += metadata_len; @@ -1362,9 +1369,15 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) if ( (idx >= list->nr) || hypercall_preempt_check() ) break; } + + list->name_total_size = name_total_copied; + list->metadata_total_size = metadata_total_copied; } else { + list->name_total_size = 0; + list->metadata_total_size = 0; + list_for_each_entry( data, &payload_list, list ) { list->name_total_size += strlen(data->name) + 1; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b0fec271d3..9eca72865b 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -26,9 +26,9 @@ * (e.g. adding semantics to 0-checked input fields or data to zeroed output * fields) don't require a change of the version. * - * Last version bump: Xen 4.17 + * Last version bump: Xen 4.21 */ -#define XEN_SYSCTL_INTERFACE_VERSION 0x00000015 +#define XEN_SYSCTL_INTERFACE_VERSION 0x00000016 /* * Read console content from Xen buffer ring. @@ -1101,8 +1101,12 @@ struct xen_sysctl_livepatch_list { amount of payloads and version. OUT: How many payloads left. */ uint32_t pad; /* IN: Must be zero. */ - uint32_t name_total_size; /* OUT: Total size of all transfer names */ - uint32_t metadata_total_size; /* OUT: Total size of all transfer metadata */ + uint32_t name_total_size; /* IN: Size of name buffer + OUT: Total size of transferred + names */ + uint32_t metadata_total_size; /* IN: Size of metadata buffer + OUT: Total size of transferred + metadata */ XEN_GUEST_HANDLE_64(xen_livepatch_status_t) status; /* OUT. Must have enough space allocate for nr of them. */ XEN_GUEST_HANDLE_64(char) name; /* OUT: Array of names. Each member -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 14 08:44:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 08:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984084.1370245 (Exim 4.92) (envelope-from ) id 1uF7ip-0005m7-5q; Wed, 14 May 2025 08:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984084.1370245; Wed, 14 May 2025 08:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF7ip-0005lz-30; Wed, 14 May 2025 08:44:15 +0000 Received: by outflank-mailman (input) for mailman id 984084; Wed, 14 May 2025 08:44:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF7io-0005lr-Mw for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 08:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF7io-008IFf-2j for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 08:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF7io-00HGUI-1h for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 08:44:14 +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=0OPfK4kmHw5xxPxV4EUE9sYavtl7PIU9gXdOjaev9ss=; b=Z5VInMhFOz0UWUNr/XM5FDFxe7 KNfSIk7rVGbNm9qjiZb3MVz6LuktMp3jzAE/oEP+Mm5BozXezYh91YlhhZH7um7AwNKNKyF8ahqq2 XoHmNamipkQ2RDvKSBEmvnwTgDLaM/1jHza3nW7TWIRZ1zr5/oVSeV1kLpVXfDP8HM5s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Wed, 14 May 2025 08:44:14 +0000 commit bbaea9878bf6d11f6f336710148dbbd26e927cfd Author: Roger Pau Monne AuthorDate: Wed Apr 30 11:36:09 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 13 19:43:48 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 66c15a3c86..a1703db762 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3805,14 +3805,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3829,7 +3826,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984106.1370269 (Exim 4.92) (envelope-from ) id 1uF88n-00025x-ER; Wed, 14 May 2025 09:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984106.1370269; Wed, 14 May 2025 09:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF88n-00025p-Bo; Wed, 14 May 2025 09:11:05 +0000 Received: by outflank-mailman (input) for mailman id 984106; Wed, 14 May 2025 09:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF88l-00025j-Sh for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF88l-008InB-34 for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF88l-0015Is-1s for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:03 +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=zhATWMUgIdJxCzRg8I3G16YZKDH1+VIWqQzLoSuzpCU=; b=jmjo8SIBpMzeXitlGf0OKKgxOt hddslr3NMkQmdu5WMSLbu0KouGf+MFU8fPLmmaYCF4UuypRZBkohNhhIwfGnkpMS/wF7TQEWcdPwI aybigDWJ02YS7wCFQmfFh55vPC/1jVR8qW+osY7v9p08+l7vKMmSkjbiH+SQ5iwxbjhY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: support cache-writeback in flush_area_local() et al Message-Id: Date: Wed, 14 May 2025 09:11:03 +0000 commit aa3f897a2006286745f3c7f32fbb1d26b2f9630b Author: Jan Beulich AuthorDate: Wed May 14 10:58:02 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 10:58:02 2025 +0200 x86: support cache-writeback in flush_area_local() et al The majority of the present callers really aren't after invalidating cache contents, but only after writeback. Make this available by simply extending the FLUSH_CACHE handling accordingly. No feature checks are required here: cache_writeback() falls back to cache_flush() as necessary, while WBNOINVD degenerates to WBINVD on older hardware. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/flushtlb.c | 15 +++++++++------ xen/arch/x86/include/asm/flushtlb.h | 8 +++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c index 1e0011d5b1..796b25dad6 100644 --- a/xen/arch/x86/flushtlb.c +++ b/xen/arch/x86/flushtlb.c @@ -232,7 +232,7 @@ unsigned int flush_area_local(const void *va, unsigned int flags) if ( flags & FLUSH_HVM_ASID_CORE ) hvm_flush_guest_tlbs(); - if ( flags & FLUSH_CACHE ) + if ( flags & (FLUSH_CACHE | FLUSH_CACHE_WRITEBACK) ) { const struct cpuinfo_x86 *c = ¤t_cpu_data; unsigned long sz = 0; @@ -245,13 +245,16 @@ unsigned int flush_area_local(const void *va, unsigned int flags) c->x86_clflush_size && c->x86_cache_size && sz && ((sz >> 10) < c->x86_cache_size) ) { - cache_flush(va, sz); - flags &= ~FLUSH_CACHE; + if ( flags & FLUSH_CACHE ) + cache_flush(va, sz); + else + cache_writeback(va, sz); + flags &= ~(FLUSH_CACHE | FLUSH_CACHE_WRITEBACK); } - else - { + else if ( flags & FLUSH_CACHE ) wbinvd(); - } + else + wbnoinvd(); } if ( flags & FLUSH_ROOT_PGTBL ) diff --git a/xen/arch/x86/include/asm/flushtlb.h b/xen/arch/x86/include/asm/flushtlb.h index bb0ad58db4..209ea1e62f 100644 --- a/xen/arch/x86/include/asm/flushtlb.h +++ b/xen/arch/x86/include/asm/flushtlb.h @@ -135,6 +135,8 @@ void switch_cr3_cr4(unsigned long cr3, unsigned long cr4); #else # define FLUSH_NO_ASSIST 0 #endif + /* Write back data cache contents */ +#define FLUSH_CACHE_WRITEBACK 0x10000 /* Flush local TLBs/caches. */ unsigned int flush_area_local(const void *va, unsigned int flags); @@ -195,7 +197,11 @@ static inline int clean_and_invalidate_dcache_va_range(const void *p, } static inline int clean_dcache_va_range(const void *p, unsigned long size) { - return clean_and_invalidate_dcache_va_range(p, size); + unsigned int order = get_order_from_bytes(size); + + /* sub-page granularity support needs to be added if necessary */ + flush_area_local(p, FLUSH_CACHE_WRITEBACK | FLUSH_ORDER(order)); + return 0; } unsigned int guest_flush_tlb_flags(const struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:11:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984107.1370272 (Exim 4.92) (envelope-from ) id 1uF88x-00029F-G5; Wed, 14 May 2025 09:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984107.1370272; Wed, 14 May 2025 09:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF88x-000298-DF; Wed, 14 May 2025 09:11:15 +0000 Received: by outflank-mailman (input) for mailman id 984107; Wed, 14 May 2025 09:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF88w-00028t-3k for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF88w-008InM-0p for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF88v-0015kZ-34 for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:13 +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=WszjBVsrAJTGLMb2X81kpJYkL28PQk67uJpsryAsREI=; b=2LJhwQK/WNrKVKuCdtI/IYNtN2 U5j/86b7FXqW90Q0SfHtRodm/QIEUcRdoyJGiMwuBuojwhKBqhKmO527lLQhKeCVVDXKIxrmB+XNo 3XlYEg+wfGUun/xbCmSYmP8zf2H/pdN8hU2ezNaGuql5GP3KO6xeXVRxK4XYXH2A8k+M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: initialize bitmap to zero in riscv_fill_hwcap_from_isa_string() Message-Id: Date: Wed, 14 May 2025 09:11:13 +0000 commit 2cdd22fd25a1f999fe5f054925ae03e3ab3c4f9d Author: Oleksii Kurochko AuthorDate: Wed May 14 10:59:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 10:59:00 2025 +0200 xen/riscv: initialize bitmap to zero in riscv_fill_hwcap_from_isa_string() The this_isa bitmap should be explicitly initialized to zero to avoid false positives when detecting supported ISA extensions. Without proper zero-initialization, the bitmap may retain non-zero values from uninitialized memory, causing Xen to incorrectly assume that certain extensions are supported. This change ensures reliable detection of ISA capabilities. Fixes: 0c2f717eae ("xen/riscv: identify specific ISA supported by cpu") Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/cpufeature.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/riscv/cpufeature.c b/xen/arch/riscv/cpufeature.c index 5aafab0f49..3246a03624 100644 --- a/xen/arch/riscv/cpufeature.c +++ b/xen/arch/riscv/cpufeature.c @@ -405,6 +405,8 @@ static void __init riscv_fill_hwcap_from_isa_string(void) const char *isa; unsigned long cpuid; + bitmap_zero(this_isa, RISCV_ISA_EXT_MAX); + if ( !dt_device_type_is_equal(cpu, "cpu") ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:11:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984108.1370277 (Exim 4.92) (envelope-from ) id 1uF897-0002CP-Ic; Wed, 14 May 2025 09:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984108.1370277; Wed, 14 May 2025 09:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF897-0002CH-G2; Wed, 14 May 2025 09:11:25 +0000 Received: by outflank-mailman (input) for mailman id 984108; Wed, 14 May 2025 09:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF896-0002C4-Cu for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF896-008InQ-1n for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF896-0016H3-0k for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:24 +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=kOEzwReVFqKX1SHqfYmuXhzBjnhbAva1TXrTuDAxIrI=; b=sdZpwA0OQTzYcg5Q9UThJ1Y+Zu yFsjq8nben9bP88RFMNMwTGj7wT9nSKdtSMPykhoR2hwBx7WZkG45GlpduKxiI9AwKuBr5TmHkN/f 6kzAsG5N1yRAo85XkFIMidGgxXAL8H9DCgmgxXOzLCjmGCMDIeeoIrqpVnYXk28/thmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: add inclusion of xen/bitops.h to asm/cmpxchg.h Message-Id: Date: Wed, 14 May 2025 09:11:24 +0000 commit 38d6441b1da565591bc7aa563590301e213a0346 Author: Oleksii Kurochko AuthorDate: Wed May 14 10:59:22 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 10:59:22 2025 +0200 xen/riscv: add inclusion of xen/bitops.h to asm/cmpxchg.h Add inclusion of xen/bitops.h to asm/cmpxchg.h to avoid compilation issues connected to GENMASK() which is used inside asm/cmpxchg.h. Signed-off-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/riscv/include/asm/cmpxchg.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/riscv/include/asm/cmpxchg.h b/xen/arch/riscv/include/asm/cmpxchg.h index 7d7c89b6fa..d47ebaffce 100644 --- a/xen/arch/riscv/include/asm/cmpxchg.h +++ b/xen/arch/riscv/include/asm/cmpxchg.h @@ -4,6 +4,7 @@ #ifndef ASM__RISCV__CMPXCHG_H #define ASM__RISCV__CMPXCHG_H +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:11:36 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:11:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984109.1370281 (Exim 4.92) (envelope-from ) id 1uF89I-0002F9-KN; Wed, 14 May 2025 09:11:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984109.1370281; Wed, 14 May 2025 09:11:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF89I-0002F1-HU; Wed, 14 May 2025 09:11:36 +0000 Received: by outflank-mailman (input) for mailman id 984109; Wed, 14 May 2025 09:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF89G-0002En-Og for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF89G-008Inn-2v for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF89G-0016eX-1i for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:11:34 +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=mi/3ozTiiXbka+0GG4mbg8YdQRbOMB1Mf21btDk7ROk=; b=QNKoYH0P5JaokHWz5zLza1hle7 o6Vh43qLrYd5W4cBhx07TBe7HJEiOHlt+DDAKZO2G5QandZt+zIFf7HKnFzUnBsBkMnt3ZeyFSGf0 rWL1d6rdGsHAZgayeNEm3UKlgCaLsIO+Oz3keFu2XIFfKeWanfRYtop0nupfF1ioV2rY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Wed, 14 May 2025 09:11:34 +0000 commit d7127e06f617ed89eefe17a9ac954032863032d5 Author: Jan Beulich AuthorDate: Wed May 14 11:00:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 11:00:00 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 38ac0823d7..556134f85a 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -289,9 +289,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984144.1370304 (Exim 4.92) (envelope-from ) id 1uF8pL-0000KS-Vz; Wed, 14 May 2025 09:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984144.1370304; Wed, 14 May 2025 09: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 1uF8pL-0000KK-TK; Wed, 14 May 2025 09:55:03 +0000 Received: by outflank-mailman (input) for mailman id 984144; Wed, 14 May 2025 09:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8pL-0000KC-Aa for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF8pL-008Ja9-0M for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF8pK-003tJq-2Q for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09: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=K/SYMuZBj+daYGJAvJm/9NcNxr+lqcYnAor4dhBhH3c=; b=XP4YlfbYPEPlOvbxCVF5v0FHp8 O4wGV74ICyOwPEKugHLf0c9jtdnhzv/BQmkAadzaCFwSUz1AkSnOiX3syqYoG/J3S/DkCtkJiBlwp tjLvgH3NNjChRLJ44L5+JnK5x1pHAkOCjzmDQGqcsYDlgSFVnNpdWDqXcJsgXQVzZ7zA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] livepatch: Pass buffer size to list sysctl Message-Id: Date: Wed, 14 May 2025 09:55:02 +0000 commit 4c3ce492ede17902d086ef925dd120c25d974a87 Author: Kevin Lampis AuthorDate: Thu May 8 18:01:56 2025 +0100 Commit: Roger Pau Monne CommitDate: Tue May 13 19:43:48 2025 +0200 livepatch: Pass buffer size to list sysctl The livepatch list sysctl writes metadata into a buffer provided by the caller. The caller is expected to allocate an appropriately sized buffer but this is racy and may result in Xen writing beyond the end of the buffer should the metadata size change. The name buffer is expected to be an array of elements with size XEN_LIVEPATCH_NAME_SIZE to avoid this kind of race but the xen-livepatch tool allocates only as many bytes as needed, therefore encountering the same potential race condition. Fix both these issues by requiring the caller to pass in the size of the name and metadata buffers and then not writing beyond the allocated size. The sysctl interface version is bumped due to the change in semantics of the fields. Signed-off-by: Kevin Lampis Signed-off-by: Ross Lagerwall Fixes: b145b4a39c13 ('livepatch: Handle arbitrary size names with the list operation') Fixes: 5083e0ff939d ('livepatch: Add metadata runtime retrieval mechanism') Reviewed-by: Roger Pau Monné --- tools/libs/ctrl/xc_misc.c | 3 +++ xen/common/livepatch.c | 23 ++++++++++++++++++----- xen/include/public/sysctl.h | 12 ++++++++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/tools/libs/ctrl/xc_misc.c b/tools/libs/ctrl/xc_misc.c index 6a60216bda..33e87bac28 100644 --- a/tools/libs/ctrl/xc_misc.c +++ b/tools/libs/ctrl/xc_misc.c @@ -867,6 +867,9 @@ int xc_livepatch_list(xc_interface *xch, const unsigned int max, set_xen_guest_handle(sysctl.u.livepatch.u.list.metadata, metadata); set_xen_guest_handle(sysctl.u.livepatch.u.list.metadata_len, metadata_len); + sysctl.u.livepatch.u.list.name_total_size = name_sz; + sysctl.u.livepatch.u.list.metadata_total_size = metadata_sz; + rc = do_sysctl(xch, &sysctl); /* * From here on we MUST call xc_hypercall_bounce. If rc < 0 we diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index be9b7e3675..9a0df5363b 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -1311,11 +1311,10 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) return -EINVAL; } - list->name_total_size = 0; - list->metadata_total_size = 0; if ( list->nr ) { size_t name_offset = 0, metadata_offset = 0; + size_t name_total_copied = 0, metadata_total_copied = 0; list_for_each_entry( data, &payload_list, list ) { @@ -1328,10 +1327,15 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) status.rc = data->rc; name_len = strlen(data->name) + 1; - list->name_total_size += name_len; - metadata_len = data->metadata.len; - list->metadata_total_size += metadata_len; + + if ( (name_total_copied + name_len) > list->name_total_size || + (metadata_total_copied + metadata_len) > + list->metadata_total_size ) + { + rc = -ENOBUFS; + break; + } if ( !guest_handle_subrange_okay(list->name, name_offset, name_offset + name_len - 1) || @@ -1355,6 +1359,9 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) break; } + name_total_copied += name_len; + metadata_total_copied += metadata_len; + idx++; name_offset += name_len; metadata_offset += metadata_len; @@ -1362,9 +1369,15 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) if ( (idx >= list->nr) || hypercall_preempt_check() ) break; } + + list->name_total_size = name_total_copied; + list->metadata_total_size = metadata_total_copied; } else { + list->name_total_size = 0; + list->metadata_total_size = 0; + list_for_each_entry( data, &payload_list, list ) { list->name_total_size += strlen(data->name) + 1; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b0fec271d3..9eca72865b 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -26,9 +26,9 @@ * (e.g. adding semantics to 0-checked input fields or data to zeroed output * fields) don't require a change of the version. * - * Last version bump: Xen 4.17 + * Last version bump: Xen 4.21 */ -#define XEN_SYSCTL_INTERFACE_VERSION 0x00000015 +#define XEN_SYSCTL_INTERFACE_VERSION 0x00000016 /* * Read console content from Xen buffer ring. @@ -1101,8 +1101,12 @@ struct xen_sysctl_livepatch_list { amount of payloads and version. OUT: How many payloads left. */ uint32_t pad; /* IN: Must be zero. */ - uint32_t name_total_size; /* OUT: Total size of all transfer names */ - uint32_t metadata_total_size; /* OUT: Total size of all transfer metadata */ + uint32_t name_total_size; /* IN: Size of name buffer + OUT: Total size of transferred + names */ + uint32_t metadata_total_size; /* IN: Size of metadata buffer + OUT: Total size of transferred + metadata */ XEN_GUEST_HANDLE_64(xen_livepatch_status_t) status; /* OUT. Must have enough space allocate for nr of them. */ XEN_GUEST_HANDLE_64(char) name; /* OUT: Array of names. Each member -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:55:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984145.1370308 (Exim 4.92) (envelope-from ) id 1uF8pW-0000MZ-19; Wed, 14 May 2025 09:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984145.1370308; Wed, 14 May 2025 09:55: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 1uF8pV-0000MR-Un; Wed, 14 May 2025 09:55:13 +0000 Received: by outflank-mailman (input) for mailman id 984145; Wed, 14 May 2025 09:55:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8pV-0000MH-7P for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF8pV-008JaE-1C for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF8pV-003toF-04 for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:13 +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=lNVDeH2Q0XKP5jkfg1zhQebZygCLpcqisvtkfJATAUU=; b=LmYhliRVL3oQJ4q8q5Q/7fcRcH sINzH+o+1ZMrRqM2UIbYUqY3UzMChYjflJD/A3yhw2YXCQuQSjbb5kr8NAJpiNtTp/sDYE3aYDWGY Z8O9yPQCjs9DVbEY+zy0npkex9j7gBq44+2WptAE4ACVoy+9P1R8WbuQ+NQV9BrNZ9/8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Wed, 14 May 2025 09:55:13 +0000 commit bbaea9878bf6d11f6f336710148dbbd26e927cfd Author: Roger Pau Monne AuthorDate: Wed Apr 30 11:36:09 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 13 19:43:48 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 66c15a3c86..a1703db762 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3805,14 +3805,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3829,7 +3826,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:55:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984146.1370313 (Exim 4.92) (envelope-from ) id 1uF8pg-0000PJ-2e; Wed, 14 May 2025 09:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984146.1370313; Wed, 14 May 2025 09:55: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 1uF8pg-0000PB-05; Wed, 14 May 2025 09:55:24 +0000 Received: by outflank-mailman (input) for mailman id 984146; Wed, 14 May 2025 09:55:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8pf-0000P2-CQ for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF8pf-008JaK-1Y for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF8pf-003uJ5-0g for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:23 +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=5/TjxKHcrmCU9QGAfL3PVxLUKZPaFNNAtZZOwm626YQ=; b=e+ogoBiOsd22lw8/Z3FuDhqpt0 50O8j+T/b+E+WRkklz65jQgpHjCYaL9schPcOrBkn0hfBmZ1HetxlOlmjXHbyy57FdBKriq+KD8uI K2E0m7ck17BAfBDEWy4Mr8a3OU7THegbzd4MSZqAviArlmI75Xbd86vScRTBJYow/YOg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: support cache-writeback in flush_area_local() et al Message-Id: Date: Wed, 14 May 2025 09:55:23 +0000 commit aa3f897a2006286745f3c7f32fbb1d26b2f9630b Author: Jan Beulich AuthorDate: Wed May 14 10:58:02 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 10:58:02 2025 +0200 x86: support cache-writeback in flush_area_local() et al The majority of the present callers really aren't after invalidating cache contents, but only after writeback. Make this available by simply extending the FLUSH_CACHE handling accordingly. No feature checks are required here: cache_writeback() falls back to cache_flush() as necessary, while WBNOINVD degenerates to WBINVD on older hardware. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/flushtlb.c | 15 +++++++++------ xen/arch/x86/include/asm/flushtlb.h | 8 +++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c index 1e0011d5b1..796b25dad6 100644 --- a/xen/arch/x86/flushtlb.c +++ b/xen/arch/x86/flushtlb.c @@ -232,7 +232,7 @@ unsigned int flush_area_local(const void *va, unsigned int flags) if ( flags & FLUSH_HVM_ASID_CORE ) hvm_flush_guest_tlbs(); - if ( flags & FLUSH_CACHE ) + if ( flags & (FLUSH_CACHE | FLUSH_CACHE_WRITEBACK) ) { const struct cpuinfo_x86 *c = ¤t_cpu_data; unsigned long sz = 0; @@ -245,13 +245,16 @@ unsigned int flush_area_local(const void *va, unsigned int flags) c->x86_clflush_size && c->x86_cache_size && sz && ((sz >> 10) < c->x86_cache_size) ) { - cache_flush(va, sz); - flags &= ~FLUSH_CACHE; + if ( flags & FLUSH_CACHE ) + cache_flush(va, sz); + else + cache_writeback(va, sz); + flags &= ~(FLUSH_CACHE | FLUSH_CACHE_WRITEBACK); } - else - { + else if ( flags & FLUSH_CACHE ) wbinvd(); - } + else + wbnoinvd(); } if ( flags & FLUSH_ROOT_PGTBL ) diff --git a/xen/arch/x86/include/asm/flushtlb.h b/xen/arch/x86/include/asm/flushtlb.h index bb0ad58db4..209ea1e62f 100644 --- a/xen/arch/x86/include/asm/flushtlb.h +++ b/xen/arch/x86/include/asm/flushtlb.h @@ -135,6 +135,8 @@ void switch_cr3_cr4(unsigned long cr3, unsigned long cr4); #else # define FLUSH_NO_ASSIST 0 #endif + /* Write back data cache contents */ +#define FLUSH_CACHE_WRITEBACK 0x10000 /* Flush local TLBs/caches. */ unsigned int flush_area_local(const void *va, unsigned int flags); @@ -195,7 +197,11 @@ static inline int clean_and_invalidate_dcache_va_range(const void *p, } static inline int clean_dcache_va_range(const void *p, unsigned long size) { - return clean_and_invalidate_dcache_va_range(p, size); + unsigned int order = get_order_from_bytes(size); + + /* sub-page granularity support needs to be added if necessary */ + flush_area_local(p, FLUSH_CACHE_WRITEBACK | FLUSH_ORDER(order)); + return 0; } unsigned int guest_flush_tlb_flags(const struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:55:35 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984147.1370317 (Exim 4.92) (envelope-from ) id 1uF8pr-0000SJ-4G; Wed, 14 May 2025 09:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984147.1370317; Wed, 14 May 2025 09:55:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8pr-0000SB-1d; Wed, 14 May 2025 09:55:35 +0000 Received: by outflank-mailman (input) for mailman id 984147; Wed, 14 May 2025 09:55:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8pp-0000S2-MP for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF8pp-008Jag-2k for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF8pp-003us6-1U for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55: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=6gDnVZqgchTvqEPP04mSnEic9hTddkgz9KhwXScfziM=; b=1l4VWQeVK3ovh+rlSSC23BOg3X DqzAa9ndYkRuynFDW9Ru1aXlCPt/3nmoC690Vit75G7nCJfFZSfXDioQi+g24kXyQ5AKrujl5qERD mKYhBnriRv4KyXyxCVzDgR/efeXfZurBagjJ14PAeJQ1OzRPTlfKFucfu8n23fQdYN3E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: initialize bitmap to zero in riscv_fill_hwcap_from_isa_string() Message-Id: Date: Wed, 14 May 2025 09:55:33 +0000 commit 2cdd22fd25a1f999fe5f054925ae03e3ab3c4f9d Author: Oleksii Kurochko AuthorDate: Wed May 14 10:59:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 10:59:00 2025 +0200 xen/riscv: initialize bitmap to zero in riscv_fill_hwcap_from_isa_string() The this_isa bitmap should be explicitly initialized to zero to avoid false positives when detecting supported ISA extensions. Without proper zero-initialization, the bitmap may retain non-zero values from uninitialized memory, causing Xen to incorrectly assume that certain extensions are supported. This change ensures reliable detection of ISA capabilities. Fixes: 0c2f717eae ("xen/riscv: identify specific ISA supported by cpu") Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/cpufeature.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/riscv/cpufeature.c b/xen/arch/riscv/cpufeature.c index 5aafab0f49..3246a03624 100644 --- a/xen/arch/riscv/cpufeature.c +++ b/xen/arch/riscv/cpufeature.c @@ -405,6 +405,8 @@ static void __init riscv_fill_hwcap_from_isa_string(void) const char *isa; unsigned long cpuid; + bitmap_zero(this_isa, RISCV_ISA_EXT_MAX); + if ( !dt_device_type_is_equal(cpu, "cpu") ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:55:45 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:55:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984148.1370321 (Exim 4.92) (envelope-from ) id 1uF8q1-0000UX-5f; Wed, 14 May 2025 09:55:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984148.1370321; Wed, 14 May 2025 09:55: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 1uF8q1-0000UP-34; Wed, 14 May 2025 09:55:45 +0000 Received: by outflank-mailman (input) for mailman id 984148; Wed, 14 May 2025 09:55:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8q0-0000UF-9S for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF8q0-008Jak-1E for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF8pz-003vby-3D for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:44 +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=Auf6knF0yvm/yeM4rlGwR0YkeWxquLjlHDpV36kLKSU=; b=VvKHEWh/S2yNq9gcbkndaVxFiJ /BG52bTIdh4B/SosVWasye3/zkH2NU0DrCGJWl1ufqvH8L41swgWKwtJZ0MQonHd2zJk7XnBLCON4 uHMcntpJxtT13X+HmE6Af/9gibq6gHG5j8Yj9Tyg8XcKl2tVasGPnOPEc29QaDyvNaWo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add inclusion of xen/bitops.h to asm/cmpxchg.h Message-Id: Date: Wed, 14 May 2025 09:55:43 +0000 commit 38d6441b1da565591bc7aa563590301e213a0346 Author: Oleksii Kurochko AuthorDate: Wed May 14 10:59:22 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 10:59:22 2025 +0200 xen/riscv: add inclusion of xen/bitops.h to asm/cmpxchg.h Add inclusion of xen/bitops.h to asm/cmpxchg.h to avoid compilation issues connected to GENMASK() which is used inside asm/cmpxchg.h. Signed-off-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/riscv/include/asm/cmpxchg.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/riscv/include/asm/cmpxchg.h b/xen/arch/riscv/include/asm/cmpxchg.h index 7d7c89b6fa..d47ebaffce 100644 --- a/xen/arch/riscv/include/asm/cmpxchg.h +++ b/xen/arch/riscv/include/asm/cmpxchg.h @@ -4,6 +4,7 @@ #ifndef ASM__RISCV__CMPXCHG_H #define ASM__RISCV__CMPXCHG_H +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 14 09:55:56 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 May 2025 09:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984149.1370324 (Exim 4.92) (envelope-from ) id 1uF8qC-0000Y0-86; Wed, 14 May 2025 09:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984149.1370324; Wed, 14 May 2025 09:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8qC-0000Xt-5f; Wed, 14 May 2025 09:55:56 +0000 Received: by outflank-mailman (input) for mailman id 984149; Wed, 14 May 2025 09:55:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uF8qA-0000Xf-Nd for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uF8qA-008Jaq-2v for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uF8qA-003wKs-1b for xen-changelog@lists.xenproject.org; Wed, 14 May 2025 09:55:54 +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=wiGcaxBmvUfb5OBpfnLzfCtwWbp9zrgwd+VidJlGdj4=; b=7CJSm6Fl1hm/IsHjFbgkl6qBdy nHORflcAuIJdZdwBMFnJ6GzRqxGAd5SgJTfqsHPMuGypcSrCg2l00DlNibjNkvUzNPbaVN3qjZ/kD cKpLv5vJs43QHkHg+7PWdkjUGILr5f3qeh0lpQcFSnTD+EkRfSvEV0q0rXwxzeJxf0RQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Wed, 14 May 2025 09:55:54 +0000 commit d7127e06f617ed89eefe17a9ac954032863032d5 Author: Jan Beulich AuthorDate: Wed May 14 11:00:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed May 14 11:00:00 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 38ac0823d7..556134f85a 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -289,9 +289,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 15 07:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 07:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984812.1370739 (Exim 4.92) (envelope-from ) id 1uFSkE-0003Wf-95; Thu, 15 May 2025 07:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984812.1370739; Thu, 15 May 2025 07:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSkE-0003WX-6V; Thu, 15 May 2025 07:11:06 +0000 Received: by outflank-mailman (input) for mailman id 984812; Thu, 15 May 2025 07:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSkD-0003V6-C7 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFSkD-00AJGM-0m for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFSkC-009EG4-2b for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:04 +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=oHMpN9clbhDKaPAxE88iLCxaPjvmFrNafNi+4HjsNts=; b=PrZOnHJZe16FvrgbHDTZooqAHd U+XOVZHA5eFJ6syQpFB2wfneMxJWnZQVVLHwzTgu8CerjbzRpjbv+zIlaP5PibZAvsOCsEKeq2quS 9HIrrX2kFK5UEOZmbL8U4s0dyE/Kfgh2CozxktPTos4u1QDZzbeI11odG4+pufWm77No=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: restrict iommu_flush_all() to cache writeback Message-Id: Date: Thu, 15 May 2025 07:11:04 +0000 commit e21800ff1e8641c8e486a79db13b51f1a373b4c2 Author: Jan Beulich AuthorDate: Thu May 15 08:54:50 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 08:54:50 2025 +0200 VT-d: restrict iommu_flush_all() to cache writeback We don't need to invalidate caches here; all we're after is that earlier writes have made it to main memory (and aiui even that just in case). Plus we only need to do this if any of the IOMMUs is non-coherent. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/passthrough/vtd/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index a1927d9f12..c55f02c97e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -698,7 +698,8 @@ static int __must_check iommu_flush_all(void) bool flush_dev_iotlb; int rc = 0; - flush_local(FLUSH_CACHE); + if ( iommu_non_coherent ) + flush_local(FLUSH_CACHE_WRITEBACK); for_each_drhd_unit ( drhd ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 15 07:11:17 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 07:11:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984813.1370743 (Exim 4.92) (envelope-from ) id 1uFSkP-0003a7-Ax; Thu, 15 May 2025 07:11:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984813.1370743; Thu, 15 May 2025 07:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSkP-0003Zz-80; Thu, 15 May 2025 07:11:17 +0000 Received: by outflank-mailman (input) for mailman id 984813; Thu, 15 May 2025 07:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSkN-0003Zn-QV for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFSkN-00AJGV-36 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFSkN-009EzJ-1a for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:15 +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=t5PpBtYYeKsEiAkJNsWNNSnNveAWgQ0xdMbMb3NQGr4=; b=UtCdUnIvo3Z/Y3IyuumpsV3VSk BIgLvluucomiURB/89Wr/3za8VLp9QaJ9y/1tBmTpmFv1jdEARBRvIFflpE999EMTSeAoRBvoBrDe cfUTjCoeA4KeQ47x7ljaOGtdG06Ht8AnXIEuoUz8xoOk6eVTqRq9nP4NaQWbDxlVukrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/asm-generic: introduce asm-generic/irq-dt.h Message-Id: Date: Thu, 15 May 2025 07:11:15 +0000 commit 41b7ba030a7576af85a2a29d9282bbc4af552239 Author: Oleksii Kurochko AuthorDate: Thu May 15 08:55:38 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 08:55:38 2025 +0200 xen/asm-generic: introduce asm-generic/irq-dt.h Introduce defintions of IRQ_TYPE_* which correspond to the Xen internal representation of the IRQ types and make them the same asthe existing device tree defintions for convenience. These defines are going to be re-used, at least, by RISC-V architecture. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/include/asm/Makefile | 1 + xen/arch/arm/include/asm/irq.h | 15 +-------------- xen/include/asm-generic/irq-dt.h | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/include/asm/Makefile b/xen/arch/arm/include/asm/Makefile index 831c914cce..87c8821421 100644 --- a/xen/arch/arm/include/asm/Makefile +++ b/xen/arch/arm/include/asm/Makefile @@ -4,6 +4,7 @@ generic-y += device.h generic-y += dom0less-build.h generic-y += hardirq.h generic-y += iocap.h +generic-y += irq-dt.h generic-y += paging.h generic-y += percpu.h generic-y += random.h diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h index 88e060bf29..fce7e42a33 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -4,20 +4,7 @@ #include #include -/* - * These defines correspond to the Xen internal representation of the - * IRQ types. We choose to make them the same as the existing device - * tree definitions for convenience. - */ -#define IRQ_TYPE_NONE DT_IRQ_TYPE_NONE -#define IRQ_TYPE_EDGE_RISING DT_IRQ_TYPE_EDGE_RISING -#define IRQ_TYPE_EDGE_FALLING DT_IRQ_TYPE_EDGE_FALLING -#define IRQ_TYPE_EDGE_BOTH DT_IRQ_TYPE_EDGE_BOTH -#define IRQ_TYPE_LEVEL_HIGH DT_IRQ_TYPE_LEVEL_HIGH -#define IRQ_TYPE_LEVEL_LOW DT_IRQ_TYPE_LEVEL_LOW -#define IRQ_TYPE_LEVEL_MASK DT_IRQ_TYPE_LEVEL_MASK -#define IRQ_TYPE_SENSE_MASK DT_IRQ_TYPE_SENSE_MASK -#define IRQ_TYPE_INVALID DT_IRQ_TYPE_INVALID +#include #define NR_VECTORS 256 /* XXX */ diff --git a/xen/include/asm-generic/irq-dt.h b/xen/include/asm-generic/irq-dt.h new file mode 100644 index 0000000000..5ec46da533 --- /dev/null +++ b/xen/include/asm-generic/irq-dt.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_GENERIC_IRQ_DT_H__ +#define __ASM_GENERIC_IRQ_DT_H__ + +/* + * These defines correspond to the Xen internal representation of the + * IRQ types. We choose to make them the same as the existing device + * tree definitions for convenience. + */ +#define IRQ_TYPE_NONE DT_IRQ_TYPE_NONE +#define IRQ_TYPE_EDGE_RISING DT_IRQ_TYPE_EDGE_RISING +#define IRQ_TYPE_EDGE_FALLING DT_IRQ_TYPE_EDGE_FALLING +#define IRQ_TYPE_EDGE_BOTH DT_IRQ_TYPE_EDGE_BOTH +#define IRQ_TYPE_LEVEL_HIGH DT_IRQ_TYPE_LEVEL_HIGH +#define IRQ_TYPE_LEVEL_LOW DT_IRQ_TYPE_LEVEL_LOW +#define IRQ_TYPE_LEVEL_MASK DT_IRQ_TYPE_LEVEL_MASK +#define IRQ_TYPE_SENSE_MASK DT_IRQ_TYPE_SENSE_MASK +#define IRQ_TYPE_INVALID DT_IRQ_TYPE_INVALID + +#endif /* __ASM_GENERIC_IRQ_DT_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 15 07:11:27 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 07:11:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984814.1370747 (Exim 4.92) (envelope-from ) id 1uFSkZ-0003ds-CA; Thu, 15 May 2025 07:11:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984814.1370747; Thu, 15 May 2025 07:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSkZ-0003dk-9S; Thu, 15 May 2025 07:11:27 +0000 Received: by outflank-mailman (input) for mailman id 984814; Thu, 15 May 2025 07:11:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSkY-0003dd-Bv for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFSkY-00AJGZ-1b for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFSkY-009Fgg-0O for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:11:26 +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=xDp4/H1woBnqcsdTiCekRLCn6XCnPE3uhv0CCnuTdZ8=; b=lzlqHxXNH4uYJ+Gy/sJAxpZnY1 QsoVyml626uRWwQz8sl4dPep3/7N3QxF5OwG1BepcfYtcek2JRGmTHwTuMLQf9bSxX3bTTchDDwrH haiuLHKlVIm9sV+7fe7SVKFHtxZcUZrkWA1J0tGpNlq71Mais7gWz2G7HKPWsL81aB1Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/EFI: purge a stray semicolon Message-Id: Date: Thu, 15 May 2025 07:11:26 +0000 commit b7b0459864c65933bc45af4bfe8f5473db1ebf17 Author: Jan Beulich AuthorDate: Thu May 15 08:56:58 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 08:56:58 2025 +0200 x86/EFI: purge a stray semicolon Aiui in principle this constitutes a Misra C:2012 rule 2.2 violation. Just that we didn't adopt this rule (yet?). Fixes: afcb4a06c740 ("x86/thunk: Build Xen with Return Thunks") Signed-off-by: Jan Beulich Reviewed-by: Marek Marczykowski-Górecki --- xen/arch/x86/efi/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 23ba30abf3..0d92d06cd3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -4,7 +4,7 @@ int __attribute__((__ms_abi__)) test(int i) } /* In case -mfunction-return is in use. */ -void __x86_return_thunk(void) {}; +void __x86_return_thunk(void) {} /* * Populate an array with "addresses" of relocatable and absolute values. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 15 07:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 07:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984826.1370751 (Exim 4.92) (envelope-from ) id 1uFSur-0004uw-43; Thu, 15 May 2025 07:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984826.1370751; Thu, 15 May 2025 07:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSur-0004uo-1K; Thu, 15 May 2025 07:22:05 +0000 Received: by outflank-mailman (input) for mailman id 984826; Thu, 15 May 2025 07:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSuq-0004ui-86 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFSuq-00AJV3-0N for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFSup-009zSo-2L for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:03 +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=YlsvBxiQnXS28FAK6E/vm+UoLorvcV96KNs5qmy4uTE=; b=b5QsVmH0eOJh1RpHz9bNNcvl/p O4hFjG5WPzlSTnuE57c9NjyEaGp607Bm0fNMFeKKl0ztEKNM0i6HneLEb3Hi0K4yCeRSdqsQBpLBI bDqgsJmakN9hedIPUxfaPBsOOiM9QdP08cwn4rjlNl+7KJeCq+1MFk1tUo7LkngL6gk4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Thu, 15 May 2025 07:22:03 +0000 commit dba0556612922510eb97a5fd7aac659f340c661a Author: Andrew Cooper AuthorDate: Thu May 15 09:08:30 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:08:30 2025 +0200 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 5873740e41acb8593f92623ddd03caebda2718f6 master date: 2025-05-13 14:49:12 +0100 --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 14c0d0a058..bb04d3d124 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2376,7 +2376,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2532,6 +2532,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index f6ab522690..783b4a2f2c 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -299,6 +299,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 076faaa980..6f2b3fffdd 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 1048f16e0c..515f3f64d5 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -211,6 +211,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 3c11d1f43c..c9f980cd57 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index b0d2a62c07..1bba4c5002 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -506,6 +506,9 @@ void tsx_init(void); void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index f7078130cd..ec4956e104 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -378,6 +378,7 @@ void start_secondary(void *unused) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 46681d10ae..d8702b0e18 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -367,6 +369,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2509,6 +2513,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 6fa7777409..e6ed4c02e1 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -345,6 +345,7 @@ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A Register File(s) cleared by VERW */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 07:22:16 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 07:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984827.1370755 (Exim 4.92) (envelope-from ) id 1uFSv2-0004we-5N; Thu, 15 May 2025 07:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984827.1370755; Thu, 15 May 2025 07:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSv2-0004wW-2l; Thu, 15 May 2025 07:22:16 +0000 Received: by outflank-mailman (input) for mailman id 984827; Thu, 15 May 2025 07:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSv0-0004wQ-M5 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFSv0-00AJVD-2i for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFSv0-00A0Ba-1S for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:14 +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=uVuhmodglLJxU614QUMC+GFUrGEZarD6iEQzqPtne7I=; b=FilgFqrgrp1vIGKbM7vIqCVcDs DFSiaqGPR4n3uZ7t5XLcJJ7TV7poPtZ3busryh0oEoBW6jhMhJ9Zljllx3gw0uy78Rk54jc+yavhY 0CL0lr/LIKnHEJuv2kmgqezIcXdEDxk6B3nGVf7aZuPgFpdzp/qW4QCuHlnYvrS7+15k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Thu, 15 May 2025 07:22:14 +0000 commit 562af755b1e0f09b3d351ae1b9753f7fb891c748 Author: Roger Pau Monné AuthorDate: Thu May 15 09:08:54 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:08:54 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: bbaea9878bf6d11f6f336710148dbbd26e927cfd master date: 2025-05-13 19:43:48 +0200 --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index a17d024f2a..3635f90684 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3778,14 +3778,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3802,7 +3799,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 07:22:26 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 07:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984828.1370760 (Exim 4.92) (envelope-from ) id 1uFSvC-0004zI-76; Thu, 15 May 2025 07:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984828.1370760; Thu, 15 May 2025 07:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSvC-0004z8-4B; Thu, 15 May 2025 07:22:26 +0000 Received: by outflank-mailman (input) for mailman id 984828; Thu, 15 May 2025 07:22:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFSvB-0004yr-7v for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFSvB-00AJVJ-1F for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFSvA-00A0ts-35 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 07:22:24 +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=aypxwl5fgcu9Pj9LRAzmqjJQSkd7Pi06gkmNF4xkPAE=; b=qUR4hzAcRLTWTqbUCVltmgTb1h YtZXLLs7t68Nsp3J62TfXZMdIGc5I7bw9BsZ51TALp3HpFEhV0x3GU9JRZWBXUt2//KaY3peQHnfP r+1ohC695U6LxxKo4amR0jqRG8VSg0FoAZnjuzoWhmtEKX+ebFqxC8DXbN2gqzHt6yZI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Thu, 15 May 2025 07:22:24 +0000 commit ca12e753548d0c65e7aaebafa868857c943cf1e2 Author: Jan Beulich AuthorDate: Thu May 15 09:09:10 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:09:10 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: d7127e06f617ed89eefe17a9ac954032863032d5 master date: 2025-05-14 11:00:00 +0200 --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index db2d574680..cb152abda4 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -285,9 +285,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:00:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984868.1370792 (Exim 4.92) (envelope-from ) id 1uFTVd-00032O-N8; Thu, 15 May 2025 08:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984868.1370792; Thu, 15 May 2025 08:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTVd-00031s-Ju; Thu, 15 May 2025 08:00:05 +0000 Received: by outflank-mailman (input) for mailman id 984868; Thu, 15 May 2025 08:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTVc-0002nX-CT for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTVc-00AKcM-18 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTVb-00ChAb-31 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:03 +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=yQk3RsRUhR3BjXQRDir/Rmidj8SNua4wWsEyLp9Mhao=; b=o1sPbmofNGKls+PHoSw7/J9gxw kIHVGE5gP6xrDEs+bqp69z+9l3qi+GG276Yd3XBAdBwJPhSl+gB18TJ5c18dG8UGFRku0hFh+l7Ye xOarAwPMPVKLwjGau1yPjRD3O+mZegrryAE+n5QZOeANp/PdiwOXlGzd4cjRdrQbpA54=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Thu, 15 May 2025 08:00:03 +0000 commit 4876425ce7f6b7224c499ac3f0f895362c81a4b1 Author: Andrew Cooper AuthorDate: Thu May 15 09:06:28 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:06:28 2025 +0200 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 5873740e41acb8593f92623ddd03caebda2718f6 master date: 2025-05-13 14:49:12 +0100 --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 559fb21c5b..99cc60a061 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2406,7 +2406,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2562,6 +2562,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 610937f42e..01cdaf9052 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -299,6 +299,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 74d10c93d8..f03eedcc25 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 1729ba0c30..6dbe6dfe09 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -216,6 +216,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 22d9e76e55..6f2c3147e3 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index c26ef9090c..c709d337c9 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -510,6 +510,9 @@ void tsx_init(void); void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 0a89f22a39..386e6a0849 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -378,6 +378,7 @@ void asmlinkage start_secondary(void *unused) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 94cdbd521c..fa444caabb 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -367,6 +369,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2509,6 +2513,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 4d9e468af6..3a2b646f02 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -366,6 +366,7 @@ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:00:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984870.1370797 (Exim 4.92) (envelope-from ) id 1uFTVn-0003JJ-Q3; Thu, 15 May 2025 08:00:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984870.1370797; Thu, 15 May 2025 08:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTVn-0003JB-NH; Thu, 15 May 2025 08:00:15 +0000 Received: by outflank-mailman (input) for mailman id 984870; Thu, 15 May 2025 08:00:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTVm-0003J3-Lu for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTVm-00AKfW-2h for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTVm-00Chyb-1T for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:14 +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=3I/ZKirt68ciT14k5oCn+cZwis5vcrgMUnUCiu9gn90=; b=UGNLetyISg9gecYoCJW1b0CtvW S/xggVz0VpCnWmWizGeexZPIoo3pw99GEfO40WH8+Xn0gGK6s842Ba/q5bACOIwuDoAjVUcAtWREc q7zm22HywZObDz3kk2Af2wWYtUDIpREP3X7OSYEQfon0/ny4vsFA+xP2yP7pf+UzR/oo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Thu, 15 May 2025 08:00:14 +0000 commit e9e2f3277190bd5635d9f4ecee867772868f960a Author: Roger Pau Monné AuthorDate: Thu May 15 09:06:52 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:06:52 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: bbaea9878bf6d11f6f336710148dbbd26e927cfd master date: 2025-05-13 19:43:48 +0200 --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c3e15a029b..9861efbef9 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3795,14 +3795,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3819,7 +3816,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:00:26 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:00:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984871.1370801 (Exim 4.92) (envelope-from ) id 1uFTVy-0003Tg-RO; Thu, 15 May 2025 08:00:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984871.1370801; Thu, 15 May 2025 08:00:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTVy-0003TY-On; Thu, 15 May 2025 08:00:26 +0000 Received: by outflank-mailman (input) for mailman id 984871; Thu, 15 May 2025 08:00:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTVx-0003TN-BH for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTVx-00AKks-1d for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTVx-00CilW-0I for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:00:25 +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=J/00s6Fp5wB4poJ2hXhNbDc83qS3qgwB6yvJ2wBODnE=; b=OzhodJsbM92DoFHd9QD5ZOoNVO 87H4N0ohovsDJ+kEP1fxGaDIrAGr8AJrgz89uDoHK+Asl1fj4vw/+xxpm7koqVkYaTeyO8jH3dIxd mGILPsCa/cYY46aGBC93ibpXA284s/zlmzYK0kk1Ut9KbsluHftVki2RQxtGrB1JRaXA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Thu, 15 May 2025 08:00:25 +0000 commit 43aeacff8695850ee26ee038159b1f88f5e69fdf Author: Jan Beulich AuthorDate: Thu May 15 09:07:06 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:07:06 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: d7127e06f617ed89eefe17a9ac954032863032d5 master date: 2025-05-14 11:00:00 +0200 --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index ce390b0422..296a3cd08b 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -285,9 +285,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984899.1370835 (Exim 4.92) (envelope-from ) id 1uFTgG-0006XR-9J; Thu, 15 May 2025 08:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984899.1370835; Thu, 15 May 2025 08:11: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 1uFTgG-0006XJ-6i; Thu, 15 May 2025 08:11:04 +0000 Received: by outflank-mailman (input) for mailman id 984899; Thu, 15 May 2025 08:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTgF-0006XB-Kq for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTgF-00AKyI-1s for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTgF-00DW8Y-0Z for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:03 +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=5jEg/LrNetjA+DAds/iIXP25OFkl1vitRk4qYHXXIMo=; b=XQTLCd1+2w8SBgzlol324GxDse wx8QtKQpvA01Ej1Eof99bSNX3HXIkXa0Y4z7/gvZeiemv88uSM66E/hAT/tMa2iU2f5uYHRscBoEF hlFL7uPFqXxO9AzfskrzvSBN4k0BlG1gwOEtNRIPuU2bLKQu/7glQkmXpSRV9oH+tnkg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: restrict iommu_flush_all() to cache writeback Message-Id: Date: Thu, 15 May 2025 08:11:03 +0000 commit e21800ff1e8641c8e486a79db13b51f1a373b4c2 Author: Jan Beulich AuthorDate: Thu May 15 08:54:50 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 08:54:50 2025 +0200 VT-d: restrict iommu_flush_all() to cache writeback We don't need to invalidate caches here; all we're after is that earlier writes have made it to main memory (and aiui even that just in case). Plus we only need to do this if any of the IOMMUs is non-coherent. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/passthrough/vtd/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index a1927d9f12..c55f02c97e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -698,7 +698,8 @@ static int __must_check iommu_flush_all(void) bool flush_dev_iotlb; int rc = 0; - flush_local(FLUSH_CACHE); + if ( iommu_non_coherent ) + flush_local(FLUSH_CACHE_WRITEBACK); for_each_drhd_unit ( drhd ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:11:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984900.1370839 (Exim 4.92) (envelope-from ) id 1uFTgQ-0006db-BG; Thu, 15 May 2025 08:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984900.1370839; Thu, 15 May 2025 08:11: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 1uFTgQ-0006dT-8E; Thu, 15 May 2025 08:11:14 +0000 Received: by outflank-mailman (input) for mailman id 984900; Thu, 15 May 2025 08:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTgQ-0006dN-1L for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTgQ-00AKyP-0d for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTgP-00DWsR-2S for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:13 +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=wNVRQLsjSjUhZeHykVFzbHGNUKYXYHHvoIZjsWnwfK4=; b=PcHcjwztcRneFy/bOdYxWAO3I5 GuNrZ7u14e2iw9+QLtgjB6MIR4+MhODAarv1M0RyT72zDYKx7Wt7j1OdYV2FIMoOH1vReKCtiRuXl ISPYFaAKecvDMJahvTLg+MOLHRW3apsJheerKJoBdzd8BQ3D8YuYO+vQDzMZM/eopxzI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/asm-generic: introduce asm-generic/irq-dt.h Message-Id: Date: Thu, 15 May 2025 08:11:13 +0000 commit 41b7ba030a7576af85a2a29d9282bbc4af552239 Author: Oleksii Kurochko AuthorDate: Thu May 15 08:55:38 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 08:55:38 2025 +0200 xen/asm-generic: introduce asm-generic/irq-dt.h Introduce defintions of IRQ_TYPE_* which correspond to the Xen internal representation of the IRQ types and make them the same asthe existing device tree defintions for convenience. These defines are going to be re-used, at least, by RISC-V architecture. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/include/asm/Makefile | 1 + xen/arch/arm/include/asm/irq.h | 15 +-------------- xen/include/asm-generic/irq-dt.h | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/include/asm/Makefile b/xen/arch/arm/include/asm/Makefile index 831c914cce..87c8821421 100644 --- a/xen/arch/arm/include/asm/Makefile +++ b/xen/arch/arm/include/asm/Makefile @@ -4,6 +4,7 @@ generic-y += device.h generic-y += dom0less-build.h generic-y += hardirq.h generic-y += iocap.h +generic-y += irq-dt.h generic-y += paging.h generic-y += percpu.h generic-y += random.h diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h index 88e060bf29..fce7e42a33 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -4,20 +4,7 @@ #include #include -/* - * These defines correspond to the Xen internal representation of the - * IRQ types. We choose to make them the same as the existing device - * tree definitions for convenience. - */ -#define IRQ_TYPE_NONE DT_IRQ_TYPE_NONE -#define IRQ_TYPE_EDGE_RISING DT_IRQ_TYPE_EDGE_RISING -#define IRQ_TYPE_EDGE_FALLING DT_IRQ_TYPE_EDGE_FALLING -#define IRQ_TYPE_EDGE_BOTH DT_IRQ_TYPE_EDGE_BOTH -#define IRQ_TYPE_LEVEL_HIGH DT_IRQ_TYPE_LEVEL_HIGH -#define IRQ_TYPE_LEVEL_LOW DT_IRQ_TYPE_LEVEL_LOW -#define IRQ_TYPE_LEVEL_MASK DT_IRQ_TYPE_LEVEL_MASK -#define IRQ_TYPE_SENSE_MASK DT_IRQ_TYPE_SENSE_MASK -#define IRQ_TYPE_INVALID DT_IRQ_TYPE_INVALID +#include #define NR_VECTORS 256 /* XXX */ diff --git a/xen/include/asm-generic/irq-dt.h b/xen/include/asm-generic/irq-dt.h new file mode 100644 index 0000000000..5ec46da533 --- /dev/null +++ b/xen/include/asm-generic/irq-dt.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_GENERIC_IRQ_DT_H__ +#define __ASM_GENERIC_IRQ_DT_H__ + +/* + * These defines correspond to the Xen internal representation of the + * IRQ types. We choose to make them the same as the existing device + * tree definitions for convenience. + */ +#define IRQ_TYPE_NONE DT_IRQ_TYPE_NONE +#define IRQ_TYPE_EDGE_RISING DT_IRQ_TYPE_EDGE_RISING +#define IRQ_TYPE_EDGE_FALLING DT_IRQ_TYPE_EDGE_FALLING +#define IRQ_TYPE_EDGE_BOTH DT_IRQ_TYPE_EDGE_BOTH +#define IRQ_TYPE_LEVEL_HIGH DT_IRQ_TYPE_LEVEL_HIGH +#define IRQ_TYPE_LEVEL_LOW DT_IRQ_TYPE_LEVEL_LOW +#define IRQ_TYPE_LEVEL_MASK DT_IRQ_TYPE_LEVEL_MASK +#define IRQ_TYPE_SENSE_MASK DT_IRQ_TYPE_SENSE_MASK +#define IRQ_TYPE_INVALID DT_IRQ_TYPE_INVALID + +#endif /* __ASM_GENERIC_IRQ_DT_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:11:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984901.1370844 (Exim 4.92) (envelope-from ) id 1uFTgb-0006g4-Ck; Thu, 15 May 2025 08:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984901.1370844; Thu, 15 May 2025 08:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTgb-0006fv-9j; Thu, 15 May 2025 08:11:25 +0000 Received: by outflank-mailman (input) for mailman id 984901; Thu, 15 May 2025 08:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTga-0006fj-Gv for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTga-00AKyT-29 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTga-00DXes-11 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:24 +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=L6vuNsmRMz0Myf6+Va0T4caCrU2TF54vyC2gehAELSU=; b=6JarXSsMii8KVKvEXlG5f24sR5 msHnPO7zjbew5Uw8lFqtQorzxWLVu/s8hGBc7nkxJIDFe83Qc7JUn9eiQT3yFJji9H3uAm9G/2C/0 SxnvMJK3la2B4QRJ73h5h1oAwokbcJ98MFv4uRg5A3SvstgUaKAczskqRjWXt/AXujgs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/EFI: purge a stray semicolon Message-Id: Date: Thu, 15 May 2025 08:11:24 +0000 commit b7b0459864c65933bc45af4bfe8f5473db1ebf17 Author: Jan Beulich AuthorDate: Thu May 15 08:56:58 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 08:56:58 2025 +0200 x86/EFI: purge a stray semicolon Aiui in principle this constitutes a Misra C:2012 rule 2.2 violation. Just that we didn't adopt this rule (yet?). Fixes: afcb4a06c740 ("x86/thunk: Build Xen with Return Thunks") Signed-off-by: Jan Beulich Reviewed-by: Marek Marczykowski-Górecki --- xen/arch/x86/efi/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 23ba30abf3..0d92d06cd3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -4,7 +4,7 @@ int __attribute__((__ms_abi__)) test(int i) } /* In case -mfunction-return is in use. */ -void __x86_return_thunk(void) {}; +void __x86_return_thunk(void) {} /* * Populate an array with "addresses" of relocatable and absolute values. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:11:38 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:11:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984902.1370846 (Exim 4.92) (envelope-from ) id 1uFTgo-0006iy-Dg; Thu, 15 May 2025 08:11:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984902.1370846; Thu, 15 May 2025 08:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTgo-0006ir-BF; Thu, 15 May 2025 08:11:38 +0000 Received: by outflank-mailman (input) for mailman id 984902; Thu, 15 May 2025 08:11:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTgn-0006il-Ic for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTgn-00AKye-2M for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTgn-00DYYg-1C for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:37 +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=UAUX15rVjHaSJij/bHy7B1SSwDIzFC3t8K2I++qc4jc=; b=yfRHBJLQvmh/68oycl5bxtFEK/ HDzLlbo5CTpZspiDM0V1z9n8pMzXcEdvl+0h1aMWytnSrjI/Sk0UVuNRZ8yJIObyAqN2Lyyek1t53 MWc/ALo2iwkNo4m8fgplcFCgqev0qGlEHUXtwP6Q6CaoVYg26JsBNpSDrnKrH5gkqdkM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Thu, 15 May 2025 08:11:37 +0000 commit dba0556612922510eb97a5fd7aac659f340c661a Author: Andrew Cooper AuthorDate: Thu May 15 09:08:30 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:08:30 2025 +0200 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 5873740e41acb8593f92623ddd03caebda2718f6 master date: 2025-05-13 14:49:12 +0100 --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 14c0d0a058..bb04d3d124 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2376,7 +2376,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2532,6 +2532,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index f6ab522690..783b4a2f2c 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -299,6 +299,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 076faaa980..6f2b3fffdd 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 1048f16e0c..515f3f64d5 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -211,6 +211,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 3c11d1f43c..c9f980cd57 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index b0d2a62c07..1bba4c5002 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -506,6 +506,9 @@ void tsx_init(void); void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index f7078130cd..ec4956e104 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -378,6 +378,7 @@ void start_secondary(void *unused) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 46681d10ae..d8702b0e18 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -367,6 +369,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2509,6 +2513,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 6fa7777409..e6ed4c02e1 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -345,6 +345,7 @@ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A Register File(s) cleared by VERW */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:11:48 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:11:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984904.1370850 (Exim 4.92) (envelope-from ) id 1uFTgy-0006lY-FM; Thu, 15 May 2025 08:11:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984904.1370850; Thu, 15 May 2025 08:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTgy-0006lQ-Ch; Thu, 15 May 2025 08:11:48 +0000 Received: by outflank-mailman (input) for mailman id 984904; Thu, 15 May 2025 08:11:48 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTgy-0006lF-39 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:48 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTgy-00AKyj-0r for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:48 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTgx-00DZGV-2q for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:47 +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=QyhIxNAH+muRpN33B3lDDLo8SypxPkbAzbf16caUoZY=; b=BcupzMt0ZmY/tZv8169GoG/VMe 8LbK7316g7/FjmGDO7ckFj42AK3k9i/nmD4o4Lxo0kjgLcVBvTGcPdhez94IfnBLr4U2M11c11I0V Y8TY7XjgYMHdlElxJeIJy706w4WajW84JcWXhcmUD7fIfcUJdns1BHXtQnmtz/IXZwag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Thu, 15 May 2025 08:11:47 +0000 commit 562af755b1e0f09b3d351ae1b9753f7fb891c748 Author: Roger Pau Monné AuthorDate: Thu May 15 09:08:54 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:08:54 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: bbaea9878bf6d11f6f336710148dbbd26e927cfd master date: 2025-05-13 19:43:48 +0200 --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index a17d024f2a..3635f90684 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3778,14 +3778,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3802,7 +3799,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:11:59 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:11:59 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984905.1370855 (Exim 4.92) (envelope-from ) id 1uFTh9-0006on-IM; Thu, 15 May 2025 08:11:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984905.1370855; Thu, 15 May 2025 08:11:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTh9-0006of-FZ; Thu, 15 May 2025 08:11:59 +0000 Received: by outflank-mailman (input) for mailman id 984905; Thu, 15 May 2025 08:11:58 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFTh8-0006oV-FN for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:58 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFTh8-00AKzB-21 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:58 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFTh8-00DZtd-0w for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:11:58 +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=DXatay6OMhektc8Nzq3a7lrkTZ4azYEYP8Bty4apcAo=; b=ofLb6f1dtPU8u5voAIPqK+PeF6 34r2RYOqaBuFrN6kxq6MOoiy56e1Lw3WmGUoX8qCyOd6y4a0QXP8OBm6yCbukYM4rFxGYkj8qkaC7 q+AQH1NPNDtQBUsex0iNPQIoAfhgm4K8p39LccKLOjpKfpOU/zjA0cFH6AaCca/4XNUg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Thu, 15 May 2025 08:11:58 +0000 commit ca12e753548d0c65e7aaebafa868857c943cf1e2 Author: Jan Beulich AuthorDate: Thu May 15 09:09:10 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:09:10 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: d7127e06f617ed89eefe17a9ac954032863032d5 master date: 2025-05-14 11:00:00 +0200 --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index db2d574680..cb152abda4 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -285,9 +285,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:12:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:12:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984907.1370859 (Exim 4.92) (envelope-from ) id 1uFThM-0006rO-K7; Thu, 15 May 2025 08:12:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984907.1370859; Thu, 15 May 2025 08:12: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 1uFThM-0006rH-HC; Thu, 15 May 2025 08:12:12 +0000 Received: by outflank-mailman (input) for mailman id 984907; Thu, 15 May 2025 08:12:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFThL-0006r9-B4 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFThL-00AKzT-1a for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFThL-00Dai9-0W for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12: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=tkaHS16vAY3L1KoukbXqZDLMtY+FcBuF0cCZ84/FntI=; b=EWMGUWMFpuirRdeG0ZfXq8kJN0 OmUdL4Lmi0ZG+MRTBMIP40a76/9LVTfgKQX/uBg005YCGJ0VZotlz/2zy+YyHpfY4iOA/+/MdHKGU IiEz2s5XAx4wVZpdoE2LULPXMapLxGclNUSSgqT3CWG8X2bj+qyWuF8vL30i3J9bkR1g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Thu, 15 May 2025 08:12:11 +0000 commit f938c0849479bb48ba8d3bd3f8f69568e5d1acb1 Author: Andrew Cooper AuthorDate: Thu May 15 09:04:16 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:04:16 2025 +0200 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 5873740e41acb8593f92623ddd03caebda2718f6 master date: 2025-05-13 14:49:12 +0100 --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 53ad3ffc3f..dba5d7f31e 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2470,7 +2470,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2626,6 +2626,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 08a7fc2508..b69be6e898 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -301,6 +301,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 63f65ea5b0..7eaa20ece1 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 24b021eeff..90d69999d1 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -218,6 +218,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 22d9e76e55..6f2c3147e3 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index d247ef8dd2..c3cc527f2e 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -512,6 +512,9 @@ static inline void tsx_init(void) {} void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 891a29fca1..b16e2812e1 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -381,6 +381,7 @@ void asmlinkage start_secondary(void *unused) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 0a635025e4..3027f1db6b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -369,6 +371,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2494,6 +2498,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 1e0e870c5c..10462771e5 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -380,6 +380,7 @@ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:12:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:12:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984909.1370862 (Exim 4.92) (envelope-from ) id 1uFThW-0006tW-Li; Thu, 15 May 2025 08:12:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984909.1370862; Thu, 15 May 2025 08:12: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 1uFThW-0006tO-J1; Thu, 15 May 2025 08:12:22 +0000 Received: by outflank-mailman (input) for mailman id 984909; Thu, 15 May 2025 08:12:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFThV-0006tI-Sx for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFThW-00AKzd-07 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFThV-00DbOE-29 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12: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=Ez16vl0QcB6MH14wvKv8XaIVV2lzU9uvtmUhlRBUxOc=; b=6J6jag+7Z9e/rNybbT4wST2jw4 Rkiti/yUu2xvmJhe05XJaova4Yfy40wG21U4O0jJbGm7cwpMXdCyrfcrhgi1eQ+2pLfZ4UXleIzB6 rLEfhcOy3LRuSesXxha2jMji66l0qYv52MCXiO4LkvWGFmhQ4Sm1Q4SKKb5UsJZU8YPs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Thu, 15 May 2025 08:12:21 +0000 commit ee150f56fca78f696e3fee4e8fa8a9adaa0fab4e Author: Roger Pau Monné AuthorDate: Thu May 15 09:04:43 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:04:43 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: bbaea9878bf6d11f6f336710148dbbd26e927cfd master date: 2025-05-13 19:43:48 +0200 --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 3f43cbabe1..3430b13dcd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3811,14 +3811,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3835,7 +3832,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:12:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:12:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984910.1370866 (Exim 4.92) (envelope-from ) id 1uFThh-0006w8-NB; Thu, 15 May 2025 08:12:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984910.1370866; Thu, 15 May 2025 08:12: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 1uFThh-0006vz-KV; Thu, 15 May 2025 08:12:33 +0000 Received: by outflank-mailman (input) for mailman id 984910; Thu, 15 May 2025 08:12:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFThg-0006vq-DX for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFThg-00AKzj-1r for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFThg-00DcBM-0a for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12: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=w3MKzTsyUHZfKk5ZhDj9aM5tj3ti+iwSTqekiuMATEA=; b=npjq0A/yD6x1K2DPh4hH6HR9Az rL37KAMgQtCm5HGUCj9u8qWUpN6E+Uv7W5VuglQOWCEUDDnRnEQiPbjCFkhOpZG2lG8xfVuntX2u+ SJJhdkklxa+BX22dZmB2G1prLcVrLcLIYEEwMFwtgFVYi9aSaUjjajQgwo70wcnsjaBc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Thu, 15 May 2025 08:12:32 +0000 commit 612cfd7215568fe8a7e8939dfcc4bf53d986e482 Author: Jan Beulich AuthorDate: Thu May 15 09:05:02 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:05:02 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: d7127e06f617ed89eefe17a9ac954032863032d5 master date: 2025-05-14 11:00:00 +0200 --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 3a09ed6346..bde17c7fb8 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -289,9 +289,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu May 15 08:12:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 08:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.984911.1370870 (Exim 4.92) (envelope-from ) id 1uFThs-0006z2-Od; Thu, 15 May 2025 08:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 984911.1370870; Thu, 15 May 2025 08:12: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 1uFThs-0006ys-Lx; Thu, 15 May 2025 08:12:44 +0000 Received: by outflank-mailman (input) for mailman id 984911; Thu, 15 May 2025 08:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFThr-0006yl-PB for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFThr-00AKzn-31 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFThr-00Dd1q-1u for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 08:12: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=lcKB6YY53RrRGc+L1xyDGe6zENfpuwaNKiMhsVhuA1k=; b=wyXVMDOWydfj2Kh+/R4lVp+hLL PFFv1jwI3Jn7DXkogMlTZ9fm6/Ua7U7VVvRcgwNJU4JW/B+o9YF770edShMfjyFaBAQNFdXu5Q6We h7G7ETEjXWLens7gRdCDE26CTCjTS3wMTuVDO5LvIkoip6O0zIfx6msEk+VWvUHhrabw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] update Xen version to 4.18.5 Message-Id: Date: Thu, 15 May 2025 08:12:43 +0000 commit 0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12 Author: Jan Beulich AuthorDate: Thu May 15 10:07:19 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 10:07:19 2025 +0200 update Xen version to 4.18.5 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 684411fa67..5fc7fe27da 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 18 -export XEN_EXTRAVERSION ?= .5-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 10:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 10:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985175.1371114 (Exim 4.92) (envelope-from ) id 1uFVj1-0003Cx-Jm; Thu, 15 May 2025 10:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985175.1371114; Thu, 15 May 2025 10: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 1uFVj1-0003Cq-HD; Thu, 15 May 2025 10:22:03 +0000 Received: by outflank-mailman (input) for mailman id 985175; Thu, 15 May 2025 10:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFVj0-0003Ci-6l for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFVj0-00ANV9-0m for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFViz-004fGp-2k for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10: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=LHOqV7nvczKzEoACT3vPiItkpa5SQ4yhMNFkQKpW9J4=; b=4gnNz+jHZ+jb/gT01lVMlxqUZi PVnx4NUrddl6WOsqFYg+7H0a6x0FaBwjzybKBP8Qxe30iu0bABj7I0S8vFzuphi4JeV5Pa9JrbSXf uB2dYZNEl3bIm4mjwOijjD4S9CVGVeofSpOHUmDh57/oMtzALcpm54Ru3k2yUmW9F0GU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Thu, 15 May 2025 10:22:01 +0000 commit 4876425ce7f6b7224c499ac3f0f895362c81a4b1 Author: Andrew Cooper AuthorDate: Thu May 15 09:06:28 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:06:28 2025 +0200 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 5873740e41acb8593f92623ddd03caebda2718f6 master date: 2025-05-13 14:49:12 +0100 --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 559fb21c5b..99cc60a061 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2406,7 +2406,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2562,6 +2562,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 610937f42e..01cdaf9052 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -299,6 +299,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 74d10c93d8..f03eedcc25 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 1729ba0c30..6dbe6dfe09 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -216,6 +216,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 22d9e76e55..6f2c3147e3 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index c26ef9090c..c709d337c9 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -510,6 +510,9 @@ void tsx_init(void); void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 0a89f22a39..386e6a0849 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -378,6 +378,7 @@ void asmlinkage start_secondary(void *unused) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 94cdbd521c..fa444caabb 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -367,6 +369,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2509,6 +2513,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 4d9e468af6..3a2b646f02 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -366,6 +366,7 @@ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu May 15 10:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 10:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985176.1371118 (Exim 4.92) (envelope-from ) id 1uFVjB-0003FN-Mp; Thu, 15 May 2025 10:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985176.1371118; Thu, 15 May 2025 10: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 1uFVjB-0003FF-K1; Thu, 15 May 2025 10:22:13 +0000 Received: by outflank-mailman (input) for mailman id 985176; Thu, 15 May 2025 10:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFVjA-0003F7-90 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFVjA-00ANVF-1O for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFVjA-004ffw-0J for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10: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=nhaVEAK6hlrbAJA54rZn2zJ7iLvfMN0Hp8hUa1LLdbQ=; b=q8MGdAQM++au1Hv0A8ewycBY33 +331k9rWY4LummuGx41XMk+6/jlGGQRIBqXp30d1q3e7v55xaIYpRewkR6HM2DqVRhFE/I5et6mKx 8GVShUfQZ9hKqjG6Xo+oXDbKnvwSrCL2t7tSzPANPKtbsiTVS5Jjpx+YHYaYQ/Z4qw8I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Thu, 15 May 2025 10:22:12 +0000 commit e9e2f3277190bd5635d9f4ecee867772868f960a Author: Roger Pau Monné AuthorDate: Thu May 15 09:06:52 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:06:52 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: bbaea9878bf6d11f6f336710148dbbd26e927cfd master date: 2025-05-13 19:43:48 +0200 --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c3e15a029b..9861efbef9 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3795,14 +3795,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3819,7 +3816,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu May 15 10:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 10:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985177.1371122 (Exim 4.92) (envelope-from ) id 1uFVjL-0003Hw-OA; Thu, 15 May 2025 10:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985177.1371122; Thu, 15 May 2025 10: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 1uFVjL-0003Ho-LZ; Thu, 15 May 2025 10:22:23 +0000 Received: by outflank-mailman (input) for mailman id 985177; Thu, 15 May 2025 10:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFVjK-0003HS-E6 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFVjK-00ANVN-1y for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFVjK-004foj-0v for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10: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=AQpBkpP8NeKsYm+Vs6vwAJaVct1df2C/WuXdJ+pGOSQ=; b=k9ECzbB+xg1uKo1GOm2qSuZYy/ jkUwk8tUL1uppWHn/W5YF/vTxtrD9XeAEgNOHT80cxL4tDf9ggSxwNqO98axhY1Wrvkei0D7tsSlw 3i4aFlNR9LgJHHSbY35tGIF4qNLz9yRsLiPlDzczEMcpY3k/5vbAPDQUkVRZjIxQQt+4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Thu, 15 May 2025 10:22:22 +0000 commit 43aeacff8695850ee26ee038159b1f88f5e69fdf Author: Jan Beulich AuthorDate: Thu May 15 09:07:06 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:07:06 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: d7127e06f617ed89eefe17a9ac954032863032d5 master date: 2025-05-14 11:00:00 +0200 --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index ce390b0422..296a3cd08b 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -285,9 +285,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu May 15 10:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 10:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985179.1371127 (Exim 4.92) (envelope-from ) id 1uFVjV-0003KN-Pk; Thu, 15 May 2025 10:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985179.1371127; Thu, 15 May 2025 10: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 1uFVjV-0003KF-N1; Thu, 15 May 2025 10:22:33 +0000 Received: by outflank-mailman (input) for mailman id 985179; Thu, 15 May 2025 10:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFVjU-0003K2-Rk for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFVjU-00ANVV-39 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFVjU-004g1t-24 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10: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=EVwBzUj5PIYzlQKj/1YJLYGVfUl5I7Kmj3XhdZksaZM=; b=JZp1ncbbo+HgYoKCzLwmmJwnvK LM2gZV0tgH0k+8Zl9MpV+fYPQ6MQLraNsl5URClqHFmYnLT5LTwJFDrmDXcxeiWn68f2ABI4sucxr 5ZJKnAzc06dtQLNc5qvo6gQWMAHMjo2Jzmm6UN1kMs2SSrw547y+zJI1AModv5WxRSuw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] update Xen version to 4.18.5 Message-Id: Date: Thu, 15 May 2025 10:22:32 +0000 commit 0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12 Author: Jan Beulich AuthorDate: Thu May 15 10:07:19 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 10:07:19 2025 +0200 update Xen version to 4.18.5 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 684411fa67..5fc7fe27da 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 18 -export XEN_EXTRAVERSION ?= .5-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 15 10:22:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 10:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985181.1371141 (Exim 4.92) (envelope-from ) id 1uFVjg-0003cd-6J; Thu, 15 May 2025 10:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985181.1371141; Thu, 15 May 2025 10:22: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 1uFVjg-0003cR-3H; Thu, 15 May 2025 10:22:44 +0000 Received: by outflank-mailman (input) for mailman id 985181; Thu, 15 May 2025 10:22:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFVjf-0003c3-CT for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFVjf-00ANVb-1f for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFVjf-004gVH-0g for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10: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=LnjhsP8E94wnavbWgCOxAf9gaYFyS0P7gYQ+zZapyuo=; b=zfoOd9AL8jPfI7NnqlwIQu/RMj bNEwyaJxtLifWVVPWzRlNLgCCIXCLenvt847mygi89cQnO7/ZLP9XiXLpKW3BL01Fae63EiaKLE4q sWpPjxetBPIvk+iTNbx3sBHwXW75aovlyvIRLDz8NQmF57rvcWh/+1T4xpxMMFYFSc2I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/p2m: limit cache flush in memory_type_changed() Message-Id: Date: Thu, 15 May 2025 10:22:43 +0000 commit 50bbacacb814e6091142407170bb8aedb5a9cfa8 Author: Roger Pau Monne AuthorDate: Wed Apr 30 16:46:34 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu May 15 10:20:14 2025 +0200 x86/p2m: limit cache flush in memory_type_changed() Only do the cache flush when there's a p2m type change to propagate, otherwise there's no change in the p2m effective caching attributes. If the p2m memory_type_changed hook is not set p2m_memory_type_changed() is a no-op, no recalculation of caching attributes is needed, nor flushing of the previous cache contents. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 3 +-- xen/arch/x86/include/asm/p2m.h | 2 +- xen/arch/x86/mm/p2m.c | 13 ++++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 797f2ae7fd..402a1d9263 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -783,9 +783,8 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, NULL, hvm_load_mtrr_msr, 1, void memory_type_changed(struct domain *d) { if ( (is_iommu_enabled(d) || cache_flush_permitted(d)) && - d->vcpu && d->vcpu[0] ) + d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) ) { - p2m_memory_type_changed(d); flush_all(FLUSH_CACHE); } } diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index b9ce7d8705..4358cc15a2 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -700,7 +700,7 @@ void p2m_pod_dump_data(struct domain *d); #ifdef CONFIG_HVM /* Report a change affecting memory types. */ -void p2m_memory_type_changed(struct domain *d); +bool p2m_memory_type_changed(struct domain *d); /* Called by p2m code when demand-populating a PoD page */ bool diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 3a39b5d124..b9a7c2dc53 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -126,12 +126,21 @@ static void _memory_type_changed(struct p2m_domain *p2m) { if ( p2m->memory_type_changed ) p2m->memory_type_changed(p2m); + else + ASSERT_UNREACHABLE(); } -void p2m_memory_type_changed(struct domain *d) +bool p2m_memory_type_changed(struct domain *d) { struct p2m_domain *hostp2m = p2m_get_hostp2m(d); + /* + * The p2m memory_type_changed hook will be the same for the host p2m or + * the altp2ms, do the check early and return if not set. + */ + if ( !hostp2m->memory_type_changed ) + return false; + p2m_lock(hostp2m); _memory_type_changed(hostp2m); @@ -154,6 +163,8 @@ void p2m_memory_type_changed(struct domain *d) } p2m_unlock(hostp2m); + + return true; } int p2m_set_ioreq_server(struct domain *d, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 15 10:22:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 10:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985183.1371145 (Exim 4.92) (envelope-from ) id 1uFVjq-0003l0-7b; Thu, 15 May 2025 10:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985183.1371145; Thu, 15 May 2025 10:22: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 1uFVjq-0003ks-4r; Thu, 15 May 2025 10:22:54 +0000 Received: by outflank-mailman (input) for mailman id 985183; Thu, 15 May 2025 10:22:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFVjp-0003jL-GA for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFVjp-00ANW2-26 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10:22:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFVjp-004ge8-18 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 10: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=OPK32EJNB6mdjGgKVfwaWPCvGbBVSDzpKLVeeUTPrZY=; b=Z1EXPxGjN67KKoBKErGd2a6BOs YBGyDeUq6ySo8mgNnQdf3rqqE65XMaSWm2l5SdIvJ+Dy1FXkw5ygI/1j6Li94udIHYPNcIE2x+k+A CpA5oG6UrgqvFOu7BzVT2Zv2zQgT1kO/DkmR6nZGtG8KKCXwlL/TF8+zftu8jV8jeVB4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/iommu: use rangeset_subtract() in arch_iommu_hwdom_init() Message-Id: Date: Thu, 15 May 2025 10:22:53 +0000 commit f1f351df030986c7beccb76ae3dfb58bf436da18 Author: Roger Pau Monne AuthorDate: Thu May 15 10:52:56 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu May 15 11:21:26 2025 +0200 x86/iommu: use rangeset_subtract() in arch_iommu_hwdom_init() Remove an open-coded instance of rangeset_subtract(). No functional change intended. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/drivers/passthrough/x86/iommu.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 67f025c1ec..0954cc4922 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -312,14 +312,6 @@ void iommu_identity_map_teardown(struct domain *d) } } -static int __hwdom_init cf_check map_subtract(unsigned long s, unsigned long e, - void *data) -{ - struct rangeset *map = data; - - return rangeset_remove_range(map, s, e); -} - struct handle_iomemcap { struct rangeset *r; unsigned long last; @@ -505,7 +497,7 @@ void __hwdom_init arch_iommu_hwdom_init(struct domain *d) * since ranges in mmio_ro_ranges are already explicitly mapped below * in read-only mode. */ - rc = rangeset_report_ranges(mmio_ro_ranges, 0, ~0UL, map_subtract, map); + rc = rangeset_subtract(map, mmio_ro_ranges); if ( rc ) panic("IOMMU failed to remove read-only regions: %d\n", rc); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 15 11:00:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 11:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985237.1371179 (Exim 4.92) (envelope-from ) id 1uFWJp-00027y-Fd; Thu, 15 May 2025 11:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985237.1371179; Thu, 15 May 2025 11:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFWJp-00027s-CF; Thu, 15 May 2025 11:00:05 +0000 Received: by outflank-mailman (input) for mailman id 985237; Thu, 15 May 2025 11:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFWJn-0001ns-Ty for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 11:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFWJn-00AOJQ-2X for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 11:00:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFWJn-005flp-1D for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 11:00:03 +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=K0lRRxyh7UF3ICXzlrd9xsr/ch0+U99b4GZXJvBff/o=; b=ps0hMMOMVt6BXMXWwepd94tVqB a+q9CRp8vUQf+K+upCNwfMjNvqe27noB6PBcV6MCohZtSCzBvYB4GMW1gHE8eom4ATAFrD5FpvJlD FEfTkQ93aIqUO/Yn5w1Ta5qM1C2vnF13ZKfY823WNvnWwpUpGwSPEmqhBv1TFy63cj5k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: limit cache flush in memory_type_changed() Message-Id: Date: Thu, 15 May 2025 11:00:03 +0000 commit 50bbacacb814e6091142407170bb8aedb5a9cfa8 Author: Roger Pau Monne AuthorDate: Wed Apr 30 16:46:34 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu May 15 10:20:14 2025 +0200 x86/p2m: limit cache flush in memory_type_changed() Only do the cache flush when there's a p2m type change to propagate, otherwise there's no change in the p2m effective caching attributes. If the p2m memory_type_changed hook is not set p2m_memory_type_changed() is a no-op, no recalculation of caching attributes is needed, nor flushing of the previous cache contents. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 3 +-- xen/arch/x86/include/asm/p2m.h | 2 +- xen/arch/x86/mm/p2m.c | 13 ++++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 797f2ae7fd..402a1d9263 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -783,9 +783,8 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, NULL, hvm_load_mtrr_msr, 1, void memory_type_changed(struct domain *d) { if ( (is_iommu_enabled(d) || cache_flush_permitted(d)) && - d->vcpu && d->vcpu[0] ) + d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) ) { - p2m_memory_type_changed(d); flush_all(FLUSH_CACHE); } } diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index b9ce7d8705..4358cc15a2 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -700,7 +700,7 @@ void p2m_pod_dump_data(struct domain *d); #ifdef CONFIG_HVM /* Report a change affecting memory types. */ -void p2m_memory_type_changed(struct domain *d); +bool p2m_memory_type_changed(struct domain *d); /* Called by p2m code when demand-populating a PoD page */ bool diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 3a39b5d124..b9a7c2dc53 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -126,12 +126,21 @@ static void _memory_type_changed(struct p2m_domain *p2m) { if ( p2m->memory_type_changed ) p2m->memory_type_changed(p2m); + else + ASSERT_UNREACHABLE(); } -void p2m_memory_type_changed(struct domain *d) +bool p2m_memory_type_changed(struct domain *d) { struct p2m_domain *hostp2m = p2m_get_hostp2m(d); + /* + * The p2m memory_type_changed hook will be the same for the host p2m or + * the altp2ms, do the check early and return if not set. + */ + if ( !hostp2m->memory_type_changed ) + return false; + p2m_lock(hostp2m); _memory_type_changed(hostp2m); @@ -154,6 +163,8 @@ void p2m_memory_type_changed(struct domain *d) } p2m_unlock(hostp2m); + + return true; } int p2m_set_ioreq_server(struct domain *d, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 15 11:00:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 May 2025 11:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.985238.1371184 (Exim 4.92) (envelope-from ) id 1uFWJz-0002Ka-GW; Thu, 15 May 2025 11:00:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985238.1371184; Thu, 15 May 2025 11:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFWJz-0002KS-Dd; Thu, 15 May 2025 11:00:15 +0000 Received: by outflank-mailman (input) for mailman id 985238; Thu, 15 May 2025 11:00:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFWJy-0002KE-As for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 11:00:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uFWJy-00AOJf-1W for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 11:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uFWJy-005gc8-05 for xen-changelog@lists.xenproject.org; Thu, 15 May 2025 11:00:14 +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=Lub0LHB0LipLk/gWjF+RVl6wrxWhsZr2I3TaySZzBUo=; b=ghoQ72eVWMpXQsUjaZd+R5woWW LJSTDrd54YZDmeJVnjFaCXLqCCV64wVHjpfXTqIuhHJF7r8OhZWkUeLyaFbdtZHw85NZ0CIVuJCJe iVUMKJRKlBOO187TIIkk/wLiqVmtg5Kuh1HodNDaIABVX3YcvirztPdps0mee2RES5aQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/iommu: use rangeset_subtract() in arch_iommu_hwdom_init() Message-Id: Date: Thu, 15 May 2025 11:00:14 +0000 commit f1f351df030986c7beccb76ae3dfb58bf436da18 Author: Roger Pau Monne AuthorDate: Thu May 15 10:52:56 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu May 15 11:21:26 2025 +0200 x86/iommu: use rangeset_subtract() in arch_iommu_hwdom_init() Remove an open-coded instance of rangeset_subtract(). No functional change intended. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/drivers/passthrough/x86/iommu.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 67f025c1ec..0954cc4922 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -312,14 +312,6 @@ void iommu_identity_map_teardown(struct domain *d) } } -static int __hwdom_init cf_check map_subtract(unsigned long s, unsigned long e, - void *data) -{ - struct rangeset *map = data; - - return rangeset_remove_range(map, s, e); -} - struct handle_iomemcap { struct rangeset *r; unsigned long last; @@ -505,7 +497,7 @@ void __hwdom_init arch_iommu_hwdom_init(struct domain *d) * since ranges in mmio_ro_ranges are already explicitly mapped below * in read-only mode. */ - rc = rangeset_report_ranges(mmio_ro_ranges, 0, ~0UL, map_subtract, map); + rc = rangeset_subtract(map, mmio_ro_ranges); if ( rc ) panic("IOMMU failed to remove read-only regions: %d\n", rc); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 16 20:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 20:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987525.1372729 (Exim 4.92) (envelope-from ) id 1uG1uW-0006R9-9p; Fri, 16 May 2025 20:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987525.1372729; Fri, 16 May 2025 20: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 1uG1uW-0006R1-6Z; Fri, 16 May 2025 20:44:04 +0000 Received: by outflank-mailman (input) for mailman id 987525; Fri, 16 May 2025 20:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG1uU-0006Qv-6C for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 20:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG1uU-00Ccrq-0c for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 20:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG1uT-002dNr-2e for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 20: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=7JcIXTZv3FbgXsmQCYFWdrKhvKKksjZgdMEojZsAzLM=; b=NGeN0teLbwo27cOgwfJ2t71BkN +29opm+VQkWTbkzSeefborv/OUfSgTdQSkrzD56bHBAWLdoPK1Rz33zXJMYktara9koH5Vl+ZqX2U DdYH8/z1stqlH+OsFE3RosT4Xx2VpRaD+AzVDjYR34Ig/9Zn1NGJ6RCP9i6qgEM795Vw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/emul: Fix emulation of RDSEED with older toolchains Message-Id: Date: Fri, 16 May 2025 20:44:01 +0000 commit ddec00769cd80a44b412281d8b52482e4e20c2e5 Author: Andrew Cooper AuthorDate: Thu May 15 20:09:35 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 21:34:19 2025 +0100 x86/emul: Fix emulation of RDSEED with older toolchains This is reported as a MISRA R16.3 (missing break) violation, but turns out to be substantially more complicated than expected. In commit a8fe4ec5320a ("x86emul: support RDRAND/RDSEED"), the switch() statement had a default case going to cannot_emulate, with both the case 6 and case 7 labels being fully within #ifdef HAVE_GAS_RD{RAND,SEED}. Therefore, when the toolchain didn't understand the RDRAND/RDSEED instructions, attempts to emulate them suffered #UD. (In principle, this is a problem as there's no interlock to prevent RDRAND/RDSEED being advertised to the guest, but as instructions with only register encodings, they can only legitimately be emulated when VM Introspection is in use.) In commit 58f1bba44033 ("x86emul: support RDPID"), case 7 was taken outside of HAVE_GAS_RDSEED, meaning that emulating an RDSEED instruction no longer hit the default case when the toolchain was too old. Instead, it would fall out of the switch statement and be completed normally, behaving as a NOP to the guest. Retrofit a "return X86EMUL_UNIMPLEMENTED" in the case that the toolchain doesn't know the RDRAND instruction, matching how RDRAND work. Note that this has been fixed differently in Xen 4.21. Commit 05bf9f1f0f52 ("x86/emulate: Remove HAVE_AS_RDRAND and HAVE_AS_RDSEED") has removed the problematic condition due to the toolchain baseline upgrade. Fixes: 58f1bba44033 ("x86emul: support RDPID") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_emulate/0fc7.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/x86_emulate/0fc7.c b/xen/arch/x86/x86_emulate/0fc7.c index 5268d5cafd..2b6b444bab 100644 --- a/xen/arch/x86/x86_emulate/0fc7.c +++ b/xen/arch/x86/x86_emulate/0fc7.c @@ -102,6 +102,8 @@ int x86emul_0fc7(struct x86_emulate_state *s, if ( carry ) regs->eflags |= X86_EFLAGS_CF; break; +#else + return X86EMUL_UNIMPLEMENTED; #endif } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:55:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987574.1372743 (Exim 4.92) (envelope-from ) id 1uG31D-0006WR-5w; Fri, 16 May 2025 21:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987574.1372743; Fri, 16 May 2025 21: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 1uG31D-0006WJ-3C; Fri, 16 May 2025 21:55:03 +0000 Received: by outflank-mailman (input) for mailman id 987574; Fri, 16 May 2025 21:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG31C-0006WD-F8 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG31C-00Ce6z-0z for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG31B-003DcY-35 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21: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=+OTAc2BG2xvDwNZO79CcaFpZyBsInM+fh9pvdoCSfKs=; b=YHcE6aTI/wZTY3bBH/Gxh2HaKv OR1xaLSsvzEU8/S1b+U1+jrHeiaOnM2CWqmyUqIA8gReA74/jHMQ9aJWVkwOweijn0KctOl+Gc+fl EouqI0Bz5Or7Lu1Yo/cXIIiSftgcJiXFPBH3Cfdxx5VY2w0uc11RdNVsb8TQQjOkV9vM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/alternative: Support replacements when a feature is not present Message-Id: Date: Fri, 16 May 2025 21:55:01 +0000 commit cf818880122c257c6c79506aacc69ee190a1e11e Author: Andrew Cooper AuthorDate: Mon Apr 21 15:52:56 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/alternative: Support replacements when a feature is not present Use the top bit of a->cpuid to express inverted polarity. This requires stripping the top bit back out when performing the sanity checks. Despite only being used once, create a replace boolean to express the decision more clearly in _apply_alternatives(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 328ed39c59e0af06d594f5e64a52b57aa0b02340) --- xen/arch/x86/alternative.c | 14 +++++++++++--- xen/arch/x86/include/asm/alternative-asm.h | 2 +- xen/arch/x86/include/asm/alternative.h | 11 +++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 1ba35cb9ed..88c90044c2 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -197,6 +197,8 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, uint8_t *repl = ALT_REPL_PTR(a); uint8_t buf[MAX_PATCH_LEN]; unsigned int total_len = a->orig_len + a->pad_len; + unsigned int feat = a->cpuid & ~ALT_FLAG_NOT; + bool inv = a->cpuid & ALT_FLAG_NOT, replace; if ( a->repl_len > total_len ) { @@ -214,11 +216,11 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, return -ENOSPC; } - if ( a->cpuid >= NCAPINTS * 32 ) + if ( feat >= NCAPINTS * 32 ) { printk(XENLOG_ERR "Alt for %ps, feature %#x outside of featureset range %#x\n", - ALT_ORIG_PTR(a), a->cpuid, NCAPINTS * 32); + ALT_ORIG_PTR(a), feat, NCAPINTS * 32); return -ERANGE; } @@ -243,8 +245,14 @@ static int init_or_livepatch _apply_alternatives(struct alt_instr *start, continue; } + /* + * Should a replacement be performed? Most replacements have positive + * polarity, but we support negative polarity too. + */ + replace = boot_cpu_has(feat) ^ inv; + /* If there is no replacement to make, see about optimising the nops. */ - if ( !boot_cpu_has(a->cpuid) ) + if ( !replace ) { /* Origin site site already touched? Don't nop anything. */ if ( base->priv ) diff --git a/xen/arch/x86/include/asm/alternative-asm.h b/xen/arch/x86/include/asm/alternative-asm.h index 83e8594f0e..ed3f4cb055 100644 --- a/xen/arch/x86/include/asm/alternative-asm.h +++ b/xen/arch/x86/include/asm/alternative-asm.h @@ -12,7 +12,7 @@ * instruction. See apply_alternatives(). */ .macro altinstruction_entry orig, repl, feature, orig_len, repl_len, pad_len - .if \feature >= NCAPINTS * 32 + .if ((\feature) & ~ALT_FLAG_NOT) >= NCAPINTS * 32 .error "alternative feature outside of featureset range" .endif .long \orig - . diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index 38472fb58e..ef63e257ad 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -1,6 +1,13 @@ #ifndef __X86_ALTERNATIVE_H__ #define __X86_ALTERNATIVE_H__ +/* + * Common to both C and ASM. Express a replacement when a feature is not + * available. + */ +#define ALT_FLAG_NOT (1 << 15) +#define ALT_NOT(x) (ALT_FLAG_NOT | (x)) + #ifdef __ASSEMBLY__ #include #else @@ -12,7 +19,7 @@ struct __packed alt_instr { int32_t orig_offset; /* original instruction */ int32_t repl_offset; /* offset to replacement instruction */ - uint16_t cpuid; /* cpuid bit set for replacement */ + uint16_t cpuid; /* cpuid bit set for replacement (top bit is polarity) */ uint8_t orig_len; /* length of original instruction */ uint8_t repl_len; /* length of new instruction */ uint8_t pad_len; /* length of build-time padding */ @@ -60,7 +67,7 @@ extern void alternative_branches(void); alt_repl_len(n2)) "-" alt_orig_len) #define ALTINSTR_ENTRY(feature, num) \ - " .if " STR(feature) " >= " STR(NCAPINTS * 32) "\n" \ + " .if (" STR(feature & ~ALT_FLAG_NOT) ") >= " STR(NCAPINTS * 32) "\n" \ " .error \"alternative feature outside of featureset range\"\n" \ " .endif\n" \ " .long .LXEN%=_orig_s - .\n" /* label */ \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987575.1372748 (Exim 4.92) (envelope-from ) id 1uG31N-0006YV-7f; Fri, 16 May 2025 21:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987575.1372748; Fri, 16 May 2025 21: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 1uG31N-0006YN-4e; Fri, 16 May 2025 21:55:13 +0000 Received: by outflank-mailman (input) for mailman id 987575; Fri, 16 May 2025 21:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG31M-0006YB-BG for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG31M-00Ce78-1Y for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG31M-003Dqw-0T for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21: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=AqNoC7s9I9ev0mQCeLISqgbTyK62mjCVRnzb0BEGoXo=; b=fW0bVgj+SDotdA7EBJyVlNEJPL BYVhVAJweRu41xwRefpt5eW6WzVPTRmbyp9FeQ3D/hfoTf+mWe+NT2aImSTvWlU5MILod5r2xU4V4 JtP0OLuMGGzUan3qW4KOsEj0XSD0Br1aODloB2yTvwJ1XXB4MtInWeJv9un6jTjEvAvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/guest: Remove use of the Xen hypercall_page Message-Id: Date: Fri, 16 May 2025 21:55:12 +0000 commit 5992d3ab9f7ffd73a753fb72284550aa3d7981ba Author: Andrew Cooper AuthorDate: Mon Apr 21 10:34:02 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/guest: Remove use of the Xen hypercall_page In order to protect against ITS, Xen needs to start using return thunks. Therefore the advice in XSA-466 becomes relevant, and the hypercall_page needs to be removed. Implement early_hypercall(), with infrastructure to figure out the correct instruction on first use. Use ALTERNATIVE()s to result in inline hypercalls, including the ALT_NOT() form so we only need a single synthetic feature bit. No overall change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit ef30ffe0a0f79313c00720793c475c45a9e490ff) --- xen/arch/x86/guest/xen/Makefile | 2 +- xen/arch/x86/guest/xen/hypercall.S | 50 ++++++++++++++++++++ xen/arch/x86/guest/xen/hypercall_page.S | 76 ------------------------------ xen/arch/x86/guest/xen/xen.c | 48 +++++++++++++++++-- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/guest/xen-hcall.h | 24 ++++++---- 6 files changed, 112 insertions(+), 89 deletions(-) diff --git a/xen/arch/x86/guest/xen/Makefile b/xen/arch/x86/guest/xen/Makefile index 26fb4b1007..8b3250aa88 100644 --- a/xen/arch/x86/guest/xen/Makefile +++ b/xen/arch/x86/guest/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += hypercall_page.o +obj-bin-y += hypercall.init.o obj-y += xen.o obj-bin-$(CONFIG_PVH_GUEST) += pvh-boot.init.o diff --git a/xen/arch/x86/guest/xen/hypercall.S b/xen/arch/x86/guest/xen/hypercall.S new file mode 100644 index 0000000000..05e429794c --- /dev/null +++ b/xen/arch/x86/guest/xen/hypercall.S @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + + .section .init.text, "ax", @progbits + + /* + * Used during early boot, before alternatives have run and inlined + * the appropriate instruction. Called using the hypercall ABI. + */ +FUNC(early_hypercall) + cmpb $0, early_hypercall_insn(%rip) + jl .L_setup + je 1f + + vmmcall + ret + +1: vmcall + ret + +.L_setup: + /* + * When setting up the first time around, all registers need + * preserving. Save the non-callee-saved ones. + */ + push %r11 + push %r10 + push %r9 + push %r8 + push %rdi + push %rsi + push %rdx + push %rcx + push %rax + + call early_hypercall_setup + + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi + pop %r8 + pop %r9 + pop %r10 + pop %r11 + + jmp early_hypercall +END(early_hypercall) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S deleted file mode 100644 index 7ab55fc1f6..0000000000 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include - - .section ".text.page_aligned", "ax", @progbits - -DATA(hypercall_page, PAGE_SIZE) - /* Poisoned with `ret` for safety before hypercalls are set up. */ - .fill PAGE_SIZE, 1, 0xc3 -END(hypercall_page) - -/* - * Identify a specific hypercall in the hypercall page - * @param name Hypercall name. - */ -#define DECLARE_HYPERCALL(name) \ - .globl HYPERCALL_ ## name; \ - .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 - -DECLARE_HYPERCALL(set_trap_table) -DECLARE_HYPERCALL(mmu_update) -DECLARE_HYPERCALL(set_gdt) -DECLARE_HYPERCALL(stack_switch) -DECLARE_HYPERCALL(set_callbacks) -DECLARE_HYPERCALL(fpu_taskswitch) -DECLARE_HYPERCALL(sched_op_compat) -DECLARE_HYPERCALL(platform_op) -DECLARE_HYPERCALL(set_debugreg) -DECLARE_HYPERCALL(get_debugreg) -DECLARE_HYPERCALL(update_descriptor) -DECLARE_HYPERCALL(memory_op) -DECLARE_HYPERCALL(multicall) -DECLARE_HYPERCALL(update_va_mapping) -DECLARE_HYPERCALL(set_timer_op) -DECLARE_HYPERCALL(event_channel_op_compat) -DECLARE_HYPERCALL(xen_version) -DECLARE_HYPERCALL(console_io) -DECLARE_HYPERCALL(physdev_op_compat) -DECLARE_HYPERCALL(grant_table_op) -DECLARE_HYPERCALL(vm_assist) -DECLARE_HYPERCALL(update_va_mapping_otherdomain) -DECLARE_HYPERCALL(iret) -DECLARE_HYPERCALL(vcpu_op) -DECLARE_HYPERCALL(set_segment_base) -DECLARE_HYPERCALL(mmuext_op) -DECLARE_HYPERCALL(xsm_op) -DECLARE_HYPERCALL(nmi_op) -DECLARE_HYPERCALL(sched_op) -DECLARE_HYPERCALL(callback_op) -DECLARE_HYPERCALL(xenoprof_op) -DECLARE_HYPERCALL(event_channel_op) -DECLARE_HYPERCALL(physdev_op) -DECLARE_HYPERCALL(hvm_op) -DECLARE_HYPERCALL(sysctl) -DECLARE_HYPERCALL(domctl) -DECLARE_HYPERCALL(kexec_op) -DECLARE_HYPERCALL(argo_op) -DECLARE_HYPERCALL(xenpmu_op) - -DECLARE_HYPERCALL(arch_0) -DECLARE_HYPERCALL(arch_1) -DECLARE_HYPERCALL(arch_2) -DECLARE_HYPERCALL(arch_3) -DECLARE_HYPERCALL(arch_4) -DECLARE_HYPERCALL(arch_5) -DECLARE_HYPERCALL(arch_6) -DECLARE_HYPERCALL(arch_7) - -/* - * Local variables: - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index c17f5c447a..5c9f393c75 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -26,7 +26,6 @@ bool __read_mostly xen_guest; uint32_t __read_mostly xen_cpuid_base; -extern char hypercall_page[]; static struct rangeset *mem; DEFINE_PER_CPU(unsigned int, vcpu_id); @@ -35,6 +34,50 @@ static struct vcpu_info *vcpu_info; static unsigned long vcpu_info_mapped[BITS_TO_LONGS(NR_CPUS)]; DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); +/* + * Which instruction to use for early hypercalls: + * < 0 setup + * 0 vmcall + * > 0 vmmcall + */ +int8_t __initdata early_hypercall_insn = -1; + +/* + * Called once during the first hypercall to figure out which instruction to + * use. Error handling options are limited. + */ +void asmlinkage __init early_hypercall_setup(void) +{ + BUG_ON(early_hypercall_insn != -1); + + if ( !boot_cpu_data.x86_vendor ) + { + unsigned int eax, ebx, ecx, edx; + + cpuid(0, &eax, &ebx, &ecx, &edx); + + boot_cpu_data.x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); + } + + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + case X86_VENDOR_CENTAUR: + case X86_VENDOR_SHANGHAI: + early_hypercall_insn = 0; + setup_force_cpu_cap(X86_FEATURE_USE_VMCALL); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + early_hypercall_insn = 1; + break; + + default: + BUG(); + } +} + static void __init find_xen_leaves(void) { uint32_t eax, ebx, ecx, edx, base; @@ -337,9 +380,6 @@ const struct hypervisor_ops *__init xg_probe(void) if ( !xen_cpuid_base ) return NULL; - /* Fill the hypercall page. */ - wrmsrl(cpuid_ebx(xen_cpuid_base + 2), __pa(hypercall_page)); - xen_guest = true; return &ops; diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index ba3df174b7..9e3ed21c02 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ +XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/guest/xen-hcall.h b/xen/arch/x86/include/asm/guest/xen-hcall.h index 665b472d05..96004dec99 100644 --- a/xen/arch/x86/include/asm/guest/xen-hcall.h +++ b/xen/arch/x86/include/asm/guest/xen-hcall.h @@ -30,9 +30,11 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)) \ : "memory" ); \ (type)res; \ @@ -42,10 +44,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)) \ : "memory" ); \ (type)res; \ @@ -55,10 +59,12 @@ ({ \ long res, tmp__; \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__) \ ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)) \ : "memory" ); \ (type)res; \ @@ -69,10 +75,12 @@ long res, tmp__; \ register long _a4 asm ("r10") = ((long)(a4)); \ asm volatile ( \ - "call hypercall_page + %c[offset]" \ + ALTERNATIVE_2("call early_hypercall", \ + "vmmcall", ALT_NOT(X86_FEATURE_USE_VMCALL), \ + "vmcall", X86_FEATURE_USE_VMCALL) \ : "=a" (res), "=D" (tmp__), "=S" (tmp__), "=d" (tmp__), \ "=&r" (tmp__) ASM_CALL_CONSTRAINT \ - : [offset] "i" (hcall * 32), \ + : "0" (hcall), \ "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), \ "4" (_a4) \ : "memory" ); \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987576.1372751 (Exim 4.92) (envelope-from ) id 1uG31X-0006an-8x; Fri, 16 May 2025 21:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987576.1372751; Fri, 16 May 2025 21: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 1uG31X-0006af-64; Fri, 16 May 2025 21:55:23 +0000 Received: by outflank-mailman (input) for mailman id 987576; Fri, 16 May 2025 21:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG31W-0006aT-HV for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG31W-00Ce7V-2C for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG31W-003E5N-12 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21: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=ugM339994H8Vb3/KMRtDUvbG3g3ueWID658cAKdVpy0=; b=hMZU21Ri5gWSR7qzd5XFS8Qgq2 wOwUU9Lxr2MYhs6rd220CmLWorgkhC/jz7F8vh1XUWt/VVLdFT4PkaBpVfezZBvCs4tznbPQxhrR7 Lo3EfFhs6jybk3RRekJZVlgF4JC0sbgC+BKoGvGzpq5cGvBsb5RQyjtLQ5LVsx7nOE4I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS Message-Id: Date: Fri, 16 May 2025 21:55:22 +0000 commit f81f44393f9cccd8673a9b55849ee232bf29d724 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:50 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/thunk: (Mis)align __x86_indirect_thunk_* to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. Arrange for __x86_indirect_thunk_* to always be in the second half. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d293cc9da9021a51915e058acd1f05e83a462aa9) --- xen/arch/x86/indirect-thunk.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index fd5493c22b..c4b978d67b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -11,6 +11,10 @@ #include +/* Alignment is dealt with explicitly here; override the respective macro. */ +#undef SYM_ALIGN +#define SYM_ALIGN(align...) + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -35,6 +39,16 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + FUNC(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987577.1372756 (Exim 4.92) (envelope-from ) id 1uG31h-0006dm-Bn; Fri, 16 May 2025 21:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987577.1372756; Fri, 16 May 2025 21:55: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 1uG31h-0006de-8k; Fri, 16 May 2025 21:55:33 +0000 Received: by outflank-mailman (input) for mailman id 987577; Fri, 16 May 2025 21:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG31g-0006dW-LS for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG31g-00Ce7Z-2h for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG31g-003EB7-1g for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55: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=3siJTBuTSwafOp55OJ7GJ3pyfTSjIX2oSEFXaG3aBsM=; b=Mvb9ONss1jWhgUGPLfcT+hV8Pq 3laJWRLpWJpwnHXpnjtSGQatqOPLEtifD6SKlA21LBs44EtAnwJQJ5IpjhcjhXmhjNZaiNMQ5Navf Xz3o+VF94bScoJwRL3fmaxFMnulR9nIDognJAY4qbfxmL45bZoxcAypfqWGMB95Vb/JE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS Message-Id: Date: Fri, 16 May 2025 21:55:32 +0000 commit c6a2b5e9d0c5fdbb6aadce7773ca81ad8a07dcf9 Author: Andrew Cooper AuthorDate: Mon May 5 14:27:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/thunk: (Mis)align the RETs in clear_bhb_loops() to mitigate ITS The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. clear_bhb_loops() has a precise layout of branches. The alignment for performance cause the RETs to always be in an unsafe position, and converting those to return thunks changes the branching pattern. While such a conversion is believed to be safe, clear_bhb_loops() is also a performance-relevant fastpath, so (mis)align the RETs to be in a safe position. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit c0db07031a41ff892f57756b7e2b4ef98df72588) --- xen/arch/x86/bhb-thunk.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 678c00c5d0..52625f4e2c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -50,7 +50,12 @@ END(clear_bhb_tsx) * ret * * The CALL/RETs are necessary to prevent the Loop Stream Detector from - * interfering. The alignment is for performance and not safety. + * interfering. + * + * The .balign's are for performance, but they cause the RETs to be in unsafe + * positions with respect to Indirect Target Selection. The .skips are to + * move the RETs into ITS-safe positions, rather than using the slowpath + * through __x86_return_thunk. * * The "short" sequence (5 and 5) is for CPUs prior to Alder Lake / Sapphire * Rapids (i.e. Cores prior to Golden Cove and/or Gracemont). @@ -66,12 +71,14 @@ FUNC(clear_bhb_loops) jmp 5f int3 - .align 64 + .balign 64 + .skip 32 - (.Lr1 - 1f), 0xcc 1: call 2f - ret +.Lr1: ret int3 - .align 64 + .balign 64 + .skip 32 - 18 /* (.Lr2 - 2f) but Clang IAS doesn't like this */, 0xcc 2: ALTERNATIVE "mov $5, %eax", "mov $7, %eax", X86_SPEC_BHB_LOOPS_LONG 3: jmp 4f @@ -83,7 +90,7 @@ FUNC(clear_bhb_loops) sub $1, %ecx jnz 1b - ret +.Lr2: ret 5: /* * The Intel sequence has an LFENCE here. The purpose is to ensure -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987578.1372759 (Exim 4.92) (envelope-from ) id 1uG31r-0006gB-Cz; Fri, 16 May 2025 21:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987578.1372759; Fri, 16 May 2025 21:55: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 1uG31r-0006g4-A8; Fri, 16 May 2025 21:55:43 +0000 Received: by outflank-mailman (input) for mailman id 987578; Fri, 16 May 2025 21:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG31q-0006fy-QY for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG31q-00Ce7d-37 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG31q-003EHl-2E for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55: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=g7K6HImJzsAXkPpJE1dhHY+lTuC4jVt1ygM0JuHXjfw=; b=AMcKmhyRqFhM0kKeYVR+AF/7Sa iJtRYbpuUjcXMM7pgo2S8G6elhzd1TZkPIM8RZ1t+xAnQUJgCsfXNuFcbOK2bOBXxWrMLICfofXFh orux23kYn3ZNuvoP/iGW33E2nIAcH2V7bmkzoYmgmoTZd9cqGfcHZfJleSpHBQt05Xfs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/stubs: Introduce place_ret() to abstract away raw 0xc3's Message-Id: Date: Fri, 16 May 2025 21:55:42 +0000 commit cda26aed40cec7e8ff7fc0b22d97e1a0ba8d38a7 Author: Andrew Cooper AuthorDate: Sun May 4 22:44:42 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/stubs: Introduce place_ret() to abstract away raw 0xc3's The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. This means it's not safe for logic using the stubs to write raw 0xc3's. Introduce place_ret() which, for now, writes a raw 0xc3 but will contain additional logic when return thunks are in use. stub_selftest() doesn't strictly need to be converted as they only run on boot, but doing so gets us a partial test of place_ret() too. No functional change. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit 2eb1132f796386e4524fb25dd0ed349e14ca35dd) --- tools/tests/x86_emulator/x86-emulate.h | 6 ++++ xen/arch/x86/Makefile | 6 ++-- xen/arch/x86/alternative.c | 14 ++++++++ xen/arch/x86/extable.c | 11 +++--- xen/arch/x86/include/asm/alternative.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 5 +-- xen/arch/x86/x86_emulate/fpu.c | 18 ++++++---- xen/arch/x86/x86_emulate/x86_emulate.c | 64 +++++++++++++++++----------------- 8 files changed, 77 insertions(+), 49 deletions(-) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 929c1a72ae..4c292ac338 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -77,6 +77,12 @@ #define is_canonical_address(x) (((int64_t)(x) >> 47) == ((int64_t)(x) >> 63)) +static inline void *place_ret(void *ptr) +{ + *(uint8_t *)ptr = 0xc3; + return ptr + 1; +} + extern uint32_t mxcsr_mask; extern struct cpu_policy cpu_policy; diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 0ded68d069..02ab235de7 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -11,9 +11,7 @@ obj-$(CONFIG_PV) += pv/ obj-y += x86_64/ obj-y += x86_emulate/ -alternative-y := alternative.init.o -alternative-$(CONFIG_LIVEPATCH) := -obj-bin-y += $(alternative-y) +obj-y += alternative.o obj-y += apic.o obj-y += bhb-thunk.o obj-y += bitops.o @@ -41,7 +39,7 @@ obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += alternative.o livepatch.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 88c90044c2..ec451d962c 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,6 +137,20 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +/* + * Place a return at @ptr. @ptr must be in the writable alias of a stub. + * + * Returns the next position to write into the stub. + */ +void *place_ret(void *ptr) +{ + uint8_t *p = ptr; + + *p++ = 0xc3; + + return p; +} + /* * text_poke - Update instructions on a live kernel or non-executed code. * @addr: address to modify diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 705cf9eb94..1572efa69a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -151,20 +151,20 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) int __init cf_check stub_selftest(void) { static const struct { - uint8_t opc[8]; + uint8_t opc[7]; uint64_t rax; union stub_exception_token res; } tests[] __initconst = { #define endbr64 0xf3, 0x0f, 0x1e, 0xfa - { .opc = { endbr64, 0x0f, 0xb9, 0xc3, 0xc3 }, /* ud1 */ + { .opc = { endbr64, 0x0f, 0xb9, 0x90 }, /* ud1 */ .res.fields.trapnr = X86_EXC_UD }, - { .opc = { endbr64, 0x90, 0x02, 0x00, 0xc3 }, /* nop; add (%rax),%al */ + { .opc = { endbr64, 0x90, 0x02, 0x00 }, /* nop; add (%rax),%al */ .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, - { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ + { .opc = { endbr64, 0x02, 0x04, 0x04 }, /* add (%rsp,%rax),%al */ .rax = 0xfedcba9876543210UL, .res.fields.trapnr = X86_EXC_SS }, - { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ + { .opc = { endbr64, 0xcc, 0x90, 0x90 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP }, #undef endbr64 }; @@ -183,6 +183,7 @@ int __init cf_check stub_selftest(void) memset(ptr, 0xcc, STUB_BUF_SIZE / 2); memcpy(ptr, tests[i].opc, ARRAY_SIZE(tests[i].opc)); + place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); asm volatile ( "INDIRECT_CALL %[stb]\n" diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index ef63e257ad..28d4ec0f9c 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -31,6 +31,8 @@ struct __packed alt_instr { #define ALT_REPL_PTR(a) __ALT_PTR(a, repl_offset) extern void add_nops(void *insns, unsigned int len); +void *place_ret(void *ptr); + /* Similar to alternative_instructions except it can be run with IRQs enabled. */ extern int apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void alternative_instructions(void); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 70150c2722..ff5d1c9f86 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -76,7 +76,6 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0x41, 0x5c, /* pop %r12 */ 0x5d, /* pop %rbp */ 0x5b, /* pop %rbx */ - 0xc3, /* ret */ }; const struct stubs *this_stubs = &this_cpu(stubs); @@ -126,11 +125,13 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, APPEND_CALL(save_guest_gprs); APPEND_BUFF(epilogue); + p = place_ret(p); /* Build-time best effort attempt to catch problems. */ BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + - MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + + 1 /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c index 54c8621421..9cc37a1d8e 100644 --- a/xen/arch/x86/x86_emulate/fpu.c +++ b/xen/arch/x86/x86_emulate/fpu.c @@ -32,36 +32,42 @@ static inline bool fpu_check_write(void) #define emulate_fpu_insn_memdst(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ *insn_bytes = 2; \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "+m" (arg) : "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_memsrc(opc, ext, arg) \ do { \ + void *_p = get_stub(stub); \ /* ModRM: mod=0, reg=ext, rm=0, i.e. a (%rax) operand */ \ - memcpy(get_stub(stub), \ - ((uint8_t[]){ opc, ((ext) & 7) << 3, 0xc3 }), 3); \ + memcpy(_p, ((uint8_t[]){ opc, ((ext) & 7) << 3 }), 2); _p += 2; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "m" (arg), "a" (&(arg))); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub("", "", "=m" (dummy) : "i" (0)); \ put_stub(stub); \ } while (0) #define emulate_fpu_insn_stub_eflags(bytes...) \ do { \ + void *_p = get_stub(stub); \ unsigned int nr_ = sizeof((uint8_t[]){ bytes }); \ unsigned long tmp_; \ - memcpy(get_stub(stub), ((uint8_t[]){ bytes, 0xc3 }), nr_ + 1); \ + memcpy(_p, ((uint8_t[]){ bytes }), nr_); _p += nr_; \ + place_ret(_p); \ invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), \ [eflags] "+g" (regs->eflags), [tmp] "=&r" (tmp_) \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e8cba5a27f..a6a1c9937f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1398,7 +1398,7 @@ x86_emulate( stb[3] = 0x91; stb[4] = evex.opmsk << 3; insn_bytes = 5; - stb[5] = 0xc3; + place_ret(&stb[5]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); @@ -3631,7 +3631,7 @@ x86_emulate( } opc[1] = (modrm & 0x38) | 0xc0; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -3698,7 +3698,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); ea.reg = decode_gpr(&_regs, modrm_reg); invoke_stub("", "", "=a" (*ea.reg) : "c" (mmvalp), "m" (*mmvalp)); @@ -3772,7 +3772,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 2; copy_REX_VEX(opc, rex_prefix, vex); } - opc[2] = 0xc3; + place_ret(&opc[2]); _regs.eflags &= ~EFLAGS_MASK; invoke_stub("", @@ -4008,7 +4008,7 @@ x86_emulate( opc[1] = modrm & 0xc7; insn_bytes = PFX_BYTES + 2; simd_0f_to_gpr: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); generate_exception_if(ea.type != OP_REG, X86_EXC_UD); @@ -4405,7 +4405,7 @@ x86_emulate( vex.w = 0; opc[1] = modrm & 0x38; insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4442,7 +4442,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0x38; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "+m" (src.val) : "a" (&src.val)); @@ -4637,7 +4637,7 @@ x86_emulate( #endif /* X86EMUL_NO_SIMD */ simd_0f_reg_only: - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", [dummy_out] "=g" (dummy) : [dummy_in] "i" (0) ); @@ -4971,7 +4971,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xf8; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); ea.reg = decode_gpr(&_regs, modrm_rm); @@ -5014,7 +5014,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); invoke_stub("", "", "=a" (dst.val) : [dummy] "i" (0)); @@ -5044,7 +5044,7 @@ x86_emulate( opc = init_prefixes(stub); opc[0] = b; opc[1] = modrm; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_VEX(opc, vex); _regs.eflags &= ~EFLAGS_MASK; @@ -5612,7 +5612,7 @@ x86_emulate( if ( !mode_64bit() ) vex.w = 0; opc[1] = modrm & 0xc7; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_REX_VEX(opc, rex_prefix, vex); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); @@ -5730,7 +5730,7 @@ x86_emulate( opc[1] &= 0x38; } insn_bytes = PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -6010,7 +6010,7 @@ x86_emulate( pvex->b = !mode_64bit() || (vex.reg >> 3); opc[1] = 0xc0 | (~vex.reg & 7); pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=a" (ea.val) : [dummy] "i" (0)); put_stub(stub); @@ -6284,7 +6284,7 @@ x86_emulate( evex.w = 0; opc[1] = modrm & 0xf8; insn_bytes = EVEX_PFX_BYTES + 2; - opc[2] = 0xc3; + place_ret(&opc[2]); copy_EVEX(opc, evex); invoke_stub("", "", "=g" (dummy) : "a" (src.val)); @@ -6383,7 +6383,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6453,7 +6453,7 @@ x86_emulate( pvex->b = 1; opc[1] = (modrm_reg & 7) << 3; pvex->reg = 0xf; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6509,7 +6509,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6574,7 +6574,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "+m" (*mmvalp) : "a" (mmvalp)); @@ -6588,7 +6588,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6664,7 +6664,7 @@ x86_emulate( pevex->b = 1; opc[1] = (modrm_reg & 7) << 3; pevex->RX = 1; - opc[2] = 0xc3; + place_ret(&opc[2]); invoke_stub("", "", "=m" (*mmvalp) : "a" (mmvalp)); @@ -6741,7 +6741,7 @@ x86_emulate( opc[2] = 0x90; /* Use (%rax) as source. */ opc[3] = evex.opmsk << 3; - opc[4] = 0xc3; + place_ret(&opc[4]); invoke_stub("", "", "+m" (op_mask) : "a" (&op_mask)); put_stub(stub); @@ -6940,7 +6940,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); src.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val), "a" (*src.reg)); @@ -6976,7 +6976,7 @@ x86_emulate( pvex->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub("=&a" (dst.val), "c" (&src.val)); @@ -7217,7 +7217,7 @@ x86_emulate( evex.w = vex.w = 0; opc[1] = modrm & 0x38; opc[2] = imm1; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7384,7 +7384,7 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; copy_VEX(opc, vex); } - opc[3] = 0xc3; + place_ret(&opc[3]); /* Latch MXCSR - we may need to restore it below. */ invoke_stub("stmxcsr %[mxcsr]", "", @@ -7630,7 +7630,7 @@ x86_emulate( } opc[2] = imm1; insn_bytes = PFX_BYTES + 3; - opc[3] = 0xc3; + place_ret(&opc[3]); if ( vex.opcx == vex_none ) { /* Cover for extra prefix byte. */ @@ -7976,7 +7976,7 @@ x86_emulate( pxop->reg = 0xf; /* rAX */ buf[3] = b; buf[4] = (modrm & 0x38) | 0x01; /* r/m=(%rCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); dst.reg = decode_vex_gpr(vex.reg, &_regs, ctxt); emulate_stub([dst] "=&a" (dst.val), "c" (&src.val)); @@ -8085,7 +8085,7 @@ x86_emulate( buf[3] = b; buf[4] = 0x09; /* reg=rCX r/m=(%rCX) */ *(uint32_t *)(buf + 5) = imm1; - buf[9] = 0xc3; + place_ret(&buf[9]); emulate_stub([dst] "=&c" (dst.val), "[dst]" (&src.val)); @@ -8181,12 +8181,12 @@ x86_emulate( if ( evex_encoded() ) { - opc[insn_bytes - EVEX_PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - EVEX_PFX_BYTES]); copy_EVEX(opc, evex); } else { - opc[insn_bytes - PFX_BYTES] = 0xc3; + place_ret(&opc[insn_bytes - PFX_BYTES]); copy_REX_VEX(opc, rex_prefix, vex); } @@ -8510,7 +8510,7 @@ int x86_emul_rmw( pvex->reg = 0xf; /* rAX */ buf[3] = ctxt->opcode; buf[4] = 0x11; /* reg=rDX r/m=(%RCX) */ - buf[5] = 0xc3; + place_ret(&buf[5]); *eflags &= ~EFLAGS_MASK; invoke_stub("", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:55:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987579.1372763 (Exim 4.92) (envelope-from ) id 1uG322-0006iW-Eh; Fri, 16 May 2025 21:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987579.1372763; Fri, 16 May 2025 21:55: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 1uG322-0006iO-Br; Fri, 16 May 2025 21:55:54 +0000 Received: by outflank-mailman (input) for mailman id 987579; Fri, 16 May 2025 21:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG320-0006iG-UM for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG321-00Ce7l-0L for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG320-003ENe-2f for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:55: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=8gOEpQXVPq1b4VoJo3cir5JCoDHmwiFEgV5ixi5HzU8=; b=alDo+Z4rXkfOzktLXmsSEcv7I8 hG8IUvpyDyqDa5Js4pv80BKrbnel1SF2yhehDkCov8BefHgIUmlmYvyyzSau7g1MRUX8Q1a96e73c Weht2t0yp1Ez1TIOBOVLC3mjiNA+j6m6HhfCUhPLC9s5Yu5vswCCgaBfxRwtxWsGCrgM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/thunk: Build Xen with Return Thunks Message-Id: Date: Fri, 16 May 2025 21:55:52 +0000 commit b9e8204ab1ebf4536c53db07e7daf8567e3e9328 Author: Jan Beulich AuthorDate: Mon Apr 7 17:15:17 2025 +0200 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/thunk: Build Xen with Return Thunks The Indirect Target Selection speculative vulnerability means that indirect branches (including RETs) are unsafe when in the first half of a cacheline. In order to mitigate this, build with return thunks and arrange for __x86_return_thunk to be (mis)aligned in the same manner as __x86_indirect_thunk_* so the RET instruction is placed in a safe location. place_ret() needs to conditionally emit JMP __x86_return_thunk instead of RET. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit afcb4a06c740f7f71d2e9746c9d147c38a6e6c90) --- xen/arch/x86/Kconfig | 5 +++++ xen/arch/x86/Makefile | 1 + xen/arch/x86/acpi/wakeup_prot.S | 2 +- xen/arch/x86/alternative.c | 31 ++++++++++++++++++++++++++++++- xen/arch/x86/arch.mk | 3 +++ xen/arch/x86/bhb-thunk.S | 2 +- xen/arch/x86/clear_page.S | 4 +++- xen/arch/x86/copy_page.S | 4 +++- xen/arch/x86/efi/check.c | 3 +++ xen/arch/x86/include/asm/asm-defns.h | 6 ++++++ xen/arch/x86/indirect-thunk.S | 24 ++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/arch/x86/pv/gpr_switch.S | 4 ++-- xen/arch/x86/spec_ctrl.c | 3 +++ xen/arch/x86/x86_64/compat/entry.S | 6 +++--- xen/arch/x86/x86_64/entry.S | 2 +- xen/arch/x86/xen.lds.S | 1 + xen/common/Kconfig | 11 +++++++++++ xen/lib/x86-generic-hweightl.c | 4 ++++ 19 files changed, 106 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 9cdd04721a..96fd1c3272 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -38,9 +38,14 @@ config ARCH_DEFCONFIG default "arch/x86/configs/x86_64_defconfig" config CC_HAS_INDIRECT_THUNK + # GCC >= 8 or Clang >= 6 def_bool $(cc-option,-mindirect-branch-register) || \ $(cc-option,-mretpoline-external-thunk) +config CC_HAS_RETURN_THUNK + # GCC >= 8 or Clang >= 15 + def_bool $(cc-option,-mfunction-return=thunk-extern) + config HAS_AS_CET_SS # binutils >= 2.29 or LLVM >= 6 def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 02ab235de7..a0954a6a8c 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += msi.o obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o +obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o obj-y += irq.o obj-$(CONFIG_KEXEC) += machine_kexec.o diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a741d58b91..92af6230b3 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -133,7 +133,7 @@ LABEL(s3_resume) pop %r12 pop %rbx pop %rbp - ret + RET END(do_suspend_lowlevel) .data diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index ec451d962c..1b71ae959a 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -137,16 +137,45 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) } } +void nocall __x86_return_thunk(void); + /* * Place a return at @ptr. @ptr must be in the writable alias of a stub. * + * When CONFIG_RETURN_THUNK is active, this may be a JMP __x86_return_thunk + * instead, depending on the safety of @ptr with respect to Indirect Target + * Selection. + * * Returns the next position to write into the stub. */ void *place_ret(void *ptr) { + unsigned long addr = (unsigned long)ptr; uint8_t *p = ptr; - *p++ = 0xc3; + /* + * When Return Thunks are used, if a RET would be unsafe at this location + * with respect to Indirect Target Selection (i.e. if addr is in the first + * half of a cacheline), insert a JMP __x86_return_thunk instead. + * + * The displacement needs to be relative to the executable alias of the + * stub, not to @ptr which is the writeable alias. + */ + if ( IS_ENABLED(CONFIG_RETURN_THUNK) && !(addr & 0x20) ) + { + long stub_va = (this_cpu(stubs.addr) & PAGE_MASK) + (addr & ~PAGE_MASK); + long disp = (long)__x86_return_thunk - (stub_va + 5); + + BUG_ON((int32_t)disp != disp); + + *p++ = 0xe9; + *(int32_t *)p = disp; + p += 4; + } + else + { + *p++ = 0xc3; + } return p; } diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index cb47d72991..efdbdb6045 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -44,6 +44,9 @@ CFLAGS-$(CONFIG_CC_IS_GCC) += -fno-jump-tables CFLAGS-$(CONFIG_CC_IS_CLANG) += -mretpoline-external-thunk endif +# Compile with return thunk support if selected. +CFLAGS-$(CONFIG_RETURN_THUNK) += -mfunction-return=thunk-extern + # Disable the addition of a .note.gnu.property section to object files when # livepatch support is enabled. The contents of that section can change # depending on the instructions used, and livepatch-build-tools doesn't know diff --git a/xen/arch/x86/bhb-thunk.S b/xen/arch/x86/bhb-thunk.S index 52625f4e2c..7f92201a3c 100644 --- a/xen/arch/x86/bhb-thunk.S +++ b/xen/arch/x86/bhb-thunk.S @@ -23,7 +23,7 @@ FUNC(clear_bhb_tsx) 0: .byte 0xc6, 0xf8, 0 /* xabort $0 */ int3 1: - ret + RET END(clear_bhb_tsx) /* diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index d6c076f1d8..dc3c3c26bf 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include FUNC(clear_page_sse2) @@ -16,5 +18,5 @@ FUNC(clear_page_sse2) jnz 0b sfence - ret + RET END(clear_page_sse2) diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index c3c436545b..e43e5370c8 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,6 +1,8 @@ .file __FILE__ #include + +#include #include #define src_reg %rsi @@ -41,5 +43,5 @@ FUNC(copy_page_sse2) movnti tmp4_reg, 3*WORD_SIZE(dst_reg) sfence - ret + RET END(copy_page_sse2) diff --git a/xen/arch/x86/efi/check.c b/xen/arch/x86/efi/check.c index 9e473faad3..23ba30abf3 100644 --- a/xen/arch/x86/efi/check.c +++ b/xen/arch/x86/efi/check.c @@ -3,6 +3,9 @@ int __attribute__((__ms_abi__)) test(int i) return i; } +/* In case -mfunction-return is in use. */ +void __x86_return_thunk(void) {}; + /* * Populate an array with "addresses" of relocatable and absolute values. * This is to probe ld for (a) emitting base relocations at all and (b) not diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 32d6b44910..97ebe21298 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -58,6 +58,12 @@ .endif .endm +#ifdef CONFIG_RETURN_THUNK +# define RET jmp __x86_return_thunk +#else +# define RET ret +#endif + #ifdef CONFIG_XEN_IBT # define ENDBR64 endbr64 #else diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index c4b978d67b..26dad15f12 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -15,6 +15,8 @@ #undef SYM_ALIGN #define SYM_ALIGN(align...) +#ifdef CONFIG_INDIRECT_THUNK + .macro IND_THUNK_RETPOLINE reg:req call 1f int3 @@ -62,3 +64,25 @@ END(__x86_indirect_thunk_\reg) .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 GEN_INDIRECT_THUNK reg=r\reg .endr + +#endif /* CONFIG_INDIRECT_THUNK */ + +#ifdef CONFIG_RETURN_THUNK + .section .text.entry.__x86_return_thunk, "ax", @progbits + + /* + * The Indirect Target Selection speculative vulnerability means that + * indirect branches (including RETs) are unsafe when in the first + * half of a cacheline. Arrange for them to be in the second half. + * + * Align to 64, then skip 32. + */ + .balign 64 + .fill 32, 1, 0xcc + +FUNC(__x86_return_thunk) + ret + int3 /* Halt straight-line speculation */ +END(__x86_return_thunk) + +#endif /* CONFIG_RETURN_THUNK */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index ff5d1c9f86..295d847ea2 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -131,7 +131,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, BUILD_BUG_ON(STUB_BUF_SIZE / 2 < (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES) + - 1 /* ret */)); + (IS_ENABLED(CONFIG_RETURN_THUNK) ? 5 : 1) /* ret */)); /* Runtime confirmation that we haven't clobbered an adjacent stub. */ BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 5409ad3b14..362b5d2416 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -26,7 +26,7 @@ FUNC(load_guest_gprs) movq UREGS_r15(%rdi), %r15 movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi - ret + RET END(load_guest_gprs) /* Save guest GPRs. Parameter on the stack above the return address. */ @@ -48,5 +48,5 @@ FUNC(save_guest_gprs) movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) - ret + RET END(save_guest_gprs) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index ced8475001..fe27e82a47 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -571,6 +571,9 @@ static void __init print_details(enum ind_thunk thunk) #ifdef CONFIG_INDIRECT_THUNK " INDIRECT_THUNK" #endif +#ifdef CONFIG_RETURN_THUNK + " RETURN_THUNK" +#endif #ifdef CONFIG_SHADOW_PAGING " SHADOW_PAGING" #endif diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 1e87652f4b..d7b381ea54 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -180,7 +180,7 @@ FUNC(cr4_pv32_restore) or cr4_pv32_mask(%rip), %rax mov %rax, %cr4 mov %rax, (%rcx) - ret + RET 0: #ifndef NDEBUG /* Check that _all_ of the bits intended to be set actually are. */ @@ -198,7 +198,7 @@ FUNC(cr4_pv32_restore) 1: #endif xor %eax, %eax - ret + RET END(cr4_pv32_restore) FUNC(compat_syscall) @@ -329,7 +329,7 @@ __UNLIKELY_END(compat_bounce_null_selector) xor %eax, %eax mov %ax, TRAPBOUNCE_cs(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .section .fixup,"ax" .Lfx13: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 40d094d5b2..6efc6bab1e 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -604,7 +604,7 @@ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) xor %eax, %eax mov %rax, TRAPBOUNCE_eip(%rdx) mov %al, TRAPBOUNCE_flags(%rdx) - ret + RET .pushsection .fixup, "ax", @progbits # Numeric tags below represent the intended overall %rsi adjustment. diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 42217eaf24..e6c71a8e3e 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -83,6 +83,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); _stextentry = .; *(.text.entry) + *(.text.entry.*) . = ALIGN(PAGE_SIZE); _etextentry = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 6166327f4d..7d9442ec05 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -136,6 +136,17 @@ config INDIRECT_THUNK When enabled, indirect branches are implemented using a new construct called "retpoline" that prevents speculation. +config RETURN_THUNK + bool "Out-of-line Returns" + depends on CC_HAS_RETURN_THUNK + default INDIRECT_THUNK + help + Compile Xen with out-of-line returns. + + This allows Xen to mitigate a variety of speculative vulnerabilities + by choosing a hardware-dependent instruction sequence to implement + function returns safely. + config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y diff --git a/xen/lib/x86-generic-hweightl.c b/xen/lib/x86-generic-hweightl.c index 123a5b4392..1cab68952a 100644 --- a/xen/lib/x86-generic-hweightl.c +++ b/xen/lib/x86-generic-hweightl.c @@ -51,7 +51,11 @@ asm ( "pop %rdx\n\t" "pop %rdi\n\t" +#ifdef CONFIG_RETURN_THUNK + "jmp __x86_return_thunk\n\t" +#else "ret\n\t" +#endif ".size arch_generic_hweightl, . - arch_generic_hweightl\n\t" ); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:56:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987580.1372766 (Exim 4.92) (envelope-from ) id 1uG32C-0006lO-HG; Fri, 16 May 2025 21:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987580.1372766; Fri, 16 May 2025 21:56: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 1uG32C-0006lH-Ei; Fri, 16 May 2025 21:56:04 +0000 Received: by outflank-mailman (input) for mailman id 987580; Fri, 16 May 2025 21:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG32B-0006ky-2T for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG32B-00Ce80-0n for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG32A-003EUm-35 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56: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=M4W2U0ipTaUyik/f1E0RtjzQTQMktuh7m2ztkhQN1Jg=; b=t6fLr4qT4nzoMq1cWhDkleVkRc uXKaUlc/TjP2+7DIw3tAC5MyCyYS+pggyb+YeQ0qqmvSdxSUMf8NWeZK8OesaADqL9whf+1xAqr2x cvoJRxPwvAPa8SguiWNxS3i5GWy3tKZQNIySGtBrEwmzF/lij/djzrXOIr97X6C0pTAM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware Message-Id: Date: Fri, 16 May 2025 21:56:02 +0000 commit 45056fe5c5bf866208bf8bfe712c166950b5ba54 Author: Andrew Cooper AuthorDate: Thu May 9 17:43:47 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 12 17:27:09 2025 +0100 x86/spec-ctrl: Synthesise ITS_NO to guests on unaffected hardware It is easier to express feature word 17 in terms of word 16 + [32, 64) as that's how the layout is given in documentation. This is part of XSA-469 / CVE-2024-28956 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné (cherry picked from commit f6042f38e621525feff86bb101dc751d2d87cff8) --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 86 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 +- xen/tools/gen-cpuid.py | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 3a06b6f297..24b021eeff 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -218,6 +218,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index fe27e82a47..0a635025e4 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1760,6 +1760,90 @@ static void __init bhi_calculations(void) } } +/* + * https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html + */ +static void __init its_calculations(void) +{ + /* + * Indirect Target Selection is a Branch Prediction bug whereby certain + * indirect branches (including RETs) get predicted using a direct branch + * target, rather than a suitable indirect target, bypassing hardware + * isolation protections. + * + * ITS affects Core (but not Atom) processors starting from the + * introduction of eIBRS, up to but not including Golden Cove cores + * (checked here with BHI_CTRL). + * + * The ITS_NO feature is not expected to be enumerated by hardware, and is + * only for VMMs to synthesise for guests. + * + * ITS comes in 3 flavours: + * + * 1) Across-IBPB. Indirect branches after the IBPB can be controlled + * by direct targets which existed prior to the IBPB. This is + * addressed in the IPU 2025.1 microcode drop, and has no other + * software interaction. + * + * 2) Guest/Host. Indirect branches in the VMM can be controlled by + * direct targets from the guest. This applies equally to PV guests + * (Ring3) and HVM guests (VMX), and applies to all Skylake-uarch + * cores with eIBRS. + * + * 3) Intra-mode. Indirect branches in the VMM can be controlled by + * other execution in the same mode. + */ + + /* + * If we can see ITS_NO, or we're virtualised, do nothing. We are or may + * migrate somewhere unsafe. + */ + if ( cpu_has_its_no || cpu_has_hypervisor ) + return; + + /* ITS is only known to affect Intel processors at this time. */ + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) + return; + + /* + * ITS does not exist on: + * - non-Family 6 CPUs + * - those without eIBRS + * - those with BHI_CTRL + * but we still need to synthesise ITS_NO. + */ + if ( boot_cpu_data.x86 != 6 || !cpu_has_eibrs || + boot_cpu_has(X86_FEATURE_BHI_CTRL) ) + goto synthesise; + + switch ( boot_cpu_data.x86_model ) + { + /* These Skylake-uarch cores suffer cases #2 and #3. */ + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_L: + case INTEL_FAM6_KABYLAKE: + case INTEL_FAM6_COMETLAKE: + case INTEL_FAM6_COMETLAKE_L: + return; + + /* These Sunny/Willow/Cypress Cove cores suffer case #3. */ + case INTEL_FAM6_ICELAKE_X: + case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_ICELAKE_L: + case INTEL_FAM6_TIGERLAKE_L: + case INTEL_FAM6_TIGERLAKE: + case INTEL_FAM6_ROCKETLAKE: + return; + + default: + break; + } + + /* Platforms remaining are not believed to be vulnerable to ITS. */ + synthesise: + setup_force_cpu_cap(X86_FEATURE_ITS_NO); +} + void spec_ctrl_init_domain(struct domain *d) { bool pv = is_pv_domain(d); @@ -2316,6 +2400,8 @@ void __init init_speculation_mitigations(void) bhi_calculations(); + its_calculations(); + print_details(thunk); /* diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 16207e3817..1e0e870c5c 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -379,7 +379,8 @@ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ -/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ +/* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index a77cb30bdb..163b105bc6 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -51,7 +51,7 @@ def parse_definitions(state): r"\s+/\*([\w!|]*) .*$") word_regex = re.compile( - r"^/\* .* word (\d*) \*/$") + r"^/\* .* word (\d*) .*\*/$") last_word = -1 this = sys.modules[__name__] -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:56:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987581.1372770 (Exim 4.92) (envelope-from ) id 1uG32M-0006pY-J8; Fri, 16 May 2025 21:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987581.1372770; Fri, 16 May 2025 21:56: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 1uG32M-0006pQ-GB; Fri, 16 May 2025 21:56:14 +0000 Received: by outflank-mailman (input) for mailman id 987581; Fri, 16 May 2025 21:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG32L-0006pC-6P for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG32L-00Ce84-1C for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG32L-003EbJ-0H for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:13 +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=lO/gDIw2T3oshRCoukyO0hS/PCNCshWA5T6KcLd/ih4=; b=pqt1muK8pzLNpsXIsMmy4cjA3v A912n3pnxcaNrZcTLpGNUSy81pZ70tIt0GPzvVYaRMfNFrP3PnJvg7K2zn7OnwV3XM9F6QUNEL3+C +MrB3OnrFeB0YZHgAMFhImsmblL3ebgkLtudCMeZG/CJyPxyW6R+vF+St8Yn2HTxtzmw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Message-Id: Date: Fri, 16 May 2025 21:56:13 +0000 commit d58800f13d6eb15569f245c012749c469a4a8727 Author: Andrew Cooper AuthorDate: Tue May 13 13:55:12 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:55:12 2025 +0200 xen/link: Include .debug_str_offsets in DWARF2_DEBUG_SECTIONS Building Xen with Clang-17 yields the following warning: ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: ./.xen.efi.0xffff82d040000000.0:/4: section below image base ld: ./.xen.efi.0xffff82d040000000.1:/4: section below image base ld: warning: orphan section `.debug_str_offsets' from `prelink.o' being placed in section `.debug_str_offsets' ld: xen.efi:/4: section below image base Set the alignment to 4 as it holds 4-byte values, despite the fact that Clang appears to only use 1. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a88b99300aedea103884b4ef8c66a5a94206feb5 master date: 2025-04-28 19:46:46 +0100 --- xen/include/xen/xen.lds.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/xen.lds.h b/xen/include/xen/xen.lds.h index 16a9b1ba03..793d0e1145 100644 --- a/xen/include/xen/xen.lds.h +++ b/xen/include/xen/xen.lds.h @@ -56,6 +56,7 @@ DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1) \ DECL_DEBUG(.debug_types, 1) \ DECL_DEBUG(.debug_str, 1) \ + DECL_DEBUG(.debug_str_offsets, 4) \ DECL_DEBUG2(.debug_line, .debug_line.*, 1) \ DECL_DEBUG(.debug_line_str, 1) \ DECL_DEBUG(.debug_names, 4) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:56:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987582.1372775 (Exim 4.92) (envelope-from ) id 1uG32W-0006sN-KO; Fri, 16 May 2025 21:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987582.1372775; Fri, 16 May 2025 21:56: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 1uG32W-0006sF-Hb; Fri, 16 May 2025 21:56:24 +0000 Received: by outflank-mailman (input) for mailman id 987582; Fri, 16 May 2025 21:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG32V-0006rr-9w for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG32V-00Ce8R-1U for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG32V-003EhV-0g for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:23 +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=Mt1Hzo2sovf5zvJirhyBIIWDNwB21ruXqHlMpVOLznY=; b=BdyDNyjp8HgazQUqVTBi8DFiA/ xNNHWGG3zSuo7mD7tYF7PfpqFjjkKJTunxZdWKhh+kIvz3vJkbcpizzs1eOQSsdxbz1zt2QEw4HjO ACuwcfhoptqf8P9N+7sSTZvIwVO2B+Wk/aiIlmrYsZ8F0fKgwz8yJHnbRm1wfwao674I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86emul: avoid UB shifts in FLDENV/FRSTOR handling Message-Id: Date: Fri, 16 May 2025 21:56:23 +0000 commit 68506161ef5c4b6784d3cfe1d47d01ad2c7b779d Author: Jan Beulich AuthorDate: Tue May 13 13:56:04 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:56:04 2025 +0200 x86emul: avoid UB shifts in FLDENV/FRSTOR handling 16-bit quantities, no matter whether expressed as uint16_t or as bitfield, will be promoted to plain int before doing any arithmetic on them. Shifting such values by 16 will therefore shift into the sign bit, which is UB if that bit becomes set. To account for all reads and all writes accessing opposite members of the same union, introduce yet more local variables to reduce the shift counts to 12. Fixes: be55ed744ed8 ("x86emul: support FLDENV and FRSTOR") Reported-by: Fabian Specht Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: d00fc019b6eba68bd7f2186a6427e5a005ce989f master date: 2025-04-30 08:46:21 +0200 --- xen/arch/x86/x86_emulate/blk.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_emulate/blk.c b/xen/arch/x86/x86_emulate/blk.c index 08a05f8453..9ed1b7c96c 100644 --- a/xen/arch/x86/x86_emulate/blk.c +++ b/xen/arch/x86/x86_emulate/blk.c @@ -81,17 +81,19 @@ int x86_emul_blk( if ( !s->rex_prefix ) { /* Convert 32-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = fpstate.env.mode.real.fip_lo + - (fpstate.env.mode.real.fip_hi << 16); - unsigned int fdp = fpstate.env.mode.real.fdp_lo + - (fpstate.env.mode.real.fdp_hi << 16); + unsigned int fip = fpstate.env.mode.real.fip_lo & 0xf; + unsigned int fcs = (fpstate.env.mode.real.fip_lo >> 4) | + (fpstate.env.mode.real.fip_hi << 12); + unsigned int fdp = fpstate.env.mode.real.fdp_lo & 0xf; + unsigned int fds = (fpstate.env.mode.real.fdp_lo >> 4) | + (fpstate.env.mode.real.fdp_hi << 12); unsigned int fop = fpstate.env.mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(fpstate.env) ) @@ -121,17 +123,19 @@ int x86_emul_blk( else { /* Convert 16-bit real/vm86 to 32-bit prot format. */ - unsigned int fip = env->mode.real.fip_lo + - (env->mode.real.fip_hi << 16); - unsigned int fdp = env->mode.real.fdp_lo + - (env->mode.real.fdp_hi << 16); + unsigned int fip = env->mode.real.fip_lo & 0xf; + unsigned int fcs = (env->mode.real.fip_lo >> 4) | + (env->mode.real.fip_hi << 12); + unsigned int fdp = env->mode.real.fdp_lo & 0xf; + unsigned int fds = (env->mode.real.fdp_lo >> 4) | + (env->mode.real.fdp_hi << 12); unsigned int fop = env->mode.real.fop; - fpstate.env.mode.prot.fip = fip & 0xf; - fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fip = fip; + fpstate.env.mode.prot.fcs = fcs; fpstate.env.mode.prot.fop = fop; - fpstate.env.mode.prot.fdp = fdp & 0xf; - fpstate.env.mode.prot.fds = fdp >> 4; + fpstate.env.mode.prot.fdp = fdp; + fpstate.env.mode.prot.fds = fds; } if ( bytes == sizeof(*env) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:56:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987583.1372779 (Exim 4.92) (envelope-from ) id 1uG32g-0006uk-Lg; Fri, 16 May 2025 21:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987583.1372779; Fri, 16 May 2025 21:56: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 1uG32g-0006ub-J7; Fri, 16 May 2025 21:56:34 +0000 Received: by outflank-mailman (input) for mailman id 987583; Fri, 16 May 2025 21:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG32f-0006uL-D7 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG32f-00Ce8Z-1r for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG32f-003EpZ-0y for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56: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=IqRpkYkF3vJQd6AR60ZIup6+d1f8D0ESHGJden2VUR0=; b=cqnrN3KwR5qm1amFfIZNHW9lF/ VfKxHj5FvxlwXPaAOd4DbQD1wtRwAt0FkLok8lp60jn82yRhZHzrm8ZTiHEizuhApQPfVE3qHYxQR IytJHQvMaFUUzB49WKdRrJWCtCEKU629YB69GQ7o1bG82D9B0TsBE7RQAqnIyLT5LG8M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] cpufreq: don't leave stale statistics pointer Message-Id: Date: Fri, 16 May 2025 21:56:33 +0000 commit b1eeea44cd129ca5e03c20757e27351563384e5c Author: Jan Beulich AuthorDate: Tue May 13 13:56:21 2025 +0200 Commit: Jan Beulich CommitDate: Tue May 13 13:56:21 2025 +0200 cpufreq: don't leave stale statistics pointer Error paths of cpufreq_statistic_init() correctly free the base structure pointer, but the per-CPU variable would still hold it, mis- guiding e.g. cpufreq_statistic_update(). Defer installing of the pointer there until the structure was fully populated. Fixes: 755af07edba1 ("x86/cpufreq: don't use static array for large per-CPU data structures") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: a1ce987411f61dbf5fe64bba0cd3d36d7cc0311f master date: 2025-04-30 08:47:49 +0200 --- xen/drivers/cpufreq/utility.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index e690a484f1..d9caf31aa2 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -113,7 +113,6 @@ int cpufreq_statistic_init(unsigned int cpu) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -139,6 +138,8 @@ int cpufreq_statistic_init(unsigned int cpu) pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:56:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987584.1372785 (Exim 4.92) (envelope-from ) id 1uG32q-0006wv-OV; Fri, 16 May 2025 21:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987584.1372785; Fri, 16 May 2025 21:56: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 1uG32q-0006wn-KZ; Fri, 16 May 2025 21:56:44 +0000 Received: by outflank-mailman (input) for mailman id 987584; Fri, 16 May 2025 21:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG32p-0006wb-HM for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG32p-00Ce8d-2H for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG32p-003Exp-1P for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56: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=1buU9/YrXhjjl/hnKRZ4PvxnEjxHKuJt/Bfe0kVPZAg=; b=ZsMndmCGz/mFNXSvtnBgbPp41h 98PZ77ocZ0d5N0PwSuY8fO1F/GvcTTFhT6n1ZLNzQ4WKL4EVOcYas4ZMaYAlUrokRqqaRoov+fbCY QdREJdRXqRefxbcJtFn+aqiLAJu9k4ukqhXABQfMlsZRNWEIkJrwDqKPTX8YXKRqx3AM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/spec-ctrl: Support Intel's new PB-OPT Message-Id: Date: Fri, 16 May 2025 21:56:43 +0000 commit f938c0849479bb48ba8d3bd3f8f69568e5d1acb1 Author: Andrew Cooper AuthorDate: Thu May 15 09:04:16 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:04:16 2025 +0200 x86/spec-ctrl: Support Intel's new PB-OPT In IPU 2025.2 (May 2025), Intel have released an alternative mitigation for a prior security issue (SA-00982) on Sapphire and Emerald Rapids CPUs. Intel suggest that certain workloads will benefit from using the alternative mode. This can be selected by booting with `spec-ctrl=ibpb-alt`. https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 5873740e41acb8593f92623ddd03caebda2718f6 master date: 2025-05-13 14:49:12 +0100 --- docs/misc/xen-command-line.pandoc | 6 +++++- xen/arch/x86/acpi/power.c | 1 + xen/arch/x86/cpu/intel.c | 28 ++++++++++++++++++++++++++++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 3 +++ xen/arch/x86/include/asm/processor.h | 3 +++ xen/arch/x86/smpboot.c | 1 + xen/arch/x86/spec_ctrl.c | 7 +++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 9 files changed, 50 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 53ad3ffc3f..dba5d7f31e 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2470,7 +2470,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,bp-spec-reduce}= ]` +> bhi-dis-s,bp-spec-reduce,ibpb-alt}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2626,6 +2626,10 @@ 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. +On Sappire and Emerald Rapids CPUs with May 2025 microcode or later, the +`ibpb-alt=` option can be used to switch to the alternative mitigation for +Intel SA-00982. Intel suggest that some workloads will benefit from this. + ### sync_console > `= ` diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 08a7fc2508..b69be6e898 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -301,6 +301,7 @@ static int enter_state(u32 state) } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); /* * This should be before restoring CR4, but that is earlier in asm and diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 63f65ea5b0..7eaa20ece1 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,6 +49,34 @@ void __init set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val) update_mcu_opt_ctrl(); } +static uint32_t __ro_after_init pb_opt_ctrl_mask; +static uint32_t __ro_after_init pb_opt_ctrl_val; + +void update_pb_opt_ctrl(void) +{ + uint32_t mask = pb_opt_ctrl_mask, lo, hi; + + if ( !mask ) + return; + + rdmsr(MSR_PB_OPT_CTRL, lo, hi); + + lo &= ~mask; + lo |= pb_opt_ctrl_val; + + wrmsr(MSR_PB_OPT_CTRL, lo, hi); +} + +void __init set_in_pb_opt_ctrl(uint32_t mask, uint32_t val) +{ + pb_opt_ctrl_mask |= mask; + + pb_opt_ctrl_val &= ~mask; + pb_opt_ctrl_val |= (val & mask); + + update_pb_opt_ctrl(); +} + /* * Processors which have self-snooping capability can handle conflicting * memory type across CPUs by snooping its own cache. However, there exists diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 24b021eeff..90d69999d1 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -218,6 +218,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_gds_no boot_cpu_has(X86_FEATURE_GDS_NO) #define cpu_has_rfds_no boot_cpu_has(X86_FEATURE_RFDS_NO) #define cpu_has_rfds_clear boot_cpu_has(X86_FEATURE_RFDS_CLEAR) +#define cpu_has_pb_opt_ctrl boot_cpu_has(X86_FEATURE_PB_OPT_CTRL) #define cpu_has_its_no boot_cpu_has(X86_FEATURE_ITS_NO) /* Synthesized. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 22d9e76e55..6f2c3147e3 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -56,6 +56,9 @@ #define MSR_MISC_PACKAGE_CTRL 0x000000bc #define PGK_CTRL_ENERGY_FILTER_EN (_AC(1, ULL) << 0) +#define MSR_PB_OPT_CTRL 0x000000bf +#define PB_OPT_IBPB_ALT (_AC(1, ULL) << 0) + #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index d247ef8dd2..c3cc527f2e 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -512,6 +512,9 @@ static inline void tsx_init(void) {} void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void update_pb_opt_ctrl(void); +void set_in_pb_opt_ctrl(uint32_t mask, uint32_t val); + enum ap_boot_method { AP_BOOT_NORMAL, AP_BOOT_SKINIT, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 891a29fca1..b16e2812e1 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -381,6 +381,7 @@ void asmlinkage start_secondary(void *unused) info->last_spec_ctrl = default_xen_spec_ctrl; } update_mcu_opt_ctrl(); + update_pb_opt_ctrl(); tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 0a635025e4..3027f1db6b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -85,6 +85,8 @@ 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 bool __initdata opt_ibpb_alt; + static int __init cf_check parse_spec_ctrl(const char *s) { const char *ss; @@ -369,6 +371,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_div_scrub = val; else if ( (val = parse_boolean("bp-spec-reduce", s, ss)) >= 0 ) opt_bp_spec_reduce = val; + else if ( (val = parse_boolean("ibpb-alt", s, ss)) >= 0 ) + opt_ibpb_alt = val; else rc = -EINVAL; @@ -2494,6 +2498,9 @@ void __init init_speculation_mitigations(void) wrmsrl(MSR_SPEC_CTRL, val); info->last_spec_ctrl = val; } + + if ( cpu_has_pb_opt_ctrl ) + set_in_pb_opt_ctrl(PB_OPT_IBPB_ALT, opt_ibpb_alt); } static void __init __maybe_unused build_assertions(void) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 1e0e870c5c..10462771e5 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -380,6 +380,7 @@ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 (express in terms of word 16) */ +XEN_CPUFEATURE(PB_OPT_CTRL, 16*32+32) /* MSR_PB_OPT_CTRL.IBPB_ALT */ XEN_CPUFEATURE(ITS_NO, 16*32+62) /*!A No Indirect Target Selection */ #endif /* XEN_CPUFEATURE */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:56:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987585.1372786 (Exim 4.92) (envelope-from ) id 1uG330-000702-Py; Fri, 16 May 2025 21:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987585.1372786; Fri, 16 May 2025 21:56: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 1uG330-0006zu-NL; Fri, 16 May 2025 21:56:54 +0000 Received: by outflank-mailman (input) for mailman id 987585; Fri, 16 May 2025 21:56:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG32z-0006zf-K5 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG32z-00Ce8k-2b for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG32z-003F4D-1n for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:56: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=5yCjMUkvglmRAOtslYrn/2AWabxnWLQ3mJN2WmSPNMI=; b=nsuY12v94YPQQAo6Bs857j2xF/ DVq9OTMGiUxbv4lUafnOlQVwUv07FOXI/F2n3sSFSs+Cw/bCMCropq8n9mwta/3Mq/INGnjhbTB8o 44e8qzIIFtRVVxeHVsO42/D8QZEFrqdRIo2V9CTlx1BisQSjzJw/vn5U660DWQZiFdQs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches Message-Id: Date: Fri, 16 May 2025 21:56:53 +0000 commit ee150f56fca78f696e3fee4e8fa8a9adaa0fab4e Author: Roger Pau Monné AuthorDate: Thu May 15 09:04:43 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:04:43 2025 +0200 x86/pv: fix MMUEXT_FLUSH_CACHE to flush all pCPU caches The implementation of MMUEXT_FLUSH_CACHE is bogus, as it doesn't account to flush the cache of any previous pCPU where the current vCPU might have run, and hence is likely to not work as expected. Fix this by resorting to use the same logic as MMUEXT_FLUSH_CACHE_GLOBAL, which will be correct in all cases. Adjust MMUEXT_FLUSH_CACHE_GLOBAL return code in case cache flush is not permitted for the domain to use -EACCES instead of -EINVAL, as that's more accurate and also matches the error code used by MMUEXT_FLUSH_CACHE. Fixes: 8e90e37e6db8 ("Fix WBINVD by adding a new hypercall.") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: bbaea9878bf6d11f6f336710148dbbd26e927cfd master date: 2025-05-13 19:43:48 +0200 --- xen/arch/x86/mm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 3f43cbabe1..3430b13dcd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3811,14 +3811,11 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(currd != pg_owner) ) - rc = -EPERM; - else if ( unlikely(!cache_flush_permitted(currd)) ) - rc = -EACCES; - else - wbinvd(); - break; - + /* + * Dirty pCPU caches where the current vCPU has been scheduled are + * not tracked, and hence we need to resort to a global cache + * flush for correctness. + */ case MMUEXT_FLUSH_CACHE_GLOBAL: if ( unlikely(currd != pg_owner) ) rc = -EPERM; @@ -3835,7 +3832,7 @@ long do_mmuext_op( flush_mask(mask, FLUSH_CACHE); } else - rc = -EINVAL; + rc = -EACCES; break; case MMUEXT_SET_LDT: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:57:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987586.1372791 (Exim 4.92) (envelope-from ) id 1uG33A-00072V-RH; Fri, 16 May 2025 21:57:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987586.1372791; Fri, 16 May 2025 21:57: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 1uG33A-00072N-Ok; Fri, 16 May 2025 21:57:04 +0000 Received: by outflank-mailman (input) for mailman id 987586; Fri, 16 May 2025 21:57:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG339-00072A-Pw for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:57:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG339-00Ce9A-39 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:57:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG339-003FBR-26 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:57:03 +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=/WQ6NHdgZsW2OM9mtvUOEh7MpgJmkDgVWfJNmPatuE8=; b=TZvHFBpb9WikrEVgKVNv07Hj5e 6K99NllbjUTdT0LMint1IV0e7DN/bpXFAENgOYOfn7Yy7X43hcofConuJ7Xewyiacw+RqRSJjjrSi bEsAJb+3B5197tmuLqjyUlhuIJhRLfgPdTOUsgs1oskiYzNyBzQWBeSdQeYe9A+yBT8k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/IRQ: constrain creator-domain-ID assertion Message-Id: Date: Fri, 16 May 2025 21:57:03 +0000 commit 612cfd7215568fe8a7e8939dfcc4bf53d986e482 Author: Jan Beulich AuthorDate: Thu May 15 09:05:02 2025 +0200 Commit: Jan Beulich CommitDate: Thu May 15 09:05:02 2025 +0200 x86/IRQ: constrain creator-domain-ID assertion If init_one_irq_desc() fails, ->arch.creator_domid won't be set to the expected value, and hence the assertion may trigger. Limit it to just the success case of that function call. Fixes: 92d9101eab ("x86: allow stubdom access to irq created for msi") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: d7127e06f617ed89eefe17a9ac954032863032d5 master date: 2025-05-14 11:00:00 +0200 --- xen/arch/x86/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 3a09ed6346..bde17c7fb8 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -289,9 +289,9 @@ int create_irq(nodeid_t node, bool grant_access) mask = NULL; } ret = assign_irq_vector(irq, mask); - } - ASSERT(desc->arch.creator_domid == DOMID_INVALID); + ASSERT(desc->arch.creator_domid == DOMID_INVALID); + } if (ret < 0) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 21:57:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 21:57:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987587.1372795 (Exim 4.92) (envelope-from ) id 1uG33K-00074w-T4; Fri, 16 May 2025 21:57:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987587.1372795; Fri, 16 May 2025 21:57: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 1uG33K-00074m-Q6; Fri, 16 May 2025 21:57:14 +0000 Received: by outflank-mailman (input) for mailman id 987587; Fri, 16 May 2025 21:57:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG33J-00074g-Sv for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:57:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG33K-00Ce9K-0G for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:57:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG33J-003FHq-2c for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 21:57:13 +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=O4GYTU8Y2KsjDZfK2lGvkxTr8QO2Zhr7cmiAeAacNrs=; b=NPDHSGgQ/e+ni8UUtrObiudqFZ RpaOiUFeE3B596yqo4XMlY0HwQBZqmaLSmT7Ui2rhbHKJdYs84Q9bDbUKZ3ID4Q9GKVM5nq8tp5/i WqP+ObN/sCxdovPOO51uCjJiGyHef2x8YlvnzxRcR6PQb4kVQEK7GsfA+VPOOhm74a/k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/emul: Fix emulation of RDSEED with older toolchains Message-Id: Date: Fri, 16 May 2025 21:57:13 +0000 commit ddec00769cd80a44b412281d8b52482e4e20c2e5 Author: Andrew Cooper AuthorDate: Thu May 15 20:09:35 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 21:34:19 2025 +0100 x86/emul: Fix emulation of RDSEED with older toolchains This is reported as a MISRA R16.3 (missing break) violation, but turns out to be substantially more complicated than expected. In commit a8fe4ec5320a ("x86emul: support RDRAND/RDSEED"), the switch() statement had a default case going to cannot_emulate, with both the case 6 and case 7 labels being fully within #ifdef HAVE_GAS_RD{RAND,SEED}. Therefore, when the toolchain didn't understand the RDRAND/RDSEED instructions, attempts to emulate them suffered #UD. (In principle, this is a problem as there's no interlock to prevent RDRAND/RDSEED being advertised to the guest, but as instructions with only register encodings, they can only legitimately be emulated when VM Introspection is in use.) In commit 58f1bba44033 ("x86emul: support RDPID"), case 7 was taken outside of HAVE_GAS_RDSEED, meaning that emulating an RDSEED instruction no longer hit the default case when the toolchain was too old. Instead, it would fall out of the switch statement and be completed normally, behaving as a NOP to the guest. Retrofit a "return X86EMUL_UNIMPLEMENTED" in the case that the toolchain doesn't know the RDRAND instruction, matching how RDRAND work. Note that this has been fixed differently in Xen 4.21. Commit 05bf9f1f0f52 ("x86/emulate: Remove HAVE_AS_RDRAND and HAVE_AS_RDSEED") has removed the problematic condition due to the toolchain baseline upgrade. Fixes: 58f1bba44033 ("x86emul: support RDPID") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_emulate/0fc7.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/x86_emulate/0fc7.c b/xen/arch/x86/x86_emulate/0fc7.c index 5268d5cafd..2b6b444bab 100644 --- a/xen/arch/x86/x86_emulate/0fc7.c +++ b/xen/arch/x86/x86_emulate/0fc7.c @@ -102,6 +102,8 @@ int x86emul_0fc7(struct x86_emulate_state *s, if ( carry ) regs->eflags |= X86_EFLAGS_CF; break; +#else + return X86EMUL_UNIMPLEMENTED; #endif } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Fri May 16 22:44:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 22:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987637.1372829 (Exim 4.92) (envelope-from ) id 1uG3mc-0005qm-OD; Fri, 16 May 2025 22:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987637.1372829; Fri, 16 May 2025 22: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 1uG3mc-0005qe-Ld; Fri, 16 May 2025 22:44:02 +0000 Received: by outflank-mailman (input) for mailman id 987637; Fri, 16 May 2025 22:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG3mc-0005qY-45 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG3mc-00CexA-0L for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG3mb-003qsH-2Y for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22: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=CxneuOd9lpiv+pXU38uImb5OMphjZEz8dEFtJF+rL9I=; b=QQeQWIWYZRl5DxYZFBMazOsqH5 Vs4uUJA8PvQjBYM/s+wbnCO/dkyDdlkmVXNeXmuslWVvNCH/707gpLryde4+bV1JFMv7CEcCmzaRO +oZbQZBpkIQhYop0dbT55tLBZR1fiHhfz0Z0VOCe7S0U4q1zEShtcHRHolQswo5ucfnQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/regs: Fold x86_64/regs.h into it's single includer Message-Id: Date: Fri, 16 May 2025 22:44:01 +0000 commit 267c7fe2413e1f5f0672641ff76ea4e384a321b2 Author: Andrew Cooper AuthorDate: Sun Dec 29 14:30:17 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/regs: Fold x86_64/regs.h into it's single includer Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/regs.h | 24 +++++++++++++++++++++++- xen/arch/x86/include/asm/x86_64/regs.h | 28 ---------------------------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/include/asm/regs.h b/xen/arch/x86/include/asm/regs.h index ddf5e14e57..60b0d7b873 100644 --- a/xen/arch/x86/include/asm/regs.h +++ b/xen/arch/x86/include/asm/regs.h @@ -2,7 +2,29 @@ #ifndef __X86_REGS_H__ #define __X86_REGS_H__ -#include +#include +#include + +#define ring_0(r) (((r)->cs & 3) == 0) +#define ring_1(r) (((r)->cs & 3) == 1) +#define ring_2(r) (((r)->cs & 3) == 2) +#define ring_3(r) (((r)->cs & 3) == 3) + +#define guest_kernel_mode(v, r) \ + (!is_pv_32bit_vcpu(v) ? \ + (ring_3(r) && ((v)->arch.flags & TF_kernel_mode)) : \ + (ring_1(r))) + +#define permit_softint(dpl, v, r) \ + ((dpl) >= (guest_kernel_mode(v, r) ? 1 : 3)) + +/* Check for null trap callback handler: Is the EIP null? */ +#define null_trap_bounce(v, tb) \ + (!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0)) + +/* Number of bytes of on-stack execution state to be context-switched. */ +/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */ +#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es)) #define guest_mode(r) \ ({ \ diff --git a/xen/arch/x86/include/asm/x86_64/regs.h b/xen/arch/x86/include/asm/x86_64/regs.h deleted file mode 100644 index 171cf9a2e2..0000000000 --- a/xen/arch/x86/include/asm/x86_64/regs.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _X86_64_REGS_H -#define _X86_64_REGS_H - -#include -#include - -#define ring_0(r) (((r)->cs & 3) == 0) -#define ring_1(r) (((r)->cs & 3) == 1) -#define ring_2(r) (((r)->cs & 3) == 2) -#define ring_3(r) (((r)->cs & 3) == 3) - -#define guest_kernel_mode(v, r) \ - (!is_pv_32bit_vcpu(v) ? \ - (ring_3(r) && ((v)->arch.flags & TF_kernel_mode)) : \ - (ring_1(r))) - -#define permit_softint(dpl, v, r) \ - ((dpl) >= (guest_kernel_mode(v, r) ? 1 : 3)) - -/* Check for null trap callback handler: Is the EIP null? */ -#define null_trap_bounce(v, tb) \ - (!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0)) - -/* Number of bytes of on-stack execution state to be context-switched. */ -/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */ -#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es)) - -#endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 22:44:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 22:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987638.1372833 (Exim 4.92) (envelope-from ) id 1uG3mm-0005tJ-Po; Fri, 16 May 2025 22:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987638.1372833; Fri, 16 May 2025 22: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 1uG3mm-0005tA-N2; Fri, 16 May 2025 22:44:12 +0000 Received: by outflank-mailman (input) for mailman id 987638; Fri, 16 May 2025 22:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG3mm-0005t2-4F for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG3mm-00CexG-0r for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG3ml-003qya-33 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22: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=hvgnS9SaeTs2E0lNAHjeXdM1u0MuRDzxo5UvaveK/tc=; b=yTt+DM9cMAw+pG5rjZawfn14Qk f/yA3OrrUWWq8u8ZTOSOdxM9zIwMVxNuU9UefduHxhtfInM3eZzlMrbwiP8WYKhlcYtQTBjMobVjT R2h+dB3vGdCOHsCi5CKQ/BZghflV3FbqNFf2UkK2kgyCebWKRUMj+yvJau2vx3IabeoM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Rework register state printing to use a struct Message-Id: Date: Fri, 16 May 2025 22:44:11 +0000 commit 32403f9f9fc671f05a6726a227d56e63c48cd777 Author: Andrew Cooper AuthorDate: Sun Dec 29 19:23:03 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/traps: Rework register state printing to use a struct ... in preference to the crs[8] array. This avoids abusing crs[5..7] for the fs/gs bases, giving them proper named fields instead, and avoids storage for cr1 which is unused in the x86 architecture. In show_registers(), remove a redundant read_cr2(). read_registers() already did the same, and it is only the PV path which needs to override with arch_get_cr2(). In vcpu_show_registers(), express the gsb/gss decision using SWAP(). The determination is going to get even more complicated under FRED. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/traps.c | 96 +++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index ac0fafd72d..01b4f06232 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -23,6 +23,11 @@ #include #include +struct extra_state +{ + unsigned long cr0, cr2, cr3, cr4; + unsigned long fsb, gsb, gss; +}; static void print_xen_info(void) { @@ -35,28 +40,29 @@ static void print_xen_info(void) enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; -/* (ab)use crs[5..7] for fs/gs bases. */ -static void read_registers(struct cpu_user_regs *regs, unsigned long crs[8]) +static void read_registers(struct cpu_user_regs *regs, struct extra_state *state) { - crs[0] = read_cr0(); - crs[2] = read_cr2(); - crs[3] = read_cr3(); - crs[4] = read_cr4(); + state->cr0 = read_cr0(); + state->cr2 = read_cr2(); + state->cr3 = read_cr3(); + state->cr4 = read_cr4(); + read_sregs(regs); - crs[5] = read_fs_base(); - crs[6] = read_gs_base(); - crs[7] = read_gs_shadow(); + + state->fsb = read_fs_base(); + state->gsb = read_gs_base(); + state->gss = read_gs_shadow(); } static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, - unsigned long crs[8]) + struct extra_state *state) { struct segment_register sreg; - crs[0] = v->arch.hvm.guest_cr[0]; - crs[2] = v->arch.hvm.guest_cr[2]; - crs[3] = v->arch.hvm.guest_cr[3]; - crs[4] = v->arch.hvm.guest_cr[4]; + state->cr0 = v->arch.hvm.guest_cr[0]; + state->cr2 = v->arch.hvm.guest_cr[2]; + state->cr3 = v->arch.hvm.guest_cr[3]; + state->cr4 = v->arch.hvm.guest_cr[4]; hvm_get_segment_register(v, x86_seg_cs, &sreg); regs->cs = sreg.sel; @@ -69,20 +75,20 @@ static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, hvm_get_segment_register(v, x86_seg_fs, &sreg); regs->fs = sreg.sel; - crs[5] = sreg.base; + state->fsb = sreg.base; hvm_get_segment_register(v, x86_seg_gs, &sreg); regs->gs = sreg.sel; - crs[6] = sreg.base; + state->gsb = sreg.base; hvm_get_segment_register(v, x86_seg_ss, &sreg); regs->ss = sreg.sel; - crs[7] = hvm_get_reg(v, MSR_SHADOW_GS_BASE); + state->gss = hvm_get_reg(v, MSR_SHADOW_GS_BASE); } static void _show_registers( - const struct cpu_user_regs *regs, unsigned long crs[8], + const struct cpu_user_regs *regs, const struct extra_state *state, enum context context, const struct vcpu *v) { static const char *const context_names[] = { @@ -112,10 +118,10 @@ static void _show_registers( printk("r12: %016lx r13: %016lx r14: %016lx\n", regs->r12, regs->r13, regs->r14); printk("r15: %016lx cr0: %016lx cr4: %016lx\n", - regs->r15, crs[0], crs[4]); - printk("cr3: %016lx cr2: %016lx\n", crs[3], crs[2]); + regs->r15, state->cr0, state->cr4); + printk("cr3: %016lx cr2: %016lx\n", state->cr3, state->cr2); printk("fsb: %016lx gsb: %016lx gss: %016lx\n", - crs[5], crs[6], crs[7]); + state->fsb, state->gsb, state->gss); printk("ds: %04x es: %04x fs: %04x gs: %04x " "ss: %04x cs: %04x\n", regs->ds, regs->es, regs->fs, @@ -125,34 +131,33 @@ static void _show_registers( void show_registers(const struct cpu_user_regs *regs) { struct cpu_user_regs fault_regs = *regs; - unsigned long fault_crs[8]; + struct extra_state fault_state; enum context context; struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; if ( guest_mode(regs) && is_hvm_vcpu(v) ) { - get_hvm_registers(v, &fault_regs, fault_crs); + get_hvm_registers(v, &fault_regs, &fault_state); context = CTXT_hvm_guest; } else { - read_registers(&fault_regs, fault_crs); + read_registers(&fault_regs, &fault_state); if ( guest_mode(regs) ) { context = CTXT_pv_guest; - fault_crs[2] = arch_get_cr2(v); + fault_state.cr2 = arch_get_cr2(v); } else { context = CTXT_hypervisor; - fault_crs[2] = read_cr2(); } } print_xen_info(); printk("CPU: %d\n", smp_processor_id()); - _show_registers(&fault_regs, fault_crs, context, v); + _show_registers(&fault_regs, &fault_state, context, v); if ( ler_msr && !guest_mode(regs) ) { @@ -173,34 +178,41 @@ void vcpu_show_registers(struct vcpu *v) { const struct cpu_user_regs *regs = &v->arch.user_regs; struct cpu_user_regs aux_regs; + struct extra_state state; enum context context; - unsigned long crs[8]; if ( is_hvm_vcpu(v) ) { aux_regs = *regs; - get_hvm_registers(v, &aux_regs, crs); + get_hvm_registers(v, &aux_regs, &state); regs = &aux_regs; context = CTXT_hvm_guest; } else { bool kernel = guest_kernel_mode(v, regs); + unsigned long gsb, gss; + + state.cr0 = v->arch.pv.ctrlreg[0]; + state.cr2 = arch_get_cr2(v); + state.cr3 = pagetable_get_paddr(kernel + ? v->arch.guest_table + : v->arch.guest_table_user); + state.cr4 = v->arch.pv.ctrlreg[4]; + + gsb = v->arch.pv.gs_base_user; + gss = v->arch.pv.gs_base_kernel; + if ( kernel ) + SWAP(gsb, gss); - crs[0] = v->arch.pv.ctrlreg[0]; - crs[2] = arch_get_cr2(v); - crs[3] = pagetable_get_paddr(kernel ? - v->arch.guest_table : - v->arch.guest_table_user); - crs[4] = v->arch.pv.ctrlreg[4]; - crs[5] = v->arch.pv.fs_base; - crs[6 + !kernel] = v->arch.pv.gs_base_kernel; - crs[7 - !kernel] = v->arch.pv.gs_base_user; + state.fsb = v->arch.pv.fs_base; + state.gsb = gsb; + state.gss = gss; context = CTXT_pv_guest; } - _show_registers(regs, crs, context, v); + _show_registers(regs, &state, context, v); } void show_page_walk(unsigned long addr) @@ -268,7 +280,7 @@ void show_page_walk(unsigned long addr) void asmlinkage do_double_fault(struct cpu_user_regs *regs) { unsigned int cpu; - unsigned long crs[8]; + struct extra_state state; console_force_unlock(); @@ -279,10 +291,10 @@ void asmlinkage do_double_fault(struct cpu_user_regs *regs) printk("*** DOUBLE FAULT ***\n"); print_xen_info(); - read_registers(regs, crs); + read_registers(regs, &state); printk("CPU: %d\n", cpu); - _show_registers(regs, crs, CTXT_hypervisor, NULL); + _show_registers(regs, &state, CTXT_hypervisor, NULL); show_code(regs); show_stack_overflow(cpu, regs); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 22:44:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 22:44:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987639.1372837 (Exim 4.92) (envelope-from ) id 1uG3mw-0005wD-RB; Fri, 16 May 2025 22:44:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987639.1372837; Fri, 16 May 2025 22:44: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 1uG3mw-0005w5-OU; Fri, 16 May 2025 22:44:22 +0000 Received: by outflank-mailman (input) for mailman id 987639; Fri, 16 May 2025 22:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG3mw-0005vw-9Q for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG3mw-00Cexa-1P for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG3mw-003r6X-0L for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22: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=RAiU5PU5RpaW2V/71/3BSNjEdTdxiVk8Jrneyd+8o8c=; b=tgZumGRyHiBYGKwbmS6zs88YZo VkLlg68DdxKlslFvrEuXSLXNmDQxSU/L5KkHciChbNI8Ta8He5qfqn9uAMAXkzMqZ3IbZIiH6zHnL H/515Ko0MNwWwgdkutViSlel5taLgN/SERQBwgIpTEuQuwayaJxuBdVTYqfVg9RC6eZQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Avoid OoB accesses to print the data selectors Message-Id: Date: Fri, 16 May 2025 22:44:22 +0000 commit f903769f665c87d8456aa4a581d520a49841f09f Author: Andrew Cooper AuthorDate: Sun Dec 29 19:06:10 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/traps: Avoid OoB accesses to print the data selectors _show_registers() prints the data selectors from struct cpu_user_regs, but these fields are sometimes out-of-bounds. See commit 6065a05adf15 ("x86/traps: 'Fix' safety of read_registers() in #DF path"). There are 3 callers of _show_registers(): 1. vcpu_show_registers(), which always operates on a scheduled-out vCPU, where v->arch.user_regs (or aux_regs on the stack) is always in-bounds. 2. show_registers() where regs is always an on-stack frame. regs is copied into a local variable first (which is an OoB read for constructs such as WARN()), before being modified (so no OoB write). 3. do_double_fault(), where regs is adjacent to the stack guard page, and written into directly. This is an out of bounds read and write, with a bodge to avoid the writes hitting the guard page. Include the data segment selectors in struct extra_state, and use those fields instead of the fields in regs. This resolves the OoB write on the #DF path. Resolve the OoB read in show_registers() by doing a partial memcpy() rather than full structure copy. This is temporary until we've finished untangling the vm86 fields fully. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/traps.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 01b4f06232..23622cdb14 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -27,6 +27,7 @@ struct extra_state { unsigned long cr0, cr2, cr3, cr4; unsigned long fsb, gsb, gss; + uint16_t ds, es, fs, gs; }; static void print_xen_info(void) @@ -40,18 +41,21 @@ static void print_xen_info(void) enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; -static void read_registers(struct cpu_user_regs *regs, struct extra_state *state) +static void read_registers(struct extra_state *state) { state->cr0 = read_cr0(); state->cr2 = read_cr2(); state->cr3 = read_cr3(); state->cr4 = read_cr4(); - read_sregs(regs); - state->fsb = read_fs_base(); state->gsb = read_gs_base(); state->gss = read_gs_shadow(); + + asm ( "mov %%ds, %0" : "=m" (state->ds) ); + asm ( "mov %%es, %0" : "=m" (state->es) ); + asm ( "mov %%fs, %0" : "=m" (state->fs) ); + asm ( "mov %%gs, %0" : "=m" (state->gs) ); } static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, @@ -68,17 +72,17 @@ static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, regs->cs = sreg.sel; hvm_get_segment_register(v, x86_seg_ds, &sreg); - regs->ds = sreg.sel; + state->ds = sreg.sel; hvm_get_segment_register(v, x86_seg_es, &sreg); - regs->es = sreg.sel; + state->es = sreg.sel; hvm_get_segment_register(v, x86_seg_fs, &sreg); - regs->fs = sreg.sel; + state->fs = sreg.sel; state->fsb = sreg.base; hvm_get_segment_register(v, x86_seg_gs, &sreg); - regs->gs = sreg.sel; + state->gs = sreg.sel; state->gsb = sreg.base; hvm_get_segment_register(v, x86_seg_ss, &sreg); @@ -124,17 +128,23 @@ static void _show_registers( state->fsb, state->gsb, state->gss); printk("ds: %04x es: %04x fs: %04x gs: %04x " "ss: %04x cs: %04x\n", - regs->ds, regs->es, regs->fs, - regs->gs, regs->ss, regs->cs); + state->ds, state->es, state->fs, + state->gs, regs->ss, regs->cs); } void show_registers(const struct cpu_user_regs *regs) { - struct cpu_user_regs fault_regs = *regs; + struct cpu_user_regs fault_regs; struct extra_state fault_state; enum context context; struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; + /* + * Don't read beyond the end of the hardware frame. It is out of bounds + * for WARN()/etc. + */ + memcpy(&fault_regs, regs, offsetof(struct cpu_user_regs, es)); + if ( guest_mode(regs) && is_hvm_vcpu(v) ) { get_hvm_registers(v, &fault_regs, &fault_state); @@ -142,7 +152,7 @@ void show_registers(const struct cpu_user_regs *regs) } else { - read_registers(&fault_regs, &fault_state); + read_registers(&fault_state); if ( guest_mode(regs) ) { @@ -209,6 +219,11 @@ void vcpu_show_registers(struct vcpu *v) state.gsb = gsb; state.gss = gss; + state.ds = v->arch.user_regs.ds; + state.es = v->arch.user_regs.es; + state.fs = v->arch.user_regs.fs; + state.gs = v->arch.user_regs.gs; + context = CTXT_pv_guest; } @@ -291,7 +306,7 @@ void asmlinkage do_double_fault(struct cpu_user_regs *regs) printk("*** DOUBLE FAULT ***\n"); print_xen_info(); - read_registers(regs, &state); + read_registers(&state); printk("CPU: %d\n", cpu); _show_registers(regs, &state, CTXT_hypervisor, NULL); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 22:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 22:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987640.1372841 (Exim 4.92) (envelope-from ) id 1uG3n7-0005z9-Tv; Fri, 16 May 2025 22:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987640.1372841; Fri, 16 May 2025 22: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 1uG3n7-0005z1-RE; Fri, 16 May 2025 22:44:33 +0000 Received: by outflank-mailman (input) for mailman id 987640; Fri, 16 May 2025 22:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG3n6-0005yo-Dd for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG3n6-00Cexe-1u for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG3n6-003rD5-0t for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22: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=gCPQM+mzwRrzTg6NCL3iVq2H5mtMN0f2TFwLBmK6xME=; b=6B9vFWnKpmsHDmfqTj8IdGL9t6 70wb+26UprXcP9lrdKy7YCu0F8eXW4yVVuNXN/QfzzfJeclGCGUDTntX7PlYjH/631ywvLkI0XK09 yixC1VoAwdLMjn0kPuLzjClwZ8XFgBLXWf1nC0Rs9wBXhaU0TQPh1jF5bVj8opjD6JaA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert "x86/traps: 'Fix' safety of read_registers() in #DF path" Message-Id: Date: Fri, 16 May 2025 22:44:32 +0000 commit 14acde869f02a39d395b6c78d9e367aebc3dbde5 Author: Andrew Cooper AuthorDate: Mon Dec 30 14:07:18 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 Revert "x86/traps: 'Fix' safety of read_registers() in #DF path" This reverts commit 6065a05adf152a556fb9f11a5218c89e41b62893. The discussed "proper fix" has now been implemented, and the #DF path no longer writes out-of-bounds. Restore the proper #DF IST pointer. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e8d4ca3203..b934ce7ca4 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -847,13 +847,7 @@ void load_system_tables(void) tss->ist[IST_MCE - 1] = stack_top + (1 + IST_MCE) * PAGE_SIZE; tss->ist[IST_NMI - 1] = stack_top + (1 + IST_NMI) * PAGE_SIZE; tss->ist[IST_DB - 1] = stack_top + (1 + IST_DB) * PAGE_SIZE; - /* - * Gross bodge. The #DF handler uses the vm86 fields of cpu_user_regs - * beyond the hardware frame. Adjust the stack entrypoint so this - * doesn't manifest as an OoB write which hits the guard page. - */ - tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE - - (sizeof(struct cpu_user_regs) - offsetof(struct cpu_user_regs, es)); + tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE; tss->bitmap = IOBMP_INVALID_OFFSET; /* All other stack pointers poisioned. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 22:44:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 22:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987641.1372845 (Exim 4.92) (envelope-from ) id 1uG3nH-00061Z-VB; Fri, 16 May 2025 22:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987641.1372845; Fri, 16 May 2025 22: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 1uG3nH-00061R-Sd; Fri, 16 May 2025 22:44:43 +0000 Received: by outflank-mailman (input) for mailman id 987641; Fri, 16 May 2025 22:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG3nG-00061A-IJ for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG3nG-00Cexj-2J for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG3nG-003rMj-1O for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22: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=CDOkKR/x+kgtptzQVerkIqLYMez9wNiQYFWHKDIVLeM=; b=BdIu4wEKLXPb+iLHdbdeFRsUJx PhzsHZvZlXc7k7huhX5CV/mAo1b7Kow4CrQphDiozvUzFywMLhRQHhdEhhAk9tjDhLpqaI+C5MpnS RSqN6R9MzfdAbiDZ8TYVxSo16wVsfmPxiEYt5KbJA0bxGXrogeRjkfFxBkGpQJRx8LRc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ARM: Fix register constraints in run_in_exception_handler() Message-Id: Date: Fri, 16 May 2025 22:44:42 +0000 commit 1f5e64755d0e25b3aadf3c1ec1a4a0f0f3665969 Author: Andrew Cooper AuthorDate: Fri Feb 7 22:27:53 2025 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 ARM: Fix register constraints in run_in_exception_handler() For asm() statements, clobbers are disjoint from inputs and outputs. Therefore, run_in_exception_handler() specifying an input and clobbering BUG_FN_REG forces the compiler to set up fn in the wrong regsiter, just to have the code block move it into the correct register. Instead, use `register asm()` to tell the compiler which register fn really wants to be in. This results in better code generation. Bloat-o-meter reports: ARM64: Function old new delta dump_registers 356 348 -8 ARM32: ns16550_poll 52 48 -4 dump_registers 432 428 -4 The other instruction dropped in ARM64's dump_registers() is an alignment nop. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/bug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/bug.h b/xen/arch/arm/include/asm/bug.h index cacaf014ab..8bf71587be 100644 --- a/xen/arch/arm/include/asm/bug.h +++ b/xen/arch/arm/include/asm/bug.h @@ -59,15 +59,15 @@ struct bug_frame { * be called function in a fixed register. */ #define run_in_exception_handler(fn) do { \ - asm ("mov " __stringify(BUG_FN_REG) ", %0\n" \ - "1:"BUG_INSTR"\n" \ + register unsigned long _fn asm (STR(BUG_FN_REG)) = (unsigned long)(fn); \ + asm ("1:"BUG_INSTR"\n" \ ".pushsection .bug_frames." __stringify(BUGFRAME_run_fn) "," \ " \"a\", %%progbits\n" \ "2:\n" \ ".p2align 2\n" \ ".long (1b - 2b)\n" \ ".long 0, 0, 0\n" \ - ".popsection" :: "r" (fn) : __stringify(BUG_FN_REG) ); \ + ".popsection" :: "r" (_fn) ); \ } while (0) #define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, "") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 22:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 22:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987642.1372850 (Exim 4.92) (envelope-from ) id 1uG3nS-000648-12; Fri, 16 May 2025 22:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987642.1372850; Fri, 16 May 2025 22: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 1uG3nR-000640-U4; Fri, 16 May 2025 22:44:53 +0000 Received: by outflank-mailman (input) for mailman id 987642; Fri, 16 May 2025 22:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG3nQ-00063n-P0 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG3nQ-00CeyZ-2u for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG3nQ-003raE-1o for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 22: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=kWlgkhQLJuHW5YoZkmB+xbQkdhIKedVo3ttMrr9kBxk=; b=QaD2pEu74EOk1pAi1zxKxTQu71 14HTXqiRZOEJXvV7uJK+PW7X7L5V5JWox65cBzsM5xrAlPDmduuEOlzao1SSwMK0hMOrZHd23iUs9 W0vVgQD4JRable4yOJB5SW1fCkxfffgZ1sJUb6Y2kJuhRRyYvi3dVk3hD/oFZdzO1+AE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vmx: Annotate the VMCS field widths Message-Id: Date: Fri, 16 May 2025 22:44:52 +0000 commit bbed2d36a0ea0c3842820f765065c905f576a6b3 Author: Andrew Cooper AuthorDate: Fri May 16 00:09:50 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/vmx: Annotate the VMCS field widths This helps identify the appropriate type to use. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h index cde4fe011b..ff5dd66b0a 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h @@ -436,6 +436,7 @@ extern struct vmx_caps vmx_caps; /* VMCS field encodings. */ #define VMCS_HIGH(x) ((x) | 1) enum vmcs_field { + /* 16-bit fields. */ VIRTUAL_PROCESSOR_ID = 0x00000000, POSTED_INTR_NOTIFICATION_VECTOR = 0x00000002, EPTP_INDEX = 0x00000004, @@ -457,6 +458,8 @@ enum vmcs_field { HOST_FS_SELECTOR = 0x00000c08, HOST_GS_SELECTOR = 0x00000c0a, HOST_TR_SELECTOR = 0x00000c0c, + + /* 64-bit fields. */ IO_BITMAP_A = 0x00002000, IO_BITMAP_B = 0x00002002, MSR_BITMAP = 0x00002004, @@ -493,6 +496,8 @@ enum vmcs_field { HOST_PAT = 0x00002c00, HOST_EFER = 0x00002c02, HOST_PERF_GLOBAL_CTRL = 0x00002c04, + + /* 32-bit fields. */ PIN_BASED_VM_EXEC_CONTROL = 0x00004000, CPU_BASED_VM_EXEC_CONTROL = 0x00004002, EXCEPTION_BITMAP = 0x00004004, @@ -546,6 +551,8 @@ enum vmcs_field { GUEST_SYSENTER_CS = 0x0000482a, GUEST_PREEMPTION_TIMER = 0x0000482e, HOST_SYSENTER_CS = 0x00004c00, + + /* Natural-width fields. */ CR0_GUEST_HOST_MASK = 0x00006000, CR4_GUEST_HOST_MASK = 0x00006002, CR0_READ_SHADOW = 0x00006004, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 23:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 23:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987697.1372903 (Exim 4.92) (envelope-from ) id 1uG4Cl-0003x5-0N; Fri, 16 May 2025 23:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987697.1372903; Fri, 16 May 2025 23: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 1uG4Ck-0003wx-U4; Fri, 16 May 2025 23:11:02 +0000 Received: by outflank-mailman (input) for mailman id 987697; Fri, 16 May 2025 23:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4Ck-0003wr-7a for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4Ck-00CfSh-0v for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4Ck-004F14-05 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23: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=XkO4BQiOXYvRy4tvidF1CGWUiZ0qxqH5hpaVCKNk78M=; b=QuND011uKs5Q06LYdsnrlK0C5G jRH2l5bYECUy8kX9IEk1fc3snIeZkFqrL5xzVD9wRpxhCqokeNANFp7H4IhRFysWBNGNSOpVnA4u3 RD2KPe+D08GFpfnJKlab2Ctz//Ijjt7chsEhPG4m2BJpWX2t9eJyOn/ZmlRrWhALQDr0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Introduce asm inline and use it for BUG_FRAME Message-Id: Date: Fri, 16 May 2025 23:11:02 +0000 commit cd564e40df8b9b16a6c1427742ca10e063cf7017 Author: Andrew Cooper AuthorDate: Tue Apr 22 12:36:18 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 xen: Introduce asm inline and use it for BUG_FRAME Compilers estimate the size of an asm() block for inlining purposes. Constructs with embedded metadata (BUG_FRAME, ALTERNATIVE, EXTABLE, etc) appear large, depsite often only being a handful of instructions. asm inline() overrides the estimation to identify the block as being small. This has a substantial impact on inlining decisions, expected to be for the better given that the compiler has a more accurate picture to work with. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/Kconfig | 4 ++++ xen/arch/arm/include/asm/bug.h | 6 ++++-- xen/include/xen/bug.h | 11 ++++++----- xen/include/xen/compiler.h | 15 +++++++++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 1b24e8f3c0..07c4accf88 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -29,6 +29,10 @@ config LD_IS_GNU config LD_IS_LLVM def_bool $(success,$(LD) --version | head -n 1 | grep -q "^LLD") +config CC_HAS_ASM_INLINE + # GCC >= 9, Clang >= 11 + def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null) + # Use -f{function,data}-sections compiler parameters config CC_SPLIT_SECTIONS bool diff --git a/xen/arch/arm/include/asm/bug.h b/xen/arch/arm/include/asm/bug.h index 8bf71587be..0f436df63f 100644 --- a/xen/arch/arm/include/asm/bug.h +++ b/xen/arch/arm/include/asm/bug.h @@ -34,7 +34,8 @@ struct bug_frame { #define BUG_FRAME(type, line, file, has_msg, msg) do { \ BUILD_BUG_ON((line) >> 16); \ BUILD_BUG_ON((type) >= BUGFRAME_NR); \ - asm ("1:"BUG_INSTR"\n" \ + asm_inline ( \ + "1:"BUG_INSTR"\n" \ ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \ "2:\t.asciz " __stringify(file) "\n" \ "3:\n" \ @@ -60,7 +61,8 @@ struct bug_frame { */ #define run_in_exception_handler(fn) do { \ register unsigned long _fn asm (STR(BUG_FN_REG)) = (unsigned long)(fn); \ - asm ("1:"BUG_INSTR"\n" \ + asm_inline ( \ + "1:"BUG_INSTR"\n" \ ".pushsection .bug_frames." __stringify(BUGFRAME_run_fn) "," \ " \"a\", %%progbits\n" \ "2:\n" \ diff --git a/xen/include/xen/bug.h b/xen/include/xen/bug.h index 99814c4bef..0cabdba379 100644 --- a/xen/include/xen/bug.h +++ b/xen/include/xen/bug.h @@ -89,11 +89,12 @@ struct bug_frame { #ifndef BUG_FRAME #define BUG_FRAME(type, line, ptr, second_frame, msg) do { \ - BUG_CHECK_LINE_WIDTH(line); \ - BUILD_BUG_ON((type) >= BUGFRAME_NR); \ - asm volatile ( _ASM_BUGFRAME_TEXT(second_frame) \ - :: _ASM_BUGFRAME_INFO(type, line, ptr, msg) ); \ -} while ( false ) + BUG_CHECK_LINE_WIDTH(line); \ + BUILD_BUG_ON((type) >= BUGFRAME_NR); \ + asm_inline volatile ( \ + _ASM_BUGFRAME_TEXT(second_frame) \ + :: _ASM_BUGFRAME_INFO(type, line, ptr, msg) ); \ + } while ( false ) #endif diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index c68fab1891..735c844d2d 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -53,6 +53,21 @@ #define unreachable() __builtin_unreachable() #endif +/* + * Compilers estimate the size of an asm() block for inlining purposes. + * + * Constructs with embedded metadata (BUG_FRAME, ALTERNATIVE, EXTABLE, etc) + * appear large, depsite typically only being a handful of instructions. asm + * inline() overrides the estimation to identify the block as being small. + * + * Note: __inline is needed to avoid getting caught up in INIT_SECTIONS_ONLY. + */ +#if CONFIG_CC_HAS_ASM_INLINE +# define asm_inline asm __inline +#else +# define asm_inline asm +#endif + /* * Add the pseudo keyword 'fallthrough' so case statement blocks * must end with any of these keywords: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 23:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 23:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987698.1372906 (Exim 4.92) (envelope-from ) id 1uG4Cv-00044V-1u; Fri, 16 May 2025 23:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987698.1372906; Fri, 16 May 2025 23: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 1uG4Cu-00044O-VW; Fri, 16 May 2025 23:11:12 +0000 Received: by outflank-mailman (input) for mailman id 987698; Fri, 16 May 2025 23:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4Cu-00042x-6k for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4Cu-00CfSl-1F for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4Cu-004F7X-0S for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23: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=UgH6UtStfXUx13zljeiv9G4YuSEVljmdPvwr8j3z2SA=; b=JlA0FpSGizwYRMzIpAHppmQvNw re5lZlCuIxoYPJsQbvEMcV81AGE3uAa+Sq609PNNfWgJRKHGepORhBDDdiK1+JA1uvDhVqOD/WJkS 67z/R9fe+bUHib+Gp2/etf6dHi/4m2pk5JBjdTuB4I+rftYUUV4yROFB+lFsCDcGWlvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Use asm_inline for ALTERNATIVE() and EXTABLE Message-Id: Date: Fri, 16 May 2025 23:11:12 +0000 commit 729953c4f37eb485e2c1e3be93becce7180f0a31 Author: Andrew Cooper AuthorDate: Thu May 15 18:14:19 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 x86: Use asm_inline for ALTERNATIVE() and EXTABLE ... when there really are only a few instructions in line. In some cases, reformat to reduce left-hand margine space. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 52 ++++++++++++++++------------- xen/arch/x86/domain.c | 21 ++++++------ xen/arch/x86/extable.c | 21 ++++++------ xen/arch/x86/hvm/vmx/vmcs.c | 15 +++++---- xen/arch/x86/i387.c | 4 +-- xen/arch/x86/include/asm/alternative-call.h | 3 +- xen/arch/x86/include/asm/alternative.h | 36 +++++++++++--------- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 15 +++++---- xen/arch/x86/include/asm/uaccess.h | 4 +-- xen/arch/x86/pv/misc-hypercalls.c | 19 ++++++----- xen/arch/x86/traps.c | 48 ++++++++++++++------------ xen/arch/x86/usercopy.c | 6 ++-- 12 files changed, 132 insertions(+), 112 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 37d67dd15c..27ae167808 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -60,41 +60,45 @@ static inline int rdmsr_amd_safe(unsigned int msr, unsigned int *lo, unsigned int *hi) { #ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT - asm goto ( "1: rdmsr\n\t" - _ASM_EXTABLE(1b, %l[fault]) - : "=a" (*lo), "=d" (*hi) - : "c" (msr), "D" (0x9c5a203a) - : - : fault ); + asm_inline goto ( + "1: rdmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : "=a" (*lo), "=d" (*hi) + : "c" (msr), "D" (0x9c5a203a) + : + : fault ); + return 0; fault: return -EFAULT; #else - int err; - - asm volatile("1: rdmsr\n2:\n" - ".section .fixup,\"ax\"\n" - "3: movl %6,%2\n" - " jmp 2b\n" - ".previous\n" - _ASM_EXTABLE(1b, 3b) - : "=a" (*lo), "=d" (*hi), "=r" (err) - : "c" (msr), "D" (0x9c5a203a), "2" (0), "i" (-EFAULT)); - - return err; + int err; + + asm_inline volatile ( + "1: rdmsr\n2:\n" + ".section .fixup,\"ax\"\n" + "3: movl %6,%2\n" + " jmp 2b\n" + ".previous\n" + _ASM_EXTABLE(1b, 3b) + : "=a" (*lo), "=d" (*hi), "=r" (err) + : "c" (msr), "D" (0x9c5a203a), "2" (0), "i" (-EFAULT) ); + + return err; #endif } static inline int wrmsr_amd_safe(unsigned int msr, unsigned int lo, unsigned int hi) { - asm goto ( "1: wrmsr\n\t" - _ASM_EXTABLE(1b, %l[fault]) - : - : "c" (msr), "a" (lo), "d" (hi), "D" (0x9c5a203a) - : - : fault ); + asm_inline goto ( + "1: wrmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : + : "c" (msr), "a" (lo), "d" (hi), "D" (0x9c5a203a) + : + : fault ); return 0; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f197dad4c0..7536b6c871 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1706,16 +1706,17 @@ static void load_segments(struct vcpu *n) * @all_segs_okay in function scope, and load NUL into @sel. */ #define TRY_LOAD_SEG(seg, val) \ - asm volatile ( "1: mov %k[_val], %%" #seg "\n\t" \ - "2:\n\t" \ - ".section .fixup, \"ax\"\n\t" \ - "3: xor %k[ok], %k[ok]\n\t" \ - " mov %k[ok], %%" #seg "\n\t" \ - " jmp 2b\n\t" \ - ".previous\n\t" \ - _ASM_EXTABLE(1b, 3b) \ - : [ok] "+r" (all_segs_okay) \ - : [_val] "rm" (val) ) + asm_inline volatile ( \ + "1: mov %k[_val], %%" #seg "\n\t" \ + "2:\n\t" \ + ".section .fixup, \"ax\"\n\t" \ + "3: xor %k[ok], %k[ok]\n\t" \ + " mov %k[ok], %%" #seg "\n\t" \ + " jmp 2b\n\t" \ + ".previous\n\t" \ + _ASM_EXTABLE(1b, 3b) \ + : [ok] "+r" (all_segs_okay) \ + : [_val] "rm" (val) ) if ( !compat ) { diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 1572efa69a..de39202452 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -186,16 +186,17 @@ int __init cf_check stub_selftest(void) place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); - asm volatile ( "INDIRECT_CALL %[stb]\n" - ".Lret%=:\n\t" - ".pushsection .fixup,\"ax\"\n" - ".Lfix%=:\n\t" - "pop %[exn]\n\t" - "jmp .Lret%=\n\t" - ".popsection\n\t" - _ASM_EXTABLE(.Lret%=, .Lfix%=) - : [exn] "+m" (res) ASM_CALL_CONSTRAINT - : [stb] "r" (addr), "a" (tests[i].rax)); + asm_inline volatile ( + "INDIRECT_CALL %[stb]\n" + ".Lret%=:\n\t" + ".pushsection .fixup,\"ax\"\n" + ".Lfix%=:\n\t" + "pop %[exn]\n\t" + "jmp .Lret%=\n\t" + ".popsection\n\t" + _ASM_EXTABLE(.Lret%=, .Lfix%=) + : [exn] "+m" (res) ASM_CALL_CONSTRAINT + : [stb] "r" (addr), "a" (tests[i].rax) ); if ( res.raw != tests[i].res.raw ) { diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index a44475ae15..59f4d1d86f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -749,13 +749,14 @@ static int _vmx_cpu_up(bool bsp) if ( bsp && (rc = vmx_cpu_up_prepare(cpu)) != 0 ) return rc; - asm goto ( "1: vmxon %[addr]\n\t" - " jbe %l[vmxon_fail]\n\t" - _ASM_EXTABLE(1b, %l[vmxon_fault]) - : - : [addr] "m" (this_cpu(vmxon_region)) - : "memory" - : vmxon_fail, vmxon_fault ); + asm_inline goto ( + "1: vmxon %[addr]\n\t" + " jbe %l[vmxon_fail]\n\t" + _ASM_EXTABLE(1b, %l[vmxon_fault]) + : + : [addr] "m" (this_cpu(vmxon_region)) + : "memory" + : vmxon_fail, vmxon_fault ); this_cpu(vmxon) = 1; diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 5429531ddd..b84cd6f7a9 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -62,7 +62,7 @@ static inline void fpu_fxrstor(struct vcpu *v) switch ( __builtin_expect(fpu_ctxt->x[FPU_WORD_SIZE_OFFSET], 8) ) { default: - asm volatile ( + asm_inline volatile ( "1: fxrstorq %0\n" ".section .fixup,\"ax\" \n" "2: push %%"__OP"ax \n" @@ -82,7 +82,7 @@ static inline void fpu_fxrstor(struct vcpu *v) : "m" (*fpu_ctxt), "i" (sizeof(*fpu_ctxt) / 4) ); break; case 4: case 2: - asm volatile ( + asm_inline volatile ( "1: fxrstor %0 \n" ".section .fixup,\"ax\"\n" "2: push %%"__OP"ax \n" diff --git a/xen/arch/x86/include/asm/alternative-call.h b/xen/arch/x86/include/asm/alternative-call.h index bbc49a5274..b22c10c322 100644 --- a/xen/arch/x86/include/asm/alternative-call.h +++ b/xen/arch/x86/include/asm/alternative-call.h @@ -87,7 +87,8 @@ struct alt_call { rettype ret_; \ register unsigned long r10_ asm("r10"); \ register unsigned long r11_ asm("r11"); \ - asm volatile ("1: call *%c[addr](%%rip)\n\t" \ + asm_inline volatile ( \ + "1: call *%c[addr](%%rip)\n\t" \ ".pushsection .alt_call_sites, \"a\", @progbits\n\t" \ ".long 1b - .\n\t" \ ".popsection" \ diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index e17be8ddfd..0482bbf7cb 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -126,12 +126,15 @@ extern void alternative_instructions(void); * without volatile and memory clobber. */ #define alternative(oldinstr, newinstr, feature) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") + asm_inline volatile ( \ + ALTERNATIVE(oldinstr, newinstr, feature) \ + ::: "memory" ) #define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \ - asm volatile (ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ - newinstr2, feature2) \ - : : : "memory") + asm_inline volatile ( \ + ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ + newinstr2, feature2) \ + ::: "memory" ) /* * Alternative inline assembly with input. @@ -143,14 +146,16 @@ extern void alternative_instructions(void); * If you use variable sized constraints like "m" or "g" in the * replacement make sure to pad to the worst case length. */ -#define alternative_input(oldinstr, newinstr, feature, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : : input) +#define alternative_input(oldinstr, newinstr, feature, input...) \ + asm_inline volatile ( \ + ALTERNATIVE(oldinstr, newinstr, feature) \ + :: input ) /* Like alternative_input, but with a single output argument */ -#define alternative_io(oldinstr, newinstr, feature, output, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : output : input) +#define alternative_io(oldinstr, newinstr, feature, output, input...) \ + asm_inline volatile ( \ + ALTERNATIVE(oldinstr, newinstr, feature) \ + : output : input ) /* * This is similar to alternative_io. But it has two features and @@ -160,11 +165,12 @@ extern void alternative_instructions(void); * Otherwise, if CPU has feature1, newinstr1 is used. * Otherwise, oldinstr is used. */ -#define alternative_io_2(oldinstr, newinstr1, feature1, newinstr2, \ - feature2, output, input...) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ - newinstr2, feature2) \ - : output : input) +#define alternative_io_2(oldinstr, newinstr1, feature1, newinstr2, \ + feature2, output, input...) \ + asm_inline volatile ( \ + ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ + newinstr2, feature2) \ + : output : input ) /* Use this macro(s) if you need more than one output parameter. */ #define ASM_OUTPUT2(a...) a diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index d85b52b9d5..56bea252cc 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -431,13 +431,14 @@ static always_inline void __invvpid(unsigned long type, u16 vpid, u64 gva) } operand = {vpid, 0, gva}; /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ - asm goto ( "1: invvpid %[operand], %[type]\n\t" - " jbe %l[vmfail]\n\t" - "2:" _ASM_EXTABLE(1b, 2b) - : - : [operand] "m" (operand), [type] "r" (type) - : "memory" - : vmfail ); + asm_inline goto ( + "1: invvpid %[operand], %[type]\n\t" + " jbe %l[vmfail]\n\t" + "2:" _ASM_EXTABLE(1b, 2b) + : + : [operand] "m" (operand), [type] "r" (type) + : "memory" + : vmfail ); return; vmfail: diff --git a/xen/arch/x86/include/asm/uaccess.h b/xen/arch/x86/include/asm/uaccess.h index 2d01669b96..719d053936 100644 --- a/xen/arch/x86/include/asm/uaccess.h +++ b/xen/arch/x86/include/asm/uaccess.h @@ -154,7 +154,7 @@ struct __large_struct { unsigned long buf[100]; }; * aliasing issues. */ #define put_unsafe_asm(x, addr, GUARD, err, itype, rtype, ltype, errret) \ - __asm__ __volatile__( \ + asm_inline volatile ( \ GUARD( \ " guest_access_mask_ptr %[ptr], %[scr1], %[scr2]\n" \ ) \ @@ -171,7 +171,7 @@ struct __large_struct { unsigned long buf[100]; }; "[ptr]" (addr), [errno] "i" (errret)) #define get_unsafe_asm(x, addr, GUARD, err, rtype, ltype, errret) \ - __asm__ __volatile__( \ + asm_inline volatile ( \ GUARD( \ " guest_access_mask_ptr %[ptr], %[scr1], %[scr2]\n" \ ) \ diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index b529f00ea1..17030d800d 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -230,15 +230,16 @@ long do_set_segment_base(unsigned int which, unsigned long base) * Anyone wanting to check for errors from this hypercall should * re-read %gs and compare against the input. */ - asm volatile ( "1: mov %[sel], %%gs\n\t" - ".section .fixup, \"ax\", @progbits\n\t" - "2: mov %k[flat], %%gs\n\t" - " xor %[sel], %[sel]\n\t" - " jmp 1b\n\t" - ".previous\n\t" - _ASM_EXTABLE(1b, 2b) - : [sel] "+r" (sel) - : [flat] "r" (FLAT_USER_DS32) ); + asm_inline volatile ( + "1: mov %[sel], %%gs\n\t" + ".section .fixup, \"ax\", @progbits\n\t" + "2: mov %k[flat], %%gs\n\t" + " xor %[sel], %[sel]\n\t" + " jmp 1b\n\t" + ".previous\n\t" + _ASM_EXTABLE(1b, 2b) + : [sel] "+r" (sel) + : [flat] "r" (FLAT_USER_DS32) ); /* Update the cache of the inactive base, as read from the GDT/LDT. */ v->arch.pv.gs_base_user = read_gs_base(); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 25e0d5777e..c94779b4ad 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -126,27 +126,29 @@ void show_code(const struct cpu_user_regs *regs) * Copy forward from regs->rip. In the case of a fault, %ecx contains the * number of bytes remaining to copy. */ - asm volatile ("1: rep movsb; 2:" - _ASM_EXTABLE(1b, 2b) - : "=&c" (missing_after), - "=&D" (tmp), "=&S" (tmp) - : "0" (ARRAY_SIZE(insns_after)), - "1" (insns_after), - "2" (regs->rip)); + asm_inline volatile ( + "1: rep movsb; 2:" + _ASM_EXTABLE(1b, 2b) + : "=&c" (missing_after), + "=&D" (tmp), "=&S" (tmp) + : "0" (ARRAY_SIZE(insns_after)), + "1" (insns_after), + "2" (regs->rip) ); /* * Copy backwards from regs->rip - 1. In the case of a fault, %ecx * contains the number of bytes remaining to copy. */ - asm volatile ("std;" - "1: rep movsb;" - "2: cld;" - _ASM_EXTABLE(1b, 2b) - : "=&c" (missing_before), - "=&D" (tmp), "=&S" (tmp) - : "0" (ARRAY_SIZE(insns_before)), - "1" (insns_before + ARRAY_SIZE(insns_before) - 1), - "2" (regs->rip - 1)); + asm_inline volatile ( + "std;" + "1: rep movsb;" + "2: cld;" + _ASM_EXTABLE(1b, 2b) + : "=&c" (missing_before), + "=&D" (tmp), "=&S" (tmp) + : "0" (ARRAY_SIZE(insns_before)), + "1" (insns_before + ARRAY_SIZE(insns_before) - 1), + "2" (regs->rip - 1) ); clac(); printk("Xen code around <%p> (%ps)%s:\n", @@ -524,12 +526,14 @@ static void show_trace(const struct cpu_user_regs *regs) printk("Xen call trace:\n"); /* Guarded read of the stack top. */ - asm ( "1: mov %[data], %[tos]; 2:\n" - ".pushsection .fixup,\"ax\"\n" - "3: movb $1, %[fault]; jmp 2b\n" - ".popsection\n" - _ASM_EXTABLE(1b, 3b) - : [tos] "+r" (tos), [fault] "+qm" (fault) : [data] "m" (*sp) ); + asm_inline ( + "1: mov %[data], %[tos]; 2:\n" + ".pushsection .fixup,\"ax\"\n" + "3: movb $1, %[fault]; jmp 2b\n" + ".popsection\n" + _ASM_EXTABLE(1b, 3b) + : [tos] "+r" (tos), [fault] "+qm" (fault) + : [data] "m" (*sp) ); /* * If RIP looks sensible, or the top of the stack doesn't, print RIP at diff --git a/xen/arch/x86/usercopy.c b/xen/arch/x86/usercopy.c index 7ab2009efe..a24b52cc66 100644 --- a/xen/arch/x86/usercopy.c +++ b/xen/arch/x86/usercopy.c @@ -19,7 +19,7 @@ unsigned int copy_to_guest_ll(void __user *to, const void *from, unsigned int n) GUARD(unsigned dummy); stac(); - asm volatile ( + asm_inline volatile ( GUARD( " guest_access_mask_ptr %[to], %q[scratch1], %q[scratch2]\n" ) @@ -39,7 +39,7 @@ unsigned int copy_from_guest_ll(void *to, const void __user *from, unsigned int unsigned dummy; stac(); - asm volatile ( + asm_inline volatile ( GUARD( " guest_access_mask_ptr %[from], %q[scratch1], %q[scratch2]\n" ) @@ -101,7 +101,7 @@ unsigned int clear_guest_pv(void __user *to, unsigned int n) long dummy; stac(); - asm volatile ( + asm_inline volatile ( " guest_access_mask_ptr %[to], %[scratch1], %[scratch2]\n" "1: rep stosb\n" "2:\n" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 23:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 23:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987700.1372911 (Exim 4.92) (envelope-from ) id 1uG4D5-0004AQ-5J; Fri, 16 May 2025 23:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987700.1372911; Fri, 16 May 2025 23: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 1uG4D5-0004AG-2P; Fri, 16 May 2025 23:11:23 +0000 Received: by outflank-mailman (input) for mailman id 987700; Fri, 16 May 2025 23:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4D4-0004A5-9r for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4D4-00CfTE-1Z for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4D4-004FFO-0l for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23: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=ErA09CSU6spGC5280o0oHxheexwMbN67A6R+kvqYTqk=; b=Gub1PgcoohKSkZ8/d+/X15+knM ushk1GyPfdszcKLMKkvrYzClra/dy+iLsks6C1iLNklfw2q4XqV0Db1QJ7kbyl6ubrRGvhHjRvmyM x5Q4vKiN5m5phwoAulEK3O70QptVzL1U8a0gA11EkLFAxzTBepByj/oFSIbJpv4vR0rU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ARM: Use asm_inline for ALTERNATIVE() Message-Id: Date: Fri, 16 May 2025 23:11:22 +0000 commit 5b24cf26217814c446d5d542077c334ee7a00cc0 Author: Andrew Cooper AuthorDate: Thu May 15 17:58:58 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 ARM: Use asm_inline for ALTERNATIVE() ... when there really are only a few instructions in line. In some cases, reformat to reduce left-hand margine space. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/alternative.h | 4 +-- xen/arch/arm/include/asm/arm64/flushtlb.h | 4 +-- xen/arch/arm/include/asm/arm64/io.h | 43 +++++++++++++++++++------------ xen/arch/arm/include/asm/cpuerrata.h | 8 +++--- xen/arch/arm/include/asm/cpufeature.h | 8 +++--- xen/arch/arm/include/asm/page.h | 12 +++++---- xen/arch/arm/include/asm/processor.h | 7 ++--- xen/arch/arm/include/asm/sysregs.h | 10 ++++--- xen/arch/arm/mmu/p2m.c | 3 ++- 9 files changed, 58 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/include/asm/alternative.h b/xen/arch/arm/include/asm/alternative.h index 22477d9497..1563f03a0f 100644 --- a/xen/arch/arm/include/asm/alternative.h +++ b/xen/arch/arm/include/asm/alternative.h @@ -209,9 +209,9 @@ alternative_endif #endif /* __ASSEMBLY__ */ /* - * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature)); + * Usage: asm_inline (ALTERNATIVE(oldinstr, newinstr, feature)); * - * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature, CONFIG_FOO)); + * Usage: asm_inline (ALTERNATIVE(oldinstr, newinstr, feature, CONFIG_FOO)); * N.B. If CONFIG_FOO is specified, but not selected, the whole block * will be omitted, including oldinstr. */ diff --git a/xen/arch/arm/include/asm/arm64/flushtlb.h b/xen/arch/arm/include/asm/arm64/flushtlb.h index 45642201d1..3b99c11b50 100644 --- a/xen/arch/arm/include/asm/arm64/flushtlb.h +++ b/xen/arch/arm/include/asm/arm64/flushtlb.h @@ -31,7 +31,7 @@ #define TLB_HELPER(name, tlbop, sh) \ static inline void name(void) \ { \ - asm volatile( \ + asm_inline volatile ( \ "dsb " # sh "st;" \ "tlbi " # tlbop ";" \ ALTERNATIVE( \ @@ -55,7 +55,7 @@ static inline void name(void) \ #define TLB_HELPER_VA(name, tlbop) \ static inline void name(vaddr_t va) \ { \ - asm volatile( \ + asm_inline volatile ( \ "tlbi " # tlbop ", %0;" \ ALTERNATIVE( \ "nop; nop;", \ diff --git a/xen/arch/arm/include/asm/arm64/io.h b/xen/arch/arm/include/asm/arm64/io.h index 7d59598777..ac90b729c4 100644 --- a/xen/arch/arm/include/asm/arm64/io.h +++ b/xen/arch/arm/include/asm/arm64/io.h @@ -51,40 +51,51 @@ static inline void __raw_writeq(u64 val, volatile void __iomem *addr) static inline u8 __raw_readb(const volatile void __iomem *addr) { u8 val; - asm volatile(ALTERNATIVE("ldrb %w0, [%1]", - "ldarb %w0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + + asm_inline volatile ( + ALTERNATIVE("ldrb %w0, [%1]", + "ldarb %w0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } static inline u16 __raw_readw(const volatile void __iomem *addr) { u16 val; - asm volatile(ALTERNATIVE("ldrh %w0, [%1]", - "ldarh %w0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + asm_inline volatile ( + ALTERNATIVE("ldrh %w0, [%1]", + "ldarh %w0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } static inline u32 __raw_readl(const volatile void __iomem *addr) { u32 val; - asm volatile(ALTERNATIVE("ldr %w0, [%1]", - "ldar %w0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + + asm_inline volatile ( + ALTERNATIVE("ldr %w0, [%1]", + "ldar %w0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } static inline u64 __raw_readq(const volatile void __iomem *addr) { u64 val; - asm volatile(ALTERNATIVE("ldr %0, [%1]", - "ldar %0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + + asm_inline volatile ( + ALTERNATIVE("ldr %0, [%1]", + "ldar %0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } diff --git a/xen/arch/arm/include/asm/cpuerrata.h b/xen/arch/arm/include/asm/cpuerrata.h index 8d7e7b9375..1799a16d7e 100644 --- a/xen/arch/arm/include/asm/cpuerrata.h +++ b/xen/arch/arm/include/asm/cpuerrata.h @@ -16,10 +16,10 @@ static inline bool check_workaround_##erratum(void) \ { \ register_t ret; \ \ - asm volatile (ALTERNATIVE("mov %0, #0", \ - "mov %0, #1", \ - feature) \ - : "=r" (ret)); \ + asm_inline volatile ( \ + ALTERNATIVE("mov %0, #0", \ + "mov %0, #1", feature) \ + : "=r" (ret) ); \ \ return unlikely(ret); \ } \ diff --git a/xen/arch/arm/include/asm/cpufeature.h b/xen/arch/arm/include/asm/cpufeature.h index 50297e53d9..b6df188011 100644 --- a/xen/arch/arm/include/asm/cpufeature.h +++ b/xen/arch/arm/include/asm/cpufeature.h @@ -102,10 +102,10 @@ static inline bool cpus_have_cap(unsigned int num) #define cpus_have_const_cap(num) ({ \ register_t __ret; \ \ - asm volatile (ALTERNATIVE("mov %0, #0", \ - "mov %0, #1", \ - num) \ - : "=r" (__ret)); \ + asm_inline volatile ( \ + ALTERNATIVE("mov %0, #0", \ + "mov %0, #1", num) \ + : "=r" (__ret) ); \ \ unlikely(__ret); \ }) diff --git a/xen/arch/arm/include/asm/page.h b/xen/arch/arm/include/asm/page.h index 69f817d1e6..27bc96b9f4 100644 --- a/xen/arch/arm/include/asm/page.h +++ b/xen/arch/arm/include/asm/page.h @@ -176,7 +176,8 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) { size -= dcache_line_bytes - ((uintptr_t)p & cacheline_mask); p = (void *)((uintptr_t)p & ~cacheline_mask); - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); + asm_inline volatile ( + __clean_and_invalidate_dcache_one(0) :: "r" (p) ); p += dcache_line_bytes; } @@ -185,7 +186,8 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) asm volatile (__invalidate_dcache_one(0) : : "r" (p + idx)); if ( size > 0 ) - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p + idx)); + asm_inline volatile ( + __clean_and_invalidate_dcache_one(0) :: "r" (p + idx) ); dsb(sy); /* So we know the flushes happen before continuing */ @@ -209,7 +211,7 @@ static inline int clean_dcache_va_range(const void *p, unsigned long size) p = (void *)((uintptr_t)p & ~cacheline_mask); for ( ; size >= dcache_line_bytes; idx += dcache_line_bytes, size -= dcache_line_bytes ) - asm volatile (__clean_dcache_one(0) : : "r" (p + idx)); + asm_inline volatile ( __clean_dcache_one(0) : : "r" (p + idx) ); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ return 0; @@ -247,7 +249,7 @@ static inline int clean_and_invalidate_dcache_va_range if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ clean_dcache_va_range(_p, sizeof(x)); \ else \ - asm volatile ( \ + asm_inline volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ __clean_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ @@ -259,7 +261,7 @@ static inline int clean_and_invalidate_dcache_va_range if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ clean_and_invalidate_dcache_va_range(_p, sizeof(x)); \ else \ - asm volatile ( \ + asm_inline volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ __clean_and_invalidate_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ diff --git a/xen/arch/arm/include/asm/processor.h b/xen/arch/arm/include/asm/processor.h index 60b587db69..9cbc4f9110 100644 --- a/xen/arch/arm/include/asm/processor.h +++ b/xen/arch/arm/include/asm/processor.h @@ -607,9 +607,10 @@ register_t get_default_cptr_flags(void); #define SYNCHRONIZE_SERROR(feat) \ do { \ ASSERT(local_abort_is_enabled()); \ - asm volatile(ALTERNATIVE("dsb sy; isb", \ - "nop; nop", feat) \ - : : : "memory"); \ + asm_inline volatile ( \ + ALTERNATIVE("dsb sy; isb", \ + "nop; nop", feat) \ + ::: "memory" ); \ } while (0) /* diff --git a/xen/arch/arm/include/asm/sysregs.h b/xen/arch/arm/include/asm/sysregs.h index 61e30c9e51..5c2d362be3 100644 --- a/xen/arch/arm/include/asm/sysregs.h +++ b/xen/arch/arm/include/asm/sysregs.h @@ -22,11 +22,13 @@ static inline register_t read_sysreg_par(void) * DMB SY before and after accessing it, as part of the workaround for the * errata 1508412. */ - asm volatile(ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, - CONFIG_ARM64_ERRATUM_1508412)); + asm_inline volatile ( + ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, + CONFIG_ARM64_ERRATUM_1508412) ); par_el1 = READ_SYSREG64(PAR_EL1); - asm volatile(ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, - CONFIG_ARM64_ERRATUM_1508412)); + asm_inline volatile ( + ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, + CONFIG_ARM64_ERRATUM_1508412) ); return par_el1; } diff --git a/xen/arch/arm/mmu/p2m.c b/xen/arch/arm/mmu/p2m.c index 7642dbc7c5..d96078f547 100644 --- a/xen/arch/arm/mmu/p2m.c +++ b/xen/arch/arm/mmu/p2m.c @@ -228,7 +228,8 @@ void p2m_restore_state(struct vcpu *n) * registers associated to EL1/EL0 translations regime have been * synchronized. */ - asm volatile(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_AT_SPECULATE)); + asm_inline volatile ( + ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_AT_SPECULATE) ); WRITE_SYSREG64(p2m->vttbr, VTTBR_EL2); last_vcpu_ran = &p2m->last_vcpu_ran[smp_processor_id()]; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 16 23:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 May 2025 23:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987701.1372915 (Exim 4.92) (envelope-from ) id 1uG4DG-0004DA-6d; Fri, 16 May 2025 23:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987701.1372915; Fri, 16 May 2025 23:11: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 1uG4DG-0004D1-3x; Fri, 16 May 2025 23:11:34 +0000 Received: by outflank-mailman (input) for mailman id 987701; Fri, 16 May 2025 23:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4DE-0004Cg-Ce for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4DE-00CfTL-1r for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4DE-004FM8-13 for xen-changelog@lists.xenproject.org; Fri, 16 May 2025 23:11: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=WR6dF9XdVDyU+W1rU0jYwLWyuBYZjWgZ8nxGf658BnA=; b=AS4lvGwesg6co03L+GFVwwfCL5 W1oOU8Cnk87Bc+RzAzY6YDKa3j+UYm509LoU8SJZlKteQzw3yn5g4pinCa+tb4t4GnDEqigCfgffq lguXrcd7VMiEQWaY19n7rwIDiPvsWgtPUpUqay8Ve7wRq9UQGsE5gBegkMGvKe30Yf1k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CODING_STYLE: Updated header guard recommendations Message-Id: Date: Fri, 16 May 2025 23:11:32 +0000 commit 7abea85c9f128556da2fdb08dd74c7e2489da7ea Author: Andrew Cooper AuthorDate: Fri May 16 15:20:31 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 CODING_STYLE: Updated header guard recommendations Despite the best intentions at the time, the current recommendation lead to very long identifiers, bordering on the max limit we've chosen for certification. One observation is that we do have static analysis which will highlight if duplicate guards are created accidentally. Therefore, relax the recommendations and in particular remove the specific tie to the directory structure. This has the other advantage of being more similar to other projects. This will hopefully mean there's less churn getting the tree in shape, and a random contributor is more likely to pick an appropriate guard given no specific knowledge of Xen. As always, it's something reviewers and maintainers should be aware of, and to advise on. Reviewed-by: Stefano Stabellini Signed-off-by: Andrew Cooper --- CODING_STYLE | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/CODING_STYLE b/CODING_STYLE index e3b1da6048..5644f1697f 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -157,43 +157,30 @@ Header inclusion guards ----------------------- Unless otherwise specified, all header files should include proper -guards to prevent multiple inclusions. The following naming conventions -apply: - -- Guard names are derived from directory path underneath xen/ and the - actual file name. Path components are separated by double - underscores. Alphabetic characters are converted to upper case. Non- - alphanumeric characters are replaced by single underscores. -- Certain directory components are omitted, to keep identifier length - bounded: - - the top level include/, - - architecture-specific private files' arch/, - - any architecture's arch//include/asm/ collapses to - ASM____. +guards to prevent multiple inclusions. Guards need to be unique, and +this property is checked by static analysis. -For example: +Guards should be chosen based on the logical area, with enough +disambiguation when the same filename exits in multiple locations in +the source tree. Commonly there should be a XEN or prefix. +The guard should be spelt in ALL CAPITALS, ending with _H. -- Xen headers: XEN___H - - include/xen/something.h -> XEN__SOMETHING_H +For example: -- asm-generic headers: ASM_GENERIC___H - - include/asm-generic/something.h -> ASM_GENERIC__SOMETHING_H +- Xen headers: XEN__H + - include/xen/something.h -> XEN_SOMETHING_H -- arch-specific headers: ASM_______H - - arch/x86/include/asm/something.h -> ASM__X86__SOMETHING_H +- arch-specific headers: __H + - arch/x86/include/asm/something.h -> X86_SOMETHING_H + - arch/x86/include/asm/hvm/something.h -> X86_HVM_SOMETHING_H + - arch/x86/include/asm/pv/something.h -> X86_PV_SOMETHING_H -- Private headers: ___H - - arch/arm/arm64/lib/something.h -> ARM__ARM64__LIB__SOMETHING_H - - arch/x86/lib/something.h -> X86__LIB__SOMETHING_H - - common/something.h -> COMMON__SOMETHING_H +- Private headers: _PRIVATE_H + - common/something/private.h -> _PRIVATE_H + - drivers/foo/something.h -> _H -Note that this requires some discipline on the naming of future new -sub-directories: There shouldn't be any other asm/ one anywhere, for -example. Nor should any new ports be named the same as top-level -(within xen/) directories. Which may in turn require some care if any -new top-level directories were to be added. Rule of thumb: Whenever -adding a new subdirectory, check the rules to prevent any potential -collisions. +A good choice of guard is one that wont become stale if the +driver/subsystem/etc is shuffled around the source tree. Emacs local variables --------------------- -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:00:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987840.1373039 (Exim 4.92) (envelope-from ) id 1uG4yB-0000px-Mt; Sat, 17 May 2025 00:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987840.1373039; Sat, 17 May 2025 00: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 1uG4yB-0000pe-Jz; Sat, 17 May 2025 00:00:03 +0000 Received: by outflank-mailman (input) for mailman id 987840; Sat, 17 May 2025 00:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4yA-0000W6-Of for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4yA-00CgSp-1p for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4yA-004vFB-0x for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00: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=nY1VMwkCba8JKh/I4nD3D3SnHHvw6oTNxJCql4eWFRs=; b=Lye9c4k0glZLbxnGJ0lW4ZWq66 3dEDgVoie+CaAZjvLJjQsFGrKDSI85UwVnvPGa10L69CiaqCw94dhF6txubduCW1YLrtWJO6bimtZ pdibJIoKK0BAUFuN2fM7GkCL/QEmlxNdVUf6QXyJ4GQphXSEkIdcnYM+QDmSOX0ulfAw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/regs: Fold x86_64/regs.h into it's single includer Message-Id: Date: Sat, 17 May 2025 00:00:02 +0000 commit 267c7fe2413e1f5f0672641ff76ea4e384a321b2 Author: Andrew Cooper AuthorDate: Sun Dec 29 14:30:17 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/regs: Fold x86_64/regs.h into it's single includer Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/regs.h | 24 +++++++++++++++++++++++- xen/arch/x86/include/asm/x86_64/regs.h | 28 ---------------------------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/include/asm/regs.h b/xen/arch/x86/include/asm/regs.h index ddf5e14e57..60b0d7b873 100644 --- a/xen/arch/x86/include/asm/regs.h +++ b/xen/arch/x86/include/asm/regs.h @@ -2,7 +2,29 @@ #ifndef __X86_REGS_H__ #define __X86_REGS_H__ -#include +#include +#include + +#define ring_0(r) (((r)->cs & 3) == 0) +#define ring_1(r) (((r)->cs & 3) == 1) +#define ring_2(r) (((r)->cs & 3) == 2) +#define ring_3(r) (((r)->cs & 3) == 3) + +#define guest_kernel_mode(v, r) \ + (!is_pv_32bit_vcpu(v) ? \ + (ring_3(r) && ((v)->arch.flags & TF_kernel_mode)) : \ + (ring_1(r))) + +#define permit_softint(dpl, v, r) \ + ((dpl) >= (guest_kernel_mode(v, r) ? 1 : 3)) + +/* Check for null trap callback handler: Is the EIP null? */ +#define null_trap_bounce(v, tb) \ + (!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0)) + +/* Number of bytes of on-stack execution state to be context-switched. */ +/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */ +#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es)) #define guest_mode(r) \ ({ \ diff --git a/xen/arch/x86/include/asm/x86_64/regs.h b/xen/arch/x86/include/asm/x86_64/regs.h deleted file mode 100644 index 171cf9a2e2..0000000000 --- a/xen/arch/x86/include/asm/x86_64/regs.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _X86_64_REGS_H -#define _X86_64_REGS_H - -#include -#include - -#define ring_0(r) (((r)->cs & 3) == 0) -#define ring_1(r) (((r)->cs & 3) == 1) -#define ring_2(r) (((r)->cs & 3) == 2) -#define ring_3(r) (((r)->cs & 3) == 3) - -#define guest_kernel_mode(v, r) \ - (!is_pv_32bit_vcpu(v) ? \ - (ring_3(r) && ((v)->arch.flags & TF_kernel_mode)) : \ - (ring_1(r))) - -#define permit_softint(dpl, v, r) \ - ((dpl) >= (guest_kernel_mode(v, r) ? 1 : 3)) - -/* Check for null trap callback handler: Is the EIP null? */ -#define null_trap_bounce(v, tb) \ - (!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0)) - -/* Number of bytes of on-stack execution state to be context-switched. */ -/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */ -#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es)) - -#endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:00:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:00:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987841.1373042 (Exim 4.92) (envelope-from ) id 1uG4yL-0001Ru-Vw; Sat, 17 May 2025 00:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987841.1373042; Sat, 17 May 2025 00:00: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 1uG4yL-0001Rn-St; Sat, 17 May 2025 00:00:13 +0000 Received: by outflank-mailman (input) for mailman id 987841; Sat, 17 May 2025 00:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4yK-0001Rd-Hq for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4yK-00Cgnf-2K for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4yK-004vRq-1J for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00: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=J/rlLJArLjxg/+8wOXtNLHpGI6sov9k2TyqDTrZNH6U=; b=twyDgOIh7ks4LbNdX5wHpDcrQG TixzsC8ADIyuykIX18ud2Xyroz9jitg7YZQaxtuK99E2gGK3Rgwbc7L6Kuuvpk6uL4msPQ13xXco1 fJiGo7Q4mBiSjZRgMab28uk+Ze7OnbOGUbet32vVFG03o0O5OlOEwlb3Rpig44yuR+Hs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Rework register state printing to use a struct Message-Id: Date: Sat, 17 May 2025 00:00:12 +0000 commit 32403f9f9fc671f05a6726a227d56e63c48cd777 Author: Andrew Cooper AuthorDate: Sun Dec 29 19:23:03 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/traps: Rework register state printing to use a struct ... in preference to the crs[8] array. This avoids abusing crs[5..7] for the fs/gs bases, giving them proper named fields instead, and avoids storage for cr1 which is unused in the x86 architecture. In show_registers(), remove a redundant read_cr2(). read_registers() already did the same, and it is only the PV path which needs to override with arch_get_cr2(). In vcpu_show_registers(), express the gsb/gss decision using SWAP(). The determination is going to get even more complicated under FRED. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/traps.c | 96 +++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index ac0fafd72d..01b4f06232 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -23,6 +23,11 @@ #include #include +struct extra_state +{ + unsigned long cr0, cr2, cr3, cr4; + unsigned long fsb, gsb, gss; +}; static void print_xen_info(void) { @@ -35,28 +40,29 @@ static void print_xen_info(void) enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; -/* (ab)use crs[5..7] for fs/gs bases. */ -static void read_registers(struct cpu_user_regs *regs, unsigned long crs[8]) +static void read_registers(struct cpu_user_regs *regs, struct extra_state *state) { - crs[0] = read_cr0(); - crs[2] = read_cr2(); - crs[3] = read_cr3(); - crs[4] = read_cr4(); + state->cr0 = read_cr0(); + state->cr2 = read_cr2(); + state->cr3 = read_cr3(); + state->cr4 = read_cr4(); + read_sregs(regs); - crs[5] = read_fs_base(); - crs[6] = read_gs_base(); - crs[7] = read_gs_shadow(); + + state->fsb = read_fs_base(); + state->gsb = read_gs_base(); + state->gss = read_gs_shadow(); } static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, - unsigned long crs[8]) + struct extra_state *state) { struct segment_register sreg; - crs[0] = v->arch.hvm.guest_cr[0]; - crs[2] = v->arch.hvm.guest_cr[2]; - crs[3] = v->arch.hvm.guest_cr[3]; - crs[4] = v->arch.hvm.guest_cr[4]; + state->cr0 = v->arch.hvm.guest_cr[0]; + state->cr2 = v->arch.hvm.guest_cr[2]; + state->cr3 = v->arch.hvm.guest_cr[3]; + state->cr4 = v->arch.hvm.guest_cr[4]; hvm_get_segment_register(v, x86_seg_cs, &sreg); regs->cs = sreg.sel; @@ -69,20 +75,20 @@ static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, hvm_get_segment_register(v, x86_seg_fs, &sreg); regs->fs = sreg.sel; - crs[5] = sreg.base; + state->fsb = sreg.base; hvm_get_segment_register(v, x86_seg_gs, &sreg); regs->gs = sreg.sel; - crs[6] = sreg.base; + state->gsb = sreg.base; hvm_get_segment_register(v, x86_seg_ss, &sreg); regs->ss = sreg.sel; - crs[7] = hvm_get_reg(v, MSR_SHADOW_GS_BASE); + state->gss = hvm_get_reg(v, MSR_SHADOW_GS_BASE); } static void _show_registers( - const struct cpu_user_regs *regs, unsigned long crs[8], + const struct cpu_user_regs *regs, const struct extra_state *state, enum context context, const struct vcpu *v) { static const char *const context_names[] = { @@ -112,10 +118,10 @@ static void _show_registers( printk("r12: %016lx r13: %016lx r14: %016lx\n", regs->r12, regs->r13, regs->r14); printk("r15: %016lx cr0: %016lx cr4: %016lx\n", - regs->r15, crs[0], crs[4]); - printk("cr3: %016lx cr2: %016lx\n", crs[3], crs[2]); + regs->r15, state->cr0, state->cr4); + printk("cr3: %016lx cr2: %016lx\n", state->cr3, state->cr2); printk("fsb: %016lx gsb: %016lx gss: %016lx\n", - crs[5], crs[6], crs[7]); + state->fsb, state->gsb, state->gss); printk("ds: %04x es: %04x fs: %04x gs: %04x " "ss: %04x cs: %04x\n", regs->ds, regs->es, regs->fs, @@ -125,34 +131,33 @@ static void _show_registers( void show_registers(const struct cpu_user_regs *regs) { struct cpu_user_regs fault_regs = *regs; - unsigned long fault_crs[8]; + struct extra_state fault_state; enum context context; struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; if ( guest_mode(regs) && is_hvm_vcpu(v) ) { - get_hvm_registers(v, &fault_regs, fault_crs); + get_hvm_registers(v, &fault_regs, &fault_state); context = CTXT_hvm_guest; } else { - read_registers(&fault_regs, fault_crs); + read_registers(&fault_regs, &fault_state); if ( guest_mode(regs) ) { context = CTXT_pv_guest; - fault_crs[2] = arch_get_cr2(v); + fault_state.cr2 = arch_get_cr2(v); } else { context = CTXT_hypervisor; - fault_crs[2] = read_cr2(); } } print_xen_info(); printk("CPU: %d\n", smp_processor_id()); - _show_registers(&fault_regs, fault_crs, context, v); + _show_registers(&fault_regs, &fault_state, context, v); if ( ler_msr && !guest_mode(regs) ) { @@ -173,34 +178,41 @@ void vcpu_show_registers(struct vcpu *v) { const struct cpu_user_regs *regs = &v->arch.user_regs; struct cpu_user_regs aux_regs; + struct extra_state state; enum context context; - unsigned long crs[8]; if ( is_hvm_vcpu(v) ) { aux_regs = *regs; - get_hvm_registers(v, &aux_regs, crs); + get_hvm_registers(v, &aux_regs, &state); regs = &aux_regs; context = CTXT_hvm_guest; } else { bool kernel = guest_kernel_mode(v, regs); + unsigned long gsb, gss; + + state.cr0 = v->arch.pv.ctrlreg[0]; + state.cr2 = arch_get_cr2(v); + state.cr3 = pagetable_get_paddr(kernel + ? v->arch.guest_table + : v->arch.guest_table_user); + state.cr4 = v->arch.pv.ctrlreg[4]; + + gsb = v->arch.pv.gs_base_user; + gss = v->arch.pv.gs_base_kernel; + if ( kernel ) + SWAP(gsb, gss); - crs[0] = v->arch.pv.ctrlreg[0]; - crs[2] = arch_get_cr2(v); - crs[3] = pagetable_get_paddr(kernel ? - v->arch.guest_table : - v->arch.guest_table_user); - crs[4] = v->arch.pv.ctrlreg[4]; - crs[5] = v->arch.pv.fs_base; - crs[6 + !kernel] = v->arch.pv.gs_base_kernel; - crs[7 - !kernel] = v->arch.pv.gs_base_user; + state.fsb = v->arch.pv.fs_base; + state.gsb = gsb; + state.gss = gss; context = CTXT_pv_guest; } - _show_registers(regs, crs, context, v); + _show_registers(regs, &state, context, v); } void show_page_walk(unsigned long addr) @@ -268,7 +280,7 @@ void show_page_walk(unsigned long addr) void asmlinkage do_double_fault(struct cpu_user_regs *regs) { unsigned int cpu; - unsigned long crs[8]; + struct extra_state state; console_force_unlock(); @@ -279,10 +291,10 @@ void asmlinkage do_double_fault(struct cpu_user_regs *regs) printk("*** DOUBLE FAULT ***\n"); print_xen_info(); - read_registers(regs, crs); + read_registers(regs, &state); printk("CPU: %d\n", cpu); - _show_registers(regs, crs, CTXT_hypervisor, NULL); + _show_registers(regs, &state, CTXT_hypervisor, NULL); show_code(regs); show_stack_overflow(cpu, regs); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:00:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987842.1373048 (Exim 4.92) (envelope-from ) id 1uG4yV-0001Xg-3H; Sat, 17 May 2025 00:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987842.1373048; Sat, 17 May 2025 00:00: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 1uG4yU-0001XX-Vw; Sat, 17 May 2025 00:00:22 +0000 Received: by outflank-mailman (input) for mailman id 987842; Sat, 17 May 2025 00:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4yU-0001XH-Oj for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4yU-00Cgww-34 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4yU-004vYY-2E for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00: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=1+ASLOHsmNNUZEm/6E8QF9UWuq3qzQ85BWRQx1etEM0=; b=Swp/Lpdq5q88M4p0BUdDMHL1Xy L09ig+hGe3Ao26MrvNkRgJQIty/yWIWCeSv4ohXByCtCLNaSHDOKbDpZTn8YyahSoglZcbe//nlSb II3H0PF4oaKBUFOO2buV61v3Z/sliHjj3GqJ12foZYJr0L6uHP1ZMKWI506FIn2pm61E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Avoid OoB accesses to print the data selectors Message-Id: Date: Sat, 17 May 2025 00:00:22 +0000 commit f903769f665c87d8456aa4a581d520a49841f09f Author: Andrew Cooper AuthorDate: Sun Dec 29 19:06:10 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/traps: Avoid OoB accesses to print the data selectors _show_registers() prints the data selectors from struct cpu_user_regs, but these fields are sometimes out-of-bounds. See commit 6065a05adf15 ("x86/traps: 'Fix' safety of read_registers() in #DF path"). There are 3 callers of _show_registers(): 1. vcpu_show_registers(), which always operates on a scheduled-out vCPU, where v->arch.user_regs (or aux_regs on the stack) is always in-bounds. 2. show_registers() where regs is always an on-stack frame. regs is copied into a local variable first (which is an OoB read for constructs such as WARN()), before being modified (so no OoB write). 3. do_double_fault(), where regs is adjacent to the stack guard page, and written into directly. This is an out of bounds read and write, with a bodge to avoid the writes hitting the guard page. Include the data segment selectors in struct extra_state, and use those fields instead of the fields in regs. This resolves the OoB write on the #DF path. Resolve the OoB read in show_registers() by doing a partial memcpy() rather than full structure copy. This is temporary until we've finished untangling the vm86 fields fully. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/traps.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 01b4f06232..23622cdb14 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -27,6 +27,7 @@ struct extra_state { unsigned long cr0, cr2, cr3, cr4; unsigned long fsb, gsb, gss; + uint16_t ds, es, fs, gs; }; static void print_xen_info(void) @@ -40,18 +41,21 @@ static void print_xen_info(void) enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; -static void read_registers(struct cpu_user_regs *regs, struct extra_state *state) +static void read_registers(struct extra_state *state) { state->cr0 = read_cr0(); state->cr2 = read_cr2(); state->cr3 = read_cr3(); state->cr4 = read_cr4(); - read_sregs(regs); - state->fsb = read_fs_base(); state->gsb = read_gs_base(); state->gss = read_gs_shadow(); + + asm ( "mov %%ds, %0" : "=m" (state->ds) ); + asm ( "mov %%es, %0" : "=m" (state->es) ); + asm ( "mov %%fs, %0" : "=m" (state->fs) ); + asm ( "mov %%gs, %0" : "=m" (state->gs) ); } static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, @@ -68,17 +72,17 @@ static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, regs->cs = sreg.sel; hvm_get_segment_register(v, x86_seg_ds, &sreg); - regs->ds = sreg.sel; + state->ds = sreg.sel; hvm_get_segment_register(v, x86_seg_es, &sreg); - regs->es = sreg.sel; + state->es = sreg.sel; hvm_get_segment_register(v, x86_seg_fs, &sreg); - regs->fs = sreg.sel; + state->fs = sreg.sel; state->fsb = sreg.base; hvm_get_segment_register(v, x86_seg_gs, &sreg); - regs->gs = sreg.sel; + state->gs = sreg.sel; state->gsb = sreg.base; hvm_get_segment_register(v, x86_seg_ss, &sreg); @@ -124,17 +128,23 @@ static void _show_registers( state->fsb, state->gsb, state->gss); printk("ds: %04x es: %04x fs: %04x gs: %04x " "ss: %04x cs: %04x\n", - regs->ds, regs->es, regs->fs, - regs->gs, regs->ss, regs->cs); + state->ds, state->es, state->fs, + state->gs, regs->ss, regs->cs); } void show_registers(const struct cpu_user_regs *regs) { - struct cpu_user_regs fault_regs = *regs; + struct cpu_user_regs fault_regs; struct extra_state fault_state; enum context context; struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; + /* + * Don't read beyond the end of the hardware frame. It is out of bounds + * for WARN()/etc. + */ + memcpy(&fault_regs, regs, offsetof(struct cpu_user_regs, es)); + if ( guest_mode(regs) && is_hvm_vcpu(v) ) { get_hvm_registers(v, &fault_regs, &fault_state); @@ -142,7 +152,7 @@ void show_registers(const struct cpu_user_regs *regs) } else { - read_registers(&fault_regs, &fault_state); + read_registers(&fault_state); if ( guest_mode(regs) ) { @@ -209,6 +219,11 @@ void vcpu_show_registers(struct vcpu *v) state.gsb = gsb; state.gss = gss; + state.ds = v->arch.user_regs.ds; + state.es = v->arch.user_regs.es; + state.fs = v->arch.user_regs.fs; + state.gs = v->arch.user_regs.gs; + context = CTXT_pv_guest; } @@ -291,7 +306,7 @@ void asmlinkage do_double_fault(struct cpu_user_regs *regs) printk("*** DOUBLE FAULT ***\n"); print_xen_info(); - read_registers(regs, &state); + read_registers(&state); printk("CPU: %d\n", cpu); _show_registers(regs, &state, CTXT_hypervisor, NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:00:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987843.1373051 (Exim 4.92) (envelope-from ) id 1uG4yg-0001im-48; Sat, 17 May 2025 00:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987843.1373051; Sat, 17 May 2025 00:00: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 1uG4yg-0001ie-1C; Sat, 17 May 2025 00:00:34 +0000 Received: by outflank-mailman (input) for mailman id 987843; Sat, 17 May 2025 00:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4ye-0001iY-Ra for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4yf-00CgxD-07 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4ye-004vfB-2Y for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00: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=j0YfnV8LDK70eCcGMl8SQTWklabP5OJaqEtILX7upJQ=; b=Bl1HrmIdChD2e8MZIbHPOiKoBc 0KCz+/7Zmh9lIi8ZHU0zwfbl7HESMJ+hWNCC+1Y6EZh/X1baYAGIkr4TtbApU+68WneN0elTjrA8y QnGeNLNBHHB/yI1sPVjJyzZsHjGO6Vl7IQ18vJ7JIrLFF95WMz0AYSIIAPL5dmjVwZ7I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "x86/traps: 'Fix' safety of read_registers() in #DF path" Message-Id: Date: Sat, 17 May 2025 00:00:32 +0000 commit 14acde869f02a39d395b6c78d9e367aebc3dbde5 Author: Andrew Cooper AuthorDate: Mon Dec 30 14:07:18 2024 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 Revert "x86/traps: 'Fix' safety of read_registers() in #DF path" This reverts commit 6065a05adf152a556fb9f11a5218c89e41b62893. The discussed "proper fix" has now been implemented, and the #DF path no longer writes out-of-bounds. Restore the proper #DF IST pointer. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e8d4ca3203..b934ce7ca4 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -847,13 +847,7 @@ void load_system_tables(void) tss->ist[IST_MCE - 1] = stack_top + (1 + IST_MCE) * PAGE_SIZE; tss->ist[IST_NMI - 1] = stack_top + (1 + IST_NMI) * PAGE_SIZE; tss->ist[IST_DB - 1] = stack_top + (1 + IST_DB) * PAGE_SIZE; - /* - * Gross bodge. The #DF handler uses the vm86 fields of cpu_user_regs - * beyond the hardware frame. Adjust the stack entrypoint so this - * doesn't manifest as an OoB write which hits the guard page. - */ - tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE - - (sizeof(struct cpu_user_regs) - offsetof(struct cpu_user_regs, es)); + tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE; tss->bitmap = IOBMP_INVALID_OFFSET; /* All other stack pointers poisioned. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:00:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987844.1373055 (Exim 4.92) (envelope-from ) id 1uG4yq-0001xN-5B; Sat, 17 May 2025 00:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987844.1373055; Sat, 17 May 2025 00:00: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 1uG4yq-0001xF-2a; Sat, 17 May 2025 00:00:44 +0000 Received: by outflank-mailman (input) for mailman id 987844; Sat, 17 May 2025 00:00:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4yo-0001sx-Up for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4yp-00CgxH-0S for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4yo-004vmq-2t for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00: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=qeJR0qViQntFrsF1+4zls1fbjsGAGkwvXqLrfzzWSfw=; b=UUISiqCVpKk+vjxkX4vc+jOHTS emFnaYTHB+LUKE9WTTboPpW2FgZEzeqKyqjDACGkh8NhFZYcug0BJnzyHzRc2dQb2KSYQxj64Hfp0 7IqvXf06NPJ7MWN9G0Z8YbbBzkrhl7c1DgEPg4ZLWSu9EnakK3Lp5XwNHKUa3eHE4RH0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ARM: Fix register constraints in run_in_exception_handler() Message-Id: Date: Sat, 17 May 2025 00:00:42 +0000 commit 1f5e64755d0e25b3aadf3c1ec1a4a0f0f3665969 Author: Andrew Cooper AuthorDate: Fri Feb 7 22:27:53 2025 +0000 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 ARM: Fix register constraints in run_in_exception_handler() For asm() statements, clobbers are disjoint from inputs and outputs. Therefore, run_in_exception_handler() specifying an input and clobbering BUG_FN_REG forces the compiler to set up fn in the wrong regsiter, just to have the code block move it into the correct register. Instead, use `register asm()` to tell the compiler which register fn really wants to be in. This results in better code generation. Bloat-o-meter reports: ARM64: Function old new delta dump_registers 356 348 -8 ARM32: ns16550_poll 52 48 -4 dump_registers 432 428 -4 The other instruction dropped in ARM64's dump_registers() is an alignment nop. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/bug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/bug.h b/xen/arch/arm/include/asm/bug.h index cacaf014ab..8bf71587be 100644 --- a/xen/arch/arm/include/asm/bug.h +++ b/xen/arch/arm/include/asm/bug.h @@ -59,15 +59,15 @@ struct bug_frame { * be called function in a fixed register. */ #define run_in_exception_handler(fn) do { \ - asm ("mov " __stringify(BUG_FN_REG) ", %0\n" \ - "1:"BUG_INSTR"\n" \ + register unsigned long _fn asm (STR(BUG_FN_REG)) = (unsigned long)(fn); \ + asm ("1:"BUG_INSTR"\n" \ ".pushsection .bug_frames." __stringify(BUGFRAME_run_fn) "," \ " \"a\", %%progbits\n" \ "2:\n" \ ".p2align 2\n" \ ".long (1b - 2b)\n" \ ".long 0, 0, 0\n" \ - ".popsection" :: "r" (fn) : __stringify(BUG_FN_REG) ); \ + ".popsection" :: "r" (_fn) ); \ } while (0) #define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, "") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:00:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987846.1373059 (Exim 4.92) (envelope-from ) id 1uG4z0-00026r-6r; Sat, 17 May 2025 00:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987846.1373059; Sat, 17 May 2025 00:00: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 1uG4z0-00026j-45; Sat, 17 May 2025 00:00:54 +0000 Received: by outflank-mailman (input) for mailman id 987846; Sat, 17 May 2025 00:00:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4yz-00026b-1H for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG4yz-00CgxN-0j for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG4yy-004vuq-3A for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:00: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=7DWR4HciIYqnfCzMtIFEq/Dz2DxSNUfQkv1RkW6J9iY=; b=zA7QO8ifR1NfRuNZJniyodWRrw QSIoD9SfGn1/ZQSc7IcevqxoNTeCPSGynWBxNvMbT67fhjWrE4CXmcDvk5E8pgTeCavKEX+KuxvUT PxxkLGmFfIkgwOVRLKT6IKt/0SDsF01LbRXHxv9fNe5PEPI3dH3mNPGpwHpZeL1NGfQI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vmx: Annotate the VMCS field widths Message-Id: Date: Sat, 17 May 2025 00:00:52 +0000 commit bbed2d36a0ea0c3842820f765065c905f576a6b3 Author: Andrew Cooper AuthorDate: Fri May 16 00:09:50 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 22:20:21 2025 +0100 x86/vmx: Annotate the VMCS field widths This helps identify the appropriate type to use. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h index cde4fe011b..ff5dd66b0a 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h @@ -436,6 +436,7 @@ extern struct vmx_caps vmx_caps; /* VMCS field encodings. */ #define VMCS_HIGH(x) ((x) | 1) enum vmcs_field { + /* 16-bit fields. */ VIRTUAL_PROCESSOR_ID = 0x00000000, POSTED_INTR_NOTIFICATION_VECTOR = 0x00000002, EPTP_INDEX = 0x00000004, @@ -457,6 +458,8 @@ enum vmcs_field { HOST_FS_SELECTOR = 0x00000c08, HOST_GS_SELECTOR = 0x00000c0a, HOST_TR_SELECTOR = 0x00000c0c, + + /* 64-bit fields. */ IO_BITMAP_A = 0x00002000, IO_BITMAP_B = 0x00002002, MSR_BITMAP = 0x00002004, @@ -493,6 +496,8 @@ enum vmcs_field { HOST_PAT = 0x00002c00, HOST_EFER = 0x00002c02, HOST_PERF_GLOBAL_CTRL = 0x00002c04, + + /* 32-bit fields. */ PIN_BASED_VM_EXEC_CONTROL = 0x00004000, CPU_BASED_VM_EXEC_CONTROL = 0x00004002, EXCEPTION_BITMAP = 0x00004004, @@ -546,6 +551,8 @@ enum vmcs_field { GUEST_SYSENTER_CS = 0x0000482a, GUEST_PREEMPTION_TIMER = 0x0000482e, HOST_SYSENTER_CS = 0x00004c00, + + /* Natural-width fields. */ CR0_GUEST_HOST_MASK = 0x00006000, CR4_GUEST_HOST_MASK = 0x00006002, CR0_READ_SHADOW = 0x00006004, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987859.1373083 (Exim 4.92) (envelope-from ) id 1uG58q-0004KO-Bf; Sat, 17 May 2025 00:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987859.1373083; Sat, 17 May 2025 00:11: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 1uG58q-0004KG-99; Sat, 17 May 2025 00:11:04 +0000 Received: by outflank-mailman (input) for mailman id 987859; Sat, 17 May 2025 00:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG58o-0004Ij-Lr for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG58o-00Ch7g-1k for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG58o-0054db-0l for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00: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=HFKO2b2NHgIZsBJNMMRpxr+cnfZb+livVbgzAFEAWvE=; b=LMD1NQeCHOGxKjqT8Umt5qzu4L 9/Zjem58noAcE8vu3dZGBqM9lw/4ASIhislU567satJsAmNonJshC1Hg22Z5tOlxJ91uzJj+77t6M 8AV4QL67VHnqkoucVYkbMXc3WzyB1uqXLpXvcIdKfJjifmNGcGQAEwyJefmiLDKGZoas=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Introduce asm inline and use it for BUG_FRAME Message-Id: Date: Sat, 17 May 2025 00:11:02 +0000 commit cd564e40df8b9b16a6c1427742ca10e063cf7017 Author: Andrew Cooper AuthorDate: Tue Apr 22 12:36:18 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 xen: Introduce asm inline and use it for BUG_FRAME Compilers estimate the size of an asm() block for inlining purposes. Constructs with embedded metadata (BUG_FRAME, ALTERNATIVE, EXTABLE, etc) appear large, depsite often only being a handful of instructions. asm inline() overrides the estimation to identify the block as being small. This has a substantial impact on inlining decisions, expected to be for the better given that the compiler has a more accurate picture to work with. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/Kconfig | 4 ++++ xen/arch/arm/include/asm/bug.h | 6 ++++-- xen/include/xen/bug.h | 11 ++++++----- xen/include/xen/compiler.h | 15 +++++++++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 1b24e8f3c0..07c4accf88 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -29,6 +29,10 @@ config LD_IS_GNU config LD_IS_LLVM def_bool $(success,$(LD) --version | head -n 1 | grep -q "^LLD") +config CC_HAS_ASM_INLINE + # GCC >= 9, Clang >= 11 + def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null) + # Use -f{function,data}-sections compiler parameters config CC_SPLIT_SECTIONS bool diff --git a/xen/arch/arm/include/asm/bug.h b/xen/arch/arm/include/asm/bug.h index 8bf71587be..0f436df63f 100644 --- a/xen/arch/arm/include/asm/bug.h +++ b/xen/arch/arm/include/asm/bug.h @@ -34,7 +34,8 @@ struct bug_frame { #define BUG_FRAME(type, line, file, has_msg, msg) do { \ BUILD_BUG_ON((line) >> 16); \ BUILD_BUG_ON((type) >= BUGFRAME_NR); \ - asm ("1:"BUG_INSTR"\n" \ + asm_inline ( \ + "1:"BUG_INSTR"\n" \ ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \ "2:\t.asciz " __stringify(file) "\n" \ "3:\n" \ @@ -60,7 +61,8 @@ struct bug_frame { */ #define run_in_exception_handler(fn) do { \ register unsigned long _fn asm (STR(BUG_FN_REG)) = (unsigned long)(fn); \ - asm ("1:"BUG_INSTR"\n" \ + asm_inline ( \ + "1:"BUG_INSTR"\n" \ ".pushsection .bug_frames." __stringify(BUGFRAME_run_fn) "," \ " \"a\", %%progbits\n" \ "2:\n" \ diff --git a/xen/include/xen/bug.h b/xen/include/xen/bug.h index 99814c4bef..0cabdba379 100644 --- a/xen/include/xen/bug.h +++ b/xen/include/xen/bug.h @@ -89,11 +89,12 @@ struct bug_frame { #ifndef BUG_FRAME #define BUG_FRAME(type, line, ptr, second_frame, msg) do { \ - BUG_CHECK_LINE_WIDTH(line); \ - BUILD_BUG_ON((type) >= BUGFRAME_NR); \ - asm volatile ( _ASM_BUGFRAME_TEXT(second_frame) \ - :: _ASM_BUGFRAME_INFO(type, line, ptr, msg) ); \ -} while ( false ) + BUG_CHECK_LINE_WIDTH(line); \ + BUILD_BUG_ON((type) >= BUGFRAME_NR); \ + asm_inline volatile ( \ + _ASM_BUGFRAME_TEXT(second_frame) \ + :: _ASM_BUGFRAME_INFO(type, line, ptr, msg) ); \ + } while ( false ) #endif diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index c68fab1891..735c844d2d 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -53,6 +53,21 @@ #define unreachable() __builtin_unreachable() #endif +/* + * Compilers estimate the size of an asm() block for inlining purposes. + * + * Constructs with embedded metadata (BUG_FRAME, ALTERNATIVE, EXTABLE, etc) + * appear large, depsite typically only being a handful of instructions. asm + * inline() overrides the estimation to identify the block as being small. + * + * Note: __inline is needed to avoid getting caught up in INIT_SECTIONS_ONLY. + */ +#if CONFIG_CC_HAS_ASM_INLINE +# define asm_inline asm __inline +#else +# define asm_inline asm +#endif + /* * Add the pseudo keyword 'fallthrough' so case statement blocks * must end with any of these keywords: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987860.1373088 (Exim 4.92) (envelope-from ) id 1uG58z-0004S6-DS; Sat, 17 May 2025 00:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987860.1373088; Sat, 17 May 2025 00: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 1uG58z-0004Rv-AV; Sat, 17 May 2025 00:11:13 +0000 Received: by outflank-mailman (input) for mailman id 987860; Sat, 17 May 2025 00:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG58y-0004Rf-FB for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG58y-00Ch7l-26 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG58y-0054m8-1H for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00: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=Av/xDXuZIfzOLKAarc9nQzHvQAFVgJMJvMNWUaGb2YA=; b=MRRxLo5U/toqq3/f7bPVS7G7hE lRAUwk98YXNF4NWLBEADlwMt8Z/zh/+y4pV7BP5eCZ1wN1eesyDfAEa5vprNxwmVOaiWAZ2qBW8Qu kQoq40ocR9RWUUUsE6TDa44+LpAKIW1j5aYRkDHJj6shuEVab8NTmfSsv6/AksqoIlg0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Use asm_inline for ALTERNATIVE() and EXTABLE Message-Id: Date: Sat, 17 May 2025 00:11:12 +0000 commit 729953c4f37eb485e2c1e3be93becce7180f0a31 Author: Andrew Cooper AuthorDate: Thu May 15 18:14:19 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 x86: Use asm_inline for ALTERNATIVE() and EXTABLE ... when there really are only a few instructions in line. In some cases, reformat to reduce left-hand margine space. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 52 ++++++++++++++++------------- xen/arch/x86/domain.c | 21 ++++++------ xen/arch/x86/extable.c | 21 ++++++------ xen/arch/x86/hvm/vmx/vmcs.c | 15 +++++---- xen/arch/x86/i387.c | 4 +-- xen/arch/x86/include/asm/alternative-call.h | 3 +- xen/arch/x86/include/asm/alternative.h | 36 +++++++++++--------- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 15 +++++---- xen/arch/x86/include/asm/uaccess.h | 4 +-- xen/arch/x86/pv/misc-hypercalls.c | 19 ++++++----- xen/arch/x86/traps.c | 48 ++++++++++++++------------ xen/arch/x86/usercopy.c | 6 ++-- 12 files changed, 132 insertions(+), 112 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 37d67dd15c..27ae167808 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -60,41 +60,45 @@ static inline int rdmsr_amd_safe(unsigned int msr, unsigned int *lo, unsigned int *hi) { #ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT - asm goto ( "1: rdmsr\n\t" - _ASM_EXTABLE(1b, %l[fault]) - : "=a" (*lo), "=d" (*hi) - : "c" (msr), "D" (0x9c5a203a) - : - : fault ); + asm_inline goto ( + "1: rdmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : "=a" (*lo), "=d" (*hi) + : "c" (msr), "D" (0x9c5a203a) + : + : fault ); + return 0; fault: return -EFAULT; #else - int err; - - asm volatile("1: rdmsr\n2:\n" - ".section .fixup,\"ax\"\n" - "3: movl %6,%2\n" - " jmp 2b\n" - ".previous\n" - _ASM_EXTABLE(1b, 3b) - : "=a" (*lo), "=d" (*hi), "=r" (err) - : "c" (msr), "D" (0x9c5a203a), "2" (0), "i" (-EFAULT)); - - return err; + int err; + + asm_inline volatile ( + "1: rdmsr\n2:\n" + ".section .fixup,\"ax\"\n" + "3: movl %6,%2\n" + " jmp 2b\n" + ".previous\n" + _ASM_EXTABLE(1b, 3b) + : "=a" (*lo), "=d" (*hi), "=r" (err) + : "c" (msr), "D" (0x9c5a203a), "2" (0), "i" (-EFAULT) ); + + return err; #endif } static inline int wrmsr_amd_safe(unsigned int msr, unsigned int lo, unsigned int hi) { - asm goto ( "1: wrmsr\n\t" - _ASM_EXTABLE(1b, %l[fault]) - : - : "c" (msr), "a" (lo), "d" (hi), "D" (0x9c5a203a) - : - : fault ); + asm_inline goto ( + "1: wrmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : + : "c" (msr), "a" (lo), "d" (hi), "D" (0x9c5a203a) + : + : fault ); return 0; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f197dad4c0..7536b6c871 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1706,16 +1706,17 @@ static void load_segments(struct vcpu *n) * @all_segs_okay in function scope, and load NUL into @sel. */ #define TRY_LOAD_SEG(seg, val) \ - asm volatile ( "1: mov %k[_val], %%" #seg "\n\t" \ - "2:\n\t" \ - ".section .fixup, \"ax\"\n\t" \ - "3: xor %k[ok], %k[ok]\n\t" \ - " mov %k[ok], %%" #seg "\n\t" \ - " jmp 2b\n\t" \ - ".previous\n\t" \ - _ASM_EXTABLE(1b, 3b) \ - : [ok] "+r" (all_segs_okay) \ - : [_val] "rm" (val) ) + asm_inline volatile ( \ + "1: mov %k[_val], %%" #seg "\n\t" \ + "2:\n\t" \ + ".section .fixup, \"ax\"\n\t" \ + "3: xor %k[ok], %k[ok]\n\t" \ + " mov %k[ok], %%" #seg "\n\t" \ + " jmp 2b\n\t" \ + ".previous\n\t" \ + _ASM_EXTABLE(1b, 3b) \ + : [ok] "+r" (all_segs_okay) \ + : [_val] "rm" (val) ) if ( !compat ) { diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 1572efa69a..de39202452 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -186,16 +186,17 @@ int __init cf_check stub_selftest(void) place_ret(ptr + ARRAY_SIZE(tests[i].opc)); unmap_domain_page(ptr); - asm volatile ( "INDIRECT_CALL %[stb]\n" - ".Lret%=:\n\t" - ".pushsection .fixup,\"ax\"\n" - ".Lfix%=:\n\t" - "pop %[exn]\n\t" - "jmp .Lret%=\n\t" - ".popsection\n\t" - _ASM_EXTABLE(.Lret%=, .Lfix%=) - : [exn] "+m" (res) ASM_CALL_CONSTRAINT - : [stb] "r" (addr), "a" (tests[i].rax)); + asm_inline volatile ( + "INDIRECT_CALL %[stb]\n" + ".Lret%=:\n\t" + ".pushsection .fixup,\"ax\"\n" + ".Lfix%=:\n\t" + "pop %[exn]\n\t" + "jmp .Lret%=\n\t" + ".popsection\n\t" + _ASM_EXTABLE(.Lret%=, .Lfix%=) + : [exn] "+m" (res) ASM_CALL_CONSTRAINT + : [stb] "r" (addr), "a" (tests[i].rax) ); if ( res.raw != tests[i].res.raw ) { diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index a44475ae15..59f4d1d86f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -749,13 +749,14 @@ static int _vmx_cpu_up(bool bsp) if ( bsp && (rc = vmx_cpu_up_prepare(cpu)) != 0 ) return rc; - asm goto ( "1: vmxon %[addr]\n\t" - " jbe %l[vmxon_fail]\n\t" - _ASM_EXTABLE(1b, %l[vmxon_fault]) - : - : [addr] "m" (this_cpu(vmxon_region)) - : "memory" - : vmxon_fail, vmxon_fault ); + asm_inline goto ( + "1: vmxon %[addr]\n\t" + " jbe %l[vmxon_fail]\n\t" + _ASM_EXTABLE(1b, %l[vmxon_fault]) + : + : [addr] "m" (this_cpu(vmxon_region)) + : "memory" + : vmxon_fail, vmxon_fault ); this_cpu(vmxon) = 1; diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 5429531ddd..b84cd6f7a9 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -62,7 +62,7 @@ static inline void fpu_fxrstor(struct vcpu *v) switch ( __builtin_expect(fpu_ctxt->x[FPU_WORD_SIZE_OFFSET], 8) ) { default: - asm volatile ( + asm_inline volatile ( "1: fxrstorq %0\n" ".section .fixup,\"ax\" \n" "2: push %%"__OP"ax \n" @@ -82,7 +82,7 @@ static inline void fpu_fxrstor(struct vcpu *v) : "m" (*fpu_ctxt), "i" (sizeof(*fpu_ctxt) / 4) ); break; case 4: case 2: - asm volatile ( + asm_inline volatile ( "1: fxrstor %0 \n" ".section .fixup,\"ax\"\n" "2: push %%"__OP"ax \n" diff --git a/xen/arch/x86/include/asm/alternative-call.h b/xen/arch/x86/include/asm/alternative-call.h index bbc49a5274..b22c10c322 100644 --- a/xen/arch/x86/include/asm/alternative-call.h +++ b/xen/arch/x86/include/asm/alternative-call.h @@ -87,7 +87,8 @@ struct alt_call { rettype ret_; \ register unsigned long r10_ asm("r10"); \ register unsigned long r11_ asm("r11"); \ - asm volatile ("1: call *%c[addr](%%rip)\n\t" \ + asm_inline volatile ( \ + "1: call *%c[addr](%%rip)\n\t" \ ".pushsection .alt_call_sites, \"a\", @progbits\n\t" \ ".long 1b - .\n\t" \ ".popsection" \ diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h index e17be8ddfd..0482bbf7cb 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -126,12 +126,15 @@ extern void alternative_instructions(void); * without volatile and memory clobber. */ #define alternative(oldinstr, newinstr, feature) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") + asm_inline volatile ( \ + ALTERNATIVE(oldinstr, newinstr, feature) \ + ::: "memory" ) #define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \ - asm volatile (ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ - newinstr2, feature2) \ - : : : "memory") + asm_inline volatile ( \ + ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ + newinstr2, feature2) \ + ::: "memory" ) /* * Alternative inline assembly with input. @@ -143,14 +146,16 @@ extern void alternative_instructions(void); * If you use variable sized constraints like "m" or "g" in the * replacement make sure to pad to the worst case length. */ -#define alternative_input(oldinstr, newinstr, feature, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : : input) +#define alternative_input(oldinstr, newinstr, feature, input...) \ + asm_inline volatile ( \ + ALTERNATIVE(oldinstr, newinstr, feature) \ + :: input ) /* Like alternative_input, but with a single output argument */ -#define alternative_io(oldinstr, newinstr, feature, output, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : output : input) +#define alternative_io(oldinstr, newinstr, feature, output, input...) \ + asm_inline volatile ( \ + ALTERNATIVE(oldinstr, newinstr, feature) \ + : output : input ) /* * This is similar to alternative_io. But it has two features and @@ -160,11 +165,12 @@ extern void alternative_instructions(void); * Otherwise, if CPU has feature1, newinstr1 is used. * Otherwise, oldinstr is used. */ -#define alternative_io_2(oldinstr, newinstr1, feature1, newinstr2, \ - feature2, output, input...) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ - newinstr2, feature2) \ - : output : input) +#define alternative_io_2(oldinstr, newinstr1, feature1, newinstr2, \ + feature2, output, input...) \ + asm_inline volatile ( \ + ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ + newinstr2, feature2) \ + : output : input ) /* Use this macro(s) if you need more than one output parameter. */ #define ASM_OUTPUT2(a...) a diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index d85b52b9d5..56bea252cc 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -431,13 +431,14 @@ static always_inline void __invvpid(unsigned long type, u16 vpid, u64 gva) } operand = {vpid, 0, gva}; /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ - asm goto ( "1: invvpid %[operand], %[type]\n\t" - " jbe %l[vmfail]\n\t" - "2:" _ASM_EXTABLE(1b, 2b) - : - : [operand] "m" (operand), [type] "r" (type) - : "memory" - : vmfail ); + asm_inline goto ( + "1: invvpid %[operand], %[type]\n\t" + " jbe %l[vmfail]\n\t" + "2:" _ASM_EXTABLE(1b, 2b) + : + : [operand] "m" (operand), [type] "r" (type) + : "memory" + : vmfail ); return; vmfail: diff --git a/xen/arch/x86/include/asm/uaccess.h b/xen/arch/x86/include/asm/uaccess.h index 2d01669b96..719d053936 100644 --- a/xen/arch/x86/include/asm/uaccess.h +++ b/xen/arch/x86/include/asm/uaccess.h @@ -154,7 +154,7 @@ struct __large_struct { unsigned long buf[100]; }; * aliasing issues. */ #define put_unsafe_asm(x, addr, GUARD, err, itype, rtype, ltype, errret) \ - __asm__ __volatile__( \ + asm_inline volatile ( \ GUARD( \ " guest_access_mask_ptr %[ptr], %[scr1], %[scr2]\n" \ ) \ @@ -171,7 +171,7 @@ struct __large_struct { unsigned long buf[100]; }; "[ptr]" (addr), [errno] "i" (errret)) #define get_unsafe_asm(x, addr, GUARD, err, rtype, ltype, errret) \ - __asm__ __volatile__( \ + asm_inline volatile ( \ GUARD( \ " guest_access_mask_ptr %[ptr], %[scr1], %[scr2]\n" \ ) \ diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index b529f00ea1..17030d800d 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -230,15 +230,16 @@ long do_set_segment_base(unsigned int which, unsigned long base) * Anyone wanting to check for errors from this hypercall should * re-read %gs and compare against the input. */ - asm volatile ( "1: mov %[sel], %%gs\n\t" - ".section .fixup, \"ax\", @progbits\n\t" - "2: mov %k[flat], %%gs\n\t" - " xor %[sel], %[sel]\n\t" - " jmp 1b\n\t" - ".previous\n\t" - _ASM_EXTABLE(1b, 2b) - : [sel] "+r" (sel) - : [flat] "r" (FLAT_USER_DS32) ); + asm_inline volatile ( + "1: mov %[sel], %%gs\n\t" + ".section .fixup, \"ax\", @progbits\n\t" + "2: mov %k[flat], %%gs\n\t" + " xor %[sel], %[sel]\n\t" + " jmp 1b\n\t" + ".previous\n\t" + _ASM_EXTABLE(1b, 2b) + : [sel] "+r" (sel) + : [flat] "r" (FLAT_USER_DS32) ); /* Update the cache of the inactive base, as read from the GDT/LDT. */ v->arch.pv.gs_base_user = read_gs_base(); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 25e0d5777e..c94779b4ad 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -126,27 +126,29 @@ void show_code(const struct cpu_user_regs *regs) * Copy forward from regs->rip. In the case of a fault, %ecx contains the * number of bytes remaining to copy. */ - asm volatile ("1: rep movsb; 2:" - _ASM_EXTABLE(1b, 2b) - : "=&c" (missing_after), - "=&D" (tmp), "=&S" (tmp) - : "0" (ARRAY_SIZE(insns_after)), - "1" (insns_after), - "2" (regs->rip)); + asm_inline volatile ( + "1: rep movsb; 2:" + _ASM_EXTABLE(1b, 2b) + : "=&c" (missing_after), + "=&D" (tmp), "=&S" (tmp) + : "0" (ARRAY_SIZE(insns_after)), + "1" (insns_after), + "2" (regs->rip) ); /* * Copy backwards from regs->rip - 1. In the case of a fault, %ecx * contains the number of bytes remaining to copy. */ - asm volatile ("std;" - "1: rep movsb;" - "2: cld;" - _ASM_EXTABLE(1b, 2b) - : "=&c" (missing_before), - "=&D" (tmp), "=&S" (tmp) - : "0" (ARRAY_SIZE(insns_before)), - "1" (insns_before + ARRAY_SIZE(insns_before) - 1), - "2" (regs->rip - 1)); + asm_inline volatile ( + "std;" + "1: rep movsb;" + "2: cld;" + _ASM_EXTABLE(1b, 2b) + : "=&c" (missing_before), + "=&D" (tmp), "=&S" (tmp) + : "0" (ARRAY_SIZE(insns_before)), + "1" (insns_before + ARRAY_SIZE(insns_before) - 1), + "2" (regs->rip - 1) ); clac(); printk("Xen code around <%p> (%ps)%s:\n", @@ -524,12 +526,14 @@ static void show_trace(const struct cpu_user_regs *regs) printk("Xen call trace:\n"); /* Guarded read of the stack top. */ - asm ( "1: mov %[data], %[tos]; 2:\n" - ".pushsection .fixup,\"ax\"\n" - "3: movb $1, %[fault]; jmp 2b\n" - ".popsection\n" - _ASM_EXTABLE(1b, 3b) - : [tos] "+r" (tos), [fault] "+qm" (fault) : [data] "m" (*sp) ); + asm_inline ( + "1: mov %[data], %[tos]; 2:\n" + ".pushsection .fixup,\"ax\"\n" + "3: movb $1, %[fault]; jmp 2b\n" + ".popsection\n" + _ASM_EXTABLE(1b, 3b) + : [tos] "+r" (tos), [fault] "+qm" (fault) + : [data] "m" (*sp) ); /* * If RIP looks sensible, or the top of the stack doesn't, print RIP at diff --git a/xen/arch/x86/usercopy.c b/xen/arch/x86/usercopy.c index 7ab2009efe..a24b52cc66 100644 --- a/xen/arch/x86/usercopy.c +++ b/xen/arch/x86/usercopy.c @@ -19,7 +19,7 @@ unsigned int copy_to_guest_ll(void __user *to, const void *from, unsigned int n) GUARD(unsigned dummy); stac(); - asm volatile ( + asm_inline volatile ( GUARD( " guest_access_mask_ptr %[to], %q[scratch1], %q[scratch2]\n" ) @@ -39,7 +39,7 @@ unsigned int copy_from_guest_ll(void *to, const void __user *from, unsigned int unsigned dummy; stac(); - asm volatile ( + asm_inline volatile ( GUARD( " guest_access_mask_ptr %[from], %q[scratch1], %q[scratch2]\n" ) @@ -101,7 +101,7 @@ unsigned int clear_guest_pv(void __user *to, unsigned int n) long dummy; stac(); - asm volatile ( + asm_inline volatile ( " guest_access_mask_ptr %[to], %[scratch1], %[scratch2]\n" "1: rep stosb\n" "2:\n" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987861.1373090 (Exim 4.92) (envelope-from ) id 1uG599-0004Yu-GC; Sat, 17 May 2025 00:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987861.1373090; Sat, 17 May 2025 00: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 1uG599-0004Ym-Dd; Sat, 17 May 2025 00:11:23 +0000 Received: by outflank-mailman (input) for mailman id 987861; Sat, 17 May 2025 00:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG598-0004Yc-If for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG598-00Ch84-2S for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG598-0054tD-1e for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00: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=73KXUbocfZJXeiijRL9jyICsPUH4j+m84FKDffYy2BE=; b=XAS0EkBtS68A5buCRhhLj5B7BR upZCTfNLN2oV4tyF7BpebEwX0YY32G92npeCIS2rxkNMogZlf31yvMqnZIIfuCZVOraF1WTm5P1te UFGv7bGHPA3LpNQBbB+Of2Pw1kJ9zuC+u2ZBrmV94OZj68TSLnqeg0gDYrRhg306s/S8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ARM: Use asm_inline for ALTERNATIVE() Message-Id: Date: Sat, 17 May 2025 00:11:22 +0000 commit 5b24cf26217814c446d5d542077c334ee7a00cc0 Author: Andrew Cooper AuthorDate: Thu May 15 17:58:58 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 ARM: Use asm_inline for ALTERNATIVE() ... when there really are only a few instructions in line. In some cases, reformat to reduce left-hand margine space. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/alternative.h | 4 +-- xen/arch/arm/include/asm/arm64/flushtlb.h | 4 +-- xen/arch/arm/include/asm/arm64/io.h | 43 +++++++++++++++++++------------ xen/arch/arm/include/asm/cpuerrata.h | 8 +++--- xen/arch/arm/include/asm/cpufeature.h | 8 +++--- xen/arch/arm/include/asm/page.h | 12 +++++---- xen/arch/arm/include/asm/processor.h | 7 ++--- xen/arch/arm/include/asm/sysregs.h | 10 ++++--- xen/arch/arm/mmu/p2m.c | 3 ++- 9 files changed, 58 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/include/asm/alternative.h b/xen/arch/arm/include/asm/alternative.h index 22477d9497..1563f03a0f 100644 --- a/xen/arch/arm/include/asm/alternative.h +++ b/xen/arch/arm/include/asm/alternative.h @@ -209,9 +209,9 @@ alternative_endif #endif /* __ASSEMBLY__ */ /* - * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature)); + * Usage: asm_inline (ALTERNATIVE(oldinstr, newinstr, feature)); * - * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature, CONFIG_FOO)); + * Usage: asm_inline (ALTERNATIVE(oldinstr, newinstr, feature, CONFIG_FOO)); * N.B. If CONFIG_FOO is specified, but not selected, the whole block * will be omitted, including oldinstr. */ diff --git a/xen/arch/arm/include/asm/arm64/flushtlb.h b/xen/arch/arm/include/asm/arm64/flushtlb.h index 45642201d1..3b99c11b50 100644 --- a/xen/arch/arm/include/asm/arm64/flushtlb.h +++ b/xen/arch/arm/include/asm/arm64/flushtlb.h @@ -31,7 +31,7 @@ #define TLB_HELPER(name, tlbop, sh) \ static inline void name(void) \ { \ - asm volatile( \ + asm_inline volatile ( \ "dsb " # sh "st;" \ "tlbi " # tlbop ";" \ ALTERNATIVE( \ @@ -55,7 +55,7 @@ static inline void name(void) \ #define TLB_HELPER_VA(name, tlbop) \ static inline void name(vaddr_t va) \ { \ - asm volatile( \ + asm_inline volatile ( \ "tlbi " # tlbop ", %0;" \ ALTERNATIVE( \ "nop; nop;", \ diff --git a/xen/arch/arm/include/asm/arm64/io.h b/xen/arch/arm/include/asm/arm64/io.h index 7d59598777..ac90b729c4 100644 --- a/xen/arch/arm/include/asm/arm64/io.h +++ b/xen/arch/arm/include/asm/arm64/io.h @@ -51,40 +51,51 @@ static inline void __raw_writeq(u64 val, volatile void __iomem *addr) static inline u8 __raw_readb(const volatile void __iomem *addr) { u8 val; - asm volatile(ALTERNATIVE("ldrb %w0, [%1]", - "ldarb %w0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + + asm_inline volatile ( + ALTERNATIVE("ldrb %w0, [%1]", + "ldarb %w0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } static inline u16 __raw_readw(const volatile void __iomem *addr) { u16 val; - asm volatile(ALTERNATIVE("ldrh %w0, [%1]", - "ldarh %w0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + asm_inline volatile ( + ALTERNATIVE("ldrh %w0, [%1]", + "ldarh %w0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } static inline u32 __raw_readl(const volatile void __iomem *addr) { u32 val; - asm volatile(ALTERNATIVE("ldr %w0, [%1]", - "ldar %w0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + + asm_inline volatile ( + ALTERNATIVE("ldr %w0, [%1]", + "ldar %w0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } static inline u64 __raw_readq(const volatile void __iomem *addr) { u64 val; - asm volatile(ALTERNATIVE("ldr %0, [%1]", - "ldar %0, [%1]", - ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) - : "=r" (val) : "r" (addr)); + + asm_inline volatile ( + ALTERNATIVE("ldr %0, [%1]", + "ldar %0, [%1]", + ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) + : "=r" (val) : "r" (addr) ); + return val; } diff --git a/xen/arch/arm/include/asm/cpuerrata.h b/xen/arch/arm/include/asm/cpuerrata.h index 8d7e7b9375..1799a16d7e 100644 --- a/xen/arch/arm/include/asm/cpuerrata.h +++ b/xen/arch/arm/include/asm/cpuerrata.h @@ -16,10 +16,10 @@ static inline bool check_workaround_##erratum(void) \ { \ register_t ret; \ \ - asm volatile (ALTERNATIVE("mov %0, #0", \ - "mov %0, #1", \ - feature) \ - : "=r" (ret)); \ + asm_inline volatile ( \ + ALTERNATIVE("mov %0, #0", \ + "mov %0, #1", feature) \ + : "=r" (ret) ); \ \ return unlikely(ret); \ } \ diff --git a/xen/arch/arm/include/asm/cpufeature.h b/xen/arch/arm/include/asm/cpufeature.h index 50297e53d9..b6df188011 100644 --- a/xen/arch/arm/include/asm/cpufeature.h +++ b/xen/arch/arm/include/asm/cpufeature.h @@ -102,10 +102,10 @@ static inline bool cpus_have_cap(unsigned int num) #define cpus_have_const_cap(num) ({ \ register_t __ret; \ \ - asm volatile (ALTERNATIVE("mov %0, #0", \ - "mov %0, #1", \ - num) \ - : "=r" (__ret)); \ + asm_inline volatile ( \ + ALTERNATIVE("mov %0, #0", \ + "mov %0, #1", num) \ + : "=r" (__ret) ); \ \ unlikely(__ret); \ }) diff --git a/xen/arch/arm/include/asm/page.h b/xen/arch/arm/include/asm/page.h index 69f817d1e6..27bc96b9f4 100644 --- a/xen/arch/arm/include/asm/page.h +++ b/xen/arch/arm/include/asm/page.h @@ -176,7 +176,8 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) { size -= dcache_line_bytes - ((uintptr_t)p & cacheline_mask); p = (void *)((uintptr_t)p & ~cacheline_mask); - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); + asm_inline volatile ( + __clean_and_invalidate_dcache_one(0) :: "r" (p) ); p += dcache_line_bytes; } @@ -185,7 +186,8 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) asm volatile (__invalidate_dcache_one(0) : : "r" (p + idx)); if ( size > 0 ) - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p + idx)); + asm_inline volatile ( + __clean_and_invalidate_dcache_one(0) :: "r" (p + idx) ); dsb(sy); /* So we know the flushes happen before continuing */ @@ -209,7 +211,7 @@ static inline int clean_dcache_va_range(const void *p, unsigned long size) p = (void *)((uintptr_t)p & ~cacheline_mask); for ( ; size >= dcache_line_bytes; idx += dcache_line_bytes, size -= dcache_line_bytes ) - asm volatile (__clean_dcache_one(0) : : "r" (p + idx)); + asm_inline volatile ( __clean_dcache_one(0) : : "r" (p + idx) ); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ return 0; @@ -247,7 +249,7 @@ static inline int clean_and_invalidate_dcache_va_range if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ clean_dcache_va_range(_p, sizeof(x)); \ else \ - asm volatile ( \ + asm_inline volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ __clean_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ @@ -259,7 +261,7 @@ static inline int clean_and_invalidate_dcache_va_range if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ clean_and_invalidate_dcache_va_range(_p, sizeof(x)); \ else \ - asm volatile ( \ + asm_inline volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ __clean_and_invalidate_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ diff --git a/xen/arch/arm/include/asm/processor.h b/xen/arch/arm/include/asm/processor.h index 60b587db69..9cbc4f9110 100644 --- a/xen/arch/arm/include/asm/processor.h +++ b/xen/arch/arm/include/asm/processor.h @@ -607,9 +607,10 @@ register_t get_default_cptr_flags(void); #define SYNCHRONIZE_SERROR(feat) \ do { \ ASSERT(local_abort_is_enabled()); \ - asm volatile(ALTERNATIVE("dsb sy; isb", \ - "nop; nop", feat) \ - : : : "memory"); \ + asm_inline volatile ( \ + ALTERNATIVE("dsb sy; isb", \ + "nop; nop", feat) \ + ::: "memory" ); \ } while (0) /* diff --git a/xen/arch/arm/include/asm/sysregs.h b/xen/arch/arm/include/asm/sysregs.h index 61e30c9e51..5c2d362be3 100644 --- a/xen/arch/arm/include/asm/sysregs.h +++ b/xen/arch/arm/include/asm/sysregs.h @@ -22,11 +22,13 @@ static inline register_t read_sysreg_par(void) * DMB SY before and after accessing it, as part of the workaround for the * errata 1508412. */ - asm volatile(ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, - CONFIG_ARM64_ERRATUM_1508412)); + asm_inline volatile ( + ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, + CONFIG_ARM64_ERRATUM_1508412) ); par_el1 = READ_SYSREG64(PAR_EL1); - asm volatile(ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, - CONFIG_ARM64_ERRATUM_1508412)); + asm_inline volatile ( + ALTERNATIVE("nop", "dmb sy", ARM64_WORKAROUND_1508412, + CONFIG_ARM64_ERRATUM_1508412) ); return par_el1; } diff --git a/xen/arch/arm/mmu/p2m.c b/xen/arch/arm/mmu/p2m.c index 7642dbc7c5..d96078f547 100644 --- a/xen/arch/arm/mmu/p2m.c +++ b/xen/arch/arm/mmu/p2m.c @@ -228,7 +228,8 @@ void p2m_restore_state(struct vcpu *n) * registers associated to EL1/EL0 translations regime have been * synchronized. */ - asm volatile(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_AT_SPECULATE)); + asm_inline volatile ( + ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_AT_SPECULATE) ); WRITE_SYSREG64(p2m->vttbr, VTTBR_EL2); last_vcpu_ran = &p2m->last_vcpu_ran[smp_processor_id()]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987862.1373095 (Exim 4.92) (envelope-from ) id 1uG59K-0004hL-Hx; Sat, 17 May 2025 00:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987862.1373095; Sat, 17 May 2025 00:11: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 1uG59K-0004hB-F7; Sat, 17 May 2025 00:11:34 +0000 Received: by outflank-mailman (input) for mailman id 987862; Sat, 17 May 2025 00:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG59I-0004gw-LW for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG59I-00Ch8b-2k for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG59I-005508-1x for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:11: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=XB7yT8oFlrBwx4FtWhdx7TKshRc9EN9zaxJLLYsL8HM=; b=fhO/aOesE8YOL5HEIJcTTW9mTp zzigZF2Br/eyBL9c9ABkhHsxGMxmuHPisPaotKvL1T/Qsq9oee2UGcjHya6zwlqIPcAxRpED2ePw/ 1UozxrRKqN7z+EQxePpjKMObAkOTtR8y0elDISVv9V0t1QFa/JjY0haqU78pgi6m50y8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CODING_STYLE: Updated header guard recommendations Message-Id: Date: Sat, 17 May 2025 00:11:32 +0000 commit 7abea85c9f128556da2fdb08dd74c7e2489da7ea Author: Andrew Cooper AuthorDate: Fri May 16 15:20:31 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 16 23:54:05 2025 +0100 CODING_STYLE: Updated header guard recommendations Despite the best intentions at the time, the current recommendation lead to very long identifiers, bordering on the max limit we've chosen for certification. One observation is that we do have static analysis which will highlight if duplicate guards are created accidentally. Therefore, relax the recommendations and in particular remove the specific tie to the directory structure. This has the other advantage of being more similar to other projects. This will hopefully mean there's less churn getting the tree in shape, and a random contributor is more likely to pick an appropriate guard given no specific knowledge of Xen. As always, it's something reviewers and maintainers should be aware of, and to advise on. Reviewed-by: Stefano Stabellini Signed-off-by: Andrew Cooper --- CODING_STYLE | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/CODING_STYLE b/CODING_STYLE index e3b1da6048..5644f1697f 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -157,43 +157,30 @@ Header inclusion guards ----------------------- Unless otherwise specified, all header files should include proper -guards to prevent multiple inclusions. The following naming conventions -apply: - -- Guard names are derived from directory path underneath xen/ and the - actual file name. Path components are separated by double - underscores. Alphabetic characters are converted to upper case. Non- - alphanumeric characters are replaced by single underscores. -- Certain directory components are omitted, to keep identifier length - bounded: - - the top level include/, - - architecture-specific private files' arch/, - - any architecture's arch//include/asm/ collapses to - ASM____. +guards to prevent multiple inclusions. Guards need to be unique, and +this property is checked by static analysis. -For example: +Guards should be chosen based on the logical area, with enough +disambiguation when the same filename exits in multiple locations in +the source tree. Commonly there should be a XEN or prefix. +The guard should be spelt in ALL CAPITALS, ending with _H. -- Xen headers: XEN___H - - include/xen/something.h -> XEN__SOMETHING_H +For example: -- asm-generic headers: ASM_GENERIC___H - - include/asm-generic/something.h -> ASM_GENERIC__SOMETHING_H +- Xen headers: XEN__H + - include/xen/something.h -> XEN_SOMETHING_H -- arch-specific headers: ASM_______H - - arch/x86/include/asm/something.h -> ASM__X86__SOMETHING_H +- arch-specific headers: __H + - arch/x86/include/asm/something.h -> X86_SOMETHING_H + - arch/x86/include/asm/hvm/something.h -> X86_HVM_SOMETHING_H + - arch/x86/include/asm/pv/something.h -> X86_PV_SOMETHING_H -- Private headers: ___H - - arch/arm/arm64/lib/something.h -> ARM__ARM64__LIB__SOMETHING_H - - arch/x86/lib/something.h -> X86__LIB__SOMETHING_H - - common/something.h -> COMMON__SOMETHING_H +- Private headers: _PRIVATE_H + - common/something/private.h -> _PRIVATE_H + - drivers/foo/something.h -> _H -Note that this requires some discipline on the naming of future new -sub-directories: There shouldn't be any other asm/ one anywhere, for -example. Nor should any new ports be named the same as top-level -(within xen/) directories. Which may in turn require some care if any -new top-level directories were to be added. Rule of thumb: Whenever -adding a new subdirectory, check the rules to prevent any potential -collisions. +A good choice of guard is one that wont become stale if the +driver/subsystem/etc is shuffled around the source tree. Emacs local variables --------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987879.1373109 (Exim 4.92) (envelope-from ) id 1uG5U7-0008Da-E4; Sat, 17 May 2025 00:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987879.1373109; Sat, 17 May 2025 00: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 1uG5U7-0008DS-BO; Sat, 17 May 2025 00:33:03 +0000 Received: by outflank-mailman (input) for mailman id 987879; Sat, 17 May 2025 00:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG5U6-0008DM-62 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG5U6-00ChUr-0O for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG5U5-005OIs-2o for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00: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=k35JjIvEChyM6GqWYjd5/e7J3tpJgTGzX+eKC+A97jE=; b=un8DTTx1pRtDX/3kHtkvHNq0SK fBdNrP2+Mn4vrHI5KxSupPKnSz/529U0fR0vGqKVVqiNb+Lqjmg+sHrcUKIJmjo9tQkzmjk5t+Xx1 /dgdVsYbJ0Fzwg/r0aeNbjeGAPwYtQXdSfD4iGXbOGc5Po3TucU2SikGukwfqEctEbHE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add inclusion guards Message-Id: Date: Sat, 17 May 2025 00:33:01 +0000 commit aea1a62f74a0f86946c06a2fa2ad825d6f05962e Author: Federico Serafini AuthorDate: Fri May 16 16:21:25 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:42 2025 -0700 xen/arm: add inclusion guards MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/arm/efi/efi-boot.h | 6 ++++++ xen/arch/arm/include/asm/efibind.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index dcad46ca72..d2a09ad3a1 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -3,6 +3,10 @@ * is intended to be included by common/efi/boot.c _only_, and * therefore can define arch specific global variables. */ + +#ifndef ARM_EFI_BOOT_H +#define ARM_EFI_BOOT_H + #include #include #include @@ -1003,6 +1007,8 @@ static void __init efi_arch_flush_dcache_area(const void *vaddr, UINTN size) __flush_dcache_area(vaddr, size); } +#endif /* ARM_EFI_BOOT_H */ + /* * Local variables: * mode: C diff --git a/xen/arch/arm/include/asm/efibind.h b/xen/arch/arm/include/asm/efibind.h index 09dca7a8c9..92b8bad0bb 100644 --- a/xen/arch/arm/include/asm/efibind.h +++ b/xen/arch/arm/include/asm/efibind.h @@ -1,2 +1,7 @@ +#ifndef ARM_EFIBIND_H +#define ARM_EFIBIND_H + #include #include + +#endif /* ARM_EFIBIND_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987880.1373113 (Exim 4.92) (envelope-from ) id 1uG5UH-0008FW-Fn; Sat, 17 May 2025 00:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987880.1373113; Sat, 17 May 2025 00: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 1uG5UH-0008FP-Co; Sat, 17 May 2025 00:33:13 +0000 Received: by outflank-mailman (input) for mailman id 987880; Sat, 17 May 2025 00:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG5UG-0008FG-2o for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG5UG-00ChUv-0s for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG5UF-005OPT-37 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00: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=5k5YNnj7bV98y6o3Q/HamqUra4WPKXKmdLLAxRtLchE=; b=xkrnPBYw/9RDYjQEKwmuF4U6eT cqtqWx1ZCZY20Gu0vP+GKsiQgjNwmhMDlTYbBW//dAbqEPMCgqw+p1rpuF1IdKBuqPNZQHGjguBix XTCbARbBvB4r9U7iADTU3raURBSjWe6F9QSL2UHRdZT1rV9sO1L+cYLXP/ihKkM1az7U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: add inclusion guards Message-Id: Date: Sat, 17 May 2025 00:33:11 +0000 commit 6feaa61a2a58baf47ae517dbfebead9890f00181 Author: Federico Serafini AuthorDate: Fri May 16 16:21:26 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:43 2025 -0700 xen/x86: add inclusion guards MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/cpu.h | 6 ++++++ xen/arch/x86/efi/efi-boot.h | 6 ++++++ xen/arch/x86/efi/runtime.h | 5 +++++ xen/arch/x86/include/asm/compat.h | 5 +++++ xen/arch/x86/include/asm/efibind.h | 5 +++++ xen/arch/x86/x86_64/mmconfig.h | 5 +++++ xen/arch/x86/x86_emulate/private.h | 5 +++++ 7 files changed, 37 insertions(+) diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 8be65e975a..cbb434f3a2 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -1,4 +1,8 @@ /* attempt to consolidate cpu attributes */ + +#ifndef X86_CPU_H +#define X86_CPU_H + struct cpu_dev { void (*c_early_init)(struct cpuinfo_x86 *c); void (*c_init)(struct cpuinfo_x86 * c); @@ -26,3 +30,5 @@ void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); + +#endif /* X86_CPU_H */ diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 1d8902a9a7..0ecf4ca53f 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -3,6 +3,10 @@ * is intended to be included by common/efi/boot.c _only_, and * therefore can define arch specific global variables. */ + +#ifndef X86_EFI_EFI_BOOT_H +#define X86_EFI_EFI_BOOT_H + #include #include @@ -908,6 +912,8 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, efi_exit_boot(ImageHandle, SystemTable); } +#endif /* X86_EFI_EFI_BOOT_H */ + /* * Local variables: * mode: C diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h index 77866c5f21..88ab5651e9 100644 --- a/xen/arch/x86/efi/runtime.h +++ b/xen/arch/x86/efi/runtime.h @@ -1,3 +1,6 @@ +#ifndef X86_EFI_RUNTIME_H +#define X86_EFI_RUNTIME_H + #include #include #include @@ -17,3 +20,5 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) } } #endif + +#endif /* X86_EFI_RUNTIME_H */ diff --git a/xen/arch/x86/include/asm/compat.h b/xen/arch/x86/include/asm/compat.h index 818cad87db..30ed8f2fd0 100644 --- a/xen/arch/x86/include/asm/compat.h +++ b/xen/arch/x86/include/asm/compat.h @@ -2,6 +2,9 @@ * compat.h */ +#ifndef X86_COMPAT_H +#define X86_COMPAT_H + #ifdef CONFIG_COMPAT #define COMPAT_BITS_PER_LONG 32 @@ -18,3 +21,5 @@ int switch_compat(struct domain *); #include static inline int switch_compat(struct domain *d) { return -EOPNOTSUPP; } #endif + +#endif /* X86_COMPAT_H */ diff --git a/xen/arch/x86/include/asm/efibind.h b/xen/arch/x86/include/asm/efibind.h index bce02f3707..ab46341281 100644 --- a/xen/arch/x86/include/asm/efibind.h +++ b/xen/arch/x86/include/asm/efibind.h @@ -1,2 +1,7 @@ +#ifndef X86_EFIBIND_H +#define X86_EFIBIND_H + #include #include + +#endif /* X86_EFIBIND_H */ diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 3da4b21e9b..722bf67975 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -5,6 +5,9 @@ * Author: Allen Kay - adapted from linux */ +#ifndef X86_64_MMCONFIG_H +#define X86_64_MMCONFIG_H + #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 @@ -72,3 +75,5 @@ int pci_mmcfg_reserved(uint64_t address, unsigned int segment, int pci_mmcfg_arch_init(void); int pci_mmcfg_arch_enable(unsigned int idx); void pci_mmcfg_arch_disable(unsigned int idx); + +#endif /* X86_64_MMCONFIG_H */ diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 30be595470..467bce3c84 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -6,6 +6,9 @@ * Copyright (c) 2005-2007 XenSource Inc. */ +#ifndef X86_EMULATE_PRIVATE_H +#define X86_EMULATE_PRIVATE_H + #ifdef __XEN__ # include @@ -843,3 +846,5 @@ static inline int read_ulong(enum x86_segment seg, *val = 0; return ops->read(seg, offset, val, bytes, ctxt); } + +#endif /* X86_EMULATE_PRIVATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:33:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:33:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987881.1373117 (Exim 4.92) (envelope-from ) id 1uG5UQ-0008IP-IS; Sat, 17 May 2025 00:33:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987881.1373117; Sat, 17 May 2025 00:33: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 1uG5UQ-0008IH-Fw; Sat, 17 May 2025 00:33:22 +0000 Received: by outflank-mailman (input) for mailman id 987881; Sat, 17 May 2025 00:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG5UQ-0008I9-64 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG5UQ-00ChUz-1C for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG5UQ-005OWj-0M for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33: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=XiX92HYL59IpwOYet9pGzfRa4iF9w8Y1iOnXA91gEJs=; b=pEFBbBRvlzSDukjfvLfWX1yL9A 2zb8hseaUIvVb91ip+gVPxYlg3L+kjdlauHI0j07BmhPNyxesGE3aliAlk5BkKT42g8olcTTcRiKF NaRzCaY++ZtWizm6e6yCOq479IIL0eV451rp5lvrbEZGskoP3fGgh28Mz03RPCtTxFXE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: add inclusion guards Message-Id: Date: Sat, 17 May 2025 00:33:22 +0000 commit ca6ffd3ccae50e40fdc9a2927ca9bbd9b2e88d08 Author: Federico Serafini AuthorDate: Fri May 16 16:21:27 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:43 2025 -0700 xen: add inclusion guards MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/common/decompress.h | 5 +++++ xen/common/efi/efi.h | 5 +++++ xen/common/event_channel.h | 5 +++++ xen/include/xen/pci_ids.h | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/xen/common/decompress.h b/xen/common/decompress.h index 4683eb6c7e..034c833665 100644 --- a/xen/common/decompress.h +++ b/xen/common/decompress.h @@ -1,3 +1,6 @@ +#ifndef DECOMPRESS_H +#define DECOMPRESS_H + #ifdef __XEN__ #include @@ -22,3 +25,5 @@ #define large_free free #endif + +#endif /* DECOMPRESS_H */ diff --git a/xen/common/efi/efi.h b/xen/common/efi/efi.h index c02fbb7b69..b02aa2775d 100644 --- a/xen/common/efi/efi.h +++ b/xen/common/efi/efi.h @@ -1,3 +1,6 @@ +#ifndef EFI_EFI_H +#define EFI_EFI_H + #include #include #include @@ -51,3 +54,5 @@ void free_ebmalloc_unused_mem(void); const void *pe_find_section(const void *image, const UINTN image_size, const CHAR16 *section_name, UINTN *size_out); + +#endif /* EFI_EFI_H */ diff --git a/xen/common/event_channel.h b/xen/common/event_channel.h index a778ae775b..dc94a43cc2 100644 --- a/xen/common/event_channel.h +++ b/xen/common/event_channel.h @@ -1,5 +1,8 @@ /* Event channel handling private header. */ +#ifndef EVENT_CHANNEL_H +#define EVENT_CHANNEL_H + #include static inline unsigned int max_evtchns(const struct domain *d) @@ -67,6 +70,8 @@ static inline void evtchn_fifo_destroy(struct domain *d) } #endif /* CONFIG_EVTCHN_FIFO */ +#endif /* EVENT_CHANNEL_H */ + /* * Local variables: * mode: C diff --git a/xen/include/xen/pci_ids.h b/xen/include/xen/pci_ids.h index e798477a7e..5884a20b8f 100644 --- a/xen/include/xen/pci_ids.h +++ b/xen/include/xen/pci_ids.h @@ -1,3 +1,6 @@ +#ifndef XEN_PCI_IDS_H +#define XEN_PCI_IDS_H + #define PCI_VENDOR_ID_AMD 0x1022 #define PCI_VENDOR_ID_NVIDIA 0x10de @@ -11,3 +14,5 @@ #define PCI_VENDOR_ID_BROADCOM 0x14e4 #define PCI_VENDOR_ID_INTEL 0x8086 + +#endif /* XEN_PCI_IDS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:33:32 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:33:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987882.1373121 (Exim 4.92) (envelope-from ) id 1uG5Ua-0008Kj-Jq; Sat, 17 May 2025 00:33:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987882.1373121; Sat, 17 May 2025 00:33: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 1uG5Ua-0008Kc-HJ; Sat, 17 May 2025 00:33:32 +0000 Received: by outflank-mailman (input) for mailman id 987882; Sat, 17 May 2025 00:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG5Ua-0008KT-8p for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG5Ua-00ChVO-1U for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG5Ua-005Ofr-0g for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33: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=KJLa1TYHSCBsdKi+mdjfH8cJn4bfVmdsD7QlO8iOYvE=; b=DmiwlmCWqW0gd0tulAlyhdWg+a lLfqPjeQUKeuhVN30+WGndsJgdvNJdtsV91U4SPAAmyPY9VvFybXcl0IrpVz0B1jb1ULzJyiKjDpG zHUTSDv5edlIznb7T/xaJUXXnktkai/r7kbh8OSZTcxu6ATqmU0H4uaDTYMHl/EwEHlQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: refactor include guards Message-Id: Date: Sat, 17 May 2025 00:33:32 +0000 commit 8d070c08fc082b227d14ed0f79cd68718db92784 Author: Federico Serafini AuthorDate: Fri May 16 17:10:05 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:44 2025 -0700 xen: refactor include guards Refactor inclusion guards: 1) use a syntax that is more likely to be recognized by static analyzers; 2) follow the CODING_STYLE. No functional change. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/include/xen/err.h | 10 +++++++--- xen/include/xen/softirq.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/include/xen/err.h b/xen/include/xen/err.h index cbdd1bf7f8..a5971e290c 100644 --- a/xen/include/xen/err.h +++ b/xen/include/xen/err.h @@ -1,5 +1,7 @@ -#if !defined(__XEN_ERR_H__) && !defined(__ASSEMBLY__) -#define __XEN_ERR_H__ +#ifndef XEN_ERR_H +#define XEN_ERR_H + +#ifndef __ASSEMBLY__ #include #include @@ -41,4 +43,6 @@ static inline int __must_check PTR_RET(const void *ptr) return IS_ERR(ptr) ? PTR_ERR(ptr) : 0; } -#endif /* __XEN_ERR_H__ */ +#endif /* __ASSEMBLY__ */ + +#endif /* XEN_ERR_H */ diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index 33d6f2ecd2..e9f79ec0ce 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -1,5 +1,7 @@ -#if !defined(__XEN_SOFTIRQ_H__) && !defined(__ASSEMBLY__) -#define __XEN_SOFTIRQ_H__ +#ifndef XEN_SOFTIRQ_H +#define XEN_SOFTIRQ_H + +#ifndef __ASSEMBLY__ /* Low-latency softirqs come first in the following list. */ enum { @@ -40,4 +42,6 @@ void cpu_raise_softirq_batch_finish(void); */ void process_pending_softirqs(void); -#endif /* __XEN_SOFTIRQ_H__ */ +#endif /* __ASSEMBLY__ */ + +#endif /* XEN_SOFTIRQ_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 17 00:33:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 00:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987883.1373125 (Exim 4.92) (envelope-from ) id 1uG5Ul-0008Na-LR; Sat, 17 May 2025 00:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987883.1373125; Sat, 17 May 2025 00:33: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 1uG5Ul-0008NT-In; Sat, 17 May 2025 00:33:43 +0000 Received: by outflank-mailman (input) for mailman id 987883; Sat, 17 May 2025 00:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG5Uk-0008NC-C9 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG5Uk-00ChVS-1n for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG5Uk-005Oly-0x for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 00:33: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=Ma7GE8tRWs+Ypk6eUjIgUzxx1pzLFKSAjVEZVlBzds8=; b=g1BQvF7xnu+PhVQtv7GkCNNEaK MggAfrCLCAa4YsAJMys5VM0RVWW3B6K3D8WVHr1Ca2dElsFc8koCA0VCCBE2WxZh8HT/hQvYIX1VZ zmRUEU3F4HSoaaR1JqSmic4aQ/E1YfoI7LFlD6HeyZilTZCaDnHrmSESyYNDxEcY/dsA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/asm: refactor inclusion guards Message-Id: Date: Sat, 17 May 2025 00:33:42 +0000 commit 6fc02ebdd053856221f37ba5306232ac1575332d Author: Federico Serafini AuthorDate: Fri May 16 16:21:29 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:45 2025 -0700 x86/asm: refactor inclusion guards MISRA C Directive 4.10 states that "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Refactor inclusion guards to address a violation of Directive 4.10 and follow CODING_STYLE. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index bedb97cbee..ce724a9daa 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -261,17 +261,17 @@ $(objtree)/arch/x86/include/asm/asm-macros.h: $(obj)/asm-macros.i $(src)/Makefil $(call filechk,asm-macros.h) define filechk_asm-macros.h + echo '#ifndef X86_MACROS_H'; \ + echo '#define X86_MACROS_H'; \ echo '#if 0'; \ echo '.if 0'; \ echo '#endif'; \ - echo '#ifndef __ASM_MACROS_H__'; \ - echo '#define __ASM_MACROS_H__'; \ echo 'asm ( ".include \"$@\"" );'; \ - echo '#endif /* __ASM_MACROS_H__ */'; \ echo '#if 0'; \ echo '.endif'; \ cat $<; \ - echo '#endif' + echo '#endif'; \ + echo '#endif /* X86_MACROS_H */' endef $(obj)/efi.lds: AFLAGS-y += -DEFI -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 17 01:44:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 01:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987931.1373128 (Exim 4.92) (envelope-from ) id 1uG6ap-0007Jr-Uf; Sat, 17 May 2025 01:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987931.1373128; Sat, 17 May 2025 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 1uG6ap-0007Jj-S5; Sat, 17 May 2025 01:44:03 +0000 Received: by outflank-mailman (input) for mailman id 987931; Sat, 17 May 2025 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 1uG6ao-0007Jd-7A for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 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 1uG6ao-00EIfm-10 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG6ao-006MgM-09 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 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=eEwuTH/AZG83dNRB2UBOqGOmWjNR3WjOjdIjeAxRqrw=; b=gG4RCrOEgqnWwE8WWMvK/OVXac GeCarctzTM6+POS2UK754u0PokqmcwJumavUp9P9AfpvoWtHnu2DpscPRya8PCntq5cwtjLp31G14 moqV100+vvBqyd+tZgkepVb3BL0NP+YDZ+LkAaadbsDshcfJqM6vW00UzPA/6xshLpAE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add inclusion guards Message-Id: Date: Sat, 17 May 2025 01:44:02 +0000 commit aea1a62f74a0f86946c06a2fa2ad825d6f05962e Author: Federico Serafini AuthorDate: Fri May 16 16:21:25 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:42 2025 -0700 xen/arm: add inclusion guards MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/arm/efi/efi-boot.h | 6 ++++++ xen/arch/arm/include/asm/efibind.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index dcad46ca72..d2a09ad3a1 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -3,6 +3,10 @@ * is intended to be included by common/efi/boot.c _only_, and * therefore can define arch specific global variables. */ + +#ifndef ARM_EFI_BOOT_H +#define ARM_EFI_BOOT_H + #include #include #include @@ -1003,6 +1007,8 @@ static void __init efi_arch_flush_dcache_area(const void *vaddr, UINTN size) __flush_dcache_area(vaddr, size); } +#endif /* ARM_EFI_BOOT_H */ + /* * Local variables: * mode: C diff --git a/xen/arch/arm/include/asm/efibind.h b/xen/arch/arm/include/asm/efibind.h index 09dca7a8c9..92b8bad0bb 100644 --- a/xen/arch/arm/include/asm/efibind.h +++ b/xen/arch/arm/include/asm/efibind.h @@ -1,2 +1,7 @@ +#ifndef ARM_EFIBIND_H +#define ARM_EFIBIND_H + #include #include + +#endif /* ARM_EFIBIND_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 01:44:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 01:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987932.1373133 (Exim 4.92) (envelope-from ) id 1uG6b0-0007Lq-09; Sat, 17 May 2025 01:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987932.1373133; Sat, 17 May 2025 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 1uG6az-0007Li-TU; Sat, 17 May 2025 01:44:13 +0000 Received: by outflank-mailman (input) for mailman id 987932; Sat, 17 May 2025 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 1uG6ay-0007LU-7w for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 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 1uG6ay-00EIfu-1N for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG6ay-006MmD-0V for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 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=W6EtgsiSG88R1peMBC+f9azTcMkJR28uM91ido6Ym4M=; b=ThVPzbPq7s7PF8g+pEr7dfTS8M kHrMbR+ipAvNn+K8fWynBmEgEtcpWiN7IYegx0P6XHwwtGwV9SHrzgSxSohXnhcmsL6dRDDoQL6N1 mMIj9YMPOigITcwUjPZXgPWIx91Lwm5sCVkiqq/V0qtte+MWNNGwpAGfwnDKTEbVQPKg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: add inclusion guards Message-Id: Date: Sat, 17 May 2025 01:44:12 +0000 commit 6feaa61a2a58baf47ae517dbfebead9890f00181 Author: Federico Serafini AuthorDate: Fri May 16 16:21:26 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:43 2025 -0700 xen/x86: add inclusion guards MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/cpu.h | 6 ++++++ xen/arch/x86/efi/efi-boot.h | 6 ++++++ xen/arch/x86/efi/runtime.h | 5 +++++ xen/arch/x86/include/asm/compat.h | 5 +++++ xen/arch/x86/include/asm/efibind.h | 5 +++++ xen/arch/x86/x86_64/mmconfig.h | 5 +++++ xen/arch/x86/x86_emulate/private.h | 5 +++++ 7 files changed, 37 insertions(+) diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 8be65e975a..cbb434f3a2 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -1,4 +1,8 @@ /* attempt to consolidate cpu attributes */ + +#ifndef X86_CPU_H +#define X86_CPU_H + struct cpu_dev { void (*c_early_init)(struct cpuinfo_x86 *c); void (*c_init)(struct cpuinfo_x86 * c); @@ -26,3 +30,5 @@ void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); + +#endif /* X86_CPU_H */ diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 1d8902a9a7..0ecf4ca53f 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -3,6 +3,10 @@ * is intended to be included by common/efi/boot.c _only_, and * therefore can define arch specific global variables. */ + +#ifndef X86_EFI_EFI_BOOT_H +#define X86_EFI_EFI_BOOT_H + #include #include @@ -908,6 +912,8 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, efi_exit_boot(ImageHandle, SystemTable); } +#endif /* X86_EFI_EFI_BOOT_H */ + /* * Local variables: * mode: C diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h index 77866c5f21..88ab5651e9 100644 --- a/xen/arch/x86/efi/runtime.h +++ b/xen/arch/x86/efi/runtime.h @@ -1,3 +1,6 @@ +#ifndef X86_EFI_RUNTIME_H +#define X86_EFI_RUNTIME_H + #include #include #include @@ -17,3 +20,5 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) } } #endif + +#endif /* X86_EFI_RUNTIME_H */ diff --git a/xen/arch/x86/include/asm/compat.h b/xen/arch/x86/include/asm/compat.h index 818cad87db..30ed8f2fd0 100644 --- a/xen/arch/x86/include/asm/compat.h +++ b/xen/arch/x86/include/asm/compat.h @@ -2,6 +2,9 @@ * compat.h */ +#ifndef X86_COMPAT_H +#define X86_COMPAT_H + #ifdef CONFIG_COMPAT #define COMPAT_BITS_PER_LONG 32 @@ -18,3 +21,5 @@ int switch_compat(struct domain *); #include static inline int switch_compat(struct domain *d) { return -EOPNOTSUPP; } #endif + +#endif /* X86_COMPAT_H */ diff --git a/xen/arch/x86/include/asm/efibind.h b/xen/arch/x86/include/asm/efibind.h index bce02f3707..ab46341281 100644 --- a/xen/arch/x86/include/asm/efibind.h +++ b/xen/arch/x86/include/asm/efibind.h @@ -1,2 +1,7 @@ +#ifndef X86_EFIBIND_H +#define X86_EFIBIND_H + #include #include + +#endif /* X86_EFIBIND_H */ diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 3da4b21e9b..722bf67975 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -5,6 +5,9 @@ * Author: Allen Kay - adapted from linux */ +#ifndef X86_64_MMCONFIG_H +#define X86_64_MMCONFIG_H + #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 @@ -72,3 +75,5 @@ int pci_mmcfg_reserved(uint64_t address, unsigned int segment, int pci_mmcfg_arch_init(void); int pci_mmcfg_arch_enable(unsigned int idx); void pci_mmcfg_arch_disable(unsigned int idx); + +#endif /* X86_64_MMCONFIG_H */ diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 30be595470..467bce3c84 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -6,6 +6,9 @@ * Copyright (c) 2005-2007 XenSource Inc. */ +#ifndef X86_EMULATE_PRIVATE_H +#define X86_EMULATE_PRIVATE_H + #ifdef __XEN__ # include @@ -843,3 +846,5 @@ static inline int read_ulong(enum x86_segment seg, *val = 0; return ops->read(seg, offset, val, bytes, ctxt); } + +#endif /* X86_EMULATE_PRIVATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 01:44:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 01:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987933.1373137 (Exim 4.92) (envelope-from ) id 1uG6bA-0007OE-1X; Sat, 17 May 2025 01:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987933.1373137; Sat, 17 May 2025 01: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 1uG6b9-0007O6-VA; Sat, 17 May 2025 01:44:23 +0000 Received: by outflank-mailman (input) for mailman id 987933; Sat, 17 May 2025 01:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG6b8-0007Ny-At for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG6b8-00EIg0-1e for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG6b8-006MxB-0q for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01: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=0ANpIQsziKAHtNNIJmsC//vhDuF7JFIrHN57ummD7XU=; b=I2JX9ntml/urObIw4zru2lZJRS 7iqEIxQPr0cjjkkcJoCqCi3qF5arrWN/cV1+aCvIxaUx+pxnLCCBWeoEv/pMdWKVDm9VhINSwkOiL FKIhMK/KcDprUlm47XPCnSynhoepK6QovfpkVOr081Azg62MWrrAL904ckbIG0WOHu3g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: add inclusion guards Message-Id: Date: Sat, 17 May 2025 01:44:22 +0000 commit ca6ffd3ccae50e40fdc9a2927ca9bbd9b2e88d08 Author: Federico Serafini AuthorDate: Fri May 16 16:21:27 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:43 2025 -0700 xen: add inclusion guards MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/common/decompress.h | 5 +++++ xen/common/efi/efi.h | 5 +++++ xen/common/event_channel.h | 5 +++++ xen/include/xen/pci_ids.h | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/xen/common/decompress.h b/xen/common/decompress.h index 4683eb6c7e..034c833665 100644 --- a/xen/common/decompress.h +++ b/xen/common/decompress.h @@ -1,3 +1,6 @@ +#ifndef DECOMPRESS_H +#define DECOMPRESS_H + #ifdef __XEN__ #include @@ -22,3 +25,5 @@ #define large_free free #endif + +#endif /* DECOMPRESS_H */ diff --git a/xen/common/efi/efi.h b/xen/common/efi/efi.h index c02fbb7b69..b02aa2775d 100644 --- a/xen/common/efi/efi.h +++ b/xen/common/efi/efi.h @@ -1,3 +1,6 @@ +#ifndef EFI_EFI_H +#define EFI_EFI_H + #include #include #include @@ -51,3 +54,5 @@ void free_ebmalloc_unused_mem(void); const void *pe_find_section(const void *image, const UINTN image_size, const CHAR16 *section_name, UINTN *size_out); + +#endif /* EFI_EFI_H */ diff --git a/xen/common/event_channel.h b/xen/common/event_channel.h index a778ae775b..dc94a43cc2 100644 --- a/xen/common/event_channel.h +++ b/xen/common/event_channel.h @@ -1,5 +1,8 @@ /* Event channel handling private header. */ +#ifndef EVENT_CHANNEL_H +#define EVENT_CHANNEL_H + #include static inline unsigned int max_evtchns(const struct domain *d) @@ -67,6 +70,8 @@ static inline void evtchn_fifo_destroy(struct domain *d) } #endif /* CONFIG_EVTCHN_FIFO */ +#endif /* EVENT_CHANNEL_H */ + /* * Local variables: * mode: C diff --git a/xen/include/xen/pci_ids.h b/xen/include/xen/pci_ids.h index e798477a7e..5884a20b8f 100644 --- a/xen/include/xen/pci_ids.h +++ b/xen/include/xen/pci_ids.h @@ -1,3 +1,6 @@ +#ifndef XEN_PCI_IDS_H +#define XEN_PCI_IDS_H + #define PCI_VENDOR_ID_AMD 0x1022 #define PCI_VENDOR_ID_NVIDIA 0x10de @@ -11,3 +14,5 @@ #define PCI_VENDOR_ID_BROADCOM 0x14e4 #define PCI_VENDOR_ID_INTEL 0x8086 + +#endif /* XEN_PCI_IDS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 01:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 01:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987934.1373140 (Exim 4.92) (envelope-from ) id 1uG6bK-0007Qg-36; Sat, 17 May 2025 01:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987934.1373140; Sat, 17 May 2025 01: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 1uG6bK-0007QY-0J; Sat, 17 May 2025 01:44:34 +0000 Received: by outflank-mailman (input) for mailman id 987934; Sat, 17 May 2025 01:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG6bI-0007QD-Do for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG6bI-00EIgK-1v for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG6bI-006N8U-17 for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01: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=P3MgDGl8LvB7d2kPu/knkgSMJFQMqTVpt3cQ4Yqjdtc=; b=iDrspZftf4uyhojeC898sRu/t0 jP8kbsVBCkyQtyCy4Yz6HMpYg1nwao+iesXzxgpYO8kj2EbsQZ0ML2hkqEYgJObUu0fTgJvITyg33 EtO+0xio5ODofyQ6UgMu1VHoF+nmvtl224FNDr7c9pBT9oGK2pQRKsNT60YXi4W1ssjk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: refactor include guards Message-Id: Date: Sat, 17 May 2025 01:44:32 +0000 commit 8d070c08fc082b227d14ed0f79cd68718db92784 Author: Federico Serafini AuthorDate: Fri May 16 17:10:05 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:44 2025 -0700 xen: refactor include guards Refactor inclusion guards: 1) use a syntax that is more likely to be recognized by static analyzers; 2) follow the CODING_STYLE. No functional change. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/include/xen/err.h | 10 +++++++--- xen/include/xen/softirq.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/include/xen/err.h b/xen/include/xen/err.h index cbdd1bf7f8..a5971e290c 100644 --- a/xen/include/xen/err.h +++ b/xen/include/xen/err.h @@ -1,5 +1,7 @@ -#if !defined(__XEN_ERR_H__) && !defined(__ASSEMBLY__) -#define __XEN_ERR_H__ +#ifndef XEN_ERR_H +#define XEN_ERR_H + +#ifndef __ASSEMBLY__ #include #include @@ -41,4 +43,6 @@ static inline int __must_check PTR_RET(const void *ptr) return IS_ERR(ptr) ? PTR_ERR(ptr) : 0; } -#endif /* __XEN_ERR_H__ */ +#endif /* __ASSEMBLY__ */ + +#endif /* XEN_ERR_H */ diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index 33d6f2ecd2..e9f79ec0ce 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -1,5 +1,7 @@ -#if !defined(__XEN_SOFTIRQ_H__) && !defined(__ASSEMBLY__) -#define __XEN_SOFTIRQ_H__ +#ifndef XEN_SOFTIRQ_H +#define XEN_SOFTIRQ_H + +#ifndef __ASSEMBLY__ /* Low-latency softirqs come first in the following list. */ enum { @@ -40,4 +42,6 @@ void cpu_raise_softirq_batch_finish(void); */ void process_pending_softirqs(void); -#endif /* __XEN_SOFTIRQ_H__ */ +#endif /* __ASSEMBLY__ */ + +#endif /* XEN_SOFTIRQ_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 17 01:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 May 2025 01:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.987935.1373145 (Exim 4.92) (envelope-from ) id 1uG6bU-0007UX-5U; Sat, 17 May 2025 01:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 987935.1373145; Sat, 17 May 2025 01: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 1uG6bU-0007UP-2v; Sat, 17 May 2025 01:44:44 +0000 Received: by outflank-mailman (input) for mailman id 987935; Sat, 17 May 2025 01:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG6bS-0007U8-GF for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uG6bS-00EIgP-2D for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uG6bS-006NEE-1P for xen-changelog@lists.xenproject.org; Sat, 17 May 2025 01: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=30Djs5K7uuACpEbrhgejn39jNKiEQqVq4FOTGroA5M0=; b=r6M0dPEx3hihPkOFJtJ1RdOpxh ItmdUi9VgjjePj3PduBs3y7Qrw8WxgeGZfR61Tfv84QHina4miYbqgFC8Vp5UwC/UoCeBHNml31Yh 18LQaVz0WhZBzFyA+uZiido5pqrkiSxnVHaxNaDOXZdfVoEA4+0CATQBzv6omN8IBf+I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/asm: refactor inclusion guards Message-Id: Date: Sat, 17 May 2025 01:44:42 +0000 commit 6fc02ebdd053856221f37ba5306232ac1575332d Author: Federico Serafini AuthorDate: Fri May 16 16:21:29 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri May 16 17:21:45 2025 -0700 x86/asm: refactor inclusion guards MISRA C Directive 4.10 states that "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Refactor inclusion guards to address a violation of Directive 4.10 and follow CODING_STYLE. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index bedb97cbee..ce724a9daa 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -261,17 +261,17 @@ $(objtree)/arch/x86/include/asm/asm-macros.h: $(obj)/asm-macros.i $(src)/Makefil $(call filechk,asm-macros.h) define filechk_asm-macros.h + echo '#ifndef X86_MACROS_H'; \ + echo '#define X86_MACROS_H'; \ echo '#if 0'; \ echo '.if 0'; \ echo '#endif'; \ - echo '#ifndef __ASM_MACROS_H__'; \ - echo '#define __ASM_MACROS_H__'; \ echo 'asm ( ".include \"$@\"" );'; \ - echo '#endif /* __ASM_MACROS_H__ */'; \ echo '#if 0'; \ echo '.endif'; \ cat $<; \ - echo '#endif' + echo '#endif'; \ + echo '#endif /* X86_MACROS_H */' endef $(obj)/efi.lds: AFLAGS-y += -DEFI -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 19 22:22:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 May 2025 22:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990339.1374301 (Exim 4.92) (envelope-from ) id 1uH8rz-0004r0-AG; Mon, 19 May 2025 22:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990339.1374301; Mon, 19 May 2025 22: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 1uH8rz-0004qs-7f; Mon, 19 May 2025 22:22:03 +0000 Received: by outflank-mailman (input) for mailman id 990339; Mon, 19 May 2025 22:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uH8ry-0004qk-EF for xen-changelog@lists.xenproject.org; Mon, 19 May 2025 22:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uH8ry-001YVc-1J for xen-changelog@lists.xenproject.org; Mon, 19 May 2025 22:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uH8ry-004AGn-0V for xen-changelog@lists.xenproject.org; Mon, 19 May 2025 22: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=Rko4g5cz7KW5DVOOuoYAFz2Oi1K24m/16juShmrJBcU=; b=EYEW9kw8/f1VGRews5hQHhkNmn tB19BGjPzcXB8dXy33bSbei6Diy1Xgqewbt3nvCz1A6dOxj4ndw5VkJ3n8Zx9o65j55/zF9cbjFbR MZtOQ4Zg7ntSLLNmBur1pefDLMo4k2Nth+21VARZfUZ++7/Zrp45jzpUNepu+OuNjeDk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI/eclair: Remove ARM64 custom clean rules Message-Id: Date: Mon, 19 May 2025 22:22:02 +0000 commit 293abb9e0c5e8df96cc5dfe457c62dfcb7542b19 Author: Andrew Cooper AuthorDate: Mon May 19 15:07:27 2025 +0100 Commit: Stefano Stabellini CommitDate: Mon May 19 14:41:02 2025 -0700 CI/eclair: Remove ARM64 custom clean rules Rules 5.3, 11.2 and 16.6 are already listed in clean_guidelines_common and apply to all architectures. There's no need for arm64 to give them a second time. Signed-off-by: Andrew Cooper Reviewed-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index 5bc35db1fd..f9da5d5f4d 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -121,7 +121,7 @@ if(string_equal(target,"x86_64"), ) if(string_equal(target,"arm64"), - service_selector({"additional_clean_guidelines","MC3A2.R5.3||MC3.R11.2||MC3A2.R16.6"}) + service_selector({"additional_clean_guidelines","none()"}) ) -reports+={clean:added,"service(clean_guidelines_common||additional_clean_guidelines)"} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990934.1374865 (Exim 4.92) (envelope-from ) id 1uHOn5-0003bs-4j; Tue, 20 May 2025 15:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990934.1374865; Tue, 20 May 2025 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 1uHOn5-0003bk-24; Tue, 20 May 2025 15:22:03 +0000 Received: by outflank-mailman (input) for mailman id 990934; Tue, 20 May 2025 15:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHOn4-0003bb-2C for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHOn4-003YQo-0J for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHOn3-00G7gw-2h for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 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=RY2hIVWBXqlFw3MJps3u+j4TpIh+XRFtELzPIytkiI8=; b=dtfva4DJOVj7qtra6YLOnNs0U5 HqKAU1a4jz8OOdqbynNDNhDhRRxDLj4LJqAMhA3s9pgvWOaWQL1SEt4ociW9oq4Cj3VOnL7slJb6E hq/f260eLnhpROra2Zk8YCnuePFVfkz9WzcNqR2xgD1RbCDXL9byfL4EPZ+RsynQWgzY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI/eclair: Remove ARM64 custom clean rules Message-Id: Date: Tue, 20 May 2025 15:22:01 +0000 commit 293abb9e0c5e8df96cc5dfe457c62dfcb7542b19 Author: Andrew Cooper AuthorDate: Mon May 19 15:07:27 2025 +0100 Commit: Stefano Stabellini CommitDate: Mon May 19 14:41:02 2025 -0700 CI/eclair: Remove ARM64 custom clean rules Rules 5.3, 11.2 and 16.6 are already listed in clean_guidelines_common and apply to all architectures. There's no need for arm64 to give them a second time. Signed-off-by: Andrew Cooper Reviewed-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index 5bc35db1fd..f9da5d5f4d 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -121,7 +121,7 @@ if(string_equal(target,"x86_64"), ) if(string_equal(target,"arm64"), - service_selector({"additional_clean_guidelines","MC3A2.R5.3||MC3.R11.2||MC3A2.R16.6"}) + service_selector({"additional_clean_guidelines","none()"}) ) -reports+={clean:added,"service(clean_guidelines_common||additional_clean_guidelines)"} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:22:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990935.1374868 (Exim 4.92) (envelope-from ) id 1uHOnG-0003eb-6A; Tue, 20 May 2025 15:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990935.1374868; Tue, 20 May 2025 15: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 1uHOnG-0003eT-3c; Tue, 20 May 2025 15:22:14 +0000 Received: by outflank-mailman (input) for mailman id 990935; Tue, 20 May 2025 15:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHOnE-0003e7-Ga for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHOnE-003YR1-24 for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHOnE-00G7vS-1E for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15: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=6VURIu++VrMEHGZuBcu5LWrEHJlo+I47/SM47HE4bnU=; b=4UxzqEbVk3a5TdezrYRdh/pvlE U5Ro2OjW7KVBhD7s0YlCy8Msj8MbNJhU2EDJhxJjhUXsDRMGvUnKjb+fhmqgLma6skbXH+S8Nob2Y GXnvx0w4pz8VQa/QQNXjaGwF09jJ8S7+aW/zl0eZLzZ5N2kFh4vIE4nfNafUO4a7xErg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches Message-Id: Date: Tue, 20 May 2025 15:22:12 +0000 commit b0f8bf86057b8f01fb4e48b506805d3818600f76 Author: Roger Pau Monne AuthorDate: Tue May 6 09:28:17 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches The current emulation of wb{,no}invd is bogus for PV guests: it will only flush the current pCPU cache, without taking into account pCPUs where the vCPU had run previously. Resort to flushing the cache on all host pCPUs to make it correct. Fixes: 799fed0a7cc5 ("Priv-op emulation in Xen, for RDMSR/WRMSR/WBINVD") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/pv/emul-priv-op.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 295d847ea2..20a90703c8 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1198,13 +1198,13 @@ static int cf_check cache_op( if ( !cache_flush_permitted(current->domain) ) /* * Non-physdev domain attempted WBINVD; ignore for now since - * newer linux uses this in some start-of-day timing loops. + * Linux uses this in some start-of-day code. */ ; else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) - wbnoinvd(); + flush_all(FLUSH_CACHE_WRITEBACK); else - wbinvd(); + flush_all(FLUSH_CACHE); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990937.1374883 (Exim 4.92) (envelope-from ) id 1uHOnP-0003vV-GS; Tue, 20 May 2025 15:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990937.1374883; Tue, 20 May 2025 15: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 1uHOnP-0003vP-DV; Tue, 20 May 2025 15:22:23 +0000 Received: by outflank-mailman (input) for mailman id 990937; Tue, 20 May 2025 15:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHOnO-0003us-I3 for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHOnO-003YRL-2P for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHOnO-00G89u-1Z for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15: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=5VWT+tASWrVoBql+H+OmLdMtY8mr5NAx3I8qTAT1/78=; b=wPPv7EshHw26GOphZ2JVZ6Gkiu Rv4XmUMhk+0vrjTuBfcVuJrv7yU8+Y1RNXtAy7p5SdeP3HskFsXppZxWxSkWQLt1KWkGlP6aGkHya j5UTq13wqazsjkYQQ7Nl26+3y1aa9panXV04oomS2KE52FahWfG2uEroE0YO2aqDL0Fk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: rename cache_flush_permitted() to has_arch_io_resources() Message-Id: Date: Tue, 20 May 2025 15:22:22 +0000 commit 58c227fcb2143f7c44b82e51aff206d781db6a08 Author: Roger Pau Monne AuthorDate: Tue Apr 29 16:30:46 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 xen/x86: rename cache_flush_permitted() to has_arch_io_resources() To better describe the underlying implementation. Define cache_flush_permitted() as an alias of has_arch_io_resources(), so that current users of cache_flush_permitted() are not effectively modified. With the introduction of the new handler, change some of the call sites of cache_flush_permitted() to instead use has_arch_io_resources() as such callers are not after whether cache flush is enabled, but rather whether the domain has any IO resources assigned. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/iocap.h | 4 +++- xen/arch/x86/mm/p2m-pod.c | 4 ++-- xen/common/memory.c | 2 +- xen/include/asm-generic/iocap.h | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/iocap.h b/xen/arch/x86/include/asm/iocap.h index 53d87ae8a3..61d026dbf5 100644 --- a/xen/arch/x86/include/asm/iocap.h +++ b/xen/arch/x86/include/asm/iocap.h @@ -15,10 +15,12 @@ #define ioports_access_permitted(d, s, e) \ rangeset_contains_range((d)->arch.ioport_caps, s, e) -#define cache_flush_permitted(d) \ +#define has_arch_io_resources(d) \ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) +#define cache_flush_permitted has_arch_io_resources + static inline int ioports_permit_access(struct domain *d, unsigned long s, unsigned long e) { diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index df2a1cc074..05633fe2ac 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -338,7 +338,7 @@ p2m_pod_set_mem_target(struct domain *d, unsigned long target) ASSERT( pod_target >= p2m->pod.count ); - if ( has_arch_pdevs(d) || cache_flush_permitted(d) ) + if ( has_arch_pdevs(d) || has_arch_io_resources(d) ) ret = -ENOTEMPTY; else ret = p2m_pod_set_cache_target(p2m, pod_target, 1/*preemptible*/); @@ -1395,7 +1395,7 @@ guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, if ( !paging_mode_translate(d) ) return -EINVAL; - if ( has_arch_pdevs(d) || cache_flush_permitted(d) ) + if ( has_arch_pdevs(d) || has_arch_io_resources(d) ) return -ENOTEMPTY; do { diff --git a/xen/common/memory.c b/xen/common/memory.c index 8ca4e1a842..46620ed825 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -86,7 +86,7 @@ static unsigned int max_order(const struct domain *d) unsigned int order = domu_max_order; #ifdef CONFIG_HAS_PASSTHROUGH - if ( cache_flush_permitted(d) && order < ptdom_max_order ) + if ( has_arch_io_resources(d) && order < ptdom_max_order ) order = ptdom_max_order; #endif diff --git a/xen/include/asm-generic/iocap.h b/xen/include/asm-generic/iocap.h index dd7cb45488..664bbc8971 100644 --- a/xen/include/asm-generic/iocap.h +++ b/xen/include/asm-generic/iocap.h @@ -2,9 +2,11 @@ #ifndef __ASM_GENERIC_IOCAP_H__ #define __ASM_GENERIC_IOCAP_H__ -#define cache_flush_permitted(d) \ +#define has_arch_io_resources(d) \ (!rangeset_is_empty((d)->iomem_caps)) +#define cache_flush_permitted has_arch_io_resources + #endif /* __ASM_GENERIC_IOCAP_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:22:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990939.1374887 (Exim 4.92) (envelope-from ) id 1uHOna-000451-Hl; Tue, 20 May 2025 15:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990939.1374887; Tue, 20 May 2025 15: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 1uHOna-00044u-Er; Tue, 20 May 2025 15:22:34 +0000 Received: by outflank-mailman (input) for mailman id 990939; Tue, 20 May 2025 15:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHOnY-00043j-L1 for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHOnY-003YRT-2h for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHOnY-00G8LQ-1u for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15: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=3LyhlcwX6hfRRDnCdrkXjr1HQxnbR0DNZT35hnVmoXE=; b=10y2K2ByYE1jew9Y/Sqbxw38zS 1Z6AViNpej1uwpOpEkT/jqgDopt9UhCZSaXb/8gPJQqL/x9URj0EbAAeqeo4TO91iM2iKwwNLSOJf Emd8Zqn38ZD8tC+FlXiBunj5mghkKC7hBC6j54S1I18pq5DYBW/70kSUQqoZ/mZ6UyfU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: account for assigned PCI devices in cache_flush_permitted() Message-Id: Date: Tue, 20 May 2025 15:22:32 +0000 commit 8333e358e4cda629ed46398dc3ea4510d3d48d70 Author: Roger Pau Monne AuthorDate: Fri May 16 10:56:51 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 xen/x86: account for assigned PCI devices in cache_flush_permitted() While unlikely, it's possible for PCI devices to not have any IO resources assigned, yet in such case the owner domain might still need to issue cache control operations in case the device performs DMA requests. Adjust cache_flush_permitted() to account for has_arch_pdevs(). While there also switch l1_disallow_mask() to use cache_flush_permitted(). This should be a non-functional change after the adjustment done to cache_flush_permitted(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/iocap.h | 3 ++- xen/arch/x86/mm.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/iocap.h b/xen/arch/x86/include/asm/iocap.h index 61d026dbf5..f948b7186e 100644 --- a/xen/arch/x86/include/asm/iocap.h +++ b/xen/arch/x86/include/asm/iocap.h @@ -19,7 +19,8 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define cache_flush_permitted has_arch_io_resources +#define cache_flush_permitted(d) \ + (has_arch_io_resources(d) || has_arch_pdevs(d)) static inline int ioports_permit_access(struct domain *d, unsigned long s, unsigned long e) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index a1703db762..657623336c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -172,9 +172,7 @@ static DEFINE_SPINLOCK(subpage_ro_lock); #define l1_disallow_mask(d) \ (((d) != dom_io) && \ - (rangeset_is_empty((d)->iomem_caps) && \ - rangeset_is_empty((d)->arch.ioport_caps) && \ - !has_arch_pdevs(d) && \ + (!cache_flush_permitted(d) && \ is_pv_domain(d)) ? \ L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:22:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990943.1374892 (Exim 4.92) (envelope-from ) id 1uHOnk-0004FA-KA; Tue, 20 May 2025 15:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990943.1374892; Tue, 20 May 2025 15:22: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 1uHOnk-0004F2-Ga; Tue, 20 May 2025 15:22:44 +0000 Received: by outflank-mailman (input) for mailman id 990943; Tue, 20 May 2025 15:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHOni-0004DU-Nj for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHOni-003YRq-2y for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHOni-00G8b7-2B for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22: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=A5A/Nu4fzWnUSgMTFWX7uauZRncXUVUGEJtZ5rj5jBI=; b=Q0SfH/ii4YMVQeedNudg9/DdMQ wyr/7gxpPF86ZAyHoESQ9vEcEmMVZemRWbkqqwC+rATJ21iP0HaSq28wA2lu80VtafV/hz+dJuFGc tON+sDYB2nUU/Swf690h8N2frNXFmHVXO72qTG/ZPUQMV/GSHCBxUDtL7IXoqvLssAeE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: limit memory type cache flush to running domains Message-Id: Date: Tue, 20 May 2025 15:22:42 +0000 commit 3125ca0da2d80123823ff24148467504aa4c7f13 Author: Roger Pau Monne AuthorDate: Thu May 15 14:38:51 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 x86/hvm: limit memory type cache flush to running domains Avoid the cache flush if the domain is not yet running. There shouldn't be any cached data resulting from domain accesses that need flushing, as the domain hasn't run yet. There can be data in the caches as a result of Xen and/or toolstack behavior. Ideally we would do a cache flush strictly before starting the domain, however doing so only makes sense once we can guarantee there are no leftover mappings of the affected ranges with cacheable attributes, otherwise the CPU can speculatively populate the cache with data from those ranges. No change in domain observable behavior intended. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 402a1d9263..8e1e15af8d 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -783,7 +783,13 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, NULL, hvm_load_mtrr_msr, 1, void memory_type_changed(struct domain *d) { if ( (is_iommu_enabled(d) || cache_flush_permitted(d)) && - d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) ) + d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) && + /* + * Do the p2m type-change, but skip the cache flush if the domain is + * not yet running. The check for creation_finished must strictly be + * done after the call to p2m_memory_type_changed(). + */ + d->creation_finished ) { flush_all(FLUSH_CACHE); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:22:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990947.1374895 (Exim 4.92) (envelope-from ) id 1uHOnu-0004Q6-Kd; Tue, 20 May 2025 15:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990947.1374895; Tue, 20 May 2025 15:22: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 1uHOnu-0004Py-I2; Tue, 20 May 2025 15:22:54 +0000 Received: by outflank-mailman (input) for mailman id 990947; Tue, 20 May 2025 15:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHOns-0004Pc-Qc for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHOnt-003YRv-01 for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHOns-00G8x0-2S for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:22: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=Yuh9ZZZFfihkoQdabwAV+5XS/t2/3Vu7mknd627eAvs=; b=JJpYv7AK1OhcrSaXEEYAJotNGS EPRcHiruFR9uLSONOEJc5yVJ4F8VGeDm4yjQk1SQuk4ewagBSn2VMJdSCgcxGZeBbpBXGDcBskwxi lavQbZk73SizG7CKXMPAS9VoDAmJn08Cu4bsPKPqIdHc0rbuBsOyW8T9luVa3r5S/mGQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: reduce the need to flush caches in memory_type_changed() Message-Id: Date: Tue, 20 May 2025 15:22:52 +0000 commit 2d779cabddfa0166f6baae50627a4b370d8f0f19 Author: Roger Pau Monne AuthorDate: Thu May 15 15:15:07 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 x86/hvm: reduce the need to flush caches in memory_type_changed() The current cache flushing done in memory_type_changed() is too wide, and this doesn't scale on boxes with high number of CPUs. Attempt to limit cache flushes as a result of p2m type changes, and only do them if: * The CPU doesn't support (or has broken) self-snoop capability, otherwise there would be leftover aliases in the cache. For guest initiated memory changes (like changes to MTRRs) the guest should already do a cache flush. * The IOMMU cannot force all DMA accesses to be snooping ones. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Acked-By: Oleksii Kurochko --- CHANGELOG.md | 4 ++++ xen/arch/x86/hvm/mtrr.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ea06524db..faf2271011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - For ARM32 and ARM64, GCC 5.1 and Binutils 2.25 - Linux based device model stubdomains are now fully supported. + - On x86: + - Restrict the cache flushing done as a result of guest physical memory map + manipulations and memory type changes. + ### Added - On x86: - Option to attempt to fixup p2m page-faults on PVH dom0. diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 8e1e15af8d..4b8afad2c5 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -782,14 +782,22 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, NULL, hvm_load_mtrr_msr, 1, void memory_type_changed(struct domain *d) { - if ( (is_iommu_enabled(d) || cache_flush_permitted(d)) && + if ( cache_flush_permitted(d) && d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) && /* * Do the p2m type-change, but skip the cache flush if the domain is * not yet running. The check for creation_finished must strictly be * done after the call to p2m_memory_type_changed(). */ - d->creation_finished ) + d->creation_finished && + /* + * The cache flush should be done if either: CPU doesn't have + * self-snoop in which case there could be aliases left in the cache, + * or (some) IOMMUs cannot force all DMA device accesses to be + * snooped. + */ + (!boot_cpu_has(X86_FEATURE_XEN_SELFSNOOP) || + (is_iommu_enabled(d) && !iommu_snoop)) ) { flush_all(FLUSH_CACHE); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990978.1374919 (Exim 4.92) (envelope-from ) id 1uHPJ1-00014f-6T; Tue, 20 May 2025 15:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990978.1374919; Tue, 20 May 2025 15: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 1uHPJ1-00014X-3u; Tue, 20 May 2025 15:55:03 +0000 Received: by outflank-mailman (input) for mailman id 990978; Tue, 20 May 2025 15:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHPIz-00014P-Un for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHPIz-003Z4i-38 for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHPIz-00Gizy-2I for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15: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=sfEHDKQjbQvSCFPKy9GqMr44e7dFIdHzH6sGcqFNtHg=; b=s4NdqbSVR4Lf9bduu3N17fTizg qGh2JPUAwcB6hOGYb3aURiZOYhUzvuFNRArHp5ET8l1kZ/6mg/p/qw58RRkEQ0GMBKLUqWa+PVxvV N+wFfZ4wo1hlXnphLcBrJTD9kRoFAsDrqCOsylUCkozeotJ2OhcPf8Oy3hnAA/Uo9mZg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches Message-Id: Date: Tue, 20 May 2025 15:55:01 +0000 commit b0f8bf86057b8f01fb4e48b506805d3818600f76 Author: Roger Pau Monne AuthorDate: Tue May 6 09:28:17 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches The current emulation of wb{,no}invd is bogus for PV guests: it will only flush the current pCPU cache, without taking into account pCPUs where the vCPU had run previously. Resort to flushing the cache on all host pCPUs to make it correct. Fixes: 799fed0a7cc5 ("Priv-op emulation in Xen, for RDMSR/WRMSR/WBINVD") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/pv/emul-priv-op.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 295d847ea2..20a90703c8 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1198,13 +1198,13 @@ static int cf_check cache_op( if ( !cache_flush_permitted(current->domain) ) /* * Non-physdev domain attempted WBINVD; ignore for now since - * newer linux uses this in some start-of-day timing loops. + * Linux uses this in some start-of-day code. */ ; else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) - wbnoinvd(); + flush_all(FLUSH_CACHE_WRITEBACK); else - wbinvd(); + flush_all(FLUSH_CACHE); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990979.1374922 (Exim 4.92) (envelope-from ) id 1uHPJB-00017p-96; Tue, 20 May 2025 15:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990979.1374922; Tue, 20 May 2025 15: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 1uHPJB-00017h-6W; Tue, 20 May 2025 15:55:13 +0000 Received: by outflank-mailman (input) for mailman id 990979; Tue, 20 May 2025 15:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHPJ9-00017Q-Ss for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHPJA-003Z4q-0G for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHPJ9-00GjAg-2e for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15: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=RSfmi9z6tlt211sLrXHzNBj/QjJxuYlz+j6NhNu86R8=; b=hXivGt106WK2Fy8iycDweeph/c LPywiS3q9n3sYkcbWG37RceXdnStCphRMxnj6t5DOljeD3+BIzbwPVBKVyUsO9uw1N2RTIrTBagkW qqAVXuyUNg4ojTryqbW/PEbNBHEPncQAtZPybclhKbAbGavMhICng44YA1koPNXDz20U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: rename cache_flush_permitted() to has_arch_io_resources() Message-Id: Date: Tue, 20 May 2025 15:55:11 +0000 commit 58c227fcb2143f7c44b82e51aff206d781db6a08 Author: Roger Pau Monne AuthorDate: Tue Apr 29 16:30:46 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 xen/x86: rename cache_flush_permitted() to has_arch_io_resources() To better describe the underlying implementation. Define cache_flush_permitted() as an alias of has_arch_io_resources(), so that current users of cache_flush_permitted() are not effectively modified. With the introduction of the new handler, change some of the call sites of cache_flush_permitted() to instead use has_arch_io_resources() as such callers are not after whether cache flush is enabled, but rather whether the domain has any IO resources assigned. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/iocap.h | 4 +++- xen/arch/x86/mm/p2m-pod.c | 4 ++-- xen/common/memory.c | 2 +- xen/include/asm-generic/iocap.h | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/iocap.h b/xen/arch/x86/include/asm/iocap.h index 53d87ae8a3..61d026dbf5 100644 --- a/xen/arch/x86/include/asm/iocap.h +++ b/xen/arch/x86/include/asm/iocap.h @@ -15,10 +15,12 @@ #define ioports_access_permitted(d, s, e) \ rangeset_contains_range((d)->arch.ioport_caps, s, e) -#define cache_flush_permitted(d) \ +#define has_arch_io_resources(d) \ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) +#define cache_flush_permitted has_arch_io_resources + static inline int ioports_permit_access(struct domain *d, unsigned long s, unsigned long e) { diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index df2a1cc074..05633fe2ac 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -338,7 +338,7 @@ p2m_pod_set_mem_target(struct domain *d, unsigned long target) ASSERT( pod_target >= p2m->pod.count ); - if ( has_arch_pdevs(d) || cache_flush_permitted(d) ) + if ( has_arch_pdevs(d) || has_arch_io_resources(d) ) ret = -ENOTEMPTY; else ret = p2m_pod_set_cache_target(p2m, pod_target, 1/*preemptible*/); @@ -1395,7 +1395,7 @@ guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, if ( !paging_mode_translate(d) ) return -EINVAL; - if ( has_arch_pdevs(d) || cache_flush_permitted(d) ) + if ( has_arch_pdevs(d) || has_arch_io_resources(d) ) return -ENOTEMPTY; do { diff --git a/xen/common/memory.c b/xen/common/memory.c index 8ca4e1a842..46620ed825 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -86,7 +86,7 @@ static unsigned int max_order(const struct domain *d) unsigned int order = domu_max_order; #ifdef CONFIG_HAS_PASSTHROUGH - if ( cache_flush_permitted(d) && order < ptdom_max_order ) + if ( has_arch_io_resources(d) && order < ptdom_max_order ) order = ptdom_max_order; #endif diff --git a/xen/include/asm-generic/iocap.h b/xen/include/asm-generic/iocap.h index dd7cb45488..664bbc8971 100644 --- a/xen/include/asm-generic/iocap.h +++ b/xen/include/asm-generic/iocap.h @@ -2,9 +2,11 @@ #ifndef __ASM_GENERIC_IOCAP_H__ #define __ASM_GENERIC_IOCAP_H__ -#define cache_flush_permitted(d) \ +#define has_arch_io_resources(d) \ (!rangeset_is_empty((d)->iomem_caps)) +#define cache_flush_permitted has_arch_io_resources + #endif /* __ASM_GENERIC_IOCAP_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990980.1374927 (Exim 4.92) (envelope-from ) id 1uHPJL-0001AC-Ab; Tue, 20 May 2025 15:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990980.1374927; Tue, 20 May 2025 15: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 1uHPJL-0001A4-7t; Tue, 20 May 2025 15:55:23 +0000 Received: by outflank-mailman (input) for mailman id 990980; Tue, 20 May 2025 15:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHPJK-00019s-0l for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHPJK-003Z4u-0f for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHPJJ-00GjJi-2z for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15: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=b/wutVUPfgYMNh8peeQAHjtEK4IxGh47a1ToD5YpXOY=; b=jtefw9ZcxAbLxzgqpNl2fbp9BO 5cqS0kvEpxVP7o0LljG6bAgHKfDvqfVwELEnWhHQCKogT6Evh6TRlOe5Gxvreoh+IPdrhAOMuaB4U kdTS7z2m3Jb+quxRBvQxkhrRbBbCuG0Au9r5dv1QCQUr0C747N8tUrhmkNTRsIxldk64=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: account for assigned PCI devices in cache_flush_permitted() Message-Id: Date: Tue, 20 May 2025 15:55:21 +0000 commit 8333e358e4cda629ed46398dc3ea4510d3d48d70 Author: Roger Pau Monne AuthorDate: Fri May 16 10:56:51 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 xen/x86: account for assigned PCI devices in cache_flush_permitted() While unlikely, it's possible for PCI devices to not have any IO resources assigned, yet in such case the owner domain might still need to issue cache control operations in case the device performs DMA requests. Adjust cache_flush_permitted() to account for has_arch_pdevs(). While there also switch l1_disallow_mask() to use cache_flush_permitted(). This should be a non-functional change after the adjustment done to cache_flush_permitted(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/iocap.h | 3 ++- xen/arch/x86/mm.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/iocap.h b/xen/arch/x86/include/asm/iocap.h index 61d026dbf5..f948b7186e 100644 --- a/xen/arch/x86/include/asm/iocap.h +++ b/xen/arch/x86/include/asm/iocap.h @@ -19,7 +19,8 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define cache_flush_permitted has_arch_io_resources +#define cache_flush_permitted(d) \ + (has_arch_io_resources(d) || has_arch_pdevs(d)) static inline int ioports_permit_access(struct domain *d, unsigned long s, unsigned long e) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index a1703db762..657623336c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -172,9 +172,7 @@ static DEFINE_SPINLOCK(subpage_ro_lock); #define l1_disallow_mask(d) \ (((d) != dom_io) && \ - (rangeset_is_empty((d)->iomem_caps) && \ - rangeset_is_empty((d)->arch.ioport_caps) && \ - !has_arch_pdevs(d) && \ + (!cache_flush_permitted(d) && \ is_pv_domain(d)) ? \ L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990981.1374931 (Exim 4.92) (envelope-from ) id 1uHPJV-0001Ce-Br; Tue, 20 May 2025 15:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990981.1374931; Tue, 20 May 2025 15:55: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 1uHPJV-0001CY-9F; Tue, 20 May 2025 15:55:33 +0000 Received: by outflank-mailman (input) for mailman id 990981; Tue, 20 May 2025 15:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHPJU-0001CO-3r for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHPJU-003Z4y-0y for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHPJU-00GjUV-09 for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55: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=JWCjFc2FHc8PYZJ1j1T6CqIK0G5qv4O4067di4/hgsQ=; b=RNX5UXp4jlQu+CETuJ5Y9Wg8qG 2bdQKE7yfryQ3jsKQbCzwj7kfgBFi5dhLXyfERhFVC6hw3zU/v1RXhHKlWzPuEwwIot99BX13CGU8 W0H9/Kvf5Y2XqH7UmVHX2ZBYOzDzR8YLFl5HVMsDMcXnlwf20SWyZDYo+XJq3fRGmyTs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: limit memory type cache flush to running domains Message-Id: Date: Tue, 20 May 2025 15:55:32 +0000 commit 3125ca0da2d80123823ff24148467504aa4c7f13 Author: Roger Pau Monne AuthorDate: Thu May 15 14:38:51 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 x86/hvm: limit memory type cache flush to running domains Avoid the cache flush if the domain is not yet running. There shouldn't be any cached data resulting from domain accesses that need flushing, as the domain hasn't run yet. There can be data in the caches as a result of Xen and/or toolstack behavior. Ideally we would do a cache flush strictly before starting the domain, however doing so only makes sense once we can guarantee there are no leftover mappings of the affected ranges with cacheable attributes, otherwise the CPU can speculatively populate the cache with data from those ranges. No change in domain observable behavior intended. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 402a1d9263..8e1e15af8d 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -783,7 +783,13 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, NULL, hvm_load_mtrr_msr, 1, void memory_type_changed(struct domain *d) { if ( (is_iommu_enabled(d) || cache_flush_permitted(d)) && - d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) ) + d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) && + /* + * Do the p2m type-change, but skip the cache flush if the domain is + * not yet running. The check for creation_finished must strictly be + * done after the call to p2m_memory_type_changed(). + */ + d->creation_finished ) { flush_all(FLUSH_CACHE); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 20 15:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 20 May 2025 15:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.990982.1374934 (Exim 4.92) (envelope-from ) id 1uHPJf-0001F2-D6; Tue, 20 May 2025 15:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 990982.1374934; Tue, 20 May 2025 15:55: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 1uHPJf-0001Ev-Ae; Tue, 20 May 2025 15:55:43 +0000 Received: by outflank-mailman (input) for mailman id 990982; Tue, 20 May 2025 15:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHPJe-0001Ej-6d for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHPJe-003Z5I-1F for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHPJe-00Gjd8-0S for xen-changelog@lists.xenproject.org; Tue, 20 May 2025 15:55: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=pR6clnHLc/GxcpCXaOBqafSK1xfT14jkCWM1HNIPez8=; b=TZXp0VZ4jfGhCdN7NjinP+INQy HTqv3QFK+jS6Oucjrpr4oBpYTJ3BcM6bpgoLZs2GpccyFqYoxakNmyp789BWInquq7ncPUHD1EIWg w2iqjjgOip6OunYETPxbAGUkMhQ5EGsToSfjpS7Ni2biHfUR+ZKbyP+EwXFRWlFJeUlo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: reduce the need to flush caches in memory_type_changed() Message-Id: Date: Tue, 20 May 2025 15:55:42 +0000 commit 2d779cabddfa0166f6baae50627a4b370d8f0f19 Author: Roger Pau Monne AuthorDate: Thu May 15 15:15:07 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 20 16:35:52 2025 +0200 x86/hvm: reduce the need to flush caches in memory_type_changed() The current cache flushing done in memory_type_changed() is too wide, and this doesn't scale on boxes with high number of CPUs. Attempt to limit cache flushes as a result of p2m type changes, and only do them if: * The CPU doesn't support (or has broken) self-snoop capability, otherwise there would be leftover aliases in the cache. For guest initiated memory changes (like changes to MTRRs) the guest should already do a cache flush. * The IOMMU cannot force all DMA accesses to be snooping ones. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Acked-By: Oleksii Kurochko --- CHANGELOG.md | 4 ++++ xen/arch/x86/hvm/mtrr.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ea06524db..faf2271011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - For ARM32 and ARM64, GCC 5.1 and Binutils 2.25 - Linux based device model stubdomains are now fully supported. + - On x86: + - Restrict the cache flushing done as a result of guest physical memory map + manipulations and memory type changes. + ### Added - On x86: - Option to attempt to fixup p2m page-faults on PVH dom0. diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 8e1e15af8d..4b8afad2c5 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -782,14 +782,22 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, NULL, hvm_load_mtrr_msr, 1, void memory_type_changed(struct domain *d) { - if ( (is_iommu_enabled(d) || cache_flush_permitted(d)) && + if ( cache_flush_permitted(d) && d->vcpu && d->vcpu[0] && p2m_memory_type_changed(d) && /* * Do the p2m type-change, but skip the cache flush if the domain is * not yet running. The check for creation_finished must strictly be * done after the call to p2m_memory_type_changed(). */ - d->creation_finished ) + d->creation_finished && + /* + * The cache flush should be done if either: CPU doesn't have + * self-snoop in which case there could be aliases left in the cache, + * or (some) IOMMUs cannot force all DMA device accesses to be + * snooped. + */ + (!boot_cpu_has(X86_FEATURE_XEN_SELFSNOOP) || + (is_iommu_enabled(d) && !iommu_snoop)) ) { flush_all(FLUSH_CACHE); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 21 02:33:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 02:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991386.1375245 (Exim 4.92) (envelope-from ) id 1uHZGR-0006fI-Ee; Wed, 21 May 2025 02:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991386.1375245; Wed, 21 May 2025 02: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 1uHZGR-0006fA-Bx; Wed, 21 May 2025 02:33:03 +0000 Received: by outflank-mailman (input) for mailman id 991386; Wed, 21 May 2025 02:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHZGP-0006f4-VS for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHZGQ-005dCI-0A for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHZGP-001gSK-2a for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02: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=Uf/8U+6MbQIzO0FLl1RKxEI2I4GNDIUED6QbgkMfWuk=; b=gMHCcvcL/tDh31eLIijnhxLCDc 89Gq3XhPSyo0ceNoesuWtLQuC8mmWHE4xzXa/sBwOQqbkDX01jbH6MLd2et7LaAdWiqd2rg4ZO9wq lbV5Jb3Ry+1YPpzMPYK+bwt+XbMARO1UNlODSNq93szgBq++xeUdyycpUPlO8TMOEJ4w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/console: cleanup conring management Message-Id: Date: Wed, 21 May 2025 02:33:01 +0000 commit f90a543bd6018e46407514f9bdd47092d8d009a3 Author: Denis Mukhin AuthorDate: Mon May 19 19:40:20 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:58:43 2025 -0700 xen/console: cleanup conring management Move conring tasklet code close to conring definitions in the console driver and rename conring tasklet variables by adding conring_ prefix for better readability. No functional change. Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index c3150fbdb7..b4757844e6 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -325,6 +325,16 @@ static void cf_check do_dec_thresh(unsigned char key, bool unused) * ******************************************************** */ +static void cf_check conring_notify(void *unused) +{ + send_global_virq(VIRQ_CON_RING); +} + +static DECLARE_SOFTIRQ_TASKLET(conring_tasklet, conring_notify, NULL); + +/* NB: Do not send conring VIRQs during panic. */ +static bool conring_no_notify; + static void conring_puts(const char *str, size_t len) { ASSERT(rspin_is_locked(&console_lock)); @@ -594,13 +604,6 @@ static void cf_check serial_rx(char c) __serial_rx(c); } -static void cf_check notify_dom0_con_ring(void *unused) -{ - send_global_virq(VIRQ_CON_RING); -} -static DECLARE_SOFTIRQ_TASKLET(notify_dom0_con_ring_tasklet, - notify_dom0_con_ring, NULL); - #ifdef CONFIG_X86 static inline void xen_console_write_debug_port(const char *buf, size_t len) { @@ -650,7 +653,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, if ( opt_console_to_ring ) { conring_puts(kbuf, kcount); - tasklet_schedule(¬ify_dom0_con_ring_tasklet); + tasklet_schedule(&conring_tasklet); } nrspin_unlock_irq(&console_lock); @@ -753,8 +756,6 @@ long do_console_io( * ***************************************************** */ -static bool console_locks_busted; - static void __putstr(const char *str) { size_t len = strlen(str); @@ -775,9 +776,8 @@ static void __putstr(const char *str) #endif conring_puts(str, len); - - if ( !console_locks_busted ) - tasklet_schedule(¬ify_dom0_con_ring_tasklet); + if ( !conring_no_notify ) + tasklet_schedule(&conring_tasklet); } static int printk_prefix_check(char *p, char **pp) @@ -1171,7 +1171,7 @@ void console_force_unlock(void) spin_debug_disable(); rspin_lock_init(&console_lock); serial_force_unlock(sercon_handle); - console_locks_busted = 1; + conring_no_notify = true; console_start_sync(); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 21 02:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 02:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991387.1375248 (Exim 4.92) (envelope-from ) id 1uHZGb-0006gm-Fq; Wed, 21 May 2025 02:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991387.1375248; Wed, 21 May 2025 02: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 1uHZGb-0006ge-DJ; Wed, 21 May 2025 02:33:13 +0000 Received: by outflank-mailman (input) for mailman id 991387; Wed, 21 May 2025 02:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHZGa-0006gU-1G for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHZGa-005dCp-0X for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHZGZ-001gSv-2s for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02: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=J84nYrWy75AW4SawYv5TIi41KcyxgZeSxDownSq40Fw=; b=VZ4XwD4jPAYCoMZzEYQpxEHw+M nyp2UYpiPWTTeoRxJYLHa4iQa4HuVdHFpovOH0aKohz7+c1K9vwhbg5Zo+4jkKlsWake4gDrHETYn gOKZv5wY1+xe945SlTUuNBVA5Tn/K1mRcAbcxkG5VQz5Bc6zlSwt7KUOLtjLbEfpm+Q0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/console: introduce console_send() Message-Id: Date: Wed, 21 May 2025 02:33:11 +0000 commit 77f70275fd5f0c93eec2f0aff97c01806b355026 Author: Denis Mukhin AuthorDate: Mon May 19 19:40:28 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:58:44 2025 -0700 xen/console: introduce console_send() guest_console_write() duplicates the code from __putstr(), eliminate code duplication. Introduce console_send() for sending a message on console devices. Also, introduce internal console flags to control which console devices should be used. No functional change intended. Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 133 ++++++++++++++++++++++++++++----------------- 1 file changed, 84 insertions(+), 49 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index b4757844e6..0c0cc6677c 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -41,6 +41,28 @@ #include #endif +/* Internal console flags. */ +enum { + CONSOLE_SERIAL = BIT(0, U), /* Use serial device. */ + CONSOLE_PV = BIT(1, U), /* Use PV console. */ + CONSOLE_VIDEO = BIT(2, U), /* Use video device. */ + CONSOLE_DEBUG = BIT(3, U), /* Use debug device. */ + CONSOLE_RING = BIT(4, U), /* Use console ring. */ + CONSOLE_RING_VIRQ = BIT(5, U), /* Use console ring VIRQ. */ + + /* Default console flags. */ + CONSOLE_DEFAULT = CONSOLE_SERIAL | + CONSOLE_PV | + CONSOLE_VIDEO | + CONSOLE_RING_VIRQ | + CONSOLE_DEBUG, + + /* Use all known console devices. */ + CONSOLE_ALL = CONSOLE_DEFAULT | CONSOLE_RING, +}; + +static void console_send(const char *str, size_t len, unsigned int flags); + /* console: comma-separated list of console outputs. */ static char __initdata opt_console[30] = OPT_CONSOLE_STR; string_param("console", opt_console); @@ -428,9 +450,6 @@ void console_serial_puts(const char *s, size_t nr) serial_steal_fn(s, nr); else serial_puts(sercon_handle, s, nr); - - /* Copy all serial output into PV console */ - pv_console_puts(s, nr); } static void cf_check dump_console_ring_key(unsigned char key) @@ -464,8 +483,7 @@ static void cf_check dump_console_ring_key(unsigned char key) c += len; } - console_serial_puts(buf, sofar); - video_puts(buf, sofar); + console_send(buf, sofar, CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); free_xenheap_pages(buf, order); } @@ -614,11 +632,71 @@ static inline void xen_console_write_debug_port(const char *buf, size_t len) } #endif +static inline void console_debug_puts(const char *str, size_t len) +{ +#ifdef CONFIG_X86 + if ( opt_console_xen ) + { + if ( xen_guest ) + xen_hypercall_console_write(str, len); + else + xen_console_write_debug_port(str, len); + } +#endif +} + +/* + * Send a message on console device(s). + * + * That will handle all possible scenarios working w/ console + * - physical console (serial console, VGA console (x86 only)); + * - PV console; + * - debug console (x86 only): debug I/O port or __HYPERVISOR_console_io + * hypercall; + * - console ring. + */ +static void console_send(const char *str, size_t len, unsigned int flags) +{ + if ( flags & CONSOLE_SERIAL ) + console_serial_puts(str, len); + + if ( flags & CONSOLE_PV ) + pv_console_puts(str, len); + + if ( flags & CONSOLE_VIDEO ) + video_puts(str, len); + + if ( flags & CONSOLE_DEBUG ) + console_debug_puts(str, len); + + if ( flags & CONSOLE_RING ) + { + conring_puts(str, len); + + if ( flags & CONSOLE_RING_VIRQ ) + tasklet_schedule(&conring_tasklet); + } +} + +static inline void __putstr(const char *str) +{ + unsigned int flags = CONSOLE_ALL; + + ASSERT(rspin_is_locked(&console_lock)); + + if ( conring_no_notify ) + flags &= ~CONSOLE_RING_VIRQ; + + console_send(str, strlen(str), flags); +} + static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, unsigned int count) { char kbuf[128]; unsigned int kcount = 0; + unsigned int flags = opt_console_to_ring + ? CONSOLE_ALL : CONSOLE_DEFAULT; struct domain *cd = current->domain; while ( count > 0 ) @@ -636,26 +714,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, { /* Use direct console output as it could be interactive */ nrspin_lock_irq(&console_lock); - - console_serial_puts(kbuf, kcount); - video_puts(kbuf, kcount); - -#ifdef CONFIG_X86 - if ( opt_console_xen ) - { - if ( xen_guest ) - xen_hypercall_console_write(kbuf, kcount); - else - xen_console_write_debug_port(kbuf, kcount); - } -#endif - - if ( opt_console_to_ring ) - { - conring_puts(kbuf, kcount); - tasklet_schedule(&conring_tasklet); - } - + console_send(kbuf, kcount, flags); nrspin_unlock_irq(&console_lock); } else @@ -756,30 +815,6 @@ long do_console_io( * ***************************************************** */ -static void __putstr(const char *str) -{ - size_t len = strlen(str); - - ASSERT(rspin_is_locked(&console_lock)); - - console_serial_puts(str, len); - video_puts(str, len); - -#ifdef CONFIG_X86 - if ( opt_console_xen ) - { - if ( xen_guest ) - xen_hypercall_console_write(str, len); - else - xen_console_write_debug_port(str, len); - } -#endif - - conring_puts(str, len); - if ( !conring_no_notify ) - tasklet_schedule(&conring_tasklet); -} - static int printk_prefix_check(char *p, char **pp) { int loglvl = -1; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 21 02:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 02:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991388.1375253 (Exim 4.92) (envelope-from ) id 1uHZGl-0006jo-Ic; Wed, 21 May 2025 02:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991388.1375253; Wed, 21 May 2025 02:33: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 1uHZGl-0006jg-G5; Wed, 21 May 2025 02:33:23 +0000 Received: by outflank-mailman (input) for mailman id 991388; Wed, 21 May 2025 02:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHZGk-0006jR-2V for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHZGk-005dDQ-0p for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHZGk-001gTY-01 for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33: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=ZrjreVQmNi6dvVvd1zWAgzF2BM6HZDpX7wcYQ/wPQ0c=; b=nN4IehmTzzw8Xpiv0JPNtSku6e nkk1v4H1R2oaIAxcEKrPhF1jt/saaqpcgdfFhXznKtqyMMY2azdv+C2/ksJWrW1tG6Qnl3vVGcYo8 W1JNhIMhZ4SvUJ8cvvGsmKQZm03ZxR3EFOx7mUElDE4iRplN2PuceXR1zjvAUE+nU0Fg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/console: introduce conring_flush() Message-Id: Date: Wed, 21 May 2025 02:33:22 +0000 commit f6d1bfa1605245f9365bbde9613e75595b846286 Author: Denis Mukhin AuthorDate: Mon May 19 19:40:34 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:58:45 2025 -0700 xen/console: introduce conring_flush() Introduce conring_flush() to ensure all messages kept in the internal console ring are sent to all physical consoles (serial, VGA (x86)) after their initialization is completed. Rename dump_console_ring_key to conring_dump_keyhandler to match the notation for conring management symbols. Resolves: https://gitlab.com/xen-project/xen/-/issues/184 Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 0c0cc6677c..c15987f5bb 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -452,23 +452,19 @@ void console_serial_puts(const char *s, size_t nr) serial_puts(sercon_handle, s, nr); } -static void cf_check dump_console_ring_key(unsigned char key) +/* + * Flush contents of the conring to the physical console devices. + */ +static int conring_flush(void) { uint32_t idx, len, sofar, c; unsigned int order; char *buf; - printk("'%c' pressed -> dumping console ring buffer (dmesg)\n", key); - - /* create a buffer in which we'll copy the ring in the correct - order and NUL terminate */ order = get_order_from_bytes(conring_size + 1); buf = alloc_xenheap_pages(order, 0); if ( buf == NULL ) - { - printk("unable to allocate memory!\n"); - return; - } + return -ENOMEM; c = conringc; sofar = 0; @@ -486,6 +482,18 @@ static void cf_check dump_console_ring_key(unsigned char key) console_send(buf, sofar, CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); free_xenheap_pages(buf, order); + + return 0; +} + +static void cf_check conring_dump_keyhandler(unsigned char key) +{ + int rc; + + printk("'%c' pressed -> dumping console ring buffer (dmesg)\n", key); + rc = conring_flush(); + if ( rc ) + printk("failed to dump console ring buffer: %d\n", rc); } /* @@ -1060,6 +1068,9 @@ void __init console_init_preirq(void) serial_set_rx_handler(sercon_handle, serial_rx); pv_console_set_rx_handler(serial_rx); + /* NB: send conring contents to all enabled physical consoles, if any */ + conring_flush(); + /* HELLO WORLD --- start-of-day banner text. */ nrspin_lock(&console_lock); __putstr(xen_banner()); @@ -1150,7 +1161,7 @@ void __init console_endboot(void) if ( opt_conswitch[1] == 'x' ) console_rx = max_console_rx; - register_keyhandler('w', dump_console_ring_key, + register_keyhandler('w', conring_dump_keyhandler, "synchronously dump console ring buffer (dmesg)", 0); register_irq_keyhandler('+', &do_inc_thresh, "increase log level threshold", 0); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 21 02:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 02:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991389.1375258 (Exim 4.92) (envelope-from ) id 1uHZGv-0006mH-Kp; Wed, 21 May 2025 02:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991389.1375258; Wed, 21 May 2025 02:33: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 1uHZGv-0006m9-HT; Wed, 21 May 2025 02:33:33 +0000 Received: by outflank-mailman (input) for mailman id 991389; Wed, 21 May 2025 02:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHZGu-0006lt-73 for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHZGu-005dDy-17 for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHZGu-001gUD-0J for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 02:33: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=MRl75H01g8Sc+5FpYGZEoRmytn4YcgYhvbDuKMTxPEw=; b=JrMpP7BM3mTRNeOZqn20AHwA1S r59aBrz6DhhygPrYkjLP03JuEjS8WdCZfIZopq2PwSBta6B6q9tmlzXJcPJ18NDUmyMQer1Rabevf pbWHxPl8UJ0Q+iOss3gTgeDbxfD3qWSyjm+DiUIcf4aUrw2xm+2Y5xRQSGwz+HomJsiA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/vgic-v3: Fix write_ignore_64's check in __vgic_v3_rdistr_rd_mmio_write() Message-Id: Date: Wed, 21 May 2025 02:33:32 +0000 commit 1f75bd375d0757d6646ca2029a9559d535f6b511 Author: Oleksandr Tyshchenko AuthorDate: Tue May 20 15:53:13 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:59:01 2025 -0700 arm/vgic-v3: Fix write_ignore_64's check in __vgic_v3_rdistr_rd_mmio_write() An attempt to write access the register (i.e. GICR_PROPBASER, GICR_PENDBASER) which should be ignored (i.e. no virtual ITS present) causes the guest data abort due to incorrect check at the write_ignore_64 label. The check should be inverted. While at it, move goto to the next line. Fixes: c4d6bbdc12e5 ("xen/arm: vgic-v3: Support 32-bit access for 64-bit registers") Signed-off-by: Oleksandr Tyshchenko Acked-by: Julien Grall --- xen/arch/arm/vgic-v3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 2eaa48fadb..f20249f731 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -649,7 +649,8 @@ bad_width: return 0; write_ignore_64: - if ( vgic_reg64_check_access(dabt) ) goto bad_width; + if ( !vgic_reg64_check_access(dabt) ) + goto bad_width; return 1; write_ignore_32: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 21 07:22:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 07:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991573.1375410 (Exim 4.92) (envelope-from ) id 1uHdm7-0006Ny-D8; Wed, 21 May 2025 07:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991573.1375410; Wed, 21 May 2025 07: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 1uHdm7-0006Ns-AX; Wed, 21 May 2025 07:22:03 +0000 Received: by outflank-mailman (input) for mailman id 991573; Wed, 21 May 2025 07:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHdm5-0006Nh-ON for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHdm5-005rHz-2a for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHdm5-0022fM-1b for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07: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=qRrIf0nPoPgkHSpJKnprxdY4kk6OQQ4DRmiBLSgFQEY=; b=bq9v/diZ/NTUSyNSec65WvEjhY BrplaE6FYDTkoOTXnf2AseVx3I6CV7bmfO2cD25aNtzSi/IDKEjwcX/jsxM5NhWZowdvv99KgnOko Vf3mwU9lG2gAQRE2Gi4TqwqJSrb3XUkwNHxZQiaAYxQSW37TrK/vSJbpOjWPw8g6Gw/U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/console: cleanup conring management Message-Id: Date: Wed, 21 May 2025 07:22:01 +0000 commit f90a543bd6018e46407514f9bdd47092d8d009a3 Author: Denis Mukhin AuthorDate: Mon May 19 19:40:20 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:58:43 2025 -0700 xen/console: cleanup conring management Move conring tasklet code close to conring definitions in the console driver and rename conring tasklet variables by adding conring_ prefix for better readability. No functional change. Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index c3150fbdb7..b4757844e6 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -325,6 +325,16 @@ static void cf_check do_dec_thresh(unsigned char key, bool unused) * ******************************************************** */ +static void cf_check conring_notify(void *unused) +{ + send_global_virq(VIRQ_CON_RING); +} + +static DECLARE_SOFTIRQ_TASKLET(conring_tasklet, conring_notify, NULL); + +/* NB: Do not send conring VIRQs during panic. */ +static bool conring_no_notify; + static void conring_puts(const char *str, size_t len) { ASSERT(rspin_is_locked(&console_lock)); @@ -594,13 +604,6 @@ static void cf_check serial_rx(char c) __serial_rx(c); } -static void cf_check notify_dom0_con_ring(void *unused) -{ - send_global_virq(VIRQ_CON_RING); -} -static DECLARE_SOFTIRQ_TASKLET(notify_dom0_con_ring_tasklet, - notify_dom0_con_ring, NULL); - #ifdef CONFIG_X86 static inline void xen_console_write_debug_port(const char *buf, size_t len) { @@ -650,7 +653,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, if ( opt_console_to_ring ) { conring_puts(kbuf, kcount); - tasklet_schedule(¬ify_dom0_con_ring_tasklet); + tasklet_schedule(&conring_tasklet); } nrspin_unlock_irq(&console_lock); @@ -753,8 +756,6 @@ long do_console_io( * ***************************************************** */ -static bool console_locks_busted; - static void __putstr(const char *str) { size_t len = strlen(str); @@ -775,9 +776,8 @@ static void __putstr(const char *str) #endif conring_puts(str, len); - - if ( !console_locks_busted ) - tasklet_schedule(¬ify_dom0_con_ring_tasklet); + if ( !conring_no_notify ) + tasklet_schedule(&conring_tasklet); } static int printk_prefix_check(char *p, char **pp) @@ -1171,7 +1171,7 @@ void console_force_unlock(void) spin_debug_disable(); rspin_lock_init(&console_lock); serial_force_unlock(sercon_handle); - console_locks_busted = 1; + conring_no_notify = true; console_start_sync(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 21 07:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 07:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991574.1375414 (Exim 4.92) (envelope-from ) id 1uHdmH-0006Pp-Eo; Wed, 21 May 2025 07:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991574.1375414; Wed, 21 May 2025 07: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 1uHdmH-0006Pi-Bx; Wed, 21 May 2025 07:22:13 +0000 Received: by outflank-mailman (input) for mailman id 991574; Wed, 21 May 2025 07:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHdmF-0006Pa-N3 for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHdmF-005rIN-2s for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHdmF-0022gN-24 for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07: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=y6Efc4zOrtsCrsOSJhfH6VG5iejvXHFLrfCtMFfU+dI=; b=Dtl8Jx1wiiWceLCHodcsKBjvEO a9jMok7b2IsPccxNX0PU7nmn2GMOPUhKT+Js9myTWitxUkXebXTOxjkFpPZMbtQDWVpjhcW74IYoq qi0y9kG3ZcMnv/GqZw3NkjLZ5CIBmdX6JED4zWyo/nBd+g54H0pbqfFOdM+UrZlkB7GQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/console: introduce console_send() Message-Id: Date: Wed, 21 May 2025 07:22:11 +0000 commit 77f70275fd5f0c93eec2f0aff97c01806b355026 Author: Denis Mukhin AuthorDate: Mon May 19 19:40:28 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:58:44 2025 -0700 xen/console: introduce console_send() guest_console_write() duplicates the code from __putstr(), eliminate code duplication. Introduce console_send() for sending a message on console devices. Also, introduce internal console flags to control which console devices should be used. No functional change intended. Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 133 ++++++++++++++++++++++++++++----------------- 1 file changed, 84 insertions(+), 49 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index b4757844e6..0c0cc6677c 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -41,6 +41,28 @@ #include #endif +/* Internal console flags. */ +enum { + CONSOLE_SERIAL = BIT(0, U), /* Use serial device. */ + CONSOLE_PV = BIT(1, U), /* Use PV console. */ + CONSOLE_VIDEO = BIT(2, U), /* Use video device. */ + CONSOLE_DEBUG = BIT(3, U), /* Use debug device. */ + CONSOLE_RING = BIT(4, U), /* Use console ring. */ + CONSOLE_RING_VIRQ = BIT(5, U), /* Use console ring VIRQ. */ + + /* Default console flags. */ + CONSOLE_DEFAULT = CONSOLE_SERIAL | + CONSOLE_PV | + CONSOLE_VIDEO | + CONSOLE_RING_VIRQ | + CONSOLE_DEBUG, + + /* Use all known console devices. */ + CONSOLE_ALL = CONSOLE_DEFAULT | CONSOLE_RING, +}; + +static void console_send(const char *str, size_t len, unsigned int flags); + /* console: comma-separated list of console outputs. */ static char __initdata opt_console[30] = OPT_CONSOLE_STR; string_param("console", opt_console); @@ -428,9 +450,6 @@ void console_serial_puts(const char *s, size_t nr) serial_steal_fn(s, nr); else serial_puts(sercon_handle, s, nr); - - /* Copy all serial output into PV console */ - pv_console_puts(s, nr); } static void cf_check dump_console_ring_key(unsigned char key) @@ -464,8 +483,7 @@ static void cf_check dump_console_ring_key(unsigned char key) c += len; } - console_serial_puts(buf, sofar); - video_puts(buf, sofar); + console_send(buf, sofar, CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); free_xenheap_pages(buf, order); } @@ -614,11 +632,71 @@ static inline void xen_console_write_debug_port(const char *buf, size_t len) } #endif +static inline void console_debug_puts(const char *str, size_t len) +{ +#ifdef CONFIG_X86 + if ( opt_console_xen ) + { + if ( xen_guest ) + xen_hypercall_console_write(str, len); + else + xen_console_write_debug_port(str, len); + } +#endif +} + +/* + * Send a message on console device(s). + * + * That will handle all possible scenarios working w/ console + * - physical console (serial console, VGA console (x86 only)); + * - PV console; + * - debug console (x86 only): debug I/O port or __HYPERVISOR_console_io + * hypercall; + * - console ring. + */ +static void console_send(const char *str, size_t len, unsigned int flags) +{ + if ( flags & CONSOLE_SERIAL ) + console_serial_puts(str, len); + + if ( flags & CONSOLE_PV ) + pv_console_puts(str, len); + + if ( flags & CONSOLE_VIDEO ) + video_puts(str, len); + + if ( flags & CONSOLE_DEBUG ) + console_debug_puts(str, len); + + if ( flags & CONSOLE_RING ) + { + conring_puts(str, len); + + if ( flags & CONSOLE_RING_VIRQ ) + tasklet_schedule(&conring_tasklet); + } +} + +static inline void __putstr(const char *str) +{ + unsigned int flags = CONSOLE_ALL; + + ASSERT(rspin_is_locked(&console_lock)); + + if ( conring_no_notify ) + flags &= ~CONSOLE_RING_VIRQ; + + console_send(str, strlen(str), flags); +} + static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, unsigned int count) { char kbuf[128]; unsigned int kcount = 0; + unsigned int flags = opt_console_to_ring + ? CONSOLE_ALL : CONSOLE_DEFAULT; struct domain *cd = current->domain; while ( count > 0 ) @@ -636,26 +714,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, { /* Use direct console output as it could be interactive */ nrspin_lock_irq(&console_lock); - - console_serial_puts(kbuf, kcount); - video_puts(kbuf, kcount); - -#ifdef CONFIG_X86 - if ( opt_console_xen ) - { - if ( xen_guest ) - xen_hypercall_console_write(kbuf, kcount); - else - xen_console_write_debug_port(kbuf, kcount); - } -#endif - - if ( opt_console_to_ring ) - { - conring_puts(kbuf, kcount); - tasklet_schedule(&conring_tasklet); - } - + console_send(kbuf, kcount, flags); nrspin_unlock_irq(&console_lock); } else @@ -756,30 +815,6 @@ long do_console_io( * ***************************************************** */ -static void __putstr(const char *str) -{ - size_t len = strlen(str); - - ASSERT(rspin_is_locked(&console_lock)); - - console_serial_puts(str, len); - video_puts(str, len); - -#ifdef CONFIG_X86 - if ( opt_console_xen ) - { - if ( xen_guest ) - xen_hypercall_console_write(str, len); - else - xen_console_write_debug_port(str, len); - } -#endif - - conring_puts(str, len); - if ( !conring_no_notify ) - tasklet_schedule(&conring_tasklet); -} - static int printk_prefix_check(char *p, char **pp) { int loglvl = -1; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 21 07:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 07:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991575.1375419 (Exim 4.92) (envelope-from ) id 1uHdmR-0006Sd-Fy; Wed, 21 May 2025 07:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991575.1375419; Wed, 21 May 2025 07: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 1uHdmR-0006SV-DT; Wed, 21 May 2025 07:22:23 +0000 Received: by outflank-mailman (input) for mailman id 991575; Wed, 21 May 2025 07:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHdmP-0006S7-Pp for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHdmP-005rIs-39 for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHdmP-0022gl-2M for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22: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=hRSgIbUZUOaqUKfBhecng03+QUFFzMYZq3vefv9JNHo=; b=UG5AU3N0ZJbnYUr9Zbj/wmBu1R T8fmNR7TnzUgO1XFOzvnxcRqDtllLhcpP0HoFA6cYiRW7lTz2QHDRMNbNKN0a9p3CLg+oEQflrUUQ NOhPm1g6VzdB/lP+g6Esy+2w3fn4ITmShCa82xyTk7OUK7kZFu6hJ7usaJSYpyUHLliM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/console: introduce conring_flush() Message-Id: Date: Wed, 21 May 2025 07:22:21 +0000 commit f6d1bfa1605245f9365bbde9613e75595b846286 Author: Denis Mukhin AuthorDate: Mon May 19 19:40:34 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:58:45 2025 -0700 xen/console: introduce conring_flush() Introduce conring_flush() to ensure all messages kept in the internal console ring are sent to all physical consoles (serial, VGA (x86)) after their initialization is completed. Rename dump_console_ring_key to conring_dump_keyhandler to match the notation for conring management symbols. Resolves: https://gitlab.com/xen-project/xen/-/issues/184 Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 0c0cc6677c..c15987f5bb 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -452,23 +452,19 @@ void console_serial_puts(const char *s, size_t nr) serial_puts(sercon_handle, s, nr); } -static void cf_check dump_console_ring_key(unsigned char key) +/* + * Flush contents of the conring to the physical console devices. + */ +static int conring_flush(void) { uint32_t idx, len, sofar, c; unsigned int order; char *buf; - printk("'%c' pressed -> dumping console ring buffer (dmesg)\n", key); - - /* create a buffer in which we'll copy the ring in the correct - order and NUL terminate */ order = get_order_from_bytes(conring_size + 1); buf = alloc_xenheap_pages(order, 0); if ( buf == NULL ) - { - printk("unable to allocate memory!\n"); - return; - } + return -ENOMEM; c = conringc; sofar = 0; @@ -486,6 +482,18 @@ static void cf_check dump_console_ring_key(unsigned char key) console_send(buf, sofar, CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); free_xenheap_pages(buf, order); + + return 0; +} + +static void cf_check conring_dump_keyhandler(unsigned char key) +{ + int rc; + + printk("'%c' pressed -> dumping console ring buffer (dmesg)\n", key); + rc = conring_flush(); + if ( rc ) + printk("failed to dump console ring buffer: %d\n", rc); } /* @@ -1060,6 +1068,9 @@ void __init console_init_preirq(void) serial_set_rx_handler(sercon_handle, serial_rx); pv_console_set_rx_handler(serial_rx); + /* NB: send conring contents to all enabled physical consoles, if any */ + conring_flush(); + /* HELLO WORLD --- start-of-day banner text. */ nrspin_lock(&console_lock); __putstr(xen_banner()); @@ -1150,7 +1161,7 @@ void __init console_endboot(void) if ( opt_conswitch[1] == 'x' ) console_rx = max_console_rx; - register_keyhandler('w', dump_console_ring_key, + register_keyhandler('w', conring_dump_keyhandler, "synchronously dump console ring buffer (dmesg)", 0); register_irq_keyhandler('+', &do_inc_thresh, "increase log level threshold", 0); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 21 07:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 21 May 2025 07:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.991576.1375423 (Exim 4.92) (envelope-from ) id 1uHdmb-0006VZ-HK; Wed, 21 May 2025 07:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 991576.1375423; Wed, 21 May 2025 07: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 1uHdmb-0006VR-Eq; Wed, 21 May 2025 07:22:33 +0000 Received: by outflank-mailman (input) for mailman id 991576; Wed, 21 May 2025 07:22:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uHdmZ-0006VB-UD for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uHdma-005rJM-0C for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uHdmZ-0022hc-2d for xen-changelog@lists.xenproject.org; Wed, 21 May 2025 07:22: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=mgp1PnC9GdLmz54lVovyfZP3Z43JAp7WrYiy5QwRnCg=; b=DbVbtKgbpxy89LRRwf3HboTQOU x00xXBsOOFGV5Islx1Vm7bogG7Gc51kCq08xzIC4XqBAo6V8U0Ih4FpsB5Kmhk/DY+KaN1tmRjDbg rXcMjkeTkkejlD12aBHGHjOFvemHBfR/thXSRWDXJNM2qbCDn2LEiJfYrzz4XM+pgOls=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/vgic-v3: Fix write_ignore_64's check in __vgic_v3_rdistr_rd_mmio_write() Message-Id: Date: Wed, 21 May 2025 07:22:31 +0000 commit 1f75bd375d0757d6646ca2029a9559d535f6b511 Author: Oleksandr Tyshchenko AuthorDate: Tue May 20 15:53:13 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue May 20 18:59:01 2025 -0700 arm/vgic-v3: Fix write_ignore_64's check in __vgic_v3_rdistr_rd_mmio_write() An attempt to write access the register (i.e. GICR_PROPBASER, GICR_PENDBASER) which should be ignored (i.e. no virtual ITS present) causes the guest data abort due to incorrect check at the write_ignore_64 label. The check should be inverted. While at it, move goto to the next line. Fixes: c4d6bbdc12e5 ("xen/arm: vgic-v3: Support 32-bit access for 64-bit registers") Signed-off-by: Oleksandr Tyshchenko Acked-by: Julien Grall --- xen/arch/arm/vgic-v3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 2eaa48fadb..f20249f731 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -649,7 +649,8 @@ bad_width: return 0; write_ignore_64: - if ( vgic_reg64_check_access(dabt) ) goto bad_width; + if ( !vgic_reg64_check_access(dabt) ) + goto bad_width; return 1; write_ignore_32: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 22 09:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 May 2025 09:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.993321.1376736 (Exim 4.92) (envelope-from ) id 1uI1x9-0004Ch-Il; Thu, 22 May 2025 09:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 993321.1376736; Thu, 22 May 2025 09: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 1uI1x9-0004CZ-G9; Thu, 22 May 2025 09:11:03 +0000 Received: by outflank-mailman (input) for mailman id 993321; Thu, 22 May 2025 09:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI1x8-0004CM-Nv for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 09:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uI1x8-0082VR-2E for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 09:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uI1x8-00Gq3m-1N for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 09: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=NSiXKQ0zsk2WiHAT936kjWpxIk4tdq7aCiQ77BdDKm8=; b=ew0OVPQegfHq3kH1FKHu6A0UpR 4njBQsq/UPPCtxxwqOHz1/kzs9uzD9/rmS9AkidUmgiYA1WsP9tmlKPELPMOtE0Y6+Vt+FKFMd6ID Vli3+z088JOfNbzbj5fsCBOHL4pl0yFoXxNWm2TpD+RkWY0ZacytBNU7NujL8UapjfOc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vpci: fix handling of BAR overlaps with non-hole regions Message-Id: Date: Thu, 22 May 2025 09:11:02 +0000 commit 4acab25a9300ba69a3c1441491470bd65af52d0f Author: Roger Pau Monne AuthorDate: Mon May 12 17:05:38 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed May 21 18:29:55 2025 +0200 x86/vpci: fix handling of BAR overlaps with non-hole regions For once the message printed when a BAR overlaps with a non-hole regions is not accurate on x86. While the BAR won't be mapped by the vPCI logic, it is quite likely overlapping with a reserved region in the memory map, and already mapped as by default all reserved regions are identity mapped in the p2m. Avoid printing the warning message in modify_bars(), and instead print a more lax message in the x86 implementation of pci_check_bar() to note the current BAR position overlaps with non-hole region(s). Secondly, when an overlap is detected the BAR 'enabled' field is not set, hence other vPCI code that depends on it like vPCI MSI-X handling won't function properly, as it sees the BAR as disabled, even when memory decoding is enabled for the device and the BAR is likely mapped in the p2m. Change the handling of BARs that overlap non-hole regions to instead remove any overlapped regions from the rangeset, so the resulting ranges to map just contain the hole regions. This requires introducing a new pci_sanitize_bar_memory() that's implemented per-arch and sanitizes the address range to add to the p2m. For x86 pci_sanitize_bar_memory() removes any regions present in the host memory map, for ARM this is currently left as a dummy handler to not change existing behavior. Ultimately the above changes should fix the vPCI MSI-X handlers not working correctly when the BAR that contains the MSI-X table overlaps with a non-hole region, as then the 'enabled' BAR bit won't be set and the MSI-X traps won't handle accesses as expected. Reported-by: Stefano Stabellini Fixes: 53d9133638c3 ('pci: do not disable memory decoding for devices') Signed-off-by: Roger Pau Monné Tested-by: Victor M Lira Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/include/asm/pci.h | 3 +++ xen/arch/x86/include/asm/pci.h | 13 ++++------- xen/arch/x86/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/header.c | 9 ++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7f77226c9b..1605ec660d 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -128,6 +128,9 @@ int pci_host_bridge_mappings(struct domain *d); bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); +static inline int pci_sanitize_bar_memory(struct rangeset *r) +{ return 0; } + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index fd5480d67d..bed99437cc 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,14 +57,9 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); -static inline bool pci_check_bar(const struct pci_dev *pdev, - mfn_t start, mfn_t end) -{ - /* - * Check if BAR is not overlapping with any memory region defined - * in the memory map. - */ - return is_memory_hole(start, end); -} +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); + +struct rangeset; +int pci_sanitize_bar_memory(struct rangeset *r); #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 97b792e578..afaf9fe1c0 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -98,3 +98,53 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, return rc; } + +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + if ( !is_memory_hole(start, end) ) + gdprintk(XENLOG_WARNING, + "%pp: BAR at [%"PRI_mfn", %"PRI_mfn"] not in memory map hole\n", + &pdev->sbdf, mfn_x(start), mfn_x(end)); + + /* + * Unconditionally return true, pci_sanitize_bar_memory() will remove any + * non-hole regions. + */ + return true; +} + +/* Remove overlaps with any ranges defined in the host memory map. */ +int pci_sanitize_bar_memory(struct rangeset *r) +{ + unsigned int i; + + for ( i = 0; i < e820.nr_map; i++ ) + { + const struct e820entry *entry = &e820.map[i]; + int rc; + + if ( !entry->size ) + continue; + + rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), + PFN_UP(entry->addr + entry->size - 1)); + if ( rc ) + return rc; + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ef6c965c08..1f48f2aac6 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -394,6 +394,15 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) return rc; } } + + rc = pci_sanitize_bar_memory(bar->mem); + if ( rc ) + { + gprintk(XENLOG_WARNING, + "%pp: failed to sanitize BAR#%u memory: %d\n", + &pdev->sbdf, i, rc); + return rc; + } } /* Remove any MSIX regions if present. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 22 09:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 May 2025 09:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.993324.1376740 (Exim 4.92) (envelope-from ) id 1uI1xJ-0004Lz-KL; Thu, 22 May 2025 09:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 993324.1376740; Thu, 22 May 2025 09: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 1uI1xJ-0004Lp-Hd; Thu, 22 May 2025 09:11:13 +0000 Received: by outflank-mailman (input) for mailman id 993324; Thu, 22 May 2025 09:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI1xI-0004LZ-Ju for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 09:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uI1xI-0082Vs-2a for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 09:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uI1xI-00GqD7-1l for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 09: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=EgPNn7zTdYzI2XhtPQ5apGfUuh61XYSUOwyuINA/nFk=; b=1vAQwT6ClV8KoHDxQ0pTxQ5l1l rr1k/Si/TCAh36cmzQlxtr8oXSfZAIXEf5ZohxFKSGwd2Nx9Wozj9liGBLTywyqSXxDKghLZEcR4O iczT5MEZTROozyzA7MRD08xEPxZh6gfUf4KyvY52Xa1gGAzco7dmfNg99DI2mEhDslpo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/gnttab: do not implement GNTTABOP_cache_flush Message-Id: Date: Thu, 22 May 2025 09:11:12 +0000 commit 5642a6055c26a4000824d7d29d7ff78cdb087466 Author: Roger Pau Monne AuthorDate: Mon May 5 12:24:13 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed May 21 18:43:37 2025 +0200 x86/gnttab: do not implement GNTTABOP_cache_flush The current underlying implementation of GNTTABOP_cache_flush on x86 won't work as expected. The provided {clean,invalidate}_dcache_va_range() helpers only do a local pCPU cache flush, so the cache of previous pCPUs where the vCPU might have run are not flushed. However instead of attempting to fix this, make the GNTTABOP_cache_flush operation only available to ARM. There are no known users on x86, the implementation is broken, and other architectures don't have grant-table support yet. With that operation not implemented on x86, the related {clean,invalidate}_dcache_va_range() helpers can also be removed. Fixes: f62dc81c2df7 ("x86: introduce more cache maintenance operations") Fixes: 18e8d22fe750 ("introduce GNTTABOP_cache_flush") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-By: Oleksii Kurochko Acked-by: Julien Grall --- CHANGELOG.md | 3 +++ xen/arch/arm/Kconfig | 1 + xen/arch/x86/include/asm/flushtlb.h | 19 ------------------- xen/common/Kconfig | 3 +++ xen/common/grant_table.c | 6 ++++++ 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf2271011..ec452027f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Ability to enable stack protector ### Removed + - On x86: + - GNTTABOP_cache_flush: it's unused on x86 and the implementation is + broken. ## [4.20.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.0) - 2025-03-05 diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 3321d89068..a5aad97a68 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -17,6 +17,7 @@ config ARM select HAS_ALTERNATIVE if HAS_VMAP select HAS_DEVICE_TREE select HAS_DOM0LESS + select HAS_GRANT_CACHE_FLUSH if GRANT_TABLE select HAS_STACK_PROTECTOR select HAS_UBSAN diff --git a/xen/arch/x86/include/asm/flushtlb.h b/xen/arch/x86/include/asm/flushtlb.h index 209ea1e62f..cd625f9114 100644 --- a/xen/arch/x86/include/asm/flushtlb.h +++ b/xen/arch/x86/include/asm/flushtlb.h @@ -184,25 +184,6 @@ void flush_area_mask(const cpumask_t *mask, const void *va, } static inline void flush_page_to_ram(unsigned long mfn, bool sync_icache) {} -static inline int invalidate_dcache_va_range(const void *p, - unsigned long size) -{ return -EOPNOTSUPP; } -static inline int clean_and_invalidate_dcache_va_range(const void *p, - unsigned long size) -{ - unsigned int order = get_order_from_bytes(size); - /* sub-page granularity support needs to be added if necessary */ - flush_area_local(p, FLUSH_CACHE|FLUSH_ORDER(order)); - return 0; -} -static inline int clean_dcache_va_range(const void *p, unsigned long size) -{ - unsigned int order = get_order_from_bytes(size); - - /* sub-page granularity support needs to be added if necessary */ - flush_area_local(p, FLUSH_CACHE_WRITEBACK | FLUSH_ORDER(order)); - return 0; -} unsigned int guest_flush_tlb_flags(const struct domain *d); void guest_flush_tlb_mask(const struct domain *d, const cpumask_t *mask); diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 6d43be2e6e..3d66d09397 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -35,6 +35,9 @@ config GRANT_TABLE If unsure, say Y. +config HAS_GRANT_CACHE_FLUSH + bool + config EVTCHN_FIFO bool "Event Channel Fifo support" if EXPERT default y diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e75ff98aff..cf131c43a1 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -940,6 +940,7 @@ static void reduce_status_for_pin(struct domain *rd, gnttab_clear_flags(rd, clear_flags, status); } +#ifdef CONFIG_HAS_GRANT_CACHE_FLUSH static struct active_grant_entry *grant_map_exists(const struct domain *ld, struct grant_table *rgt, mfn_t mfn, @@ -975,6 +976,7 @@ static struct active_grant_entry *grant_map_exists(const struct domain *ld, return ERR_PTR(-EINVAL); } +#endif /* CONFIG_HAS_GRANT_CACHE_FLUSH */ union maptrack_node { struct { @@ -3520,6 +3522,7 @@ gnttab_swap_grant_ref(XEN_GUEST_HANDLE_PARAM(gnttab_swap_grant_ref_t) uop, return 0; } +#ifdef CONFIG_HAS_GRANT_CACHE_FLUSH static int _cache_flush(const gnttab_cache_flush_t *cflush, grant_ref_t *cur_ref) { struct domain *d, *owner; @@ -3631,6 +3634,7 @@ gnttab_cache_flush(XEN_GUEST_HANDLE_PARAM(gnttab_cache_flush_t) uop, return 0; } +#endif /* CONFIG_HAS_GRANT_CACHE_FLUSH */ long do_grant_table_op( unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count) @@ -3773,6 +3777,7 @@ long do_grant_table_op( break; } +#ifdef CONFIG_HAS_GRANT_CACHE_FLUSH case GNTTABOP_cache_flush: { XEN_GUEST_HANDLE_PARAM(gnttab_cache_flush_t) cflush = @@ -3789,6 +3794,7 @@ long do_grant_table_op( } break; } +#endif /* CONFIG_HAS_GRANT_CACHE_FLUSH */ default: rc = -ENOSYS; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 22 14:22:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 May 2025 14:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.994086.1377128 (Exim 4.92) (envelope-from ) id 1uI6o6-0002mF-Ke; Thu, 22 May 2025 14:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 994086.1377128; Thu, 22 May 2025 14: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 1uI6o6-0002m7-I1; Thu, 22 May 2025 14:22:02 +0000 Received: by outflank-mailman (input) for mailman id 994086; Thu, 22 May 2025 14:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI6o5-0002kg-RZ for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 14:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uI6o5-0088fl-34 for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 14:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uI6o5-001IYr-2G for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 14: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=WUoWzuiOOqm8dDxMkM4AkaTk4hWhxP8pldwrM7UGJxI=; b=tIAoSevqX7bOC09dlU8k7YrTA6 dc01Ogu6qDDlQnZdrmp/7xGQ5qsE6qdQzF6IcfGg/0D9rg8DizYuU32GSg0HzeqDfVk8z+PhHMCEZ q70YJNaREM4Q16lVANhfe5SDh4BHHYwUhZ3DboTEjiPvWQvyxsT97bD9tvovQgKWJK3s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vpci: fix off-by-one in pci_sanitize_bar_memory() Message-Id: Date: Thu, 22 May 2025 14:22:01 +0000 commit 7ab4b392b78b5ac1c7a1fb1d085637526e67521a Author: Roger Pau Monne AuthorDate: Thu May 22 15:38:34 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu May 22 16:17:12 2025 +0200 x86/vpci: fix off-by-one in pci_sanitize_bar_memory() rangeset_remove_range() uses inclusive ranges, and hence the end of the range should be calculated using PFN_DOWN(), not PFN_UP(). Fixes: 4acab25a9300 ('x86/vpci: fix handling of BAR overlaps with non-hole regions') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index afaf9fe1c0..26bb7f6a3c 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -131,7 +131,7 @@ int pci_sanitize_bar_memory(struct rangeset *r) continue; rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), - PFN_UP(entry->addr + entry->size - 1)); + PFN_DOWN(entry->addr + entry->size - 1)); if ( rc ) return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 22 15:22:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 May 2025 15:22:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.994270.1377315 (Exim 4.92) (envelope-from ) id 1uI7kA-0004Ty-IZ; Thu, 22 May 2025 15:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 994270.1377315; Thu, 22 May 2025 15: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 1uI7kA-0004Tq-Fn; Thu, 22 May 2025 15:22:02 +0000 Received: by outflank-mailman (input) for mailman id 994270; Thu, 22 May 2025 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 1uI7k9-0004Ti-ST for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 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 1uI7k9-0089pY-2M for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 15:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uI7k9-001Yfy-1Y for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 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=MmJjTePgb8SXxKDD+NuhnM/TPFJsOyPAhRTzW/bD7RY=; b=lAsonS09MmTwao9A+3+9HAT5l7 MIriaCcIQre6ZVusP7tkYNJ/dq6Rtwi7mTvWBnosM8v+A7T3/nTbJgsz9nSITw+1vpko92pejkAGE Kj3jvp6YcXyGGMXpzNw3PggGRB1I9y//F/AOo0vW318BoT0JBDf+cuOQ0x5oE35HRWRY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vpci: fix handling of BAR overlaps with non-hole regions Message-Id: Date: Thu, 22 May 2025 15:22:01 +0000 commit 4acab25a9300ba69a3c1441491470bd65af52d0f Author: Roger Pau Monne AuthorDate: Mon May 12 17:05:38 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed May 21 18:29:55 2025 +0200 x86/vpci: fix handling of BAR overlaps with non-hole regions For once the message printed when a BAR overlaps with a non-hole regions is not accurate on x86. While the BAR won't be mapped by the vPCI logic, it is quite likely overlapping with a reserved region in the memory map, and already mapped as by default all reserved regions are identity mapped in the p2m. Avoid printing the warning message in modify_bars(), and instead print a more lax message in the x86 implementation of pci_check_bar() to note the current BAR position overlaps with non-hole region(s). Secondly, when an overlap is detected the BAR 'enabled' field is not set, hence other vPCI code that depends on it like vPCI MSI-X handling won't function properly, as it sees the BAR as disabled, even when memory decoding is enabled for the device and the BAR is likely mapped in the p2m. Change the handling of BARs that overlap non-hole regions to instead remove any overlapped regions from the rangeset, so the resulting ranges to map just contain the hole regions. This requires introducing a new pci_sanitize_bar_memory() that's implemented per-arch and sanitizes the address range to add to the p2m. For x86 pci_sanitize_bar_memory() removes any regions present in the host memory map, for ARM this is currently left as a dummy handler to not change existing behavior. Ultimately the above changes should fix the vPCI MSI-X handlers not working correctly when the BAR that contains the MSI-X table overlaps with a non-hole region, as then the 'enabled' BAR bit won't be set and the MSI-X traps won't handle accesses as expected. Reported-by: Stefano Stabellini Fixes: 53d9133638c3 ('pci: do not disable memory decoding for devices') Signed-off-by: Roger Pau Monné Tested-by: Victor M Lira Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/include/asm/pci.h | 3 +++ xen/arch/x86/include/asm/pci.h | 13 ++++------- xen/arch/x86/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/header.c | 9 ++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7f77226c9b..1605ec660d 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -128,6 +128,9 @@ int pci_host_bridge_mappings(struct domain *d); bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); +static inline int pci_sanitize_bar_memory(struct rangeset *r) +{ return 0; } + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index fd5480d67d..bed99437cc 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,14 +57,9 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); -static inline bool pci_check_bar(const struct pci_dev *pdev, - mfn_t start, mfn_t end) -{ - /* - * Check if BAR is not overlapping with any memory region defined - * in the memory map. - */ - return is_memory_hole(start, end); -} +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); + +struct rangeset; +int pci_sanitize_bar_memory(struct rangeset *r); #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 97b792e578..afaf9fe1c0 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -98,3 +98,53 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, return rc; } + +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + if ( !is_memory_hole(start, end) ) + gdprintk(XENLOG_WARNING, + "%pp: BAR at [%"PRI_mfn", %"PRI_mfn"] not in memory map hole\n", + &pdev->sbdf, mfn_x(start), mfn_x(end)); + + /* + * Unconditionally return true, pci_sanitize_bar_memory() will remove any + * non-hole regions. + */ + return true; +} + +/* Remove overlaps with any ranges defined in the host memory map. */ +int pci_sanitize_bar_memory(struct rangeset *r) +{ + unsigned int i; + + for ( i = 0; i < e820.nr_map; i++ ) + { + const struct e820entry *entry = &e820.map[i]; + int rc; + + if ( !entry->size ) + continue; + + rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), + PFN_UP(entry->addr + entry->size - 1)); + if ( rc ) + return rc; + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ef6c965c08..1f48f2aac6 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -394,6 +394,15 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) return rc; } } + + rc = pci_sanitize_bar_memory(bar->mem); + if ( rc ) + { + gprintk(XENLOG_WARNING, + "%pp: failed to sanitize BAR#%u memory: %d\n", + &pdev->sbdf, i, rc); + return rc; + } } /* Remove any MSIX regions if present. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 22 15:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 May 2025 15:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.994271.1377319 (Exim 4.92) (envelope-from ) id 1uI7kK-0004Vn-KB; Thu, 22 May 2025 15:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 994271.1377319; Thu, 22 May 2025 15: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 1uI7kK-0004Vd-HL; Thu, 22 May 2025 15:22:12 +0000 Received: by outflank-mailman (input) for mailman id 994271; Thu, 22 May 2025 15:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI7kJ-0004VR-Kd for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 15:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uI7kJ-0089pn-2f for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 15:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uI7kJ-001Yhl-1r for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 15: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=FBY4Hozo4DrwT7wCHCE/Wy50hG09zvme4AYfO0qYRRA=; b=gpnzhHlvj12f+wAjoPrIAAvS+T DrZkdCdUEMAp+GZskztB+zYnkldAHL1GXoblkm8MmWu2M7q7ls0rJrOTrcn8r/X6/VuBrgTr98Rka Bo9Of8NJQP7GupSIwXRaTuftRH5Nd+XmKCW2DXgYQtcJh7CORiqrWTfRdSnMrCPDIleA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/gnttab: do not implement GNTTABOP_cache_flush Message-Id: Date: Thu, 22 May 2025 15:22:11 +0000 commit 5642a6055c26a4000824d7d29d7ff78cdb087466 Author: Roger Pau Monne AuthorDate: Mon May 5 12:24:13 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed May 21 18:43:37 2025 +0200 x86/gnttab: do not implement GNTTABOP_cache_flush The current underlying implementation of GNTTABOP_cache_flush on x86 won't work as expected. The provided {clean,invalidate}_dcache_va_range() helpers only do a local pCPU cache flush, so the cache of previous pCPUs where the vCPU might have run are not flushed. However instead of attempting to fix this, make the GNTTABOP_cache_flush operation only available to ARM. There are no known users on x86, the implementation is broken, and other architectures don't have grant-table support yet. With that operation not implemented on x86, the related {clean,invalidate}_dcache_va_range() helpers can also be removed. Fixes: f62dc81c2df7 ("x86: introduce more cache maintenance operations") Fixes: 18e8d22fe750 ("introduce GNTTABOP_cache_flush") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-By: Oleksii Kurochko Acked-by: Julien Grall --- CHANGELOG.md | 3 +++ xen/arch/arm/Kconfig | 1 + xen/arch/x86/include/asm/flushtlb.h | 19 ------------------- xen/common/Kconfig | 3 +++ xen/common/grant_table.c | 6 ++++++ 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf2271011..ec452027f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Ability to enable stack protector ### Removed + - On x86: + - GNTTABOP_cache_flush: it's unused on x86 and the implementation is + broken. ## [4.20.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.0) - 2025-03-05 diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 3321d89068..a5aad97a68 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -17,6 +17,7 @@ config ARM select HAS_ALTERNATIVE if HAS_VMAP select HAS_DEVICE_TREE select HAS_DOM0LESS + select HAS_GRANT_CACHE_FLUSH if GRANT_TABLE select HAS_STACK_PROTECTOR select HAS_UBSAN diff --git a/xen/arch/x86/include/asm/flushtlb.h b/xen/arch/x86/include/asm/flushtlb.h index 209ea1e62f..cd625f9114 100644 --- a/xen/arch/x86/include/asm/flushtlb.h +++ b/xen/arch/x86/include/asm/flushtlb.h @@ -184,25 +184,6 @@ void flush_area_mask(const cpumask_t *mask, const void *va, } static inline void flush_page_to_ram(unsigned long mfn, bool sync_icache) {} -static inline int invalidate_dcache_va_range(const void *p, - unsigned long size) -{ return -EOPNOTSUPP; } -static inline int clean_and_invalidate_dcache_va_range(const void *p, - unsigned long size) -{ - unsigned int order = get_order_from_bytes(size); - /* sub-page granularity support needs to be added if necessary */ - flush_area_local(p, FLUSH_CACHE|FLUSH_ORDER(order)); - return 0; -} -static inline int clean_dcache_va_range(const void *p, unsigned long size) -{ - unsigned int order = get_order_from_bytes(size); - - /* sub-page granularity support needs to be added if necessary */ - flush_area_local(p, FLUSH_CACHE_WRITEBACK | FLUSH_ORDER(order)); - return 0; -} unsigned int guest_flush_tlb_flags(const struct domain *d); void guest_flush_tlb_mask(const struct domain *d, const cpumask_t *mask); diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 6d43be2e6e..3d66d09397 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -35,6 +35,9 @@ config GRANT_TABLE If unsure, say Y. +config HAS_GRANT_CACHE_FLUSH + bool + config EVTCHN_FIFO bool "Event Channel Fifo support" if EXPERT default y diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e75ff98aff..cf131c43a1 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -940,6 +940,7 @@ static void reduce_status_for_pin(struct domain *rd, gnttab_clear_flags(rd, clear_flags, status); } +#ifdef CONFIG_HAS_GRANT_CACHE_FLUSH static struct active_grant_entry *grant_map_exists(const struct domain *ld, struct grant_table *rgt, mfn_t mfn, @@ -975,6 +976,7 @@ static struct active_grant_entry *grant_map_exists(const struct domain *ld, return ERR_PTR(-EINVAL); } +#endif /* CONFIG_HAS_GRANT_CACHE_FLUSH */ union maptrack_node { struct { @@ -3520,6 +3522,7 @@ gnttab_swap_grant_ref(XEN_GUEST_HANDLE_PARAM(gnttab_swap_grant_ref_t) uop, return 0; } +#ifdef CONFIG_HAS_GRANT_CACHE_FLUSH static int _cache_flush(const gnttab_cache_flush_t *cflush, grant_ref_t *cur_ref) { struct domain *d, *owner; @@ -3631,6 +3634,7 @@ gnttab_cache_flush(XEN_GUEST_HANDLE_PARAM(gnttab_cache_flush_t) uop, return 0; } +#endif /* CONFIG_HAS_GRANT_CACHE_FLUSH */ long do_grant_table_op( unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count) @@ -3773,6 +3777,7 @@ long do_grant_table_op( break; } +#ifdef CONFIG_HAS_GRANT_CACHE_FLUSH case GNTTABOP_cache_flush: { XEN_GUEST_HANDLE_PARAM(gnttab_cache_flush_t) cflush = @@ -3789,6 +3794,7 @@ long do_grant_table_op( } break; } +#endif /* CONFIG_HAS_GRANT_CACHE_FLUSH */ default: rc = -ENOSYS; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 22 15:22:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 May 2025 15:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.994272.1377323 (Exim 4.92) (envelope-from ) id 1uI7kU-0004Y5-LT; Thu, 22 May 2025 15:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 994272.1377323; Thu, 22 May 2025 15: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 1uI7kU-0004Xx-Ij; Thu, 22 May 2025 15:22:22 +0000 Received: by outflank-mailman (input) for mailman id 994272; Thu, 22 May 2025 15:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI7kT-0004Xn-NT for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 15:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uI7kT-0089qB-2w for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 15:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uI7kT-001Yjd-28 for xen-changelog@lists.xenproject.org; Thu, 22 May 2025 15:22: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=d41BhrSeZin998hWNGvAKUiU9mTQuoqFuci1sNTNRkc=; b=nMgPbHhOCb3SwJb4SvwNUGi6Fu gn82Te9wGuzLhNdRKFueztuz6Eiv6cEfbmvnZF7Jj22KlLyfLcP+r8AcE3jKQulGQaRbb9+HXZXnk 7IVxr/epLQDQk19vDkMNmlJ4492FoNxa6ewTMzMGfhTErlaIWJlST9GlMTMR1ioX9Dcg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vpci: fix off-by-one in pci_sanitize_bar_memory() Message-Id: Date: Thu, 22 May 2025 15:22:21 +0000 commit 7ab4b392b78b5ac1c7a1fb1d085637526e67521a Author: Roger Pau Monne AuthorDate: Thu May 22 15:38:34 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu May 22 16:17:12 2025 +0200 x86/vpci: fix off-by-one in pci_sanitize_bar_memory() rangeset_remove_range() uses inclusive ranges, and hence the end of the range should be calculated using PFN_DOWN(), not PFN_UP(). Fixes: 4acab25a9300 ('x86/vpci: fix handling of BAR overlaps with non-hole regions') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index afaf9fe1c0..26bb7f6a3c 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -131,7 +131,7 @@ int pci_sanitize_bar_memory(struct rangeset *r) continue; rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), - PFN_UP(entry->addr + entry->size - 1)); + PFN_DOWN(entry->addr + entry->size - 1)); if ( rc ) return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 23 08:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 May 2025 08:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.995372.1377818 (Exim 4.92) (envelope-from ) id 1uINUd-0001yC-RP; Fri, 23 May 2025 08:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 995372.1377818; Fri, 23 May 2025 08: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 1uINUd-0001y4-Ol; Fri, 23 May 2025 08:11:03 +0000 Received: by outflank-mailman (input) for mailman id 995372; Fri, 23 May 2025 08:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uINUb-0001xy-TF for xen-changelog@lists.xenproject.org; Fri, 23 May 2025 08:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uINUc-00AAxn-09 for xen-changelog@lists.xenproject.org; Fri, 23 May 2025 08:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uINUb-009122-2Z for xen-changelog@lists.xenproject.org; Fri, 23 May 2025 08: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=BXrvae1RepRp0XrulXgxtmxkBJckcl2ody3dDe7Jd+8=; b=2iPpmnTFu/0vUtV2ZElm3k9jld r50e0QCCPzJiI/dh2SJlMypV20LW8voRTm2I7vBmnkvic3tlJYSRInQEv/hzqdcIwUIa2LlYEA1jm ImbSYQmeryZ6DNXmykhjFF84JQUG66gJsbL9Tvp8lbu1UNA0+skRzSz8yJYgjO+Ksocc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: remove smp_mb() ahead of IPI dispatch Message-Id: Date: Fri, 23 May 2025 08:11:01 +0000 commit 6fec8fa1b57b4db88781f26bd2f084be5c4edd6a Author: Roger Pau Monne AuthorDate: Thu May 22 09:23:33 2025 +0200 Commit: Roger Pau Monne CommitDate: Fri May 23 09:45:20 2025 +0200 x86/traps: remove smp_mb() ahead of IPI dispatch The IPI dispatch functions already have the required barriers to ensure correct memory ordering. Note other callers of send_IPI_mask() don't use any barriers. No functional change intended. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c94779b4ad..22f2062932 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -785,8 +785,6 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) cpumask_andnot(&show_state_mask, &cpu_online_map, cpumask_of(smp_processor_id())); set_nmi_callback(nmi_show_execution_state); - /* Ensure new callback is set before sending out the NMI. */ - smp_wmb(); smp_send_nmi_allbutself(); /* Wait at most 10ms for some other CPU to respond. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 23 09:22:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 May 2025 09:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.995491.1377865 (Exim 4.92) (envelope-from ) id 1uIObL-0004NX-Hn; Fri, 23 May 2025 09:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 995491.1377865; Fri, 23 May 2025 09: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 1uIObL-0004NP-FC; Fri, 23 May 2025 09:22:03 +0000 Received: by outflank-mailman (input) for mailman id 995491; Fri, 23 May 2025 09:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uIObK-0004NH-04 for xen-changelog@lists.xenproject.org; Fri, 23 May 2025 09:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uIObK-00ACRe-06 for xen-changelog@lists.xenproject.org; Fri, 23 May 2025 09:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uIObJ-00A0VQ-2J for xen-changelog@lists.xenproject.org; Fri, 23 May 2025 09: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=GSlBWejgxO02U7McZHqInjIehy0WQkG6zy5wv81H9ho=; b=Det3iiP1Zfshh9bGmhAphOmpjl HEx9QfY+Y1D3oPsaVzERWbZjiOT9QGLHvxPvUFSIOPk9Kiy58056axQq6KJatKC+efpE1nR0L7Txv 9GcELY+vVS0QfPK3Kcj/O7j7+fzt3224kKvVd+/TtBIRzBx4CoNRqZeYeYcFvcuJWNMY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: remove smp_mb() ahead of IPI dispatch Message-Id: Date: Fri, 23 May 2025 09:22:01 +0000 commit 6fec8fa1b57b4db88781f26bd2f084be5c4edd6a Author: Roger Pau Monne AuthorDate: Thu May 22 09:23:33 2025 +0200 Commit: Roger Pau Monne CommitDate: Fri May 23 09:45:20 2025 +0200 x86/traps: remove smp_mb() ahead of IPI dispatch The IPI dispatch functions already have the required barriers to ensure correct memory ordering. Note other callers of send_IPI_mask() don't use any barriers. No functional change intended. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c94779b4ad..22f2062932 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -785,8 +785,6 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) cpumask_andnot(&show_state_mask, &cpu_online_map, cpumask_of(smp_processor_id())); set_nmi_callback(nmi_show_execution_state); - /* Ensure new callback is set before sending out the NMI. */ - smp_wmb(); smp_send_nmi_allbutself(); /* Wait at most 10ms for some other CPU to respond. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 26 18:33:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 May 2025 18:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.997724.1378537 (Exim 4.92) (envelope-from ) id 1uJcdD-0006zm-D8; Mon, 26 May 2025 18:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 997724.1378537; Mon, 26 May 2025 18: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 1uJcdD-0006za-9O; Mon, 26 May 2025 18:33:03 +0000 Received: by outflank-mailman (input) for mailman id 997724; Mon, 26 May 2025 18:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJcdC-0006zU-EG for xen-changelog@lists.xenproject.org; Mon, 26 May 2025 18:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJcdC-003Tf4-0m for xen-changelog@lists.xenproject.org; Mon, 26 May 2025 18:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJcdC-00HU7w-0b for xen-changelog@lists.xenproject.org; Mon, 26 May 2025 18: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=Rxrwbg6DuZUbVLfcGwQWEckkzj0tfbGKV1dnLM5PvWs=; b=lNVzxGv45GKT/PKikuPvOZZ+6l 8jxChzvElO949oXlinc5GIV8ogVJe4/P/MjySoXdWYPneLMTQxK30uDu2MYwC22EEP4l99VQ1f92M Q/tqdmDh/o9lo/Wo1KurjsIE+Ddd7qo0BLF66TvNfoCFFSkpGjkEuiq12jfQ8psPD0Ss=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/stubs: Consolidate the stubs infrastructure in asm/stubs.h Message-Id: Date: Mon, 26 May 2025 18:33:02 +0000 commit 6cfe3ae346fc84fbd4380fc45c70780935da590a Author: Andrew Cooper AuthorDate: Mon May 5 18:34:49 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 26 19:02:11 2025 +0100 x86/stubs: Consolidate the stubs infrastructure in asm/stubs.h Very few files need the stubs. Move the infrastructure out of processor.h and config.h into a new stubs.h, and adjust the includes accordingly. Make the per-cpu struct stubs be read mostly; they're unmodified during the uptime of the CPU, and move them into smpboot.c seeing as that's where they're allocated and freed. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/alternative.c | 1 + xen/arch/x86/extable.c | 8 +++++--- xen/arch/x86/hvm/vmx/vmx.c | 1 + xen/arch/x86/include/asm/config.h | 5 ----- xen/arch/x86/include/asm/processor.h | 11 ----------- xen/arch/x86/include/asm/stubs.h | 37 ++++++++++++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 1 + xen/arch/x86/setup.c | 1 + xen/arch/x86/smpboot.c | 3 +++ xen/arch/x86/x86_64/traps.c | 3 +-- xen/arch/x86/x86_emulate/private.h | 2 ++ 11 files changed, 52 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index ecc56964bd..d4fe56b3da 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index de39202452..5f5103179a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -1,16 +1,18 @@ +#include #include #include +#include #include #include #include #include -#include -#include #include -#include #include +#include +#include + #define EX_FIELD(ptr, field) ((unsigned long)&(ptr)->field + (ptr)->field) static inline unsigned long ex_addr(const struct exception_table_entry *x) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 827db6bdd8..c2262c5848 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -48,6 +48,7 @@ #include #include #include +#include #include static bool __initdata opt_force_ept; diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/config.h index f0123a7de9..3553bf89dc 100644 --- a/xen/arch/x86/include/asm/config.h +++ b/xen/arch/x86/include/asm/config.h @@ -49,11 +49,6 @@ /* Primary shadow stack is slot 5 of 8, immediately under the primary stack. */ #define PRIMARY_SHSTK_SLOT 5 -/* Total size of syscall and emulation stubs. */ -#define STUB_BUF_SHIFT (L1_CACHE_SHIFT > 7 ? L1_CACHE_SHIFT : 7) -#define STUB_BUF_SIZE (1 << STUB_BUF_SHIFT) -#define STUBS_PER_PAGE (PAGE_SIZE / STUB_BUF_SIZE) - /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index eacd425c53..1820e04a32 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -424,17 +424,6 @@ static inline void enable_nmis(void) void nocall sysenter_entry(void); -struct stubs { - union { - void(*func)(void); - unsigned long addr; - }; - unsigned long mfn; -}; - -DECLARE_PER_CPU(struct stubs, stubs); -unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); - static inline uint8_t get_cpu_family(uint32_t raw, uint8_t *model, uint8_t *stepping) { diff --git a/xen/arch/x86/include/asm/stubs.h b/xen/arch/x86/include/asm/stubs.h new file mode 100644 index 0000000000..a520928e9a --- /dev/null +++ b/xen/arch/x86/include/asm/stubs.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_ASM_STUBS_H +#define X86_ASM_STUBS_H + +/* + * Xen has several per-cpu executable stubs which are written dynamically. + * These are: + * + * - The SYSCALL entry stubs, LSTAR and CSTAR. These are written on boot, and + * are responsible for moving back onto Xen's stack. + * + * - The emulation stub. This is used to replay an instruction or sequence + * which trapped for emulation. + * + * The stubs have an executable alias in l2_xenmap[] (i.e. within 1G of the + * rest of .text), and are written via map_domain_page(). + */ + +#include + +/* Total size of syscall and emulation stubs. */ +#define STUB_BUF_SHIFT (L1_CACHE_SHIFT > 7 ? L1_CACHE_SHIFT : 7) +#define STUB_BUF_SIZE (1 << STUB_BUF_SHIFT) +#define STUBS_PER_PAGE (PAGE_SIZE / STUB_BUF_SIZE) + +struct stubs { + union { + void (*func)(void); + unsigned long addr; + }; + unsigned long mfn; +}; + +DECLARE_PER_CPU(struct stubs, stubs); +unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); + +#endif /* X86_ASM_STUBS_H */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 20a90703c8..463befe043 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2518954124..1f5cb67bd0 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 0189d6c332..41fe67d43c 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +58,8 @@ static cpumask_t scratch_cpu0mask; DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, send_ipi_cpumask); static cpumask_t send_ipi_cpu0mask; +DEFINE_PER_CPU_READ_MOSTLY(struct stubs, stubs); + cpumask_t cpu_online_map __read_mostly; EXPORT_SYMBOL(cpu_online_map); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 23622cdb14..c77f304bb0 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -21,6 +21,7 @@ #include #include #include +#include #include struct extra_state @@ -357,8 +358,6 @@ static unsigned int write_stub_trampoline( return ROUNDUP(p - stub, 16); } -DEFINE_PER_CPU(struct stubs, stubs); - void nocall lstar_enter(void); void nocall cstar_enter(void); diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 467bce3c84..f6130c7cf5 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -13,8 +13,10 @@ # include # include + # include # include +# include # include # include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 26 19:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 May 2025 19:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.997766.1378580 (Exim 4.92) (envelope-from ) id 1uJdDy-0005b6-Sa; Mon, 26 May 2025 19:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 997766.1378580; Mon, 26 May 2025 19: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 1uJdDy-0005az-Pu; Mon, 26 May 2025 19:11:02 +0000 Received: by outflank-mailman (input) for mailman id 997766; Mon, 26 May 2025 19:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJdDx-0005at-Qp for xen-changelog@lists.xenproject.org; Mon, 26 May 2025 19:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJdDx-003UNF-1X for xen-changelog@lists.xenproject.org; Mon, 26 May 2025 19:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJdDx-000pBh-1L for xen-changelog@lists.xenproject.org; Mon, 26 May 2025 19: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=yvLUBmuB5RUheo5Hw7zh5QxZ0RbZLZdeasT/ZPG/tXw=; b=28IwjqUv59lWrgEfxy6c/tRVqH 2UmFflIYV+sHqVzcurQhW9MxsOyEjspmNMJ7jjM14ZT2Vf1yK5jedG/5cA9FnbWNZYmgP/j2bK1rj OucGekPA7NVGZozlKJVEpkzeXSvz0osGF89EBJJGu/2cztHc2Y/mcEtIKAFc24bOTUUY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/stubs: Consolidate the stubs infrastructure in asm/stubs.h Message-Id: Date: Mon, 26 May 2025 19:11:01 +0000 commit 6cfe3ae346fc84fbd4380fc45c70780935da590a Author: Andrew Cooper AuthorDate: Mon May 5 18:34:49 2025 +0100 Commit: Andrew Cooper CommitDate: Mon May 26 19:02:11 2025 +0100 x86/stubs: Consolidate the stubs infrastructure in asm/stubs.h Very few files need the stubs. Move the infrastructure out of processor.h and config.h into a new stubs.h, and adjust the includes accordingly. Make the per-cpu struct stubs be read mostly; they're unmodified during the uptime of the CPU, and move them into smpboot.c seeing as that's where they're allocated and freed. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/alternative.c | 1 + xen/arch/x86/extable.c | 8 +++++--- xen/arch/x86/hvm/vmx/vmx.c | 1 + xen/arch/x86/include/asm/config.h | 5 ----- xen/arch/x86/include/asm/processor.h | 11 ----------- xen/arch/x86/include/asm/stubs.h | 37 ++++++++++++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 1 + xen/arch/x86/setup.c | 1 + xen/arch/x86/smpboot.c | 3 +++ xen/arch/x86/x86_64/traps.c | 3 +-- xen/arch/x86/x86_emulate/private.h | 2 ++ 11 files changed, 52 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index ecc56964bd..d4fe56b3da 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index de39202452..5f5103179a 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -1,16 +1,18 @@ +#include #include #include +#include #include #include #include #include -#include -#include #include -#include #include +#include +#include + #define EX_FIELD(ptr, field) ((unsigned long)&(ptr)->field + (ptr)->field) static inline unsigned long ex_addr(const struct exception_table_entry *x) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 827db6bdd8..c2262c5848 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -48,6 +48,7 @@ #include #include #include +#include #include static bool __initdata opt_force_ept; diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/config.h index f0123a7de9..3553bf89dc 100644 --- a/xen/arch/x86/include/asm/config.h +++ b/xen/arch/x86/include/asm/config.h @@ -49,11 +49,6 @@ /* Primary shadow stack is slot 5 of 8, immediately under the primary stack. */ #define PRIMARY_SHSTK_SLOT 5 -/* Total size of syscall and emulation stubs. */ -#define STUB_BUF_SHIFT (L1_CACHE_SHIFT > 7 ? L1_CACHE_SHIFT : 7) -#define STUB_BUF_SIZE (1 << STUB_BUF_SHIFT) -#define STUBS_PER_PAGE (PAGE_SIZE / STUB_BUF_SIZE) - /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index eacd425c53..1820e04a32 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -424,17 +424,6 @@ static inline void enable_nmis(void) void nocall sysenter_entry(void); -struct stubs { - union { - void(*func)(void); - unsigned long addr; - }; - unsigned long mfn; -}; - -DECLARE_PER_CPU(struct stubs, stubs); -unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); - static inline uint8_t get_cpu_family(uint32_t raw, uint8_t *model, uint8_t *stepping) { diff --git a/xen/arch/x86/include/asm/stubs.h b/xen/arch/x86/include/asm/stubs.h new file mode 100644 index 0000000000..a520928e9a --- /dev/null +++ b/xen/arch/x86/include/asm/stubs.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_ASM_STUBS_H +#define X86_ASM_STUBS_H + +/* + * Xen has several per-cpu executable stubs which are written dynamically. + * These are: + * + * - The SYSCALL entry stubs, LSTAR and CSTAR. These are written on boot, and + * are responsible for moving back onto Xen's stack. + * + * - The emulation stub. This is used to replay an instruction or sequence + * which trapped for emulation. + * + * The stubs have an executable alias in l2_xenmap[] (i.e. within 1G of the + * rest of .text), and are written via map_domain_page(). + */ + +#include + +/* Total size of syscall and emulation stubs. */ +#define STUB_BUF_SHIFT (L1_CACHE_SHIFT > 7 ? L1_CACHE_SHIFT : 7) +#define STUB_BUF_SIZE (1 << STUB_BUF_SHIFT) +#define STUBS_PER_PAGE (PAGE_SIZE / STUB_BUF_SIZE) + +struct stubs { + union { + void (*func)(void); + unsigned long addr; + }; + unsigned long mfn; +}; + +DECLARE_PER_CPU(struct stubs, stubs); +unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); + +#endif /* X86_ASM_STUBS_H */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 20a90703c8..463befe043 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2518954124..1f5cb67bd0 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 0189d6c332..41fe67d43c 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +58,8 @@ static cpumask_t scratch_cpu0mask; DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, send_ipi_cpumask); static cpumask_t send_ipi_cpu0mask; +DEFINE_PER_CPU_READ_MOSTLY(struct stubs, stubs); + cpumask_t cpu_online_map __read_mostly; EXPORT_SYMBOL(cpu_online_map); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 23622cdb14..c77f304bb0 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -21,6 +21,7 @@ #include #include #include +#include #include struct extra_state @@ -357,8 +358,6 @@ static unsigned int write_stub_trampoline( return ROUNDUP(p - stub, 16); } -DEFINE_PER_CPU(struct stubs, stubs); - void nocall lstar_enter(void); void nocall cstar_enter(void); diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 467bce3c84..f6130c7cf5 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -13,8 +13,10 @@ # include # include + # include # include +# include # include # include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 09:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 09:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998211.1378985 (Exim 4.92) (envelope-from ) id 1uJqqp-0003Dh-II; Tue, 27 May 2025 09:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998211.1378985; Tue, 27 May 2025 09: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 1uJqqp-0003DY-FO; Tue, 27 May 2025 09:44:03 +0000 Received: by outflank-mailman (input) for mailman id 998211; Tue, 27 May 2025 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 1uJqqo-0003DQ-0n for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 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 1uJqqn-004yol-2t for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 09:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJqqn-004BJ8-2j for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 09: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=qpk55dvTqbXGr1v+EI4I6Xkb4ih6qVb/tINolpU7kBY=; b=mc/+6v1MZ3GWPjC7KSG+diu+qq 6H+cOsxpVJBFcFRPPTvxyYsYckjRdkBjw3XBDnaE4zcdSGVm2PTXO2SuA1bftkoKnkbAiNWgs2hfG ckH2Jvn/Q4w72NAzpefFCU8wuQjkRWhyPxhxA6t2Lt33uZsm2QKyGOWzASJTEf25ti/Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: print CPU and APIC ID in bring up failure Message-Id: Date: Tue, 27 May 2025 09:44:01 +0000 commit f8ffcf1d1043edf3e220d39d406a7c3c66628637 Author: Roger Pau Monne AuthorDate: Wed May 21 17:28:47 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 27 09:11:37 2025 +0200 x86/boot: print CPU and APIC ID in bring up failure Print the CPU and APIC ID that fails to respond to the init sequence, or that didn't manage to reach the "callin" state. Expand a bit the printed error messages. Otherwise the "Not responding." message is not easy to understand by users. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/smpboot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 41fe67d43c..adcaec6899 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -621,10 +621,12 @@ static int do_boot_cpu(int apicid, int cpu) smp_mb(); if ( bootsym(trampoline_cpu_started) == 0xA5 ) /* trampoline started but...? */ - printk("Stuck ??\n"); + printk("APIC ID %#x (CPU%u) didn't finish start sequence\n", + apicid, cpu); else /* trampoline code not run */ - printk("Not responding.\n"); + printk("APIC ID %#x (CPU%u) didn't respond to SIPI\n", + apicid, cpu); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 09:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 09:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998212.1378989 (Exim 4.92) (envelope-from ) id 1uJqqz-0003FU-Je; Tue, 27 May 2025 09:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998212.1378989; Tue, 27 May 2025 09: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 1uJqqz-0003FM-Gl; Tue, 27 May 2025 09:44:13 +0000 Received: by outflank-mailman (input) for mailman id 998212; Tue, 27 May 2025 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 1uJqqy-0003F8-0i for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 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 1uJqqx-004yor-3C for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 09:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJqqx-004BbE-34 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 09: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=iesxTE9ogY9Con9UrB0bLENioHaDzEsyevIH5mJMSQU=; b=P5uBOm9OKPCZSedIOdjHxceQwq mvOGusXvwYKf077zh2gfYf4aPFMPxo+9SbGwKQdu02Dm9WvSxulLqNoVW3AQQxppHpUdhrEQG0jAa 5CgoT3g2AmuORXqOEsglrdGmfHvv0vLJ0h8eDDo9KUaRKut6Ouvi/CZCwO6TYVluPaqs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: split code to dump execution state to a separate helper Message-Id: Date: Tue, 27 May 2025 09:44:11 +0000 commit 3368f3d6923216065661af5bed89b54f1ba180c9 Author: Roger Pau Monne AuthorDate: Thu May 22 09:30:15 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 27 09:11:37 2025 +0200 x86/traps: split code to dump execution state to a separate helper Split the code that triggers remote CPUs to dump stacks into a separate function. Also introduce a parameter that can be set by the caller of the newly introduced function to force CPUs to dump the full stack, rather than just dumping the current function name. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/include/asm/processor.h | 1 + xen/arch/x86/traps.c | 63 +++++++++++++++++++++++------------- 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 1820e04a32..96b9bf5f5e 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -371,6 +371,7 @@ void show_registers(const struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); void noreturn fatal_trap(const struct cpu_user_regs *regs, bool show_remote); +void show_execution_state_nmi(const cpumask_t *mask, bool show_all); extern void mtrr_ap_init(void); extern void mtrr_bp_init(void); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 22f2062932..559bb1d202 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -734,6 +734,43 @@ static int cf_check nmi_show_execution_state( return 1; } +void show_execution_state_nmi(const cpumask_t *mask, bool show_all) +{ + unsigned int msecs, pending; + + /* + * Overwrite the global variable, caller is expected to panic after having + * dumped the execution state. + */ + if ( show_all ) + opt_show_all = true; + + watchdog_disable(); + console_start_sync(); + + cpumask_copy(&show_state_mask, mask); + set_nmi_callback(nmi_show_execution_state); + send_IPI_mask(mask, APIC_DM_NMI); + + /* Wait at most 10ms for some other CPU to respond. */ + msecs = 10; + pending = cpumask_weight(&show_state_mask); + while ( pending && msecs-- ) + { + unsigned int left; + + mdelay(1); + left = cpumask_weight(&show_state_mask); + if ( left < pending ) + { + pending = left; + msecs = 10; + } + } + if ( pending ) + printk("Non-responding CPUs: {%*pbl}\n", CPUMASK_PR(&show_state_mask)); +} + const char *vector_name(unsigned int vec) { static const char names[][4] = { @@ -780,31 +817,11 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) if ( show_remote ) { - unsigned int msecs, pending; + cpumask_t *scratch = this_cpu(scratch_cpumask); - cpumask_andnot(&show_state_mask, &cpu_online_map, + cpumask_andnot(scratch, &cpu_online_map, cpumask_of(smp_processor_id())); - set_nmi_callback(nmi_show_execution_state); - smp_send_nmi_allbutself(); - - /* Wait at most 10ms for some other CPU to respond. */ - msecs = 10; - pending = cpumask_weight(&show_state_mask); - while ( pending && msecs-- ) - { - unsigned int left; - - mdelay(1); - left = cpumask_weight(&show_state_mask); - if ( left < pending ) - { - pending = left; - msecs = 10; - } - } - if ( pending ) - printk("Non-responding CPUs: {%*pbl}\n", - CPUMASK_PR(&show_state_mask)); + show_execution_state_nmi(scratch, false); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 09:44:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 09:44:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998213.1378992 (Exim 4.92) (envelope-from ) id 1uJqr8-0003Hr-Ke; Tue, 27 May 2025 09:44:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998213.1378992; Tue, 27 May 2025 09:44: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 1uJqr8-0003Hk-I8; Tue, 27 May 2025 09:44:22 +0000 Received: by outflank-mailman (input) for mailman id 998213; Tue, 27 May 2025 09:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJqr8-0003He-41 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 09:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJqr8-004yoz-0I for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 09:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJqr8-004Bv9-08 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 09: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=MG3pNdgGrf5VooDXNbwoVLtcTub6mMiFmJLa9VH8VBs=; b=xrAByOxGmXiHgF0N8v/GVqsE// 1wWnQUEFGAmI3Tfm0py3lq+qlBhhji7Ul+GmkagkrdX7DY/2HVQpDeW78rIZg2x1/ILB2NwXoDD3i VKbak384tWqUU/g7cJTAWuiG6DTo2NBnzfkRFdL8yt6Kclze8OJvMcv2kHUCJRBL89/4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: attempt to print trace and panic on AP bring up stall Message-Id: Date: Tue, 27 May 2025 09:44:22 +0000 commit a3a607f33f81c3ce3e3e0eaa2fe97d263278b464 Author: Roger Pau Monne AuthorDate: Mon Apr 14 15:57:55 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 27 09:11:37 2025 +0200 x86/boot: attempt to print trace and panic on AP bring up stall With the current AP bring up code, Xen can get stuck indefinitely if an AP freezes during boot after the 'callin' step. Introduce a 5s timeout while waiting for APs to finish startup. On failure of an AP to complete startup, send an NMI to trigger the printing of a stack backtrace on the stuck AP and panic on the BSP. This patch was done while investigating the issue caused by Intel erratum ICX143. It wasn't helpful in that case, but it's still and improvement when debugging AP bring up related issues. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/smpboot.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index adcaec6899..a90caf45a5 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1375,6 +1375,7 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) int __cpu_up(unsigned int cpu) { int apicid, ret; + s_time_t start; if ( (apicid = x86_cpu_to_apicid[cpu]) == BAD_APICID ) return -ENODEV; @@ -1393,10 +1394,18 @@ int __cpu_up(unsigned int cpu) time_latch_stamps(); set_cpu_state(CPU_STATE_ONLINE); + start = NOW(); while ( !cpu_online(cpu) ) { cpu_relax(); process_pending_softirqs(); + if ( (NOW() - start) > SECONDS(5) ) + { + /* AP is stuck, send NMI and panic. */ + show_execution_state_nmi(cpumask_of(cpu), true); + panic("APIC ID %#x (CPU%u) stuck while starting up\n", + apicid, cpu); + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 10:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 10:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998244.1379017 (Exim 4.92) (envelope-from ) id 1uJrcF-0003zQ-BR; Tue, 27 May 2025 10:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998244.1379017; Tue, 27 May 2025 10: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 1uJrcF-0003zI-7t; Tue, 27 May 2025 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 998244; Tue, 27 May 2025 10:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJrcE-0003zC-Aj for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJrcE-004znX-0F for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJrcE-005PS9-05 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10: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=JeTXt8Mj5q1d9GoZ6+AklTfRNo3uJf4G9iyZ2kGA1c0=; b=CkQAd6pVIXR60N/6BoShlkMKc6 ijChbLzWGciNhzkGHBX1jFsEXiy23mg0st//O/fvPU8nOx5uAvjNPqY/6ghbcLLhP80e+WiAad7yi /oM/D/QrOcj7Ze36Kevit/GPSDbZI5nDRWEJVTtPkKImw3OlWvgjbvJF7fiSbzAunGEo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: print CPU and APIC ID in bring up failure Message-Id: Date: Tue, 27 May 2025 10:33:02 +0000 commit f8ffcf1d1043edf3e220d39d406a7c3c66628637 Author: Roger Pau Monne AuthorDate: Wed May 21 17:28:47 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 27 09:11:37 2025 +0200 x86/boot: print CPU and APIC ID in bring up failure Print the CPU and APIC ID that fails to respond to the init sequence, or that didn't manage to reach the "callin" state. Expand a bit the printed error messages. Otherwise the "Not responding." message is not easy to understand by users. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/smpboot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 41fe67d43c..adcaec6899 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -621,10 +621,12 @@ static int do_boot_cpu(int apicid, int cpu) smp_mb(); if ( bootsym(trampoline_cpu_started) == 0xA5 ) /* trampoline started but...? */ - printk("Stuck ??\n"); + printk("APIC ID %#x (CPU%u) didn't finish start sequence\n", + apicid, cpu); else /* trampoline code not run */ - printk("Not responding.\n"); + printk("APIC ID %#x (CPU%u) didn't respond to SIPI\n", + apicid, cpu); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 10:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 10:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998245.1379021 (Exim 4.92) (envelope-from ) id 1uJrcP-00041M-C1; Tue, 27 May 2025 10:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998245.1379021; Tue, 27 May 2025 10: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 1uJrcP-00041E-9F; Tue, 27 May 2025 10:33:13 +0000 Received: by outflank-mailman (input) for mailman id 998245; Tue, 27 May 2025 10:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJrcO-000414-6c for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJrcO-004znc-0X for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJrcO-005Pbw-0Q for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10: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=Gb2S0hG8lqcA95+sQdCzojHFavskaPOSpPZSh1Qj/wU=; b=ajcypepj1wElIc4EJiob2nrtFP cgIbkjhluSNsOUaBGdeWB/wEr8THOPqIuITx0qY1l8zAG7zGqx3RMteFDDjtEYWFh2+WIyvqvEgXW rqCmRR3D8FQu/OsgxqlAykkqMR6tA8UuWNr+BxPF3n4R3BTLfctWGkb969D0Bi3Mbd3U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: split code to dump execution state to a separate helper Message-Id: Date: Tue, 27 May 2025 10:33:12 +0000 commit 3368f3d6923216065661af5bed89b54f1ba180c9 Author: Roger Pau Monne AuthorDate: Thu May 22 09:30:15 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 27 09:11:37 2025 +0200 x86/traps: split code to dump execution state to a separate helper Split the code that triggers remote CPUs to dump stacks into a separate function. Also introduce a parameter that can be set by the caller of the newly introduced function to force CPUs to dump the full stack, rather than just dumping the current function name. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/include/asm/processor.h | 1 + xen/arch/x86/traps.c | 63 +++++++++++++++++++++++------------- 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 1820e04a32..96b9bf5f5e 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -371,6 +371,7 @@ void show_registers(const struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); void noreturn fatal_trap(const struct cpu_user_regs *regs, bool show_remote); +void show_execution_state_nmi(const cpumask_t *mask, bool show_all); extern void mtrr_ap_init(void); extern void mtrr_bp_init(void); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 22f2062932..559bb1d202 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -734,6 +734,43 @@ static int cf_check nmi_show_execution_state( return 1; } +void show_execution_state_nmi(const cpumask_t *mask, bool show_all) +{ + unsigned int msecs, pending; + + /* + * Overwrite the global variable, caller is expected to panic after having + * dumped the execution state. + */ + if ( show_all ) + opt_show_all = true; + + watchdog_disable(); + console_start_sync(); + + cpumask_copy(&show_state_mask, mask); + set_nmi_callback(nmi_show_execution_state); + send_IPI_mask(mask, APIC_DM_NMI); + + /* Wait at most 10ms for some other CPU to respond. */ + msecs = 10; + pending = cpumask_weight(&show_state_mask); + while ( pending && msecs-- ) + { + unsigned int left; + + mdelay(1); + left = cpumask_weight(&show_state_mask); + if ( left < pending ) + { + pending = left; + msecs = 10; + } + } + if ( pending ) + printk("Non-responding CPUs: {%*pbl}\n", CPUMASK_PR(&show_state_mask)); +} + const char *vector_name(unsigned int vec) { static const char names[][4] = { @@ -780,31 +817,11 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) if ( show_remote ) { - unsigned int msecs, pending; + cpumask_t *scratch = this_cpu(scratch_cpumask); - cpumask_andnot(&show_state_mask, &cpu_online_map, + cpumask_andnot(scratch, &cpu_online_map, cpumask_of(smp_processor_id())); - set_nmi_callback(nmi_show_execution_state); - smp_send_nmi_allbutself(); - - /* Wait at most 10ms for some other CPU to respond. */ - msecs = 10; - pending = cpumask_weight(&show_state_mask); - while ( pending && msecs-- ) - { - unsigned int left; - - mdelay(1); - left = cpumask_weight(&show_state_mask); - if ( left < pending ) - { - pending = left; - msecs = 10; - } - } - if ( pending ) - printk("Non-responding CPUs: {%*pbl}\n", - CPUMASK_PR(&show_state_mask)); + show_execution_state_nmi(scratch, false); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 10:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 10:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998246.1379024 (Exim 4.92) (envelope-from ) id 1uJrcZ-00043d-DA; Tue, 27 May 2025 10:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998246.1379024; Tue, 27 May 2025 10:33: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 1uJrcZ-00043V-Ac; Tue, 27 May 2025 10:33:23 +0000 Received: by outflank-mailman (input) for mailman id 998246; Tue, 27 May 2025 10:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJrcY-00043O-BM for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJrcY-004zni-10 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJrcY-005Pyu-0i for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 10:33: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=NWM/6eQWmlb/1ZBBTJzxyAdM1d0t/VWlxUP16M4Onsw=; b=NmGZRs9JJUUCddW6JAKZfm2Hsm sWv2wezd8fRqgQ42i1oKyMgyR2XR9rN5Bh91gFc0lbc7BixEfsZhm2e6Kxp0y3Zhx/EFytIa5yCyF Yr6WICZhuMBSozE0aUmOgrX3AqWgrFjkLZhzOsKX218Bdi3a2SSnyTmHDi7B8WQJzOs4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: attempt to print trace and panic on AP bring up stall Message-Id: Date: Tue, 27 May 2025 10:33:22 +0000 commit a3a607f33f81c3ce3e3e0eaa2fe97d263278b464 Author: Roger Pau Monne AuthorDate: Mon Apr 14 15:57:55 2025 +0200 Commit: Roger Pau Monne CommitDate: Tue May 27 09:11:37 2025 +0200 x86/boot: attempt to print trace and panic on AP bring up stall With the current AP bring up code, Xen can get stuck indefinitely if an AP freezes during boot after the 'callin' step. Introduce a 5s timeout while waiting for APs to finish startup. On failure of an AP to complete startup, send an NMI to trigger the printing of a stack backtrace on the stuck AP and panic on the BSP. This patch was done while investigating the issue caused by Intel erratum ICX143. It wasn't helpful in that case, but it's still and improvement when debugging AP bring up related issues. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/smpboot.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index adcaec6899..a90caf45a5 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1375,6 +1375,7 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) int __cpu_up(unsigned int cpu) { int apicid, ret; + s_time_t start; if ( (apicid = x86_cpu_to_apicid[cpu]) == BAD_APICID ) return -ENODEV; @@ -1393,10 +1394,18 @@ int __cpu_up(unsigned int cpu) time_latch_stamps(); set_cpu_state(CPU_STATE_ONLINE); + start = NOW(); while ( !cpu_online(cpu) ) { cpu_relax(); process_pending_softirqs(); + if ( (NOW() - start) > SECONDS(5) ) + { + /* AP is stuck, send NMI and panic. */ + show_execution_state_nmi(cpumask_of(cpu), true); + panic("APIC ID %#x (CPU%u) stuck while starting up\n", + apicid, cpu); + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 12:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 12:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998379.1379089 (Exim 4.92) (envelope-from ) id 1uJtf1-00062k-Jo; Tue, 27 May 2025 12:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998379.1379089; Tue, 27 May 2025 12: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 1uJtf1-00062c-HH; Tue, 27 May 2025 12:44:03 +0000 Received: by outflank-mailman (input) for mailman id 998379; Tue, 27 May 2025 12:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJtf0-00062W-Ap for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJtf0-0052FG-0s for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJtf0-008crT-0j for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12: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=xw+2Hr3Dtf1b8zWbmZRap4T0ynmDgOCHgBGXnx7SAPE=; b=rZzjcTfxBTlTGt5J2HgZbWAtIH fBh0zkyat9u5GHlu2uuTdkvTJD3Le5FzlcIDwVUk35MjzL5uWTj/x/pg3pXKrEN7nDOCMHrVcjUtz 9RgKjtilXY7WbSHvY8yhR1HaOozMRe48GHzzw20JkyYWyUDYeeQmruddl0i3UzVjUI5s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Rename qubes-x86-64 parameter "" to "dom0pv" Message-Id: Date: Tue, 27 May 2025 12:44:02 +0000 commit 05ea3247250494fc7dbd35b8c1106d1364f06141 Author: Andrew Cooper AuthorDate: Tue May 20 18:31:31 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 CI: Rename qubes-x86-64 parameter "" to "dom0pv" This really is a legacy of not having parameters to start with. Give PV dom0 with a PVH domU a real name. Reformat the table to fix alignment. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki --- automation/gitlab-ci/test.yaml | 8 ++++---- automation/scripts/qubes-x86-64.sh | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a603d4039a..842cecf713 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -257,7 +257,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -335,7 +335,7 @@ adl-tools-tests-pvh-x86-64-gcc-debug: kbl-smoke-x86-64-gcc-debug: extends: .kbl-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -413,7 +413,7 @@ kbl-tools-tests-pvh-x86-64-gcc-debug: zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -429,7 +429,7 @@ zen2-suspend-x86-64-gcc-debug: zen3p-smoke-x86-64-gcc-debug: extends: .zen3p-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index bfdd2ceb99..aa47ba6bf5 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -2,16 +2,16 @@ set -ex -o pipefail -# One of: -# - "" PV dom0, PVH domU -# - dom0pvh PVH dom0, PVH domU -# - dom0pvh-hvm PVH dom0, HVM domU -# - pci-hvm PV dom0, HVM domU + PCI Passthrough -# - pci-pv PV dom0, PV domU + PCI Passthrough -# - pvshim PV dom0, PVSHIM domU -# - s3 PV dom0, S3 suspend/resume -# - tools-tests-pv PV dom0, run tests from tools/tests/* -# - tools-tests-pvh PVH dom0, run tests from tools/tests/* +# One of: dom0: Testing: +# - dom0pv PV PVH domU +# - dom0pvh PVH PVH domU +# - dom0pvh-hvm PVH HVM domU +# - pci-hvm PV HVM domU + PCI Passthrough +# - pci-pv PV PV domU + PCI Passthrough +# - pvshim PV PVSHIM domU +# - s3 PV S3 suspend/resume +# - tools-tests-pv PV Run tests from tools/tests/* +# - tools-tests-pvh PVH Run tests from tools/tests/* test_variant=$1 ### defaults @@ -25,7 +25,7 @@ retrieve_xml= case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM - ""|"dom0pvh"|"dom0pvh-hvm"|"pvshim") + "dom0pv"|"dom0pvh"|"dom0pvh-hvm"|"pvshim") passed="ping test passed" domU_check=" ifconfig eth0 192.168.0.2 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 12:44:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 12:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998380.1379092 (Exim 4.92) (envelope-from ) id 1uJtfB-00064H-L3; Tue, 27 May 2025 12:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998380.1379092; Tue, 27 May 2025 12: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 1uJtfB-00064A-Id; Tue, 27 May 2025 12:44:13 +0000 Received: by outflank-mailman (input) for mailman id 998380; Tue, 27 May 2025 12:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJtfA-000640-Fx for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJtfA-0052FK-1J for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJtfA-008dEZ-13 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12: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=Wcl7AJ22XIwUxn9ytQ54J5Vws4iurAYs4En7zWg2SVg=; b=2yuf0/VPqFzAaM+8iSHnYhU/y3 5+2cpRYSmFkKbQQEZM/Xwjwe3kY5YPwII3CkNUNe0ZctUfvZXy3y32Qieuau5AgFtdKjJVluqwGze Fbc8bpvXsY0iQkfKo1MnN1AFkFidYTaxWq9DAVAEsGT4yyxqtwSwFKhD9UEY2aN3NMNw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/xstate: Rework xsetbv() to use asm goto() Message-Id: Date: Tue, 27 May 2025 12:44:12 +0000 commit 18f960208f57aeb3a50b69b3baddb1b86c2731d1 Author: Andrew Cooper AuthorDate: Fri Apr 18 16:19:59 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/xstate: Rework xsetbv() to use asm goto() Switch to using a mnemonic, and asm_inline as there's EXTABLE metadata. Update the types, and adjust parameter names. The name xfeatures is specific to xcr0, so rename to val to be more generic, even if there isn't another writeable xcr yet. No functional change. Resolves: https://gitlab.com/xen-project/xen/-/work_items/212 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/xstate.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 3d249518a1..e8e218caed 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -40,21 +40,22 @@ static DEFINE_PER_CPU(uint64_t, xcr0); /* Because XCR0 is cached for each CPU, xsetbv() is not exposed. Users should * use set_xcr0() instead. */ -static inline bool xsetbv(u32 index, u64 xfeatures) +static inline bool xsetbv(uint32_t xcr, uint64_t val) { - u32 hi = xfeatures >> 32; - u32 lo = (u32)xfeatures; - - asm volatile ( "1: .byte 0x0f,0x01,0xd1\n" - "3: \n" - ".section .fixup,\"ax\" \n" - "2: xor %0,%0 \n" - " jmp 3b \n" - ".previous \n" - _ASM_EXTABLE(1b, 2b) - : "+a" (lo) - : "c" (index), "d" (hi)); - return lo != 0; + uint32_t hi = val >> 32, lo = val; + + asm_inline goto ( + "1: xsetbv\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : + : "a" (lo), "c" (xcr), "d" (hi) + : + : fault ); + + return true; + + fault: + return false; } bool set_xcr0(u64 xfeatures) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 12:44:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 12:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998381.1379096 (Exim 4.92) (envelope-from ) id 1uJtfM-00067y-Md; Tue, 27 May 2025 12:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998381.1379096; Tue, 27 May 2025 12: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 1uJtfM-00067q-KA; Tue, 27 May 2025 12:44:24 +0000 Received: by outflank-mailman (input) for mailman id 998381; Tue, 27 May 2025 12:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJtfK-000661-J7 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJtfK-0052FS-1o for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJtfK-008dQ7-1U for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12: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=qjdjkgTH0oTlyicHkriiwy6PURlwRhGhDPBzrZF2gQU=; b=U7BEJd5eVW/ovVLaHbdKYnTy8h TefQD81vgBlhoCZP5mqEHO77hoxRM+sN/ryoZ9W+XPh3Chp30h+EQFyys9lQZ2nESSUmi4qRbNc2i OffRRaoqpkOtS3UOn9f/1Ygi5QolFINiYQHducaMGuszGSX/Ml5P64Zu1AXSiGM5MvtY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Rework wrmsr_safe() using asm goto() Message-Id: Date: Tue, 27 May 2025 12:44:22 +0000 commit ba4c717e8905c3cee09c194ad6bded2e7b9b592b Author: Andrew Cooper AuthorDate: Sat Apr 19 16:48:58 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/msr: Rework wrmsr_safe() using asm goto() This avoids needing to hold rc in a register across the WRMSR, and in most cases removes direct testing and branching based on rc, as the fault label can be rearranged to directly land on the out-of-line block. No functional change. Resolves: https://gitlab.com/xen-project/xen/-/work_items/214 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 0d3b1d6374..4c4f18b3a5 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -69,20 +69,20 @@ static inline void wrmsr_ns(uint32_t msr, uint32_t lo, uint32_t hi) /* wrmsr with exception handling */ static inline int wrmsr_safe(unsigned int msr, uint64_t val) { - int rc; - uint32_t lo, hi; - lo = (uint32_t)val; - hi = (uint32_t)(val >> 32); - - __asm__ __volatile__( - "1: wrmsr\n2:\n" - ".section .fixup,\"ax\"\n" - "3: movl %5,%0\n; jmp 2b\n" - ".previous\n" - _ASM_EXTABLE(1b, 3b) - : "=&r" (rc) - : "c" (msr), "a" (lo), "d" (hi), "0" (0), "i" (-EFAULT)); - return rc; + uint32_t lo = val, hi = val >> 32; + + asm_inline goto ( + "1: wrmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : + : "a" (lo), "c" (msr), "d" (hi) + : + : fault ); + + return 0; + + fault: + return -EFAULT; } static inline uint64_t msr_fold(const struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 12:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 12:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998382.1379101 (Exim 4.92) (envelope-from ) id 1uJtfW-0006Ah-O6; Tue, 27 May 2025 12:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998382.1379101; Tue, 27 May 2025 12: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 1uJtfW-0006AZ-LU; Tue, 27 May 2025 12:44:34 +0000 Received: by outflank-mailman (input) for mailman id 998382; Tue, 27 May 2025 12:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJtfU-0006AG-Ln for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJtfU-0052FW-25 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJtfU-008deS-20 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12: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=QPLGTObYzWjK9OnN0o2n/EV0G6M6jYv8qXKhy/9BRQo=; b=AXozsZGzxJ58CrqB3miKFXeYds /1TCoeDoj53Xu9UBJ7jPlLNzlWHs4u0VF6//67rYjSAU9ZFL0yAllWwLbS0gox5ZezM+IlmDY1R6n zzXeT7FyusTN3oM5O1NZ2ALqg7CnaSWy9xgPmb+5kibBDi+5xDil240MYBundttw4ylg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] eclair: allow and document use of GCC extension for label addresses Message-Id: Date: Tue, 27 May 2025 12:44:32 +0000 commit 5590c7e6590d78d9a90ff6d63bf8442530bf2244 Author: Nicola Vetrini AuthorDate: Fri May 23 09:20:35 2025 +0200 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 eclair: allow and document use of GCC extension for label addresses No functional change. Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/toolchain.ecl | 5 +++++ docs/misra/C-language-toolchain.rst | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/toolchain.ecl b/automation/eclair_analysis/ECLAIR/toolchain.ecl index 8ebf9f132c..842f8377e5 100644 --- a/automation/eclair_analysis/ECLAIR/toolchain.ecl +++ b/automation/eclair_analysis/ECLAIR/toolchain.ecl @@ -108,6 +108,11 @@ volatile" -config=STD.funojptr,behavior+={c99,GCC_X86_64,specified} -doc_end +-doc_begin="See section \"6.3 Labels as Values\" of "GCC_MANUAL"." +-config=STD.adrslabl,behavior={c99,GCC_ARM64,specified} +-config=STD.adrslabl,behavior={c99,GCC_X86_64,specified} +-doc_end + -doc_begin=" ext_c_missing_varargs_arg: see Section \"6.21 Macros with a Variable Number of Arguments\" of "GCC_MANUAL". ext_enum_value_not_int: non-documented GCC extension. diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-toolchain.rst index 3a1ce651d7..cb81f5c098 100644 --- a/docs/misra/C-language-toolchain.rst +++ b/docs/misra/C-language-toolchain.rst @@ -214,6 +214,10 @@ The table columns are as follows: - All architectures - See Section "4.5 Integers" of GCC_MANUAL. + * - Taking the address of a label + - All architectures + - See Section "6.3 Labels as Values" of GCC_MANUAL. + Translation Limits __________________ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 12:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 12:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998383.1379105 (Exim 4.92) (envelope-from ) id 1uJtfg-0006Cu-Pb; Tue, 27 May 2025 12:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998383.1379105; Tue, 27 May 2025 12: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 1uJtfg-0006Cm-Mv; Tue, 27 May 2025 12:44:44 +0000 Received: by outflank-mailman (input) for mailman id 998383; Tue, 27 May 2025 12:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJtfe-0006Ca-QH for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJtfe-0052Ft-2W for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJtfe-008e6S-2G for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12: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=3eQm3H4zzoZHjPaR/kpi5TXzXH6HSQrSPM3Aoo6/BII=; b=ycxfLdXbS+SNDps6X03gCX7MPa AOXIcdSIxvm4RhPSRTpMyZ/MIL8E+vwFjTSuHWD8g9y8iseiIWhqxUlVGohLj8um5BdI/14l+YPTb MjIUHYb/mKcXiDKEA77OdbPVTBh2oyU6AfvnupiZ2jrjCwLZ4Xo7hlvT5omjvtgeQZjc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Message-Id: Date: Tue, 27 May 2025 12:44:42 +0000 commit d779e3f98c2a765aae57f6ab4b0257413c12ac97 Author: Andrew Cooper AuthorDate: Fri May 23 16:29:44 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Paging Writeable depends on EPT so must be disabled in non-EPT guests like the other EPT dependent features. Otherwise, VMEntry fails with bad control state. Drop a piece of trailing whitepsace in context. Fixes: ff10aa9d8f90 ("x86: Add Support for Paging-Write Feature") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 59f4d1d86f..57d49364db 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1132,9 +1132,11 @@ static int construct_vmcs(struct vcpu *v) else { v->arch.hvm.vmx.secondary_exec_control &= - ~(SECONDARY_EXEC_ENABLE_EPT | + ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_INVPCID); + v->arch.hvm.vmx.tertiary_exec_control &= + ~(TERTIARY_EXEC_EPT_PAGING_WRITE); vmexit_ctl &= ~(VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT); vmentry_ctl &= ~VM_ENTRY_LOAD_GUEST_PAT; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 12:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 12:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998384.1379108 (Exim 4.92) (envelope-from ) id 1uJtfq-0006Fw-Qw; Tue, 27 May 2025 12:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998384.1379108; Tue, 27 May 2025 12: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 1uJtfq-0006Fn-OL; Tue, 27 May 2025 12:44:54 +0000 Received: by outflank-mailman (input) for mailman id 998384; Tue, 27 May 2025 12:44:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJtfo-0006FH-Tr for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJtfo-0052Fx-2t for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJtfo-008eNi-2h for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 12: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=jEleK2Y79g9Uf3y+2u8e4lv1zzeP6tdMrd7szJngy3I=; b=ZkwXcivd67iwntvTvRzT+fAgpR XBvCWwq14umzH1RNvsh1vn80K5pJvrvhW2pKk5QZO4HkIhhp7c4dYokwJhGn0n4wjEmm8bifAmeQE htexBBb7G8ZBSqkF6O9+JslK/WD+r5IOlhow0nn+6RegLUQYgNcc3mDmcY+r82j8UB4E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: Fix breakpoint reporting Message-Id: Date: Tue, 27 May 2025 12:44:52 +0000 commit d965e2ee07c56c341d8896852550914d87ea5374 Author: Andrew Cooper AuthorDate: Mon May 26 21:34:10 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/pv: Fix breakpoint reporting x86_merge_dr6() is not a no-op when 0 is passed in; it will discard the previously latched breakpoint bits. The combination of do_debug()'s manual call to x86_merge_dr6() for external debuggers, and pv_inject_DB() calling pv_inject_event(), results in two x86_merge_dr6() calls. Feed the same pending_dbg in the second time. This makes pv_inject_event()'s update of dr6 effectively a no-op, retaining the correct breakpoint bits. Fixes: db39fa4b27ea ("x86/pv: Fix merging of new status bits into %dr6") Reported-by: Manuel Bouyer Signed-off-by: Andrew Cooper Tested-by: Manuel Bouyer Acked-by: Roger Pau Monné --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 559bb1d202..f9e17e0159 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1840,7 +1840,7 @@ void asmlinkage do_debug(struct cpu_user_regs *regs) return; } - pv_inject_DB(0 /* N/A, already merged */); + pv_inject_DB(dr6 ^ X86_DR6_DEFAULT); } void asmlinkage do_entry_CP(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 27 16:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 16:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998666.1379379 (Exim 4.92) (envelope-from ) id 1uJxPH-0000so-2s; Tue, 27 May 2025 16:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998666.1379379; Tue, 27 May 2025 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 1uJxPG-0000sg-WF; Tue, 27 May 2025 16:44:03 +0000 Received: by outflank-mailman (input) for mailman id 998666; Tue, 27 May 2025 16:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJxPF-0000sa-Kn for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJxPF-0057IA-1d for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJxPF-00ESRx-1W for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16: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=eHNrVr5QFXzuRY7phrF7TwtvEtphdwWs6ITluI5W2AU=; b=At3qzC8ERwpdfWE2kouM5yvPmb 24Ob2t/a7OfK4nWK5kwy9o6cODWf+r8Fc1CqrU8Sx6O4Y7THw7jsGATAear8J4irLvDto814QDvDV eMz61DCN+M18hIN/6QaS9UYhjXTm97HjYoy3eeYmmyBhgRi+EAFHlYZ4NVYaTjUAtq84=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Rename qubes-x86-64 parameter "" to "dom0pv" Message-Id: Date: Tue, 27 May 2025 16:44:01 +0000 commit 05ea3247250494fc7dbd35b8c1106d1364f06141 Author: Andrew Cooper AuthorDate: Tue May 20 18:31:31 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 CI: Rename qubes-x86-64 parameter "" to "dom0pv" This really is a legacy of not having parameters to start with. Give PV dom0 with a PVH domU a real name. Reformat the table to fix alignment. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki --- automation/gitlab-ci/test.yaml | 8 ++++---- automation/scripts/qubes-x86-64.sh | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a603d4039a..842cecf713 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -257,7 +257,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -335,7 +335,7 @@ adl-tools-tests-pvh-x86-64-gcc-debug: kbl-smoke-x86-64-gcc-debug: extends: .kbl-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -413,7 +413,7 @@ kbl-tools-tests-pvh-x86-64-gcc-debug: zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -429,7 +429,7 @@ zen2-suspend-x86-64-gcc-debug: zen3p-smoke-x86-64-gcc-debug: extends: .zen3p-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index bfdd2ceb99..aa47ba6bf5 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -2,16 +2,16 @@ set -ex -o pipefail -# One of: -# - "" PV dom0, PVH domU -# - dom0pvh PVH dom0, PVH domU -# - dom0pvh-hvm PVH dom0, HVM domU -# - pci-hvm PV dom0, HVM domU + PCI Passthrough -# - pci-pv PV dom0, PV domU + PCI Passthrough -# - pvshim PV dom0, PVSHIM domU -# - s3 PV dom0, S3 suspend/resume -# - tools-tests-pv PV dom0, run tests from tools/tests/* -# - tools-tests-pvh PVH dom0, run tests from tools/tests/* +# One of: dom0: Testing: +# - dom0pv PV PVH domU +# - dom0pvh PVH PVH domU +# - dom0pvh-hvm PVH HVM domU +# - pci-hvm PV HVM domU + PCI Passthrough +# - pci-pv PV PV domU + PCI Passthrough +# - pvshim PV PVSHIM domU +# - s3 PV S3 suspend/resume +# - tools-tests-pv PV Run tests from tools/tests/* +# - tools-tests-pvh PVH Run tests from tools/tests/* test_variant=$1 ### defaults @@ -25,7 +25,7 @@ retrieve_xml= case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM - ""|"dom0pvh"|"dom0pvh-hvm"|"pvshim") + "dom0pv"|"dom0pvh"|"dom0pvh-hvm"|"pvshim") passed="ping test passed" domU_check=" ifconfig eth0 192.168.0.2 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 16:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 16:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998667.1379381 (Exim 4.92) (envelope-from ) id 1uJxPR-0000v3-58; Tue, 27 May 2025 16:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998667.1379381; Tue, 27 May 2025 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 1uJxPR-0000uv-2d; Tue, 27 May 2025 16:44:13 +0000 Received: by outflank-mailman (input) for mailman id 998667; Tue, 27 May 2025 16:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJxPP-0000uh-Kt for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJxPP-0057IG-1x for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJxPP-00EScA-1o for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16: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=xdg/jE60g2b3aX90r9dv+c/mkzdCBT412G9c2hw6rPM=; b=cuwn7hYOXRcfa8/7MYb8WjDR0Q WMokSFXeimPWx7hBUKzF9aPW3su19MDQxTQwTgzQLKwd1YeCzvICaMAdk5mL8qNuN8BMuibT93Cwy E+OGZLiI0UPlvhivBwNZrBwtf/TRg0fqRGmLIhcdBe7Xoc2m6LtZxt+MCvSATMaQtx4g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/xstate: Rework xsetbv() to use asm goto() Message-Id: Date: Tue, 27 May 2025 16:44:11 +0000 commit 18f960208f57aeb3a50b69b3baddb1b86c2731d1 Author: Andrew Cooper AuthorDate: Fri Apr 18 16:19:59 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/xstate: Rework xsetbv() to use asm goto() Switch to using a mnemonic, and asm_inline as there's EXTABLE metadata. Update the types, and adjust parameter names. The name xfeatures is specific to xcr0, so rename to val to be more generic, even if there isn't another writeable xcr yet. No functional change. Resolves: https://gitlab.com/xen-project/xen/-/work_items/212 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/xstate.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 3d249518a1..e8e218caed 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -40,21 +40,22 @@ static DEFINE_PER_CPU(uint64_t, xcr0); /* Because XCR0 is cached for each CPU, xsetbv() is not exposed. Users should * use set_xcr0() instead. */ -static inline bool xsetbv(u32 index, u64 xfeatures) +static inline bool xsetbv(uint32_t xcr, uint64_t val) { - u32 hi = xfeatures >> 32; - u32 lo = (u32)xfeatures; - - asm volatile ( "1: .byte 0x0f,0x01,0xd1\n" - "3: \n" - ".section .fixup,\"ax\" \n" - "2: xor %0,%0 \n" - " jmp 3b \n" - ".previous \n" - _ASM_EXTABLE(1b, 2b) - : "+a" (lo) - : "c" (index), "d" (hi)); - return lo != 0; + uint32_t hi = val >> 32, lo = val; + + asm_inline goto ( + "1: xsetbv\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : + : "a" (lo), "c" (xcr), "d" (hi) + : + : fault ); + + return true; + + fault: + return false; } bool set_xcr0(u64 xfeatures) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 16:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 16:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998668.1379386 (Exim 4.92) (envelope-from ) id 1uJxPb-0000xr-6i; Tue, 27 May 2025 16:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998668.1379386; Tue, 27 May 2025 16: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 1uJxPb-0000xZ-41; Tue, 27 May 2025 16:44:23 +0000 Received: by outflank-mailman (input) for mailman id 998668; Tue, 27 May 2025 16:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJxPZ-0000wu-Nq for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJxPZ-0057IO-2G for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJxPZ-00ESxP-28 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16: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=NdEAEvZH6kgu/cccWiDhwUWUTCTq6zTwQq9aLcEU7RE=; b=6bK37yanFVeo1jl+0xG2etc59l QIPFBKeYes5D3INGiqDlIV9FIyWkIxQ6bZxIcn1BfTV94sQgw1G9/Lcb0aXj4gzQzW/CRdQh4mO90 LLEKY6CLn9bgzOi7slSDOnVFK39eKEW0sN1rRvRmOgommlXAgpAefZGNmpZBp70m4i0Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Rework wrmsr_safe() using asm goto() Message-Id: Date: Tue, 27 May 2025 16:44:21 +0000 commit ba4c717e8905c3cee09c194ad6bded2e7b9b592b Author: Andrew Cooper AuthorDate: Sat Apr 19 16:48:58 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/msr: Rework wrmsr_safe() using asm goto() This avoids needing to hold rc in a register across the WRMSR, and in most cases removes direct testing and branching based on rc, as the fault label can be rearranged to directly land on the out-of-line block. No functional change. Resolves: https://gitlab.com/xen-project/xen/-/work_items/214 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 0d3b1d6374..4c4f18b3a5 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -69,20 +69,20 @@ static inline void wrmsr_ns(uint32_t msr, uint32_t lo, uint32_t hi) /* wrmsr with exception handling */ static inline int wrmsr_safe(unsigned int msr, uint64_t val) { - int rc; - uint32_t lo, hi; - lo = (uint32_t)val; - hi = (uint32_t)(val >> 32); - - __asm__ __volatile__( - "1: wrmsr\n2:\n" - ".section .fixup,\"ax\"\n" - "3: movl %5,%0\n; jmp 2b\n" - ".previous\n" - _ASM_EXTABLE(1b, 3b) - : "=&r" (rc) - : "c" (msr), "a" (lo), "d" (hi), "0" (0), "i" (-EFAULT)); - return rc; + uint32_t lo = val, hi = val >> 32; + + asm_inline goto ( + "1: wrmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : + : "a" (lo), "c" (msr), "d" (hi) + : + : fault ); + + return 0; + + fault: + return -EFAULT; } static inline uint64_t msr_fold(const struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 16:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 16:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998669.1379389 (Exim 4.92) (envelope-from ) id 1uJxPl-00011K-8M; Tue, 27 May 2025 16:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998669.1379389; Tue, 27 May 2025 16: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 1uJxPl-00011C-5Z; Tue, 27 May 2025 16:44:33 +0000 Received: by outflank-mailman (input) for mailman id 998669; Tue, 27 May 2025 16:44:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJxPj-000110-QI for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJxPj-0057IS-2X for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJxPj-00ETGt-2R for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16: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=mRodrwgE0VOCV7IT+BelXgf58WlllQ2aAX4RW7Yb1Ak=; b=K6kdbyLkJPLdgPCBKqnNZHFgos QLqBPR1AnmsXTCMaPxlwXpxnBVm5yAM3auA1IxRvWyMfiO569GgVDyhkLTU9cdqUg9PDkXu1eYAlx e5SMc48o8jWRW1h+K5qBSP1PQVXQ9o5xi70uP/t7JKIpY16jTzXjIwrCDay3LykMzoYw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] eclair: allow and document use of GCC extension for label addresses Message-Id: Date: Tue, 27 May 2025 16:44:31 +0000 commit 5590c7e6590d78d9a90ff6d63bf8442530bf2244 Author: Nicola Vetrini AuthorDate: Fri May 23 09:20:35 2025 +0200 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 eclair: allow and document use of GCC extension for label addresses No functional change. Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/toolchain.ecl | 5 +++++ docs/misra/C-language-toolchain.rst | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/toolchain.ecl b/automation/eclair_analysis/ECLAIR/toolchain.ecl index 8ebf9f132c..842f8377e5 100644 --- a/automation/eclair_analysis/ECLAIR/toolchain.ecl +++ b/automation/eclair_analysis/ECLAIR/toolchain.ecl @@ -108,6 +108,11 @@ volatile" -config=STD.funojptr,behavior+={c99,GCC_X86_64,specified} -doc_end +-doc_begin="See section \"6.3 Labels as Values\" of "GCC_MANUAL"." +-config=STD.adrslabl,behavior={c99,GCC_ARM64,specified} +-config=STD.adrslabl,behavior={c99,GCC_X86_64,specified} +-doc_end + -doc_begin=" ext_c_missing_varargs_arg: see Section \"6.21 Macros with a Variable Number of Arguments\" of "GCC_MANUAL". ext_enum_value_not_int: non-documented GCC extension. diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-toolchain.rst index 3a1ce651d7..cb81f5c098 100644 --- a/docs/misra/C-language-toolchain.rst +++ b/docs/misra/C-language-toolchain.rst @@ -214,6 +214,10 @@ The table columns are as follows: - All architectures - See Section "4.5 Integers" of GCC_MANUAL. + * - Taking the address of a label + - All architectures + - See Section "6.3 Labels as Values" of GCC_MANUAL. + Translation Limits __________________ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 16:44:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 16:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998670.1379394 (Exim 4.92) (envelope-from ) id 1uJxPv-00013b-9w; Tue, 27 May 2025 16:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998670.1379394; Tue, 27 May 2025 16: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 1uJxPv-00013T-70; Tue, 27 May 2025 16:44:43 +0000 Received: by outflank-mailman (input) for mailman id 998670; Tue, 27 May 2025 16:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJxPt-00013F-VQ for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJxPt-0057IW-2q for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJxPt-00ETU2-2j for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16: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=S/jMkjF23wOo0QDrMM88fnfvA5mPSMPHema6Oog/7AI=; b=YsuDIyuyZXRovWiPJyIdyWlhGD rEyg7cxCXvkhzzLusI5Z4OpLaFeAhRWo6iU4/7H7YYshVNTnRWCOcrd76K75h8nkkd9c7k4xjwAaO T36t4Et7eJgcWcSTa4ISFYR09+QUSEVK4Yg8vheEE+OmQs+47eI7zc8xuWxhfvCoZjE4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Message-Id: Date: Tue, 27 May 2025 16:44:41 +0000 commit d779e3f98c2a765aae57f6ab4b0257413c12ac97 Author: Andrew Cooper AuthorDate: Fri May 23 16:29:44 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Paging Writeable depends on EPT so must be disabled in non-EPT guests like the other EPT dependent features. Otherwise, VMEntry fails with bad control state. Drop a piece of trailing whitepsace in context. Fixes: ff10aa9d8f90 ("x86: Add Support for Paging-Write Feature") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 59f4d1d86f..57d49364db 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1132,9 +1132,11 @@ static int construct_vmcs(struct vcpu *v) else { v->arch.hvm.vmx.secondary_exec_control &= - ~(SECONDARY_EXEC_ENABLE_EPT | + ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_INVPCID); + v->arch.hvm.vmx.tertiary_exec_control &= + ~(TERTIARY_EXEC_EPT_PAGING_WRITE); vmexit_ctl &= ~(VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT); vmentry_ctl &= ~VM_ENTRY_LOAD_GUEST_PAT; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 27 16:44:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 May 2025 16:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.998671.1379399 (Exim 4.92) (envelope-from ) id 1uJxQ5-000166-BU; Tue, 27 May 2025 16:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 998671.1379399; Tue, 27 May 2025 16: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 1uJxQ5-00015x-8Y; Tue, 27 May 2025 16:44:53 +0000 Received: by outflank-mailman (input) for mailman id 998671; Tue, 27 May 2025 16:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uJxQ3-00015p-WB for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:51 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uJxQ3-0057It-37 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:51 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uJxQ3-00ETqE-31 for xen-changelog@lists.xenproject.org; Tue, 27 May 2025 16:44:51 +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=COWT8hHxuEU0tK+JEL3nj6Emocp0iecxyiSaRYGw80I=; b=MC+bQJ5GHchwRd6LfAeMKr0rha GRXMyzP/cY5r7t7Kc5T7w7+MSghPNjWkfDhaW4nVqG5TATpSiQjTRETNnACvLtqHIVys04JvcXcqN 8g1pqH+mWHiPGtxnHv7eY6sCoaLun3tLhB2zTu9fipCe6qNaDXSzrkPx0U3LKoAudxrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Fix breakpoint reporting Message-Id: Date: Tue, 27 May 2025 16:44:51 +0000 commit d965e2ee07c56c341d8896852550914d87ea5374 Author: Andrew Cooper AuthorDate: Mon May 26 21:34:10 2025 +0100 Commit: Andrew Cooper CommitDate: Tue May 27 12:21:38 2025 +0100 x86/pv: Fix breakpoint reporting x86_merge_dr6() is not a no-op when 0 is passed in; it will discard the previously latched breakpoint bits. The combination of do_debug()'s manual call to x86_merge_dr6() for external debuggers, and pv_inject_DB() calling pv_inject_event(), results in two x86_merge_dr6() calls. Feed the same pending_dbg in the second time. This makes pv_inject_event()'s update of dr6 effectively a no-op, retaining the correct breakpoint bits. Fixes: db39fa4b27ea ("x86/pv: Fix merging of new status bits into %dr6") Reported-by: Manuel Bouyer Signed-off-by: Andrew Cooper Tested-by: Manuel Bouyer Acked-by: Roger Pau Monné --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 559bb1d202..f9e17e0159 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1840,7 +1840,7 @@ void asmlinkage do_debug(struct cpu_user_regs *regs) return; } - pv_inject_DB(0 /* N/A, already merged */); + pv_inject_DB(dr6 ^ X86_DR6_DEFAULT); } void asmlinkage do_entry_CP(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 08:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 08:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999008.1379672 (Exim 4.92) (envelope-from ) id 1uKCDf-0000FH-KQ; Wed, 28 May 2025 08:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999008.1379672; Wed, 28 May 2025 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 1uKCDf-0000F8-Hp; Wed, 28 May 2025 08:33:03 +0000 Received: by outflank-mailman (input) for mailman id 999008; Wed, 28 May 2025 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 1uKCDe-0000F2-1U for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 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 1uKCDd-006bvu-35 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 08:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKCDd-00GjMt-2v for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 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=WihoU2+EhWniMOUM1rxp/u2noiVqlLk3awV7FHwPoAU=; b=K+FGwBc/7YS8OlvvKYgl/a5kX9 aNIMaOxg6n/83N1TT62uJ5ZIkkob5hklDGgDobd2dBgIkY5kuFeaaUUaZmeOPzs0hKSpRl4NpNYGE AUfMB7HnTwgMF2b4T+P6X535Z/rezjT3GQiM+t7bC7u0UymWVD5RRAcCd0UUDR+yvATw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvmloader: fix order of PCI vs MTRR initialization Message-Id: Date: Wed, 28 May 2025 08:33:01 +0000 commit cfd52324313f66ca2ad6bfa45bd26387ca52035c Author: Roger Pau Monne AuthorDate: Tue May 27 10:49:13 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed May 28 10:23:35 2025 +0200 x86/hvmloader: fix order of PCI vs MTRR initialization After some recent change the order of MTRR vs PCI initialization is inverted. MTRR will get initialization ahead of PCI scanning and sizing of MMIO regions. As a result when setting up MTRRs the MMIO window below 4GB will always have the same size, and there will be no window above 4GB. This results in malformed and incomplete MTRRs being setup. Fix by making sure PCI is initialized ahead of MTRR, also add a comment to notice the ordering dependency. Fixes: 2c3dffbaa324 ('tools/hvmloader: Replace LAPIC_ID() with cpu_to_apicid[]') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Reviewed-by: Anthoine Bourgeois --- tools/firmware/hvmloader/hvmloader.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 4e330fc1e2..6d23150fc9 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -341,10 +341,16 @@ int main(void) printf("CPU speed is %u MHz\n", get_cpu_mhz()); + /* + * PCI setup must be done before SMP initialization, as the later also does + * the MTRR setup and so the size of the PCI MMIO windows must be known at + * that point. + */ + pci_setup(); + smp_initialise(); apic_setup(); - pci_setup(); perform_tests(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 10:33:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 10:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999308.1379976 (Exim 4.92) (envelope-from ) id 1uKE5m-0004Xg-Oo; Wed, 28 May 2025 10:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999308.1379976; Wed, 28 May 2025 10: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 1uKE5m-0004XY-ME; Wed, 28 May 2025 10:33:02 +0000 Received: by outflank-mailman (input) for mailman id 999308; Wed, 28 May 2025 10:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKE5l-0004XS-Ox for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKE5l-006eND-29 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKE5l-0029Ga-1m for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10: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=xi7xHX0QSuXYeXj6U4wz8KUPVqzD/uLi08DhjxU5IT4=; b=Kct2SU0EgekRJWbdIiveLKP+0/ aQ/matlt/EKj5CYGAwVvaRwYOkLS2KbbCtja9XYrWXedSiLMRFX+i23skgRpsFSvL9Ci2IbxMBR1j Lt8vO9PKmUbF6deQbPBx83BEMQulD3CVmomXkIIBm6X/jF7K+UmVINsfCF1ANzzz8RvU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvmloader: fix order of PCI vs MTRR initialization Message-Id: Date: Wed, 28 May 2025 10:33:01 +0000 commit cfd52324313f66ca2ad6bfa45bd26387ca52035c Author: Roger Pau Monne AuthorDate: Tue May 27 10:49:13 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed May 28 10:23:35 2025 +0200 x86/hvmloader: fix order of PCI vs MTRR initialization After some recent change the order of MTRR vs PCI initialization is inverted. MTRR will get initialization ahead of PCI scanning and sizing of MMIO regions. As a result when setting up MTRRs the MMIO window below 4GB will always have the same size, and there will be no window above 4GB. This results in malformed and incomplete MTRRs being setup. Fix by making sure PCI is initialized ahead of MTRR, also add a comment to notice the ordering dependency. Fixes: 2c3dffbaa324 ('tools/hvmloader: Replace LAPIC_ID() with cpu_to_apicid[]') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Reviewed-by: Anthoine Bourgeois --- tools/firmware/hvmloader/hvmloader.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 4e330fc1e2..6d23150fc9 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -341,10 +341,16 @@ int main(void) printf("CPU speed is %u MHz\n", get_cpu_mhz()); + /* + * PCI setup must be done before SMP initialization, as the later also does + * the MTRR setup and so the size of the PCI MMIO windows must be known at + * that point. + */ + pci_setup(); + smp_initialise(); apic_setup(); - pci_setup(); perform_tests(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 10:33:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 10:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999309.1379980 (Exim 4.92) (envelope-from ) id 1uKE5w-0004ZQ-Q5; Wed, 28 May 2025 10:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999309.1379980; Wed, 28 May 2025 10: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 1uKE5w-0004ZI-Ne; Wed, 28 May 2025 10:33:12 +0000 Received: by outflank-mailman (input) for mailman id 999309; Wed, 28 May 2025 10:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKE5w-0004ZC-8A for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKE5w-006eNH-0g for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKE5w-0029Yr-0Z for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10: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=73SFn/9WoW7DoAfWcVc6iERp9ftdncJ9k4TJQPQLrVE=; b=I7B/uF93rs6oEQV6BVHUEyYUHG WxeS1XpjY6vMvsn3Ofydc2ntRBiD3ywkHSFgogpQVfNAiTOgklFPS7HJrv0N5NV4z/wyvRgiE0veN VlcHDuZz2Blmg03ecUd15g9DWU7HHHvI4XAo4pbuvA1VA5yktefBXgwkKzh6TmjfHEH4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/dom0less: mark domain_p2m_set_allocation __init Message-Id: Date: Wed, 28 May 2025 10:33:12 +0000 commit eec94a43319a9dd7cb90528f6e1bb608c0164913 Author: Stewart Hildebrand AuthorDate: Tue May 13 13:18:02 2025 -0400 Commit: Michal Orzel CommitDate: Wed May 28 10:32:19 2025 +0200 xen/dom0less: mark domain_p2m_set_allocation __init All functions in dom0less-build.c should be __init. Fixes: 2705f1adb9df ("xen: introduce Kconfig ARCH_PAGING_MEMPOOL") Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/common/device-tree/dom0less-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 2c56f13771..39cb2cd5c7 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -730,8 +730,8 @@ static int __init domain_p2m_set_allocation(struct domain *d, uint64_t mem, return rc; } #else /* !CONFIG_ARCH_PAGING_MEMPOOL */ -static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, - const struct dt_device_node *node) +static inline int __init domain_p2m_set_allocation( + struct domain *d, uint64_t mem, const struct dt_device_node *node) { return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 10:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 10:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999310.1379984 (Exim 4.92) (envelope-from ) id 1uKE67-0004c6-Sr; Wed, 28 May 2025 10:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999310.1379984; Wed, 28 May 2025 10:33: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 1uKE67-0004by-QJ; Wed, 28 May 2025 10:33:23 +0000 Received: by outflank-mailman (input) for mailman id 999310; Wed, 28 May 2025 10:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKE66-0004bm-Cf for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKE66-006eNL-1A for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKE66-0029kL-0q for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33: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=SgtdaNXLeRu5t44RWQfkwIeliBmeSTZ1NHlfWRORdfE=; b=kwMJBksgSOdE4u2maAshVru/4c JDOwy3AI9ZX+W7jEc3JlujNCtZgckgWASL4GIFBPc/D7mvMro55JK8uWtR2UszH7aH+EgXonTws/b 5BKx1W/F/9Sep+DwJs3jQZ1/M/RVg+spmJskgc84H6q7zAVzbR0No0L4aVw1BuK6SZ5E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: enforce __init in common/device-tree/*-build.c Message-Id: Date: Wed, 28 May 2025 10:33:22 +0000 commit fcf7cf21594116b4b7303ea2a4602ba9f97d10ab Author: Stewart Hildebrand AuthorDate: Tue May 13 13:18:03 2025 -0400 Commit: Michal Orzel CommitDate: Wed May 28 10:32:19 2025 +0200 xen: enforce __init in common/device-tree/*-build.c Code in domain-build.c and dom0less-build.c was migrated from init-only files. Thus, they contain only __init functions. Enforce this at build time. Fixes: ad03faa942b9 ("xen/common: dom0less: make some parts of Arm's CONFIG_DOM0LESS common") Fixes: d07b7369aa65 ("xen/common: dom0less: introduce common domain-build.c") Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/common/device-tree/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index 831b91399b..ff54a8ef2b 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -1,8 +1,8 @@ obj-y += bootfdt.init.o obj-y += bootinfo.init.o obj-y += device-tree.o -obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.o -obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o +obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.init.o +obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 10:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 10:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999311.1379988 (Exim 4.92) (envelope-from ) id 1uKE6H-0004eE-Ue; Wed, 28 May 2025 10:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999311.1379988; Wed, 28 May 2025 10:33: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 1uKE6H-0004e6-Rr; Wed, 28 May 2025 10:33:33 +0000 Received: by outflank-mailman (input) for mailman id 999311; Wed, 28 May 2025 10:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKE6G-0004dw-Hf for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKE6G-006eNR-1e for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKE6G-002A4j-1L for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33: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=elqfNmn/lQNCI+LOTpbocZKzW4iUBH8wGgx7r3PKjjs=; b=mEKPBTOgl7KAYJrEmb+IGMGdpa xR4PVvkZsSLhL/CdvqXptd+v6vr7dUP9I+mUpzPQxFs2E6pUwagCOZ6NOqS20241Evwh1UsE11cyK of8FwDEDPyAP06CjCtqL5L58dXCuG1TXZTDODOBmMPDGnJI5CHBzmXxd9FOdEh09Va6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/irq: Reduce size of irq_desc array to exclude local IRQs Message-Id: Date: Wed, 28 May 2025 10:33:32 +0000 commit ca55852d39ec984530bbd9d29a6d714505fd3411 Author: Mykola Kvach AuthorDate: Mon May 26 11:46:59 2025 +0300 Commit: Michal Orzel CommitDate: Wed May 28 11:39:00 2025 +0200 arm/irq: Reduce size of irq_desc array to exclude local IRQs SGI and PPI descriptors are banked and stored in the per-CPU local_irq_desc array, so not all elements of the global irq_desc array are used. This is already accounted for in the descriptor lookup logic inside __irq_to_desc: return &irq_desc[irq - NR_LOCAL_IRQS]; Therefore, the size of the irq_desc array can be reduced by NR_LOCAL_IRQS, saving (NR_LOCAL_IRQS * L1_CACHE_BYTES) bytes of memory. Signed-off-by: Mykola Kvach Reviewed-by: Michal Orzel --- xen/arch/arm/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index b9757d7ad3..03fbb90c6c 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -45,7 +45,7 @@ void irq_end_none(struct irq_desc *irq) gic_hw_ops->gic_host_irq_type->end(irq); } -static irq_desc_t irq_desc[NR_IRQS]; +static irq_desc_t irq_desc[NR_IRQS - NR_LOCAL_IRQS]; static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc); struct irq_desc *__irq_to_desc(unsigned int irq) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 10:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 10:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999312.1379992 (Exim 4.92) (envelope-from ) id 1uKE6S-0004gI-06; Wed, 28 May 2025 10:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999312.1379992; Wed, 28 May 2025 10:33: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 1uKE6R-0004gA-TI; Wed, 28 May 2025 10:33:43 +0000 Received: by outflank-mailman (input) for mailman id 999312; Wed, 28 May 2025 10:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKE6Q-0004g1-K6 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKE6Q-006eNV-1u for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKE6Q-002ARX-1p for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 10:33: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=rTNogxr3/Zld6SOaOQjeoWMcx+AAgrlTwYAXA7FdCmc=; b=IVebNYwiufNToryCGFoF9wqf/+ xH4wJW3XByuf+063GcOsMQTCWkQXS4QUZPO4eYLAqRPRcUcU9u00RuiF3B0JQwnEK4JTNPsjPD/TM /xPief1MIS7uaRUs4BXRUg6ITIVNK67LRZHmY5KU0AYBkZ9T9R3T0VGoGAVwRFGyAmQQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/vgic-v3: Fix GICD_ICPENDR read access in __vgic_v3_distr_common_mmio_read() Message-Id: Date: Wed, 28 May 2025 10:33:42 +0000 commit 861e7862b8faf25129fb6df33c1cee333a34c404 Author: Oleksandr Tyshchenko AuthorDate: Tue May 27 00:11:52 2025 +0000 Commit: Michal Orzel CommitDate: Wed May 28 11:39:00 2025 +0200 arm/vgic-v3: Fix GICD_ICPENDR read access in __vgic_v3_distr_common_mmio_read() An attempt to read access the GICD_ICPENDR register (where n > 0) which should be RAZ (as not supported) causes the guest data abort due to incorrect end offset (GICD_ICPENDR) in the case range. Fix that by using the proper end offset (GICD_ICPENDRN). Fixes: a2b83f95bfa ("xen/arm: vgic: Properly emulate the full register") Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Michal Orzel --- xen/arch/arm/vgic-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index f20249f731..4369c55177 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -709,7 +709,7 @@ static int __vgic_v3_distr_common_mmio_read(const char *name, struct vcpu *v, /* Read the pending status of an IRQ via GICD/GICR is not supported */ case VRANGE32(GICD_ISPENDR, GICD_ISPENDRN): - case VRANGE32(GICD_ICPENDR, GICD_ICPENDR): + case VRANGE32(GICD_ICPENDR, GICD_ICPENDRN): goto read_as_zero; /* Read the active status of an IRQ via GICD/GICR is not supported */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 11:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 11:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999336.1380016 (Exim 4.92) (envelope-from ) id 1uKEgY-00038k-S5; Wed, 28 May 2025 11:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999336.1380016; Wed, 28 May 2025 11: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 1uKEgY-00038c-PO; Wed, 28 May 2025 11:11:02 +0000 Received: by outflank-mailman (input) for mailman id 999336; Wed, 28 May 2025 11:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKEgX-00038W-KE for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKEgX-006f6Y-1n for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKEgX-0033K4-1g for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11: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=31V0NzyWAlG3fAjjTsWmsyk6zNi1mQNjZIlnAjF8iiM=; b=qq2nYuoiLDpsb3auD0oEDJtlC+ p3ZajKgD2GnrzaMeaimoZnh51KtoN50TdLYHkhIrcpKbaO75I5Dxj9/TCbzrJEEbhbtf3beJkN7Gi q/4jGrvq2WWfWArx6BhKe6Ti5PhO50xdo0vkZDh35Q1d3/biqDQHVjTUpHH3JtjOhEQU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/dom0less: mark domain_p2m_set_allocation __init Message-Id: Date: Wed, 28 May 2025 11:11:01 +0000 commit eec94a43319a9dd7cb90528f6e1bb608c0164913 Author: Stewart Hildebrand AuthorDate: Tue May 13 13:18:02 2025 -0400 Commit: Michal Orzel CommitDate: Wed May 28 10:32:19 2025 +0200 xen/dom0less: mark domain_p2m_set_allocation __init All functions in dom0less-build.c should be __init. Fixes: 2705f1adb9df ("xen: introduce Kconfig ARCH_PAGING_MEMPOOL") Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/common/device-tree/dom0less-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 2c56f13771..39cb2cd5c7 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -730,8 +730,8 @@ static int __init domain_p2m_set_allocation(struct domain *d, uint64_t mem, return rc; } #else /* !CONFIG_ARCH_PAGING_MEMPOOL */ -static inline int domain_p2m_set_allocation(struct domain *d, uint64_t mem, - const struct dt_device_node *node) +static inline int __init domain_p2m_set_allocation( + struct domain *d, uint64_t mem, const struct dt_device_node *node) { return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 11:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 11:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999337.1380021 (Exim 4.92) (envelope-from ) id 1uKEgi-0003D8-Tl; Wed, 28 May 2025 11:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999337.1380021; Wed, 28 May 2025 11:11: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 1uKEgi-0003D2-Qn; Wed, 28 May 2025 11:11:12 +0000 Received: by outflank-mailman (input) for mailman id 999337; Wed, 28 May 2025 11:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKEgh-0003Cu-LV for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKEgh-006f6f-23 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKEgh-0033T1-1x for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11: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=AQEtlyYl1XA2OADAYkcIXwsDVmn9YoTGr1yyqG1G2dA=; b=RRguVfhPLwIKmJu4xCvAqXd7To tK+r2SuL0ms0MB6FqDTnDGDVK7j+efGPgjyXHATchSe1Lzlp+RZahyKEsB0+9Xq5r0XZYt1c7i20B G5XWX5iIHAl59ZfxOjiw+bMOXhdGJ5yc5vNgG0P8Qq2EkV/FvFSD/62NdwJq7mPOCMko=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: enforce __init in common/device-tree/*-build.c Message-Id: Date: Wed, 28 May 2025 11:11:11 +0000 commit fcf7cf21594116b4b7303ea2a4602ba9f97d10ab Author: Stewart Hildebrand AuthorDate: Tue May 13 13:18:03 2025 -0400 Commit: Michal Orzel CommitDate: Wed May 28 10:32:19 2025 +0200 xen: enforce __init in common/device-tree/*-build.c Code in domain-build.c and dom0less-build.c was migrated from init-only files. Thus, they contain only __init functions. Enforce this at build time. Fixes: ad03faa942b9 ("xen/common: dom0less: make some parts of Arm's CONFIG_DOM0LESS common") Fixes: d07b7369aa65 ("xen/common: dom0less: introduce common domain-build.c") Signed-off-by: Stewart Hildebrand Reviewed-by: Stefano Stabellini --- xen/common/device-tree/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index 831b91399b..ff54a8ef2b 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -1,8 +1,8 @@ obj-y += bootfdt.init.o obj-y += bootinfo.init.o obj-y += device-tree.o -obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.o -obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.o +obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.init.o +obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 11:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 11:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999338.1380023 (Exim 4.92) (envelope-from ) id 1uKEgt-0003G0-Uk; Wed, 28 May 2025 11:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999338.1380023; Wed, 28 May 2025 11: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 1uKEgt-0003Fs-SA; Wed, 28 May 2025 11:11:23 +0000 Received: by outflank-mailman (input) for mailman id 999338; Wed, 28 May 2025 11:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKEgr-0003FY-OG for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKEgr-006f6l-2L for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKEgr-0033hL-2D for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11: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=g4GehvqatkEF/SxaZLbfVpzg0p7+773GEoz6RBPWDtU=; b=B3kcpFsz5+LnIWvmoRjN6GRWVM 9Z5pdF009xR9NC6DUHEuHtAyzR5AbJ7V/d7yogZYjo0Lp5HCJPeDlHWYucGmtBCafpK8H8ZNSANWy OgoAn1R9/0mv5pECqvroxCb60hpeZNc5QBQP0WJgyMlT4Lujwi1SQNUUwaA1wEzHJG/g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/irq: Reduce size of irq_desc array to exclude local IRQs Message-Id: Date: Wed, 28 May 2025 11:11:21 +0000 commit ca55852d39ec984530bbd9d29a6d714505fd3411 Author: Mykola Kvach AuthorDate: Mon May 26 11:46:59 2025 +0300 Commit: Michal Orzel CommitDate: Wed May 28 11:39:00 2025 +0200 arm/irq: Reduce size of irq_desc array to exclude local IRQs SGI and PPI descriptors are banked and stored in the per-CPU local_irq_desc array, so not all elements of the global irq_desc array are used. This is already accounted for in the descriptor lookup logic inside __irq_to_desc: return &irq_desc[irq - NR_LOCAL_IRQS]; Therefore, the size of the irq_desc array can be reduced by NR_LOCAL_IRQS, saving (NR_LOCAL_IRQS * L1_CACHE_BYTES) bytes of memory. Signed-off-by: Mykola Kvach Reviewed-by: Michal Orzel --- xen/arch/arm/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index b9757d7ad3..03fbb90c6c 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -45,7 +45,7 @@ void irq_end_none(struct irq_desc *irq) gic_hw_ops->gic_host_irq_type->end(irq); } -static irq_desc_t irq_desc[NR_IRQS]; +static irq_desc_t irq_desc[NR_IRQS - NR_LOCAL_IRQS]; static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc); struct irq_desc *__irq_to_desc(unsigned int irq) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 11:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 11:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999339.1380028 (Exim 4.92) (envelope-from ) id 1uKEh3-0003Ie-01; Wed, 28 May 2025 11:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999339.1380028; Wed, 28 May 2025 11:11: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 1uKEh2-0003IX-TY; Wed, 28 May 2025 11:11:32 +0000 Received: by outflank-mailman (input) for mailman id 999339; Wed, 28 May 2025 11:11:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKEh1-0003IN-Ra for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKEh1-006f6t-2f for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKEh1-0033pj-2V for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 11:11: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=02JwHgpJuqC6kYCN3O3UaXASBRjSuqFhFJVx5Nji2xw=; b=SJbOgIxZAGh4YbTpbfnLEvnPY9 vsZU/fY12fguicEzm03ObdQ94AR6T32qF+zeCKLQ/IwhMmKsCKB62CNMYOKIc5YYVni/dbDaVSHlN kNvamGtf0LoRDbylUJHsfqx2nO4QeGeaydndIMf78eHYLcdPCIDvS5XGhQENX0prLK9A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/vgic-v3: Fix GICD_ICPENDR read access in __vgic_v3_distr_common_mmio_read() Message-Id: Date: Wed, 28 May 2025 11:11:31 +0000 commit 861e7862b8faf25129fb6df33c1cee333a34c404 Author: Oleksandr Tyshchenko AuthorDate: Tue May 27 00:11:52 2025 +0000 Commit: Michal Orzel CommitDate: Wed May 28 11:39:00 2025 +0200 arm/vgic-v3: Fix GICD_ICPENDR read access in __vgic_v3_distr_common_mmio_read() An attempt to read access the GICD_ICPENDR register (where n > 0) which should be RAZ (as not supported) causes the guest data abort due to incorrect end offset (GICD_ICPENDR) in the case range. Fix that by using the proper end offset (GICD_ICPENDRN). Fixes: a2b83f95bfa ("xen/arm: vgic: Properly emulate the full register") Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Michal Orzel --- xen/arch/arm/vgic-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index f20249f731..4369c55177 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -709,7 +709,7 @@ static int __vgic_v3_distr_common_mmio_read(const char *name, struct vcpu *v, /* Read the pending status of an IRQ via GICD/GICR is not supported */ case VRANGE32(GICD_ISPENDR, GICD_ISPENDRN): - case VRANGE32(GICD_ICPENDR, GICD_ICPENDR): + case VRANGE32(GICD_ICPENDR, GICD_ICPENDRN): goto read_as_zero; /* Read the active status of an IRQ via GICD/GICR is not supported */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 12:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 12:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999377.1380052 (Exim 4.92) (envelope-from ) id 1uKFnH-0005Bh-5u; Wed, 28 May 2025 12:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999377.1380052; Wed, 28 May 2025 12: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 1uKFnH-0005BY-38; Wed, 28 May 2025 12:22:03 +0000 Received: by outflank-mailman (input) for mailman id 999377; Wed, 28 May 2025 12:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKFnF-0005BS-Tq for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKFnF-006gOE-2m for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKFnF-003Vwc-2f for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12: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=8ZtCHI0w0UOkFzllXIXp9G4zB2YVgoAdD+a89FXxA9w=; b=yGEeH5kMY9n+sSJiftU8TMNhlq nrqh1143vCyHY4qlzCk7NBHswyw4dPig6SChBLS827Wf/hREAez4l37v0OfHI5xhHLRn7trhi1t+P b3NvMfnvI+xzB4SrgIkrQvn7gEgzi7IwZwebv1sFE4LFts7QzmS8lMsZk3fzieJGOEbw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI/qubes: Deduplicate the handling of ${dom0_check} Message-Id: Date: Wed, 28 May 2025 12:22:01 +0000 commit 2e6bf63fb1a830a417c6d866cf9c3883d38a25f3 Author: Andrew Cooper AuthorDate: Thu May 22 17:57:24 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 CI/qubes: Deduplicate the handling of ${dom0_check} Make it clearer that ${dom0_check} is unconditional. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Reviewed-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index aa47ba6bf5..6c4c9668f9 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -221,12 +221,11 @@ if [ -n "$domU_check" ]; then tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & xl -vvv create /etc/xen/domU.cfg -${dom0_check} " >> etc/local.d/xen.start -else - echo "${dom0_check}" >> etc/local.d/xen.start fi +echo "${dom0_check}" >> etc/local.d/xen.start + chmod +x etc/local.d/xen.start mkdir -p etc/xen echo "$domU_config" > etc/xen/domU.cfg -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 12:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 12:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999380.1380056 (Exim 4.92) (envelope-from ) id 1uKFnR-0005Dn-7W; Wed, 28 May 2025 12:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999380.1380056; Wed, 28 May 2025 12: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 1uKFnR-0005Df-4V; Wed, 28 May 2025 12:22:13 +0000 Received: by outflank-mailman (input) for mailman id 999380; Wed, 28 May 2025 12:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKFnQ-0005DV-3H for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKFnP-006gOL-35 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKFnP-003W4j-2w for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12: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=kyDqPqKqIhtfnWljOYBi0mDPGuHPVA+rUCO607xKZsU=; b=NdHb7/wgtMAkd6N/vbaeRXPOrJ 4qLUBUBqsA1VGvJQS57ZH5X5QR3VgPwnY/kM8h0z0m6NmJtvA5pMeFahjwswtOwF7arZQIrDy1tZT /61XFSEC70zD1R4ocnUIaFvL6L0LLO4F/ns5Zbd4RB0jnPifRlGNnYZUpNOeSAzQvShQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: Drop depriv-fd-checker Message-Id: Date: Wed, 28 May 2025 12:22:11 +0000 commit 6c2833d90412cbf63103deb90b7082b3cbdc0de4 Author: Andrew Cooper AuthorDate: Tue May 20 19:37:31 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 tools/tests: Drop depriv-fd-checker Unlike the other tests, this is not standalone. It requires poking at a live system, making it unweildly to use. It also hasn't been touched in 7 years, despite changes in libraries and kernel devices using the deprivilege infrastructure. Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD Acked-by: Stefano Stabellini Reviewed-by: Denis Mukhin --- .gitignore | 1 - tools/tests/Makefile | 1 - tools/tests/depriv/Makefile | 52 ---- tools/tests/depriv/depriv-fd-checker.c | 436 --------------------------------- 4 files changed, 490 deletions(-) diff --git a/.gitignore b/.gitignore index 53f5df0003..4a4e206804 100644 --- a/.gitignore +++ b/.gitignore @@ -165,7 +165,6 @@ tools/misc/xencov tools/pkg-config/* tools/qemu-xen-build tools/xentrace/xenalyze -tools/tests/depriv/depriv-fd-checker tools/tests/x86_emulator/*.bin tools/tests/x86_emulator/*.tmp tools/tests/x86_emulator/32/x86_emulate diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 3e60ab6b26..36928676a6 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -9,7 +9,6 @@ ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif SUBDIRS-y += xenstore -SUBDIRS-y += depriv SUBDIRS-y += rangeset SUBDIRS-y += vpci SUBDIRS-y += paging-mempool diff --git a/tools/tests/depriv/Makefile b/tools/tests/depriv/Makefile deleted file mode 100644 index 5404a12f47..0000000000 --- a/tools/tests/depriv/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -XEN_ROOT=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += $(CFLAGS_xeninclude) -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxencall) -CFLAGS += $(CFLAGS_libxenevtchn) -CFLAGS += $(CFLAGS_libxengnttab) -CFLAGS += $(CFLAGS_libxenforeignmemory) -CFLAGS += $(CFLAGS_libxendevicemodel) -CFLAGS += $(CFLAGS_libxentoolcore) -CFLAGS += $(CFLAGS_libxentoollog) - -LDLIBS += $(LDLIBS_xeninclude) -LDLIBS += $(LDLIBS_libxenctrl) -LDLIBS += $(LDLIBS_libxencall) -LDLIBS += $(LDLIBS_libxenevtchn) -LDLIBS += $(LDLIBS_libxengnttab) -LDLIBS += $(LDLIBS_libxenforeignmemory) -LDLIBS += $(LDLIBS_libxendevicemodel) -LDLIBS += $(LDLIBS_libxentoolcore) -LDLIBS += $(LDLIBS_libxentoollog) - -INSTALL_PRIVBIN-y += depriv-fd-checker -INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y) -TARGETS += $(INSTALL_PRIVBIN) - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) - -.PHONY: clean -clean: - $(RM) *.o $(TARGETS) *~ $(DEPS_RM) - -.PHONY: distclean -distclean: clean - -depriv-fd-checker: depriv-fd-checker.o - $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) - -install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) - -.PHONY: uninstall -uninstall: - rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(INSTALL_PRIVBIN)) - --include $(DEPS_INCLUDE) diff --git a/tools/tests/depriv/depriv-fd-checker.c b/tools/tests/depriv/depriv-fd-checker.c deleted file mode 100644 index 98a27a03d5..0000000000 --- a/tools/tests/depriv/depriv-fd-checker.c +++ /dev/null @@ -1,436 +0,0 @@ -/* - * depriv-fd-checker - * - * utility to check whether file descriptor(s) are deprivileged - * - * usage: - * .../depriv-fd-checker CLASS FD X-INFO [CLASS FD X-INFO...] - * - * CLASS is one of: - * privcmd gntdev evtchn FD should be appropriate Xen control fd - * readonly FD is expected to be readonly - * appendonly FD is expected to be append write only - # tun FD is expected to be an open tun device - * - * In each case FD is probably a reference to an open-file stolen - * from another process, eg by the use of fishdescriptor. - * - * X-INFO is simply appended to the discursive reportage. - * - * It is an error if depriv-fd-checker cannot open the control - * facilities itself, or something goes wrong with checking, or an FD - * is entirely the wrong kind for the specified CLASS. Otherwise: - * - * depriv-fd-checker will perhaps print, for each triplet: - * CLASS checking FD INFORMATION... X-INFO - * and in any case print, for each triplet, exactly one of: - * CLASS pass|fail FD INFORMATION... X-INFO - * tun maybe FD IFNAME X-INFO - * - * "pass" means that the descriptor was restricted as expected. - * "fail" means that the descriptor was unrestricted. - * "maybe" means that further information is printed, as detailed above, - * and the caller should check that it is as expected - */ -/* - * Copyright (C)2018 Citrix Systems R&D - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; version 2.1 of the - * License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see - * . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -/* - * Every class needs setup. setup is called once per class at program - * startup. - * - * Then it can have - * open test getfd close - * In which case the core code will for every fd - * open test getfd dup2 test close - * And test should call blocked or succeeded and then immediately - * return, or error out - * - * Or it can have - * check - * which should call report, or error out - * - * Errors: use trouble for simple syscall errors. Or use err or errx - * and maybe print fd_desc and test_which, according to the comments - * in struct classinfo. - */ - -static xentoollog_logger *logger; - -static int object_fd; -static const char *classname; -static const char *fd_desc; -static const char *test_which; - -static const char *test_wh_unrest = "test (unrestricted)"; -static const char *test_wh_rest = "test (restricted)"; - - -static void trouble(const char *what) __attribute__((noreturn)); -static void trouble(const char *what) { - fprintf(stderr, - "trouble: %s %s %d (%s) %s: %s\n", - classname, test_which, object_fd, fd_desc, what, strerror(errno)); - exit(-1); -} - -static void report(const char *pass_or_fail, const char *what, - const char *notes) { - printf("%s %s %d %s (%s) %s\n", - classname, pass_or_fail, - object_fd, what, notes, fd_desc); - if (ferror(stdout) || fflush(stdout)) err(16,"stdout"); -} - -static void succeeded(const char *what) { - if (test_which == test_wh_unrest) { - /* ok */ - test_which = 0; - } else if (test_which == test_wh_rest) { - report("fail",what,"unexpectedly succeeded"); - test_which = 0; - } else { - abort(); - } -} - -static void blocked(const char *what) { - if (test_which == test_wh_rest) { - /* yay */ - report("pass", what,"blocked"); - test_which = 0; - } else if (test_which == test_wh_unrest) { - err(4,"test blocked on unrestricted fd: %s {%s}",what,test_which); - } else { - abort(); - } -} - -/* privcmd */ - -static xc_interface *xch; -static void setup_privcmd(void) { } -static void open_privcmd(void) { - xch = xc_interface_open(logger,0,0); - if (!xch) trouble("xc_interface_open"); -} -static void test_privcmd(void) { - int r = xc_get_online_cpus(xch); - if (r>0) - succeeded("xc_get_online_cpus"); - else if (r==0) - errx(-1,"xc_get_online_cpus{%s, %s}=0", test_which, fd_desc); - else if (errno==EPERM || errno==EACCES) - blocked("xc_get_online_cpus"); - else - trouble("xc_get_online_cpus"); -} -static int getfd_privcmd(void) { - return xencall_fd(xc_interface_xcall_handle(xch)); -} -static void close_privcmd(void) { - xc_interface_close(xch); -} - -/* gntdev */ - -static xengntshr_handle *xgs; -static uint32_t gntshr_gref; -static xengnttab_handle *xgt; -static void setup_gntdev(void) { - void *r; - xgs = xengntshr_open(logger,0); - if (!xgs) trouble("xengntshr_open"); - r = xengntshr_share_pages(xgs, 0, 1, &gntshr_gref, 1); - if (!r || r==(void*)-1) trouble("xengntshr_share_pages"); - memset(r, 0x55, XC_PAGE_SIZE); -} -static void open_gntdev(void) { - xgt = xengnttab_open(logger,0); - if (!xgt) trouble("xengnttab_open"); -} -static void test_gntdev(void) { - char mybuf[XC_PAGE_SIZE]; - memset(mybuf, 0xaa, XC_PAGE_SIZE); - xengnttab_grant_copy_segment_t seg; - seg.source.foreign.ref = gntshr_gref; - seg.source.foreign.offset = 0; - seg.source.foreign.domid = 0; - seg.dest.virt = mybuf; - seg.len = 1; - seg.flags = GNTCOPY_source_gref; - for (;;) { - seg.status = 0; - int r = xengnttab_grant_copy(xgt,1,&seg); - if (r<0) { - if (errno==EPERM || errno==EACCES || errno==ENOTTY) - blocked("xengnttab_grant_copy"); - else - trouble("xengnttab_grant_copy"); - } else if (r==0) { - if (seg.status==GNTST_okay) - succeeded("xengnttab_grant_copy okay"); - else if (seg.status==GNTST_eagain) - continue; - else errx(-1,"xengnttab_grant_copy=%d {%s, %s} but .status=%d", - r, test_which, fd_desc,(int)seg.status); - } else { - errx(-1,"xengnttab_grant_copy=%d {%s, %s}", - r, test_which, fd_desc); - } - break; - } -} -static int getfd_gntdev(void) { - return xengnttab_fd(xgt); -} -static void close_gntdev(void) { - xengnttab_close(xgt); -} - -/* evtchn */ - -static xenevtchn_handle *xce_recip, *xce; -static void setup_evtchn(void) { - xce_recip = xenevtchn_open(logger, 0); - if (!xce_recip) err(-1,"xenevtchn_open (donor)"); -} -static void open_evtchn(void) { - xce = xenevtchn_open(logger, 0); - if (!xce) err(-1,"xenevtchn_open"); -} -static void test_evtchn(void) { - xenevtchn_port_or_error_t - recip_port=-1, test_unbound_port=-1, test_send_port=-1; - - recip_port = xenevtchn_bind_unbound_port(xce_recip, 0); - if (recip_port < 0) trouble("xenevtchn_bind_unbound_port"); - - test_unbound_port = xenevtchn_bind_unbound_port(xce, 0); - if (test_unbound_port >= 0) { - succeeded("xenevtchn_bind_unbound_port"); - goto out; - } - - test_send_port = xenevtchn_bind_interdomain(xce, 0, recip_port); - /* bind_interdomain marks the channel pending */ - struct pollfd pfd; - for (;;) { - pfd.fd = xenevtchn_fd(xce_recip); - pfd.events = POLLIN; - pfd.revents = 0; - int r = poll(&pfd,1,0); - if (r>=0) break; - if (errno!=EINTR) err(-1,"poll(xce_recip)"); - } - if (pfd.revents & POLLIN) { - xenevtchn_port_or_error_t p3 = xenevtchn_pending(xce_recip); - if (p3 < 0) err(-1,"xenevtchn_pending(check)"); - if (p3 != recip_port) - errx(-1,"xenevtchn_pending=%d expected %d",p3,recip_port); - xenevtchn_unmask(xce_recip, recip_port); - } - - if (test_send_port>=0 && (pfd.revents & POLLIN)) { - succeeded("xenevtchn_bind_interdomain/poll"); - /* we make no attempt to undo what we did to this stolen fd; - * the rightful owner will see a spurious event on test_send_port */ - } else if (test_send_port==-1 && !(pfd.revents & POLLIN) && - (errno==EPERM || errno==EACCES || errno==ENOTTY)) { - blocked("xenevtchn_notify"); - } else { - err(-1,"%s %s xenevtchn_bind_interdomain=%d .revents=0x%x", - test_which, fd_desc, test_send_port, pfd.revents); - } - - out: - if (recip_port > 0) xenevtchn_unbind(xce, recip_port); - if (test_unbound_port > 0) xenevtchn_unbind(xce, test_unbound_port); - if (test_send_port > 0) xenevtchn_unbind(xce, test_send_port); -} -static int getfd_evtchn(void) { - return xenevtchn_fd(xce); -} -static void close_evtchn(void) { - xenevtchn_close(xce); -} - -/* fcntl */ - -#define CHECK_FCNTL(openmode) \ - int r = fcntl(object_fd, F_GETFL); \ - if (r < 0) trouble("fcntl F_GETFL"); \ - int m = r & (O_RDONLY | O_WRONLY | O_RDWR); \ - \ - char mbuf[100 + 30*3]; \ - snprintf(mbuf,sizeof(mbuf), \ - "F_GETFL=%#o m=%#o " #openmode "=%#o", \ - r,m,(int)openmode); \ - \ - if (m != openmode) { \ - report("fail", #openmode, mbuf); \ - return; \ - } - -/* readonly */ - -static void setup_readonly(void) { } -static void check_readonly(void) { - CHECK_FCNTL(O_RDONLY); - report("pass", "fcntl", mbuf); -} - -/* appendonly */ - -static void setup_appendonly(void) { } -static void check_appendonly(void) { - CHECK_FCNTL(O_WRONLY); - if (!(r & O_APPEND)) { - report("fail", "O_APPEND", mbuf); - return; - } - report("pass", "fcntl", mbuf); -} - -#if defined(__linux__) -#include -#include -#include -#include -#include -#ifndef TUNGETIFF -#define TUNGETIFF _IOR('T', 210, unsigned int) -#endif - -/* linux tun */ - -static void setup_tun(void) { } -static void check_tun(void) { - struct ifreq ifr; - int r; - - memset(&ifr,0,sizeof(ifr)); - r = ioctl(object_fd, TUNGETIFF, (void*)&ifr); - if (r<0) trouble("TUNGETIFF"); - printf("tun maybe %d %.*s %s\n", object_fd, - (int)IFNAMSIZ, ifr.ifr_ifrn.ifrn_name, - fd_desc); -} - -#define PLATFORM_CLASSES \ - DEFCHECK(tun), - -#else /* !defined(__linux__) */ -#define PLATFORM_CLASSES /* empty */ -#endif - -/* class table and main program */ - -#define DEFCLASS(cl) \ - { #cl, setup_##cl, 0, open_##cl, test_##cl, getfd_##cl, close_##cl } -#define DEFCHECK(meth) \ - { #meth, setup_##meth, check_##meth } - -static const struct classinfo { - const char *name; /* errors: print fd_desc test_which */ - void (*setup)(void); /* best not best not */ - void (*check)(void); /* must may */ - void (*open)(void); /* must may */ - void (*test)(void); /* must must */ - int (*getfd)(void); /* must may */ - void (*close)(void); /* must may */ -} classinfos[] = { - DEFCLASS(privcmd), - DEFCLASS(gntdev), - DEFCLASS(evtchn), - DEFCHECK(readonly), - DEFCHECK(appendonly), - PLATFORM_CLASSES - { 0 } -}; - -int main(int argc, char **argv) { - const struct classinfo *cli; - int r; - - argv++; - - logger = (xentoollog_logger*)xtl_createlogger_stdiostream - (stderr, XTL_NOTICE, XTL_STDIOSTREAM_HIDE_PROGRESS); - - fd_desc = "setup"; - test_which = "setup"; - for (cli = classinfos; cli->name; cli++) - cli->setup(); - - while ((classname = *argv++)) { - if (!*argv) errx(8,"need fd after class"); - object_fd = atoi(*argv++); - - fd_desc = *argv++; - if (!fd_desc) errx(8,"need info after fd"); - - for (cli = classinfos; cli->name; cli++) - if (!strcmp(cli->name, classname)) - goto found; - report("fail","unknown class",""); - continue; - - found: - if (cli->check) { - report("checking","check","in progress"); - test_which = "check"; - cli->check(); - } else { - test_which = "open"; - report("checking","dup-hack","in progress"); - cli->open(); - - test_which = test_wh_unrest; cli->test(); - assert(!test_which); - - test_which = "getfd"; int intern_fd = cli->getfd(); - r = dup2(object_fd, intern_fd); - if (r != intern_fd) err(-1, "dup2"); - - test_which = test_wh_rest; cli->test(); - assert(!test_which); - - test_which = "close"; cli->close(); - } - } - - return 0; -} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 12:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 12:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999382.1380059 (Exim 4.92) (envelope-from ) id 1uKFnb-0005GM-8T; Wed, 28 May 2025 12:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999382.1380059; Wed, 28 May 2025 12: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 1uKFnb-0005GE-5w; Wed, 28 May 2025 12:22:23 +0000 Received: by outflank-mailman (input) for mailman id 999382; Wed, 28 May 2025 12:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKFna-0005G2-2U for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKFna-006gOT-08 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKFna-003W76-03 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12: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=0eUeJvlzdoJw2zk5+5aXBQVpvIz2Py1pjx106p3r1RQ=; b=koxUTdqkpUdfnCKDRLHwrqcXIN 272s3rDUjKhl3D8UKtP+4yBi4S8cv7LMC1SKxA3RIVATAH7h2zCnQIfUVHUAYR+FdEzTrzw2e3xUX iQUw+0jlV2JLIkjBBLU5TpM39RtJGYKEubVkacBxqfYsF4B5fI5yx4wB2ZC/OF/NSdL8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: Install tests into $(LIBEXEC)/tests Message-Id: Date: Wed, 28 May 2025 12:22:22 +0000 commit 2d497e97e20e6e63472c6aa930a3a8b29c58b6d6 Author: Andrew Cooper AuthorDate: Tue May 20 20:03:55 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 tools/tests: Install tests into $(LIBEXEC)/tests $(LIBEXEC_BIN) is a dumping ground of many things. Separate the "clearly tests" from everything else so we can clean up how they're run in CI. Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD Acked-by: Stefano Stabellini Reviewed-by: Denis Mukhin --- tools/tests/cpu-policy/Makefile | 6 +++--- tools/tests/paging-mempool/Makefile | 6 +++--- tools/tests/rangeset/Makefile | 6 +++--- tools/tests/resource/Makefile | 6 +++--- tools/tests/tsx/Makefile | 6 +++--- tools/tests/xenstore/Makefile | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/tests/cpu-policy/Makefile b/tools/tests/cpu-policy/Makefile index 5df9b1ebbd..24f87e2eca 100644 --- a/tools/tests/cpu-policy/Makefile +++ b/tools/tests/cpu-policy/Makefile @@ -29,12 +29,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN)) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC)/tests) .PHONY: uninstall uninstall: - $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGETS)) + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGETS)) CFLAGS += -D__XEN_TOOLS__ CFLAGS += $(CFLAGS_xeninclude) diff --git a/tools/tests/paging-mempool/Makefile b/tools/tests/paging-mempool/Makefile index a081b3baa5..a1e12584ce 100644 --- a/tools/tests/paging-mempool/Makefile +++ b/tools/tests/paging-mempool/Makefile @@ -16,12 +16,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(DESTDIR)$(LIBEXEC_BIN)/$(TARGET) + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenctrl) diff --git a/tools/tests/rangeset/Makefile b/tools/tests/rangeset/Makefile index 3dafcbd054..e3bfce471c 100644 --- a/tools/tests/rangeset/Makefile +++ b/tools/tests/rangeset/Makefile @@ -20,12 +20,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGET)) + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGET)) list.h: $(XEN_ROOT)/xen/include/xen/list.h rangeset.h: $(XEN_ROOT)/xen/include/xen/rangeset.h diff --git a/tools/tests/resource/Makefile b/tools/tests/resource/Makefile index a5856bf095..09d678fffe 100644 --- a/tools/tests/resource/Makefile +++ b/tools/tests/resource/Makefile @@ -20,12 +20,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(DESTDIR)$(LIBEXEC_BIN)/$(TARGET) + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenctrl) diff --git a/tools/tests/tsx/Makefile b/tools/tests/tsx/Makefile index a4f516b725..0bb7e70103 100644 --- a/tools/tests/tsx/Makefile +++ b/tools/tests/tsx/Makefile @@ -16,12 +16,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(DESTDIR)$(LIBEXEC_BIN)/$(TARGET) + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) .PHONY: uninstall uninstall: diff --git a/tools/tests/xenstore/Makefile b/tools/tests/xenstore/Makefile index 202dda0d3c..2ee4a1327e 100644 --- a/tools/tests/xenstore/Makefile +++ b/tools/tests/xenstore/Makefile @@ -20,12 +20,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN)) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC)/tests) .PHONY: uninstall uninstall: - $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGETS)) + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGETS)) CFLAGS += $(CFLAGS_libxenstore) CFLAGS += $(APPEND_CFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 12:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 12:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999383.1380064 (Exim 4.92) (envelope-from ) id 1uKFnl-0005Id-AQ; Wed, 28 May 2025 12:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999383.1380064; Wed, 28 May 2025 12: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 1uKFnl-0005IW-7P; Wed, 28 May 2025 12:22:33 +0000 Received: by outflank-mailman (input) for mailman id 999383; Wed, 28 May 2025 12:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKFnk-0005IO-5h for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKFnk-006gOd-0P for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKFnk-003W85-0J for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12: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=NmeB7bqJK5mepxO6D0Gxlz2MNfoA/5I6Q9wIA72UD44=; b=DMkW6W6XFyeTtipzDATf9roe06 M2LZ0hZbFok2i+bBZMTpt1uh3SeRs42CuV2fNNcog3hGU6Gjglzhzie0atHVi+3D3u+wOxY6RehML h7ttkHXEGirE6l55z1bvPOmNh/j5ke+zdNRBWO4scNIsdqRvbSvW+rh3Zwfx6HJvWock=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Drop custom handling of tools/tests Message-Id: Date: Wed, 28 May 2025 12:22:32 +0000 commit 0e7f6c609834213c97328677735eb309eed571e6 Author: Andrew Cooper AuthorDate: Tue May 20 20:05:56 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 CI: Drop custom handling of tools/tests ... and use them from their installed location. The full reclusive copy of tools/tests brings in all build and intermediate artefacts. e.g. for test-tsx alone: ./tests/tsx ./tests/tsx/.test-tsx.o.d ./tests/tsx/test-tsx.o ./tests/tsx/.gitignore ./tests/tsx/test-tsx ./tests/tsx/Makefile ./tests/tsx/test-tsx.c duplicating the test binary which is also in ./usr/lib/xen/tests Rewrite run-tools-tests to run tests from their installed location (/usr/lib/xen/tests in alpine), which effectively removes the outer loop over $dir. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Reviewed-by: Stefano Stabellini Reviewed-by: Denis Mukhin --- automation/scripts/build | 1 - automation/scripts/qubes-x86-64.sh | 7 +++---- automation/scripts/run-tools-tests | 43 +++++++++++++++++--------------------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index cdb8cd7c72..0e7494ff6d 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -109,6 +109,5 @@ else # even though dist/ contains everything, while some containers don't even # build Xen (cd dist/install; find | cpio -o -H newc | gzip) > binaries/xen-tools.cpio.gz - cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 6c4c9668f9..8e86940c6e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -136,7 +136,7 @@ done passed="test passed" domU_check="" dom0_check=" -/tests/run-tools-tests /tests /tmp/tests-junit.xml && echo \"${passed}\" +/root/run-tools-tests /usr/lib/xen/tests /tmp/tests-junit.xml && echo \"${passed}\" nc -l -p 8080 < /tmp/tests-junit.xml >/dev/null & " if [ "${test_variant}" = "tools-tests-pvh" ]; then @@ -195,9 +195,8 @@ cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -mkdir -p boot etc/local.d -cp -ar ../binaries/tests . -cp -a ../automation/scripts/run-tools-tests tests/ +mkdir -p boot etc/local.d root +cp -a ../automation/scripts/run-tools-tests root/ echo "#!/bin/bash diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index 770e97c3e9..2bca1589db 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -12,30 +12,25 @@ printf '\n' > "$xml_out" printf '\n' >> "$xml_out" printf ' \n' >> "$xml_out" failed= -for dir in "$1"/*; do - [ -d "$dir" ] || continue - echo "Running test in $dir" - printf ' \n' "$dir" >> "$xml_out" - ret= - for f in "$dir"/*; do - [ -f "$f" ] || continue - [ -x "$f" ] || continue - "$f" 2>&1 | tee /tmp/out - ret=$? - if [ "$ret" -ne 0 ]; then - echo "FAILED: $ret" - failed+=" $dir" - printf ' \n' "$f" "$ret" >> "$xml_out" - # TODO: could use xml escaping... but current tests seems to - # produce sane output - cat /tmp/out >> "$xml_out" - printf ' \n' >> "$xml_out" - else - echo "PASSED" - fi - done - if [ -z "$ret" ]; then - printf ' \n' "$dir" >> "$xml_out" +for f in "$1"/*; do + if [ ! -x "$f" ]; then + echo "SKIP: $f not executable" + continue + fi + echo "Running $f" + printf ' \n' "$f" >> "$xml_out" + "$f" 2>&1 | tee /tmp/out + ret=$? + if [ "$ret" -ne 0 ]; then + echo "FAILED: $f" + failed+=" $f" + printf ' \n' "$f" "$ret" >> "$xml_out" + # TODO: could use xml escaping... but current tests seems to + # produce sane output + cat /tmp/out >> "$xml_out" + printf ' \n' >> "$xml_out" + else + echo "PASSED" fi printf ' \n' >> "$xml_out" done -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 12:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 12:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999384.1380067 (Exim 4.92) (envelope-from ) id 1uKFnv-0005Lg-Cg; Wed, 28 May 2025 12:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999384.1380067; Wed, 28 May 2025 12:22: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 1uKFnv-0005LY-A8; Wed, 28 May 2025 12:22:43 +0000 Received: by outflank-mailman (input) for mailman id 999384; Wed, 28 May 2025 12:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKFnu-0005LL-7l for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKFnu-006gOh-0f for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKFnu-003W98-0a for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22: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=U1S2hVo8Zo3vBaXl+EXYaVpQ8MzFh1h6pnYa0+s+PCw=; b=LOodBRjOPrrzl1wKafw35mVZUK Q7swpzhXeDXbehdsxRL6rTtAXP3Fzrd9GAxT2OzxvIlHkFrGlO4d1NjkZXrx8AHxnrJfMd0R5hdhl xiO+gdDQRazYgiSkQ9PgP/I0QUhjPItU8zaNIKRlR0F8zRHcUdmpHS5+UGdp+hBreyEY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ACPI: Move scheduler enable/disable calls out of {freeze,thaw}_domains() Message-Id: Date: Wed, 28 May 2025 12:22:42 +0000 commit 1099bdd24f78fa2fe5b6a4533bc8f4f18cce0df0 Author: Mykola Kvach AuthorDate: Tue May 27 13:04:16 2025 +0300 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 x86/ACPI: Move scheduler enable/disable calls out of {freeze,thaw}_domains() ... and into their parent, enter_state(). This change addresses the concern about misleading function semantics, as the scheduler operations are not directly related to the domain pausing/resuming implied by the freeze/thaw naming. Suggested-by: Jan Beulich Signed-off-by: Mykola Kvach Acked-by: Andrew Cooper --- xen/arch/x86/acpi/power.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 095ca391ad..448aa9f3a7 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -151,16 +151,12 @@ static void freeze_domains(void) for_each_domain ( d ) domain_pause(d); rcu_read_unlock(&domlist_read_lock); - - scheduler_disable(); } static void thaw_domains(void) { struct domain *d; - scheduler_enable(); - rcu_read_lock(&domlist_read_lock); for_each_domain ( d ) domain_unpause(d); @@ -216,6 +212,7 @@ static int enter_state(u32 state) printk(XENLOG_INFO "Preparing system for ACPI S%d state.\n", state); freeze_domains(); + scheduler_disable(); acpi_dmar_reinstate(); @@ -334,6 +331,7 @@ static int enter_state(u32 state) mtrr_aps_sync_end(); iommu_adjust_irq_affinities(); acpi_dmar_zap(); + scheduler_enable(); thaw_domains(); system_state = SYS_STATE_active; spin_unlock(&pm_lock); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 12:22:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 12:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999385.1380072 (Exim 4.92) (envelope-from ) id 1uKFo5-0005O7-EE; Wed, 28 May 2025 12:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999385.1380072; Wed, 28 May 2025 12:22: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 1uKFo5-0005O0-BU; Wed, 28 May 2025 12:22:53 +0000 Received: by outflank-mailman (input) for mailman id 999385; Wed, 28 May 2025 12:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKFo4-0005Nq-As for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKFo4-006gOl-0z for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKFo4-003WA1-0s for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:22: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=e1uh+wFus4NtuQmC54JJ/AKyO9DDBay0Qh57Th413VM=; b=lsVUBLDG3T3gkNYS96GVuivyEP dju84JdqArmR0AdPV2SxfzaNQwU32cMiQw1eB1v367tEdqyv7xafRIjZga9Mivy/WbOOXPDt0Yz70 CTOMHyib1hbBqbjWinPiuXUPu4ui6f8RE5RSNVMUR8NyCGT9yDnGXfECpa1PfT28QoEs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: Drop unused vpic.h includes Message-Id: Date: Wed, 28 May 2025 12:22:52 +0000 commit f15954630cf1eead2717bc7abab471d84735dbc1 Author: Andrew Cooper AuthorDate: Mon May 26 23:16:32 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 x86/hvm: Drop unused vpic.h includes It's only hvm.c, irq.c and vpci.c which need this header, and they all get it via asm/hvm/irq.h. Signed-off-by: Andrew Cooper Reviewed-by: Jason Andryuk --- xen/arch/x86/hvm/io.c | 1 - xen/arch/x86/hvm/vioapic.c | 1 - xen/arch/x86/hvm/vmsi.c | 1 - xen/arch/x86/hvm/vmx/intr.c | 1 - xen/arch/x86/hvm/vmx/vmx.c | 1 - 5 files changed, 5 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index de6ee6c4dd..23a5ea0e61 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index f896b9ea12..7c725f9e47 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 61b89834d9..32e417bc15 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 91b407e6bc..b35dc8c586 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index c2262c5848..d8879c304e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 12:23:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 12:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999386.1380075 (Exim 4.92) (envelope-from ) id 1uKFoG-0005QV-Fa; Wed, 28 May 2025 12:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999386.1380075; Wed, 28 May 2025 12:23: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 1uKFoG-0005QN-D2; Wed, 28 May 2025 12:23:04 +0000 Received: by outflank-mailman (input) for mailman id 999386; Wed, 28 May 2025 12:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKFoE-0005Q9-Dj for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKFoE-006gPM-1G for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKFoE-003WBS-1A for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 12:23: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=oWkLelHOysrgxOxCf+Vcgmj+ccwIeON9GCgAlHm7gdM=; b=KP7LsFD/s4Cse0nu5QPAnkoTzq CwL/X/dwiD85JLUZgaiRuCUKaN23ITlA269h3pw0UImXC9rjiv90m3UKWMGi+woMw7rszSUtyIWVZ E2Q+5E3jYODF3sct2Jqgw1Jx2gE03IArprxzE0Gbj8MhUv+yZs7SUIY2d3cGSi93NavI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: Remove is_periodic_irq() prototype Message-Id: Date: Wed, 28 May 2025 12:23:02 +0000 commit 9843d1c44af1640a165fec82209b7bcfe54f27fc Author: Jason Andryuk AuthorDate: Tue May 27 18:37:53 2025 -0400 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 xen/x86: Remove is_periodic_irq() prototype is_periodic_irq() was removed in the Fixes commit, but the prototype remained. Drop it now. Fixes: ddc35d1cc994 ("[HVM] Enable more than one platform timer...") Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/hvm/vpic.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/x86/include/asm/hvm/vpic.h b/xen/arch/x86/include/asm/hvm/vpic.h index d71b270193..78ed33e9aa 100644 --- a/xen/arch/x86/include/asm/hvm/vpic.h +++ b/xen/arch/x86/include/asm/hvm/vpic.h @@ -35,6 +35,5 @@ void vpic_irq_negative_edge(struct domain *d, int irq); void vpic_init(struct domain *d); void vpic_reset(struct domain *d); int vpic_ack_pending_irq(struct vcpu *v); -int is_periodic_irq(struct vcpu *v, int irq, int type); #endif /* __ASM_X86_HVM_VPIC_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 28 13:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 13:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999418.1380109 (Exim 4.92) (envelope-from ) id 1uKGYh-0004iS-9C; Wed, 28 May 2025 13:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999418.1380109; Wed, 28 May 2025 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 1uKGYh-0004iL-6L; Wed, 28 May 2025 13:11:03 +0000 Received: by outflank-mailman (input) for mailman id 999418; Wed, 28 May 2025 13:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKGYf-0004iF-Sp for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKGYf-006hIh-2h for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKGYf-003dJH-2O for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13: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=mnxZrpJXCl1JR0o4YCf177MOqiToz6niTX031JWPsNI=; b=34kEKC1bqRdFnlTs4u24Mlohvu +SR5Ff58qlJYtLluOuKHasOv9dg24CuAOG9U/aKtKqbv6c3M6nNHS3nI+7IdHUKjDHgePhGJsu4VH yCaUkcKzyhS4s4/KJJztktm84hwQFlfdoQgk3c32kzXOQrK0ZdwSlpuXH5zmggnq81fA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI/qubes: Deduplicate the handling of ${dom0_check} Message-Id: Date: Wed, 28 May 2025 13:11:01 +0000 commit 2e6bf63fb1a830a417c6d866cf9c3883d38a25f3 Author: Andrew Cooper AuthorDate: Thu May 22 17:57:24 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 CI/qubes: Deduplicate the handling of ${dom0_check} Make it clearer that ${dom0_check} is unconditional. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Reviewed-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index aa47ba6bf5..6c4c9668f9 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -221,12 +221,11 @@ if [ -n "$domU_check" ]; then tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & xl -vvv create /etc/xen/domU.cfg -${dom0_check} " >> etc/local.d/xen.start -else - echo "${dom0_check}" >> etc/local.d/xen.start fi +echo "${dom0_check}" >> etc/local.d/xen.start + chmod +x etc/local.d/xen.start mkdir -p etc/xen echo "$domU_config" > etc/xen/domU.cfg -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 13:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 13:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999419.1380114 (Exim 4.92) (envelope-from ) id 1uKGYr-0004n4-An; Wed, 28 May 2025 13:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999419.1380114; Wed, 28 May 2025 13: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 1uKGYr-0004mw-7v; Wed, 28 May 2025 13:11:13 +0000 Received: by outflank-mailman (input) for mailman id 999419; Wed, 28 May 2025 13:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKGYp-0004mi-V3 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKGYp-006hIw-30 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKGYp-003dKR-2s for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13: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=XejJgm4EupzN/bqUixAWvFb3Y/DsTdzcBbR/01htPzI=; b=KPIvxHC5x4rsbOhlsabRNfbKmK em77GWzfCpqLuLWBToi4Ld1ah1gtl6/xS5ldX5P89E0y8o7WGemVfaAT+xTzGYAJpLukiwLNnVk5v 6w5donAvga22wXzWRQmqxd80J/0CWzVbSuIpUmb0EgDI+GVRuabvWpWEjmqgz1xxHgF4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: Drop depriv-fd-checker Message-Id: Date: Wed, 28 May 2025 13:11:11 +0000 commit 6c2833d90412cbf63103deb90b7082b3cbdc0de4 Author: Andrew Cooper AuthorDate: Tue May 20 19:37:31 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 tools/tests: Drop depriv-fd-checker Unlike the other tests, this is not standalone. It requires poking at a live system, making it unweildly to use. It also hasn't been touched in 7 years, despite changes in libraries and kernel devices using the deprivilege infrastructure. Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD Acked-by: Stefano Stabellini Reviewed-by: Denis Mukhin --- .gitignore | 1 - tools/tests/Makefile | 1 - tools/tests/depriv/Makefile | 52 ---- tools/tests/depriv/depriv-fd-checker.c | 436 --------------------------------- 4 files changed, 490 deletions(-) diff --git a/.gitignore b/.gitignore index 53f5df0003..4a4e206804 100644 --- a/.gitignore +++ b/.gitignore @@ -165,7 +165,6 @@ tools/misc/xencov tools/pkg-config/* tools/qemu-xen-build tools/xentrace/xenalyze -tools/tests/depriv/depriv-fd-checker tools/tests/x86_emulator/*.bin tools/tests/x86_emulator/*.tmp tools/tests/x86_emulator/32/x86_emulate diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 3e60ab6b26..36928676a6 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -9,7 +9,6 @@ ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif SUBDIRS-y += xenstore -SUBDIRS-y += depriv SUBDIRS-y += rangeset SUBDIRS-y += vpci SUBDIRS-y += paging-mempool diff --git a/tools/tests/depriv/Makefile b/tools/tests/depriv/Makefile deleted file mode 100644 index 5404a12f47..0000000000 --- a/tools/tests/depriv/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -XEN_ROOT=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += $(CFLAGS_xeninclude) -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxencall) -CFLAGS += $(CFLAGS_libxenevtchn) -CFLAGS += $(CFLAGS_libxengnttab) -CFLAGS += $(CFLAGS_libxenforeignmemory) -CFLAGS += $(CFLAGS_libxendevicemodel) -CFLAGS += $(CFLAGS_libxentoolcore) -CFLAGS += $(CFLAGS_libxentoollog) - -LDLIBS += $(LDLIBS_xeninclude) -LDLIBS += $(LDLIBS_libxenctrl) -LDLIBS += $(LDLIBS_libxencall) -LDLIBS += $(LDLIBS_libxenevtchn) -LDLIBS += $(LDLIBS_libxengnttab) -LDLIBS += $(LDLIBS_libxenforeignmemory) -LDLIBS += $(LDLIBS_libxendevicemodel) -LDLIBS += $(LDLIBS_libxentoolcore) -LDLIBS += $(LDLIBS_libxentoollog) - -INSTALL_PRIVBIN-y += depriv-fd-checker -INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y) -TARGETS += $(INSTALL_PRIVBIN) - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) - -.PHONY: clean -clean: - $(RM) *.o $(TARGETS) *~ $(DEPS_RM) - -.PHONY: distclean -distclean: clean - -depriv-fd-checker: depriv-fd-checker.o - $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) - -install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) - -.PHONY: uninstall -uninstall: - rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(INSTALL_PRIVBIN)) - --include $(DEPS_INCLUDE) diff --git a/tools/tests/depriv/depriv-fd-checker.c b/tools/tests/depriv/depriv-fd-checker.c deleted file mode 100644 index 98a27a03d5..0000000000 --- a/tools/tests/depriv/depriv-fd-checker.c +++ /dev/null @@ -1,436 +0,0 @@ -/* - * depriv-fd-checker - * - * utility to check whether file descriptor(s) are deprivileged - * - * usage: - * .../depriv-fd-checker CLASS FD X-INFO [CLASS FD X-INFO...] - * - * CLASS is one of: - * privcmd gntdev evtchn FD should be appropriate Xen control fd - * readonly FD is expected to be readonly - * appendonly FD is expected to be append write only - # tun FD is expected to be an open tun device - * - * In each case FD is probably a reference to an open-file stolen - * from another process, eg by the use of fishdescriptor. - * - * X-INFO is simply appended to the discursive reportage. - * - * It is an error if depriv-fd-checker cannot open the control - * facilities itself, or something goes wrong with checking, or an FD - * is entirely the wrong kind for the specified CLASS. Otherwise: - * - * depriv-fd-checker will perhaps print, for each triplet: - * CLASS checking FD INFORMATION... X-INFO - * and in any case print, for each triplet, exactly one of: - * CLASS pass|fail FD INFORMATION... X-INFO - * tun maybe FD IFNAME X-INFO - * - * "pass" means that the descriptor was restricted as expected. - * "fail" means that the descriptor was unrestricted. - * "maybe" means that further information is printed, as detailed above, - * and the caller should check that it is as expected - */ -/* - * Copyright (C)2018 Citrix Systems R&D - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; version 2.1 of the - * License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see - * . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -/* - * Every class needs setup. setup is called once per class at program - * startup. - * - * Then it can have - * open test getfd close - * In which case the core code will for every fd - * open test getfd dup2 test close - * And test should call blocked or succeeded and then immediately - * return, or error out - * - * Or it can have - * check - * which should call report, or error out - * - * Errors: use trouble for simple syscall errors. Or use err or errx - * and maybe print fd_desc and test_which, according to the comments - * in struct classinfo. - */ - -static xentoollog_logger *logger; - -static int object_fd; -static const char *classname; -static const char *fd_desc; -static const char *test_which; - -static const char *test_wh_unrest = "test (unrestricted)"; -static const char *test_wh_rest = "test (restricted)"; - - -static void trouble(const char *what) __attribute__((noreturn)); -static void trouble(const char *what) { - fprintf(stderr, - "trouble: %s %s %d (%s) %s: %s\n", - classname, test_which, object_fd, fd_desc, what, strerror(errno)); - exit(-1); -} - -static void report(const char *pass_or_fail, const char *what, - const char *notes) { - printf("%s %s %d %s (%s) %s\n", - classname, pass_or_fail, - object_fd, what, notes, fd_desc); - if (ferror(stdout) || fflush(stdout)) err(16,"stdout"); -} - -static void succeeded(const char *what) { - if (test_which == test_wh_unrest) { - /* ok */ - test_which = 0; - } else if (test_which == test_wh_rest) { - report("fail",what,"unexpectedly succeeded"); - test_which = 0; - } else { - abort(); - } -} - -static void blocked(const char *what) { - if (test_which == test_wh_rest) { - /* yay */ - report("pass", what,"blocked"); - test_which = 0; - } else if (test_which == test_wh_unrest) { - err(4,"test blocked on unrestricted fd: %s {%s}",what,test_which); - } else { - abort(); - } -} - -/* privcmd */ - -static xc_interface *xch; -static void setup_privcmd(void) { } -static void open_privcmd(void) { - xch = xc_interface_open(logger,0,0); - if (!xch) trouble("xc_interface_open"); -} -static void test_privcmd(void) { - int r = xc_get_online_cpus(xch); - if (r>0) - succeeded("xc_get_online_cpus"); - else if (r==0) - errx(-1,"xc_get_online_cpus{%s, %s}=0", test_which, fd_desc); - else if (errno==EPERM || errno==EACCES) - blocked("xc_get_online_cpus"); - else - trouble("xc_get_online_cpus"); -} -static int getfd_privcmd(void) { - return xencall_fd(xc_interface_xcall_handle(xch)); -} -static void close_privcmd(void) { - xc_interface_close(xch); -} - -/* gntdev */ - -static xengntshr_handle *xgs; -static uint32_t gntshr_gref; -static xengnttab_handle *xgt; -static void setup_gntdev(void) { - void *r; - xgs = xengntshr_open(logger,0); - if (!xgs) trouble("xengntshr_open"); - r = xengntshr_share_pages(xgs, 0, 1, &gntshr_gref, 1); - if (!r || r==(void*)-1) trouble("xengntshr_share_pages"); - memset(r, 0x55, XC_PAGE_SIZE); -} -static void open_gntdev(void) { - xgt = xengnttab_open(logger,0); - if (!xgt) trouble("xengnttab_open"); -} -static void test_gntdev(void) { - char mybuf[XC_PAGE_SIZE]; - memset(mybuf, 0xaa, XC_PAGE_SIZE); - xengnttab_grant_copy_segment_t seg; - seg.source.foreign.ref = gntshr_gref; - seg.source.foreign.offset = 0; - seg.source.foreign.domid = 0; - seg.dest.virt = mybuf; - seg.len = 1; - seg.flags = GNTCOPY_source_gref; - for (;;) { - seg.status = 0; - int r = xengnttab_grant_copy(xgt,1,&seg); - if (r<0) { - if (errno==EPERM || errno==EACCES || errno==ENOTTY) - blocked("xengnttab_grant_copy"); - else - trouble("xengnttab_grant_copy"); - } else if (r==0) { - if (seg.status==GNTST_okay) - succeeded("xengnttab_grant_copy okay"); - else if (seg.status==GNTST_eagain) - continue; - else errx(-1,"xengnttab_grant_copy=%d {%s, %s} but .status=%d", - r, test_which, fd_desc,(int)seg.status); - } else { - errx(-1,"xengnttab_grant_copy=%d {%s, %s}", - r, test_which, fd_desc); - } - break; - } -} -static int getfd_gntdev(void) { - return xengnttab_fd(xgt); -} -static void close_gntdev(void) { - xengnttab_close(xgt); -} - -/* evtchn */ - -static xenevtchn_handle *xce_recip, *xce; -static void setup_evtchn(void) { - xce_recip = xenevtchn_open(logger, 0); - if (!xce_recip) err(-1,"xenevtchn_open (donor)"); -} -static void open_evtchn(void) { - xce = xenevtchn_open(logger, 0); - if (!xce) err(-1,"xenevtchn_open"); -} -static void test_evtchn(void) { - xenevtchn_port_or_error_t - recip_port=-1, test_unbound_port=-1, test_send_port=-1; - - recip_port = xenevtchn_bind_unbound_port(xce_recip, 0); - if (recip_port < 0) trouble("xenevtchn_bind_unbound_port"); - - test_unbound_port = xenevtchn_bind_unbound_port(xce, 0); - if (test_unbound_port >= 0) { - succeeded("xenevtchn_bind_unbound_port"); - goto out; - } - - test_send_port = xenevtchn_bind_interdomain(xce, 0, recip_port); - /* bind_interdomain marks the channel pending */ - struct pollfd pfd; - for (;;) { - pfd.fd = xenevtchn_fd(xce_recip); - pfd.events = POLLIN; - pfd.revents = 0; - int r = poll(&pfd,1,0); - if (r>=0) break; - if (errno!=EINTR) err(-1,"poll(xce_recip)"); - } - if (pfd.revents & POLLIN) { - xenevtchn_port_or_error_t p3 = xenevtchn_pending(xce_recip); - if (p3 < 0) err(-1,"xenevtchn_pending(check)"); - if (p3 != recip_port) - errx(-1,"xenevtchn_pending=%d expected %d",p3,recip_port); - xenevtchn_unmask(xce_recip, recip_port); - } - - if (test_send_port>=0 && (pfd.revents & POLLIN)) { - succeeded("xenevtchn_bind_interdomain/poll"); - /* we make no attempt to undo what we did to this stolen fd; - * the rightful owner will see a spurious event on test_send_port */ - } else if (test_send_port==-1 && !(pfd.revents & POLLIN) && - (errno==EPERM || errno==EACCES || errno==ENOTTY)) { - blocked("xenevtchn_notify"); - } else { - err(-1,"%s %s xenevtchn_bind_interdomain=%d .revents=0x%x", - test_which, fd_desc, test_send_port, pfd.revents); - } - - out: - if (recip_port > 0) xenevtchn_unbind(xce, recip_port); - if (test_unbound_port > 0) xenevtchn_unbind(xce, test_unbound_port); - if (test_send_port > 0) xenevtchn_unbind(xce, test_send_port); -} -static int getfd_evtchn(void) { - return xenevtchn_fd(xce); -} -static void close_evtchn(void) { - xenevtchn_close(xce); -} - -/* fcntl */ - -#define CHECK_FCNTL(openmode) \ - int r = fcntl(object_fd, F_GETFL); \ - if (r < 0) trouble("fcntl F_GETFL"); \ - int m = r & (O_RDONLY | O_WRONLY | O_RDWR); \ - \ - char mbuf[100 + 30*3]; \ - snprintf(mbuf,sizeof(mbuf), \ - "F_GETFL=%#o m=%#o " #openmode "=%#o", \ - r,m,(int)openmode); \ - \ - if (m != openmode) { \ - report("fail", #openmode, mbuf); \ - return; \ - } - -/* readonly */ - -static void setup_readonly(void) { } -static void check_readonly(void) { - CHECK_FCNTL(O_RDONLY); - report("pass", "fcntl", mbuf); -} - -/* appendonly */ - -static void setup_appendonly(void) { } -static void check_appendonly(void) { - CHECK_FCNTL(O_WRONLY); - if (!(r & O_APPEND)) { - report("fail", "O_APPEND", mbuf); - return; - } - report("pass", "fcntl", mbuf); -} - -#if defined(__linux__) -#include -#include -#include -#include -#include -#ifndef TUNGETIFF -#define TUNGETIFF _IOR('T', 210, unsigned int) -#endif - -/* linux tun */ - -static void setup_tun(void) { } -static void check_tun(void) { - struct ifreq ifr; - int r; - - memset(&ifr,0,sizeof(ifr)); - r = ioctl(object_fd, TUNGETIFF, (void*)&ifr); - if (r<0) trouble("TUNGETIFF"); - printf("tun maybe %d %.*s %s\n", object_fd, - (int)IFNAMSIZ, ifr.ifr_ifrn.ifrn_name, - fd_desc); -} - -#define PLATFORM_CLASSES \ - DEFCHECK(tun), - -#else /* !defined(__linux__) */ -#define PLATFORM_CLASSES /* empty */ -#endif - -/* class table and main program */ - -#define DEFCLASS(cl) \ - { #cl, setup_##cl, 0, open_##cl, test_##cl, getfd_##cl, close_##cl } -#define DEFCHECK(meth) \ - { #meth, setup_##meth, check_##meth } - -static const struct classinfo { - const char *name; /* errors: print fd_desc test_which */ - void (*setup)(void); /* best not best not */ - void (*check)(void); /* must may */ - void (*open)(void); /* must may */ - void (*test)(void); /* must must */ - int (*getfd)(void); /* must may */ - void (*close)(void); /* must may */ -} classinfos[] = { - DEFCLASS(privcmd), - DEFCLASS(gntdev), - DEFCLASS(evtchn), - DEFCHECK(readonly), - DEFCHECK(appendonly), - PLATFORM_CLASSES - { 0 } -}; - -int main(int argc, char **argv) { - const struct classinfo *cli; - int r; - - argv++; - - logger = (xentoollog_logger*)xtl_createlogger_stdiostream - (stderr, XTL_NOTICE, XTL_STDIOSTREAM_HIDE_PROGRESS); - - fd_desc = "setup"; - test_which = "setup"; - for (cli = classinfos; cli->name; cli++) - cli->setup(); - - while ((classname = *argv++)) { - if (!*argv) errx(8,"need fd after class"); - object_fd = atoi(*argv++); - - fd_desc = *argv++; - if (!fd_desc) errx(8,"need info after fd"); - - for (cli = classinfos; cli->name; cli++) - if (!strcmp(cli->name, classname)) - goto found; - report("fail","unknown class",""); - continue; - - found: - if (cli->check) { - report("checking","check","in progress"); - test_which = "check"; - cli->check(); - } else { - test_which = "open"; - report("checking","dup-hack","in progress"); - cli->open(); - - test_which = test_wh_unrest; cli->test(); - assert(!test_which); - - test_which = "getfd"; int intern_fd = cli->getfd(); - r = dup2(object_fd, intern_fd); - if (r != intern_fd) err(-1, "dup2"); - - test_which = test_wh_rest; cli->test(); - assert(!test_which); - - test_which = "close"; cli->close(); - } - } - - return 0; -} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 13:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 13:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999420.1380118 (Exim 4.92) (envelope-from ) id 1uKGZ1-0004q0-E6; Wed, 28 May 2025 13:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999420.1380118; Wed, 28 May 2025 13: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 1uKGZ1-0004ps-BW; Wed, 28 May 2025 13:11:23 +0000 Received: by outflank-mailman (input) for mailman id 999420; Wed, 28 May 2025 13:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKGZ0-0004pi-1e for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKGZ0-006hJ0-04 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKGYz-003dLB-3B for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11: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=JRy+TrhvtTPmXk0VtMtNn1fbKDD9fkmbhHPyc7ilpVE=; b=XN4RcOYBigGkH1laLyfj7fQR2n vV9bBkaHToPPGvsfxrM/5cYe23sw0NX5vTVyaIP6bK4lvai4dtOAIq/J1jZZVcxTvbUxKdKaJTB01 Iz2w1LYJdqrvqRn/UkSBzEGA5S8J+aIT68X77Wg13e85vTsBn5CwNXzf03wGJUBm5RxE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: Install tests into $(LIBEXEC)/tests Message-Id: Date: Wed, 28 May 2025 13:11:21 +0000 commit 2d497e97e20e6e63472c6aa930a3a8b29c58b6d6 Author: Andrew Cooper AuthorDate: Tue May 20 20:03:55 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 tools/tests: Install tests into $(LIBEXEC)/tests $(LIBEXEC_BIN) is a dumping ground of many things. Separate the "clearly tests" from everything else so we can clean up how they're run in CI. Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD Acked-by: Stefano Stabellini Reviewed-by: Denis Mukhin --- tools/tests/cpu-policy/Makefile | 6 +++--- tools/tests/paging-mempool/Makefile | 6 +++--- tools/tests/rangeset/Makefile | 6 +++--- tools/tests/resource/Makefile | 6 +++--- tools/tests/tsx/Makefile | 6 +++--- tools/tests/xenstore/Makefile | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/tests/cpu-policy/Makefile b/tools/tests/cpu-policy/Makefile index 5df9b1ebbd..24f87e2eca 100644 --- a/tools/tests/cpu-policy/Makefile +++ b/tools/tests/cpu-policy/Makefile @@ -29,12 +29,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN)) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC)/tests) .PHONY: uninstall uninstall: - $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGETS)) + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGETS)) CFLAGS += -D__XEN_TOOLS__ CFLAGS += $(CFLAGS_xeninclude) diff --git a/tools/tests/paging-mempool/Makefile b/tools/tests/paging-mempool/Makefile index a081b3baa5..a1e12584ce 100644 --- a/tools/tests/paging-mempool/Makefile +++ b/tools/tests/paging-mempool/Makefile @@ -16,12 +16,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(DESTDIR)$(LIBEXEC_BIN)/$(TARGET) + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenctrl) diff --git a/tools/tests/rangeset/Makefile b/tools/tests/rangeset/Makefile index 3dafcbd054..e3bfce471c 100644 --- a/tools/tests/rangeset/Makefile +++ b/tools/tests/rangeset/Makefile @@ -20,12 +20,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGET)) + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGET)) list.h: $(XEN_ROOT)/xen/include/xen/list.h rangeset.h: $(XEN_ROOT)/xen/include/xen/rangeset.h diff --git a/tools/tests/resource/Makefile b/tools/tests/resource/Makefile index a5856bf095..09d678fffe 100644 --- a/tools/tests/resource/Makefile +++ b/tools/tests/resource/Makefile @@ -20,12 +20,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(DESTDIR)$(LIBEXEC_BIN)/$(TARGET) + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenctrl) diff --git a/tools/tests/tsx/Makefile b/tools/tests/tsx/Makefile index a4f516b725..0bb7e70103 100644 --- a/tools/tests/tsx/Makefile +++ b/tools/tests/tsx/Makefile @@ -16,12 +16,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests .PHONY: uninstall uninstall: - $(RM) -- $(DESTDIR)$(LIBEXEC_BIN)/$(TARGET) + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) .PHONY: uninstall uninstall: diff --git a/tools/tests/xenstore/Makefile b/tools/tests/xenstore/Makefile index 202dda0d3c..2ee4a1327e 100644 --- a/tools/tests/xenstore/Makefile +++ b/tools/tests/xenstore/Makefile @@ -20,12 +20,12 @@ distclean: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN)) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(if $(TARGETS),$(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC)/tests) .PHONY: uninstall uninstall: - $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGETS)) + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGETS)) CFLAGS += $(CFLAGS_libxenstore) CFLAGS += $(APPEND_CFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 13:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 13:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999421.1380122 (Exim 4.92) (envelope-from ) id 1uKGZB-0004sL-FV; Wed, 28 May 2025 13:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999421.1380122; Wed, 28 May 2025 13:11: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 1uKGZB-0004sD-Cs; Wed, 28 May 2025 13:11:33 +0000 Received: by outflank-mailman (input) for mailman id 999421; Wed, 28 May 2025 13:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKGZA-0004s3-4M for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKGZA-006hJ4-0K for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKGZA-003dMD-0E for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11: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=3E3dGCMOQcifFuBKTcjb9GyaL3qFWTZFYJlS7F4HZDc=; b=QUDSzpWThODChBdexdDeIvY+Td AYNh5SHeo+iFhblGTRcwFroK6UgYqiwNXyj0wj5X3bvWEr8C33CtAS15DW6LXBQW8KjNNFDHCJD/5 as8uN2SHvIkJPUlR4w3MxEFgJM2Ti05Ee9uL4qtcfC5wczVhmyzni/p0aDdgy3lEvmfM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Drop custom handling of tools/tests Message-Id: Date: Wed, 28 May 2025 13:11:32 +0000 commit 0e7f6c609834213c97328677735eb309eed571e6 Author: Andrew Cooper AuthorDate: Tue May 20 20:05:56 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 CI: Drop custom handling of tools/tests ... and use them from their installed location. The full reclusive copy of tools/tests brings in all build and intermediate artefacts. e.g. for test-tsx alone: ./tests/tsx ./tests/tsx/.test-tsx.o.d ./tests/tsx/test-tsx.o ./tests/tsx/.gitignore ./tests/tsx/test-tsx ./tests/tsx/Makefile ./tests/tsx/test-tsx.c duplicating the test binary which is also in ./usr/lib/xen/tests Rewrite run-tools-tests to run tests from their installed location (/usr/lib/xen/tests in alpine), which effectively removes the outer loop over $dir. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Reviewed-by: Stefano Stabellini Reviewed-by: Denis Mukhin --- automation/scripts/build | 1 - automation/scripts/qubes-x86-64.sh | 7 +++---- automation/scripts/run-tools-tests | 43 +++++++++++++++++--------------------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index cdb8cd7c72..0e7494ff6d 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -109,6 +109,5 @@ else # even though dist/ contains everything, while some containers don't even # build Xen (cd dist/install; find | cpio -o -H newc | gzip) > binaries/xen-tools.cpio.gz - cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 6c4c9668f9..8e86940c6e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -136,7 +136,7 @@ done passed="test passed" domU_check="" dom0_check=" -/tests/run-tools-tests /tests /tmp/tests-junit.xml && echo \"${passed}\" +/root/run-tools-tests /usr/lib/xen/tests /tmp/tests-junit.xml && echo \"${passed}\" nc -l -p 8080 < /tmp/tests-junit.xml >/dev/null & " if [ "${test_variant}" = "tools-tests-pvh" ]; then @@ -195,9 +195,8 @@ cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs cd rootfs -mkdir -p boot etc/local.d -cp -ar ../binaries/tests . -cp -a ../automation/scripts/run-tools-tests tests/ +mkdir -p boot etc/local.d root +cp -a ../automation/scripts/run-tools-tests root/ echo "#!/bin/bash diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index 770e97c3e9..2bca1589db 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -12,30 +12,25 @@ printf '\n' > "$xml_out" printf '\n' >> "$xml_out" printf ' \n' >> "$xml_out" failed= -for dir in "$1"/*; do - [ -d "$dir" ] || continue - echo "Running test in $dir" - printf ' \n' "$dir" >> "$xml_out" - ret= - for f in "$dir"/*; do - [ -f "$f" ] || continue - [ -x "$f" ] || continue - "$f" 2>&1 | tee /tmp/out - ret=$? - if [ "$ret" -ne 0 ]; then - echo "FAILED: $ret" - failed+=" $dir" - printf ' \n' "$f" "$ret" >> "$xml_out" - # TODO: could use xml escaping... but current tests seems to - # produce sane output - cat /tmp/out >> "$xml_out" - printf ' \n' >> "$xml_out" - else - echo "PASSED" - fi - done - if [ -z "$ret" ]; then - printf ' \n' "$dir" >> "$xml_out" +for f in "$1"/*; do + if [ ! -x "$f" ]; then + echo "SKIP: $f not executable" + continue + fi + echo "Running $f" + printf ' \n' "$f" >> "$xml_out" + "$f" 2>&1 | tee /tmp/out + ret=$? + if [ "$ret" -ne 0 ]; then + echo "FAILED: $f" + failed+=" $f" + printf ' \n' "$f" "$ret" >> "$xml_out" + # TODO: could use xml escaping... but current tests seems to + # produce sane output + cat /tmp/out >> "$xml_out" + printf ' \n' >> "$xml_out" + else + echo "PASSED" fi printf ' \n' >> "$xml_out" done -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 13:11:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 13:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999422.1380126 (Exim 4.92) (envelope-from ) id 1uKGZL-0004ue-Gq; Wed, 28 May 2025 13:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999422.1380126; Wed, 28 May 2025 13:11: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 1uKGZL-0004uW-EE; Wed, 28 May 2025 13:11:43 +0000 Received: by outflank-mailman (input) for mailman id 999422; Wed, 28 May 2025 13:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKGZK-0004uP-7W for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKGZK-006hJB-0e for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKGZK-003dMt-0V for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11: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=itAuxZMwOjDsuscRgGhgWOG7dGgEljaSbuu9BdOmtvo=; b=xbco13xrYi50Ks3up5qA6IguuO 6IR1Ds2y5GAQg1V37B3if+BvcmFy3Qs5aa3wMnDtMy1SPF83mJvGizKYS/Gmh0iiqfUF2wznuZups jo5hKvGEcGLBwyc/4YWBJqtkDqZaATv7fxl0RjOoTSBtWGDDb8yCM0SEh7FFc0voxNjo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: Move scheduler enable/disable calls out of {freeze,thaw}_domains() Message-Id: Date: Wed, 28 May 2025 13:11:42 +0000 commit 1099bdd24f78fa2fe5b6a4533bc8f4f18cce0df0 Author: Mykola Kvach AuthorDate: Tue May 27 13:04:16 2025 +0300 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 x86/ACPI: Move scheduler enable/disable calls out of {freeze,thaw}_domains() ... and into their parent, enter_state(). This change addresses the concern about misleading function semantics, as the scheduler operations are not directly related to the domain pausing/resuming implied by the freeze/thaw naming. Suggested-by: Jan Beulich Signed-off-by: Mykola Kvach Acked-by: Andrew Cooper --- xen/arch/x86/acpi/power.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 095ca391ad..448aa9f3a7 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -151,16 +151,12 @@ static void freeze_domains(void) for_each_domain ( d ) domain_pause(d); rcu_read_unlock(&domlist_read_lock); - - scheduler_disable(); } static void thaw_domains(void) { struct domain *d; - scheduler_enable(); - rcu_read_lock(&domlist_read_lock); for_each_domain ( d ) domain_unpause(d); @@ -216,6 +212,7 @@ static int enter_state(u32 state) printk(XENLOG_INFO "Preparing system for ACPI S%d state.\n", state); freeze_domains(); + scheduler_disable(); acpi_dmar_reinstate(); @@ -334,6 +331,7 @@ static int enter_state(u32 state) mtrr_aps_sync_end(); iommu_adjust_irq_affinities(); acpi_dmar_zap(); + scheduler_enable(); thaw_domains(); system_state = SYS_STATE_active; spin_unlock(&pm_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 13:11:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 13:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999423.1380130 (Exim 4.92) (envelope-from ) id 1uKGZV-0004wt-IB; Wed, 28 May 2025 13:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999423.1380130; Wed, 28 May 2025 13:11: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 1uKGZV-0004wl-Fc; Wed, 28 May 2025 13:11:53 +0000 Received: by outflank-mailman (input) for mailman id 999423; Wed, 28 May 2025 13:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKGZU-0004wf-Al for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKGZU-006hJF-0x for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKGZU-003dNd-0r for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:11: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=G9aFwTQMZlyKfH3QZq+ymQBu1CGQjc7LCxuk6sedtaI=; b=E0U0T6zzzJolSyUUYtzuHGFmux OObUkAqhqJB1QuYG2z8jaDwrZq63MI6kUXkvgZZ1id7fa9dhDrHdBoU32cvW1Zs8KByi3jvg/d4c4 3WDkvMtWDDVHfOR4TgcH5yQ/cI5KbbfcKRgTwjXoMlfia+alAyQ+dEB0kmVSxq3RP0ao=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Drop unused vpic.h includes Message-Id: Date: Wed, 28 May 2025 13:11:52 +0000 commit f15954630cf1eead2717bc7abab471d84735dbc1 Author: Andrew Cooper AuthorDate: Mon May 26 23:16:32 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 x86/hvm: Drop unused vpic.h includes It's only hvm.c, irq.c and vpci.c which need this header, and they all get it via asm/hvm/irq.h. Signed-off-by: Andrew Cooper Reviewed-by: Jason Andryuk --- xen/arch/x86/hvm/io.c | 1 - xen/arch/x86/hvm/vioapic.c | 1 - xen/arch/x86/hvm/vmsi.c | 1 - xen/arch/x86/hvm/vmx/intr.c | 1 - xen/arch/x86/hvm/vmx/vmx.c | 1 - 5 files changed, 5 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index de6ee6c4dd..23a5ea0e61 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index f896b9ea12..7c725f9e47 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 61b89834d9..32e417bc15 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 91b407e6bc..b35dc8c586 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index c2262c5848..d8879c304e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 28 13:12:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 May 2025 13:12:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.999424.1380134 (Exim 4.92) (envelope-from ) id 1uKGZf-0004zE-JW; Wed, 28 May 2025 13:12:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 999424.1380134; Wed, 28 May 2025 13:12: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 1uKGZf-0004z6-H0; Wed, 28 May 2025 13:12:03 +0000 Received: by outflank-mailman (input) for mailman id 999424; Wed, 28 May 2025 13:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKGZe-0004yt-DE for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKGZe-006hJo-1D for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKGZe-003dOx-18 for xen-changelog@lists.xenproject.org; Wed, 28 May 2025 13:12: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=EplNtYSsj4JeDQRlqUlUbiLUrxLDnvzGu+MtT4EL+rI=; b=VILLeZhLE6pSMYRc1+4tuwwIjG tyNm2o1Oy5+IGM0tMoWXVjn52WnY+aX9qdPd/lqiFyQEi2V8gwu9ytNGtU8NLyKPG09+pafPcwXtF dhoq5LQnsM9v89BWIqr19qvBPAdMAxx58dKSG86owioDO1+6KRayG9AKob+yPf0wEI9M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Remove is_periodic_irq() prototype Message-Id: Date: Wed, 28 May 2025 13:12:02 +0000 commit 9843d1c44af1640a165fec82209b7bcfe54f27fc Author: Jason Andryuk AuthorDate: Tue May 27 18:37:53 2025 -0400 Commit: Andrew Cooper CommitDate: Wed May 28 12:29:33 2025 +0100 xen/x86: Remove is_periodic_irq() prototype is_periodic_irq() was removed in the Fixes commit, but the prototype remained. Drop it now. Fixes: ddc35d1cc994 ("[HVM] Enable more than one platform timer...") Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/hvm/vpic.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/x86/include/asm/hvm/vpic.h b/xen/arch/x86/include/asm/hvm/vpic.h index d71b270193..78ed33e9aa 100644 --- a/xen/arch/x86/include/asm/hvm/vpic.h +++ b/xen/arch/x86/include/asm/hvm/vpic.h @@ -35,6 +35,5 @@ void vpic_irq_negative_edge(struct domain *d, int irq); void vpic_init(struct domain *d); void vpic_reset(struct domain *d); int vpic_ack_pending_irq(struct vcpu *v); -int is_periodic_irq(struct vcpu *v, int irq, int type); #endif /* __ASM_X86_HVM_VPIC_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 29 19:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 May 2025 19:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000158.1380540 (Exim 4.92) (envelope-from ) id 1uKjLD-0007Fo-E5; Thu, 29 May 2025 19:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000158.1380540; Thu, 29 May 2025 19: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 1uKjLD-0007Fg-AG; Thu, 29 May 2025 19:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1000158; Thu, 29 May 2025 19:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKjLC-0007Fa-0c for xen-changelog@lists.xenproject.org; Thu, 29 May 2025 19:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKjLB-008UFK-2a for xen-changelog@lists.xenproject.org; Thu, 29 May 2025 19:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKjLB-001zLJ-1u for xen-changelog@lists.xenproject.org; Thu, 29 May 2025 19: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=VEvVH7LZkloy3XpFUD0FmAY/PWTer14yarvJCykIhRQ=; b=nme6LrHBfKO9mSdLWgPIVVOjSu 9sso2Ws0KLrw0RxjfeQlqdgYa9oIGdlapUxwIcwEga7vvUw0El5D9bfMv1zqV7/dY63DRbuF9gYJ4 a4aC2e0hv708hG0OpY+gJQhyg6sZv4ZPGY3gIMn9l6Ey2AyRA++/U0gQeiFk542fPpD8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Trim includes Message-Id: Date: Thu, 29 May 2025 19:55:01 +0000 commit d04e80e811b98db64f47790f0dcc7dce4f487b1e Author: Andrew Cooper AuthorDate: Mon May 26 20:40:24 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 14:37:41 2025 +0100 x86/traps: Trim includes None of these are used by traps.c today. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/traps.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index f9e17e0159..092c7e4197 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -17,47 +17,25 @@ #include #include #include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include #include #include #include #include #include -#include #include -#include -#include #include -#include #include -#include - #include -#include -#include #include #include #include #include -#include -#include #include -#include #include #include -#include -#include #include #include #include @@ -70,10 +48,7 @@ #include #include #include -#include -#include #include -#include /* * opt_nmi: one of 'ignore', 'dom0', or 'fatal'. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 29 20:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 May 2025 20:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000169.1380552 (Exim 4.92) (envelope-from ) id 1uKjvz-0003w2-AK; Thu, 29 May 2025 20:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000169.1380552; Thu, 29 May 2025 20: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 1uKjvz-0003vu-7d; Thu, 29 May 2025 20:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1000169; Thu, 29 May 2025 20:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKjvx-0003vm-Vk for xen-changelog@lists.xenproject.org; Thu, 29 May 2025 20:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKjvx-008V31-2i for xen-changelog@lists.xenproject.org; Thu, 29 May 2025 20:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKjvx-002Vcm-2Z for xen-changelog@lists.xenproject.org; Thu, 29 May 2025 20: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=ceAT9e/hrRqKgqgCtsZAaG8fPiJ2c5p853XkH7N/U1w=; b=hFCCxpIEBD9zDrJhkOxit0/zS/ QmQ7B4PLPFZtYTRiYQbvTwbOJOuhJhoCAvxrocTfaM1UOB9O8T4y1XxCCGTLfLA1kymiLu35DTcLv JBphckBmfm+GRay7uVthG9TWFC81o72wnhxDp5PmOlvkDazPdOn1L1v6sqPTJ6jL5zSE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Trim includes Message-Id: Date: Thu, 29 May 2025 20:33:01 +0000 commit d04e80e811b98db64f47790f0dcc7dce4f487b1e Author: Andrew Cooper AuthorDate: Mon May 26 20:40:24 2025 +0100 Commit: Andrew Cooper CommitDate: Wed May 28 14:37:41 2025 +0100 x86/traps: Trim includes None of these are used by traps.c today. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/traps.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index f9e17e0159..092c7e4197 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -17,47 +17,25 @@ #include #include #include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include #include #include #include #include #include -#include #include -#include -#include #include -#include #include -#include - #include -#include -#include #include #include #include #include -#include -#include #include -#include #include #include -#include -#include #include #include #include @@ -70,10 +48,7 @@ #include #include #include -#include -#include #include -#include /* * opt_nmi: one of 'ignore', 'dom0', or 'fatal'. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:22:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000473.1380697 (Exim 4.92) (envelope-from ) id 1uKu42-0008LL-FE; Fri, 30 May 2025 07:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000473.1380697; Fri, 30 May 2025 07: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 1uKu42-0008LB-CM; Fri, 30 May 2025 07:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1000473; Fri, 30 May 2025 07:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu42-0008L5-4A for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu42-009xJz-06 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu41-00Coir-39 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07: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=FmDkPxPk4H5bzsr2Ygc/I6kd4IxwZkzsFuopIgSU8io=; b=Dzsx1KHC2DONZrqta1krTVH9Up CzoHfa82JFZVs5qtOhfSpGLI57YozgJ1UQXJsWmiMhGTsnPJr01UVarQpH1m0SoIV1si1rA+1vKT+ wsOcnbzvl5lwa3Rhz+i22mG+GcXoj4+Kge3RAiVe2PTQsQwfEPBHnWm4AP0U6SdQMxpU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] device-tree: Move Arm's static-evtchn feature to common Message-Id: Date: Fri, 30 May 2025 07:22:01 +0000 commit 902db088395b13ce620f5a201a751556b760c0ef Author: Michal Orzel AuthorDate: Tue May 27 10:21:17 2025 +0200 Commit: Michal Orzel CommitDate: Fri May 30 08:41:12 2025 +0200 device-tree: Move Arm's static-evtchn feature to common There's nothing Arm specific about this feature. Move it to common as part of a larger activity to commonalize device tree related features. For now, select it only for ARM until others (e.g. RISC-V) verify it works for them too. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- xen/arch/arm/Kconfig | 8 -- xen/arch/arm/Makefile | 1 - xen/arch/arm/include/asm/static-evtchn.h | 25 ----- xen/arch/arm/setup.c | 2 +- xen/arch/arm/static-evtchn.c | 161 ------------------------------- xen/common/Kconfig | 8 ++ xen/common/device-tree/Makefile | 1 + xen/common/device-tree/static-evtchn.c | 160 ++++++++++++++++++++++++++++++ xen/include/xen/static-evtchn.h | 25 +++++ 9 files changed, 195 insertions(+), 196 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index a5aad97a68..57919d8b3a 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -253,14 +253,6 @@ config STATIC_SHM help This option enables statically shared memory on a dom0less system. -config STATIC_EVTCHN - bool "Static event channel support on a dom0less system" - depends on DOM0LESS_BOOT - default y - help - This option enables establishing static event channel communication - between domains on a dom0less system (domU-domU as well as domU-dom0). - config PARTIAL_EMULATION bool "Enable partial emulation of system/coprocessor registers" default y diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 129a109d6e..eeeac4e653 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -51,7 +51,6 @@ obj-y += setup.o obj-y += shutdown.o obj-y += smp.o obj-y += smpboot.o -obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o obj-y += sysctl.o diff --git a/xen/arch/arm/include/asm/static-evtchn.h b/xen/arch/arm/include/asm/static-evtchn.h deleted file mode 100644 index f964522f6a..0000000000 --- a/xen/arch/arm/include/asm/static-evtchn.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_STATIC_EVTCHN_H_ -#define __ASM_STATIC_EVTCHN_H_ - -#ifdef CONFIG_STATIC_EVTCHN - -void alloc_static_evtchn(void); - -#else /* !CONFIG_STATIC_EVTCHN */ - -static inline void alloc_static_evtchn(void) {}; - -#endif /* CONFIG_STATIC_EVTCHN */ - -#endif /* __ASM_STATIC_EVTCHN_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 10b46d0684..734e23da44 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/arm/static-evtchn.c b/xen/arch/arm/static-evtchn.c deleted file mode 100644 index 49db08d5c6..0000000000 --- a/xen/arch/arm/static-evtchn.c +++ /dev/null @@ -1,161 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include - -#include - -#define STATIC_EVTCHN_NODE_SIZE_CELLS 2 - -static int __init get_evtchn_dt_property(const struct dt_device_node *np, - uint32_t *port, uint32_t *phandle) -{ - const __be32 *prop = NULL; - uint32_t len; - - prop = dt_get_property(np, "xen,evtchn", &len); - if ( !prop ) - { - printk(XENLOG_ERR "xen,evtchn property should not be empty.\n"); - return -EINVAL; - } - - if ( !len || len < dt_cells_to_size(STATIC_EVTCHN_NODE_SIZE_CELLS) ) - { - printk(XENLOG_ERR "xen,evtchn property value is not valid.\n"); - return -EINVAL; - } - - *port = dt_next_cell(1, &prop); - *phandle = dt_next_cell(1, &prop); - - return 0; -} - -static int __init alloc_domain_evtchn(struct dt_device_node *node) -{ - int rc; - uint32_t domU1_port, domU2_port, remote_phandle; - struct dt_device_node *remote_node; - const struct dt_device_node *p1_node, *p2_node; - struct evtchn_alloc_unbound alloc_unbound; - struct evtchn_bind_interdomain bind_interdomain; - struct domain *d1 = NULL, *d2 = NULL; - - if ( !dt_device_is_compatible(node, "xen,evtchn-v1") ) - return 0; - - /* - * Event channel is already created while parsing the other side of - * evtchn node. - */ - if ( dt_device_static_evtchn_created(node) ) - return 0; - - rc = get_evtchn_dt_property(node, &domU1_port, &remote_phandle); - if ( rc ) - return rc; - - remote_node = dt_find_node_by_phandle(remote_phandle); - if ( !remote_node ) - { - printk(XENLOG_ERR - "evtchn: could not find remote evtchn phandle\n"); - return -EINVAL; - } - - rc = get_evtchn_dt_property(remote_node, &domU2_port, &remote_phandle); - if ( rc ) - return rc; - - if ( node->phandle != remote_phandle ) - { - printk(XENLOG_ERR "xen,evtchn property is not setup correctly.\n"); - return -EINVAL; - } - - p1_node = dt_get_parent(node); - if ( !p1_node ) - { - printk(XENLOG_ERR "evtchn: evtchn parent node is NULL\n" ); - return -EINVAL; - } - - p2_node = dt_get_parent(remote_node); - if ( !p2_node ) - { - printk(XENLOG_ERR "evtchn: remote parent node is NULL\n" ); - return -EINVAL; - } - - d1 = get_domain_by_id(p1_node->used_by); - d2 = get_domain_by_id(p2_node->used_by); - - if ( !d1 || !d2 ) - { - printk(XENLOG_ERR "evtchn: could not find domains\n" ); - return -EINVAL; - } - - alloc_unbound.dom = d1->domain_id; - alloc_unbound.remote_dom = d2->domain_id; - - rc = evtchn_alloc_unbound(&alloc_unbound, domU1_port); - if ( rc < 0 ) - { - printk(XENLOG_ERR - "evtchn_alloc_unbound() failure (Error %d) \n", rc); - return rc; - } - - bind_interdomain.remote_dom = d1->domain_id; - bind_interdomain.remote_port = domU1_port; - - rc = evtchn_bind_interdomain(&bind_interdomain, d2, domU2_port); - if ( rc < 0 ) - { - printk(XENLOG_ERR - "evtchn_bind_interdomain() failure (Error %d) \n", rc); - return rc; - } - - dt_device_set_static_evtchn_created(node); - dt_device_set_static_evtchn_created(remote_node); - - return 0; -} - -void __init alloc_static_evtchn(void) -{ - struct dt_device_node *node, *evtchn_node; - struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); - - BUG_ON(chosen == NULL); - - if ( hardware_domain ) - dt_device_set_used_by(chosen, hardware_domain->domain_id); - - dt_for_each_child_node(chosen, node) - { - if ( hardware_domain ) - { - if ( alloc_domain_evtchn(node) != 0 ) - panic("Could not set up domains evtchn\n"); - } - - dt_for_each_child_node(node, evtchn_node) - { - if ( alloc_domain_evtchn(evtchn_node) != 0 ) - panic("Could not set up domains evtchn\n"); - } - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 3d66d09397..0951d4c2f2 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -162,6 +162,14 @@ config STATIC_MEMORY If unsure, say N. +config STATIC_EVTCHN + bool "Static event channel support on a dom0less system" + depends on DOM0LESS_BOOT && ARM + default y + help + This option enables establishing static event channel communication + between domains on a dom0less system (domU-domU as well as domU-dom0). + menu "Speculative hardening" config INDIRECT_THUNK diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index ff54a8ef2b..57b9e6ca00 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o +obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o diff --git a/xen/common/device-tree/static-evtchn.c b/xen/common/device-tree/static-evtchn.c new file mode 100644 index 0000000000..8b82e6b3d8 --- /dev/null +++ b/xen/common/device-tree/static-evtchn.c @@ -0,0 +1,160 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#define STATIC_EVTCHN_NODE_SIZE_CELLS 2 + +static int __init get_evtchn_dt_property(const struct dt_device_node *np, + uint32_t *port, uint32_t *phandle) +{ + const __be32 *prop = NULL; + uint32_t len; + + prop = dt_get_property(np, "xen,evtchn", &len); + if ( !prop ) + { + printk(XENLOG_ERR "xen,evtchn property should not be empty.\n"); + return -EINVAL; + } + + if ( !len || len < dt_cells_to_size(STATIC_EVTCHN_NODE_SIZE_CELLS) ) + { + printk(XENLOG_ERR "xen,evtchn property value is not valid.\n"); + return -EINVAL; + } + + *port = dt_next_cell(1, &prop); + *phandle = dt_next_cell(1, &prop); + + return 0; +} + +static int __init alloc_domain_evtchn(struct dt_device_node *node) +{ + int rc; + uint32_t domU1_port, domU2_port, remote_phandle; + struct dt_device_node *remote_node; + const struct dt_device_node *p1_node, *p2_node; + struct evtchn_alloc_unbound alloc_unbound; + struct evtchn_bind_interdomain bind_interdomain; + struct domain *d1 = NULL, *d2 = NULL; + + if ( !dt_device_is_compatible(node, "xen,evtchn-v1") ) + return 0; + + /* + * Event channel is already created while parsing the other side of + * evtchn node. + */ + if ( dt_device_static_evtchn_created(node) ) + return 0; + + rc = get_evtchn_dt_property(node, &domU1_port, &remote_phandle); + if ( rc ) + return rc; + + remote_node = dt_find_node_by_phandle(remote_phandle); + if ( !remote_node ) + { + printk(XENLOG_ERR + "evtchn: could not find remote evtchn phandle\n"); + return -EINVAL; + } + + rc = get_evtchn_dt_property(remote_node, &domU2_port, &remote_phandle); + if ( rc ) + return rc; + + if ( node->phandle != remote_phandle ) + { + printk(XENLOG_ERR "xen,evtchn property is not setup correctly.\n"); + return -EINVAL; + } + + p1_node = dt_get_parent(node); + if ( !p1_node ) + { + printk(XENLOG_ERR "evtchn: evtchn parent node is NULL\n" ); + return -EINVAL; + } + + p2_node = dt_get_parent(remote_node); + if ( !p2_node ) + { + printk(XENLOG_ERR "evtchn: remote parent node is NULL\n" ); + return -EINVAL; + } + + d1 = get_domain_by_id(p1_node->used_by); + d2 = get_domain_by_id(p2_node->used_by); + + if ( !d1 || !d2 ) + { + printk(XENLOG_ERR "evtchn: could not find domains\n" ); + return -EINVAL; + } + + alloc_unbound.dom = d1->domain_id; + alloc_unbound.remote_dom = d2->domain_id; + + rc = evtchn_alloc_unbound(&alloc_unbound, domU1_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_alloc_unbound() failure (Error %d) \n", rc); + return rc; + } + + bind_interdomain.remote_dom = d1->domain_id; + bind_interdomain.remote_port = domU1_port; + + rc = evtchn_bind_interdomain(&bind_interdomain, d2, domU2_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_bind_interdomain() failure (Error %d) \n", rc); + return rc; + } + + dt_device_set_static_evtchn_created(node); + dt_device_set_static_evtchn_created(remote_node); + + return 0; +} + +void __init alloc_static_evtchn(void) +{ + struct dt_device_node *node, *evtchn_node; + struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); + + BUG_ON(chosen == NULL); + + if ( hardware_domain ) + dt_device_set_used_by(chosen, hardware_domain->domain_id); + + dt_for_each_child_node(chosen, node) + { + if ( hardware_domain ) + { + if ( alloc_domain_evtchn(node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + + dt_for_each_child_node(node, evtchn_node) + { + if ( alloc_domain_evtchn(evtchn_node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/static-evtchn.h b/xen/include/xen/static-evtchn.h new file mode 100644 index 0000000000..31ae92741a --- /dev/null +++ b/xen/include/xen/static-evtchn.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef XEN_STATIC_EVTCHN_H +#define XEN_STATIC_EVTCHN_H + +#ifdef CONFIG_STATIC_EVTCHN + +void alloc_static_evtchn(void); + +#else /* !CONFIG_STATIC_EVTCHN */ + +static inline void alloc_static_evtchn(void) {}; + +#endif /* CONFIG_STATIC_EVTCHN */ + +#endif /* XEN_STATIC_EVTCHN_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:22:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000474.1380700 (Exim 4.92) (envelope-from ) id 1uKu4C-0008Mt-GF; Fri, 30 May 2025 07:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000474.1380700; Fri, 30 May 2025 07: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 1uKu4C-0008Ml-Dk; Fri, 30 May 2025 07:22:12 +0000 Received: by outflank-mailman (input) for mailman id 1000474; Fri, 30 May 2025 07:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu4C-0008Mf-5O for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu4C-009xK3-0Q for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu4C-00CorH-0H for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07: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=BBGdbq9f3Mnk2EO2wl42pKVbdTPxhV2blT58vTUFULk=; b=ngGdAbfAcn4+WLEQjZsB2AUrbu zYKhIG05y6XcKoSh6ggrzzZ90jEsXbWbXhG0FHLPhWfXu2LSj0xtGK8PANlhNFesIcLHnTJkA8c0O VWUVJtq53DqHTPrA+NtoWAAkHXSM3r4gLPIyfqkfAhYpN49qIZQdFoN5IsYTcCO5bGro=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/arm: Document Xen booting protocol on Armv8-R Message-Id: Date: Fri, 30 May 2025 07:22:12 +0000 commit 92ad25fe3d547b622ba50226cfae8902650e1ce2 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:01 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:44:15 2025 +0200 docs/arm: Document Xen booting protocol on Armv8-R Document the requirement needed to boot Xen on Armv8-R platforms. Signed-off-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Reviewed-by: Michal Orzel Acked-by: Julien Grall --- docs/misc/arm/booting.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/misc/arm/booting.txt b/docs/misc/arm/booting.txt index 21ae74837d..e9b511cae4 100644 --- a/docs/misc/arm/booting.txt +++ b/docs/misc/arm/booting.txt @@ -56,12 +56,17 @@ image header to determine the load address, entry point, etc. Firmware/bootloader requirements -------------------------------- -Xen relies on some settings the firmware has to configure in EL3 before starting Xen. +Xen relies on some settings the firmware has to configure before starting Xen. -* Xen must be entered in NS EL2 mode +* Xen must be entered in: + * Non-Secure EL2 mode for Armv8-A Arm64 and Arm32, Armv8-R Arm32. + * Secure EL2 mode for Armv8-R Arm64. -* The bit SCR_EL3.HCE (resp. SCR.HCE for 32-bit ARM) must be set to 1. +* When EL3 is supported, the bit SCR_EL3.HCE (resp. SCR.HCE for 32-bit ARM) must + be set to 1. +* Xen must be entered with MMU/MPU off and data cache disabled (SCTLR_EL2.M bit + and SCTLR_EL2.C set to 0). Cache state shall follow [1], [2] for MPU. [1] linux/Documentation/arm/booting.rst Latest version: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/arch/arm/booting.rst -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000475.1380704 (Exim 4.92) (envelope-from ) id 1uKu4N-0008PP-I1; Fri, 30 May 2025 07:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000475.1380704; Fri, 30 May 2025 07: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 1uKu4N-0008PH-F8; Fri, 30 May 2025 07:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1000475; Fri, 30 May 2025 07:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu4M-0008P3-8l for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu4M-009xKD-0i for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu4M-00CouY-0b for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07: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=2B5dg/j/cjsxO6DBNQi7A0kCMNipfNijujSqqSn1Rck=; b=ODAs/96FmUvks1T8CXuXHyWJOI KExgjo1P3UsxIpQVVpfwIpxNDrRextLo/R7G6liXqqeQhWY1ZhfPrm6F/EB50ECSc7gVSCXEXT7Ug CXqC6i1prM7XY0v8X1TSYarq3Ra7o/2cxFx9MJ3lMJxP6/WAWPfdhFPI+vLf1Yq/6ovM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Introduce MPU memory region map structure Message-Id: Date: Fri, 30 May 2025 07:22:22 +0000 commit e67914d91ba0c15fd2e17cb2ddab8b02a988634d Author: Penny Zheng AuthorDate: Fri May 23 07:54:02 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:44:15 2025 +0200 arm/mpu: Introduce MPU memory region map structure Introduce pr_t typedef which is a structure having the prbar and prlar members, each being structured as the registers of the AArch64 Armv8-R architecture. Signed-off-by: Penny Zheng Signed-off-by: Wei Chen Signed-off-by: Luca Fancellu Acked-by: Julien Grall Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/arm64/mpu.h | 52 ++++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/mpu.h | 4 +++ 2 files changed, 56 insertions(+) diff --git a/xen/arch/arm/include/asm/arm64/mpu.h b/xen/arch/arm/include/asm/arm64/mpu.h new file mode 100644 index 0000000000..4737868507 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/mpu.h @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ARM_ARM64_MPU_H +#define ARM_ARM64_MPU_H + +#ifndef __ASSEMBLY__ + +/* Protection Region Base Address Register */ +typedef union { + struct __packed { + unsigned long xn_0:1; /* Execute-Never XN[0] */ + unsigned long xn:1; /* Execute-Never XN[1] */ + unsigned long ap_0:1; /* Access Permission AP[0] */ + unsigned long ro:1; /* Access Permission AP[1] */ + unsigned long sh:2; /* Shareability */ + unsigned long base:42; /* Base Address */ + unsigned long res0:16; /* RES0 */ + } reg; + uint64_t bits; +} prbar_t; + +/* Protection Region Limit Address Register */ +typedef union { + struct __packed { + unsigned long en:1; /* Region enable */ + unsigned long ai:3; /* Memory Attribute Index */ + unsigned long ns:1; /* Not-Secure */ + unsigned long res0:1; /* RES0 */ + unsigned long limit:42; /* Limit Address */ + unsigned long res1:16; /* RES0 */ + } reg; + uint64_t bits; +} prlar_t; + +/* MPU Protection Region */ +typedef struct { + prbar_t prbar; + prlar_t prlar; +} pr_t; + +#endif /* __ASSEMBLY__ */ + +#endif /* ARM_ARM64_MPU_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index d4ec4248b6..bb83f5a5f5 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -6,6 +6,10 @@ #ifndef __ARM_MPU_H__ #define __ARM_MPU_H__ +#if defined(CONFIG_ARM_64) +# include +#endif + #define MPU_REGION_SHIFT 6 #define MPU_REGION_ALIGN (_AC(1, UL) << MPU_REGION_SHIFT) #define MPU_REGION_MASK (~(MPU_REGION_ALIGN - 1)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000476.1380707 (Exim 4.92) (envelope-from ) id 1uKu4X-0008SJ-Kr; Fri, 30 May 2025 07:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000476.1380707; Fri, 30 May 2025 07: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 1uKu4X-0008SC-ID; Fri, 30 May 2025 07:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1000476; Fri, 30 May 2025 07:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu4W-0008S3-Di for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu4W-009xKN-14 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu4W-00Cp7a-0v for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07: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=5vQ0v8e67NTbEasuOKzOEUn3NUfD2sClUksznagVj4o=; b=WP+cWg4Fuqm9ytdTJA3Y7uTVU2 00v3w+3n/50CZgs/mqkjXBS9qzshF+zsJmLQg7xs9U7ESp5Xk4gWqlqRaGK+0iJG7VqGxDzxSQBKQ puzhDheLCvm+SYSvPgm0jow1TDOikVO63wdR4sPwGhbgUErfo4Qlyjowdmj8qp1zsEAc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Provide and populate MPU C data structures Message-Id: Date: Fri, 30 May 2025 07:22:32 +0000 commit ca5df936c473da69a05c4769aef4b3c2fe2b07e4 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:03 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:20 2025 +0200 arm/mpu: Provide and populate MPU C data structures Provide some data structure in the C world to track the MPU status, these structures will be filled at boot by the assembly early code with the boot MPU regions and afterwards they will be used at runtime. Provide methods to update a bitmap created with DECLARE_BITMAP from the assembly code for both Arm32 and Arm64. Modify Arm64 assembly boot code to reset any unused MPU region, initialise 'max_mpu_regions' with the number of supported MPU regions and modify the common asm macro 'prepare_xen_region' to load into xen_mpumap the MPU status and set/clear the bitmap 'xen_mpumap_mask' used to track the enabled regions. Provide a stub implementation for the pr_t type and asm macro for the Arm32 to prevent compilation break, they will be implemented later. Signed-off-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/arm64/asm-offsets.c | 7 ++++ xen/arch/arm/arm64/cache.S | 21 +++++++++++ xen/arch/arm/arm64/mpu/head.S | 25 +++++++++++++ xen/arch/arm/include/asm/arm32/mpu.h | 25 +++++++++++++ xen/arch/arm/include/asm/bitmap-op.inc | 63 ++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/mpu.h | 5 +++ xen/arch/arm/include/asm/mpu/mm.h | 7 ++++ xen/arch/arm/include/asm/mpu/regions.inc | 38 +++++++++++++++++++ xen/arch/arm/mpu/mm.c | 16 ++++++++ 9 files changed, 207 insertions(+) diff --git a/xen/arch/arm/arm64/asm-offsets.c b/xen/arch/arm/arm64/asm-offsets.c index 602ffa5b54..320289b281 100644 --- a/xen/arch/arm/arm64/asm-offsets.c +++ b/xen/arch/arm/arm64/asm-offsets.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,12 @@ void __dummy__(void) OFFSET(ARM_SMCCC_1_2_REGS_X14_OFFS, struct arm_smccc_1_2_regs, a14); OFFSET(ARM_SMCCC_1_2_REGS_X16_OFFS, struct arm_smccc_1_2_regs, a16); BLANK(); + +#ifdef CONFIG_MPU + DEFINE(XEN_MPUMAP_MASK_sizeof, sizeof(xen_mpumap_mask)); + DEFINE(XEN_MPUMAP_sizeof, sizeof(xen_mpumap)); + BLANK(); +#endif } /* diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S index c0a8ca163a..d3c13d98cc 100644 --- a/xen/arch/arm/arm64/cache.S +++ b/xen/arch/arm/arm64/cache.S @@ -50,3 +50,24 @@ FUNC(__flush_dcache_area) dsb sy ret END(__flush_dcache_area) + +/* + * __invalidate_dcache_area(addr, size) + * + * Ensure that the data held in the cache for the buffer is invalidated. + * + * - addr - start address of the buffer + * - size - size of the buffer + */ +FUNC(__invalidate_dcache_area) + dcache_line_size x2, x3 + add x1, x0, x1 + sub x3, x2, #1 + bic x0, x0, x3 +1: dc ivac, x0 /* invalidate D line / unified line */ + add x0, x0, x2 + cmp x0, x1 + b.lo 1b + dsb sy + ret +END(__invalidate_dcache_area) diff --git a/xen/arch/arm/arm64/mpu/head.S b/xen/arch/arm/arm64/mpu/head.S index 6d336cafbb..5df0af571e 100644 --- a/xen/arch/arm/arm64/mpu/head.S +++ b/xen/arch/arm/arm64/mpu/head.S @@ -40,6 +40,10 @@ FUNC(enable_boot_cpu_mm) mrs x5, MPUIR_EL2 and x5, x5, #NUM_MPU_REGIONS_MASK + ldr x0, =max_mpu_regions + strb w5, [x0] + dc ivac, x0 /* Invalidate cache for max_mpu_regions addr */ + /* x0: region sel */ mov x0, xzr /* Xen text section. */ @@ -74,6 +78,27 @@ FUNC(enable_boot_cpu_mm) prepare_xen_region x0, x1, x2, x3, x4, x5, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR #endif +zero_mpu: + /* Reset remaining MPU regions */ + cmp x0, x5 + beq out_zero_mpu + mov x1, #0 + mov x2, #1 + prepare_xen_region x0, x1, x2, x3, x4, x5, attr_prlar=REGION_DISABLED_PRLAR + b zero_mpu + +out_zero_mpu: + /* Invalidate data cache for MPU data structures */ + mov x4, lr + ldr x0, =xen_mpumap_mask + mov x1, #XEN_MPUMAP_MASK_sizeof + bl __invalidate_dcache_area + + ldr x0, =xen_mpumap + mov x1, #XEN_MPUMAP_sizeof + bl __invalidate_dcache_area + mov lr, x4 + b enable_mpu ret END(enable_boot_cpu_mm) diff --git a/xen/arch/arm/include/asm/arm32/mpu.h b/xen/arch/arm/include/asm/arm32/mpu.h new file mode 100644 index 0000000000..f0d4d4055c --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/mpu.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ARM_ARM32_MPU_H +#define ARM_ARM32_MPU_H + +#ifndef __ASSEMBLY__ + +/* MPU Protection Region */ +typedef struct { + uint32_t prbar; + uint32_t prlar; +} pr_t; + +#endif /* __ASSEMBLY__ */ + +#endif /* ARM_ARM32_MPU_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/bitmap-op.inc b/xen/arch/arm/include/asm/bitmap-op.inc new file mode 100644 index 0000000000..dd8563e02a --- /dev/null +++ b/xen/arch/arm/include/asm/bitmap-op.inc @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * Sets a bit in a bitmap declared by DECLARE_BITMAP, symbol name passed through + * bitmap_symbol. + * + * bitmap_set_bit: symbol of the bitmap declared by DECLARE_BITMAP + * bit: bit number to be set in the bitmap + * tmp1-tmp4: temporary registers used for the computation + * + * Preserves: bit. + * Clobbers: tmp1, tmp2, tmp3, tmp4. + */ +.macro bitmap_set_bit bitmap_symbol, bit, tmp1, tmp2, tmp3, tmp4 + adr_l \tmp1, \bitmap_symbol + mov \tmp2, #(BYTES_PER_LONG - 1) + mvn \tmp2, \tmp2 /* mask for the alignment ~(BYTES_PER_LONG - 1) */ + lsr \tmp3, \bit, #3 /* retrieve byte offset (bit/8) */ + and \tmp2, \tmp3, \tmp2 /* word offset = (bit/8) & ~(BYTES_PER_LONG - 1) */ + add \tmp1, \tmp1, \tmp2 /* bitmap_symbol + word offset */ + and \tmp2, \bit, #(BITS_PER_LONG - 1) /* bit offset inside word */ + + ldr \tmp3, [\tmp1] + mov \tmp4, #1 + lsl \tmp4, \tmp4, \tmp2 /* (1 << offset) */ + orr \tmp3, \tmp3, \tmp4 /* set the bit */ + str \tmp3, [\tmp1] +.endm + +/* + * Clears a bit in a bitmap declared by DECLARE_BITMAP, symbol name passed + * through bitmap_symbol. + * + * bitmap_set_bit: symbol of the bitmap declared by DECLARE_BITMAP + * bit: bit number to be set in the bitmap + * tmp1-tmp4: temporary registers used for the computation + * + * Preserves: bit. + * Clobbers: tmp1, tmp2, tmp3, tmp4. + */ +.macro bitmap_clear_bit bitmap_symbol, bit, tmp1, tmp2, tmp3, tmp4 + adr_l \tmp1, \bitmap_symbol + mov \tmp2, #(BYTES_PER_LONG - 1) + mvn \tmp2, \tmp2 /* mask for the alignment ~(BYTES_PER_LONG - 1) */ + lsr \tmp3, \bit, #3 /* retrieve byte offset (bit/8) */ + and \tmp2, \tmp3, \tmp2 /* word offset = (bit/8) & ~(BYTES_PER_LONG - 1) */ + add \tmp1, \tmp1, \tmp2 /* bitmap_symbol + word offset */ + and \tmp2, \bit, #(BITS_PER_LONG - 1) /* bit offset inside word */ + + ldr \tmp3, [\tmp1] + mov \tmp4, #1 + lsl \tmp4, \tmp4, \tmp2 /* (1 << offset) */ + mvn \tmp4, \tmp4 /* ~(1 << offset) */ + and \tmp3, \tmp3, \tmp4 /* clear the bit */ + str \tmp3, [\tmp1] +.endm + +/* + * Local variables: + * mode: ASM + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index bb83f5a5f5..fb93b8b19d 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -8,6 +8,10 @@ #if defined(CONFIG_ARM_64) # include +#elif defined(CONFIG_ARM_32) +# include +#else +# error "unknown ARM variant" #endif #define MPU_REGION_SHIFT 6 @@ -17,6 +21,7 @@ #define NUM_MPU_REGIONS_SHIFT 8 #define NUM_MPU_REGIONS (_AC(1, UL) << NUM_MPU_REGIONS_SHIFT) #define NUM_MPU_REGIONS_MASK (NUM_MPU_REGIONS - 1) +#define MAX_MPU_REGION_NR NUM_MPU_REGIONS_MASK #endif /* __ARM_MPU_H__ */ diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index bfd840fa5d..409b4dd53d 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -8,9 +8,16 @@ #include #include #include +#include extern struct page_info *frame_table; +extern uint8_t max_mpu_regions; + +extern DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR); + +extern pr_t xen_mpumap[MAX_MPU_REGION_NR]; + #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK)) #ifdef CONFIG_ARM_32 diff --git a/xen/arch/arm/include/asm/mpu/regions.inc b/xen/arch/arm/include/asm/mpu/regions.inc index 47868a1526..6b8c233e6c 100644 --- a/xen/arch/arm/include/asm/mpu/regions.inc +++ b/xen/arch/arm/include/asm/mpu/regions.inc @@ -1,14 +1,34 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include /* Backgroud region enable/disable */ #define SCTLR_ELx_BR BIT(17, UL) +#define REGION_DISABLED_PRLAR 0x00 /* NS=0 ATTR=000 EN=0 */ #define REGION_NORMAL_PRLAR 0x0f /* NS=0 ATTR=111 EN=1 */ #define REGION_DEVICE_PRLAR 0x09 /* NS=0 ATTR=100 EN=1 */ +#define PRLAR_ELx_EN 0x1 + +#ifdef CONFIG_ARM_64 +#define XEN_MPUMAP_ENTRY_SHIFT 0x4 /* 16 byte structure */ + +.macro store_pair reg1, reg2, dst + stp \reg1, \reg2, [\dst] +.endm + +#else +#define XEN_MPUMAP_ENTRY_SHIFT 0x3 /* 8 byte structure */ + +.macro store_pair reg1, reg2, dst + .word 0xe7f000f0 /* unimplemented */ +.endm + +#endif + /* * Macro to prepare and set a EL2 MPU memory region. * We will also create an according MPU memory region entry, which @@ -59,6 +79,24 @@ dsb sy isb + /* Load pair into xen_mpumap */ + adr_l \base, xen_mpumap + add \base, \base, \sel, LSL #XEN_MPUMAP_ENTRY_SHIFT + store_pair \prbar, \prlar, \base + + /* Set/clear xen_mpumap_mask bitmap */ + tst \prlar, #PRLAR_ELx_EN + bne 2f + /* Region is disabled, clear the bit in the bitmap */ + bitmap_clear_bit xen_mpumap_mask, \sel, \base, \limit, \prbar, \prlar + b 3f + +2: + /* Region is enabled, set the bit in the bitmap */ + bitmap_set_bit xen_mpumap_mask, \sel, \base, \limit, \prbar, \prlar + +3: + add \sel, \sel, #1 1: diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 07c8959f4e..2f31b7b787 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -7,9 +7,25 @@ #include #include #include +#include struct page_info *frame_table; +/* Maximum number of supported MPU memory regions by the EL2 MPU. */ +uint8_t __ro_after_init max_mpu_regions; + +/* + * Bitmap xen_mpumap_mask is to record the usage of EL2 MPU memory regions. + * Bit 0 represents MPU memory region 0, bit 1 represents MPU memory + * region 1, ..., and so on. + * If a MPU memory region gets enabled, set the according bit to 1. + */ +DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR) \ + __cacheline_aligned __section(".data"); + +/* EL2 Xen MPU memory region mapping table. */ +pr_t __cacheline_aligned __section(".data") xen_mpumap[MAX_MPU_REGION_NR]; + static void __init __maybe_unused build_assertions(void) { /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000477.1380712 (Exim 4.92) (envelope-from ) id 1uKu4h-0008Ut-MK; Fri, 30 May 2025 07:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000477.1380712; Fri, 30 May 2025 07:22: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 1uKu4h-0008Ul-Jh; Fri, 30 May 2025 07:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1000477; Fri, 30 May 2025 07:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu4g-0008Ud-F4 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu4g-009xKl-1M for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu4g-00CpKF-1F for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22: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=nmnWLYtjIgb2AWtvPjYCVGhKFnOIcw9rTEm1Ja5B/84=; b=gR8nKXiVMAfuKQXnkI+3TjkT1P HOk/fW9t5hKcYbi7u341KE+je23Mz2qF1n9YGpxAPab9cZ60n3weGP0xQcAH8HzxRk7XskAFLc1tp Q/ycuPmokv08Iw2uHctbwFe3JkOCtnm2itt2SZ+j2QTFsEut7skhSPXdOnDWTGeBafxk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Provide access to the MPU region from the C code Message-Id: Date: Fri, 30 May 2025 07:22:42 +0000 commit 54f34554b566b1ce6ce2a673fabb8ef60ff05cc6 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:04 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:21 2025 +0200 arm/mpu: Provide access to the MPU region from the C code Implement some utility functions in order to access the MPU regions from the C world. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/arm64/mpu.h | 2 + xen/arch/arm/include/asm/mpu/mm.h | 24 +++++++ xen/arch/arm/mpu/mm.c | 121 +++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/xen/arch/arm/include/asm/arm64/mpu.h b/xen/arch/arm/include/asm/arm64/mpu.h index 4737868507..f0ce344e78 100644 --- a/xen/arch/arm/include/asm/arm64/mpu.h +++ b/xen/arch/arm/include/asm/arm64/mpu.h @@ -5,6 +5,8 @@ #ifndef __ASSEMBLY__ +#define MPU_REGION_RES0 (0xFFFFULL << 48) + /* Protection Region Base Address Register */ typedef union { struct __packed { diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index 409b4dd53d..d7950d9b4f 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -41,6 +41,30 @@ static inline struct page_info *virt_to_page(const void *v) return mfn_to_page(mfn); } +/* Utility function to be used whenever MPU regions are modified */ +static inline void context_sync_mpu(void) +{ + /* + * ARM DDI 0600B.a, C1.7.1 + * Writes to MPU registers are only guaranteed to be visible following a + * Context synchronization event and DSB operation. + */ + dsb(sy); + isb(); +} + +/* + * The following API requires context_sync_mpu() after being used to modify MPU + * regions: + * - write_protection_region + */ + +/* Reads the MPU region (into @pr_read) with index @sel from the HW */ +void read_protection_region(pr_t *pr_read, uint8_t sel); + +/* Writes the MPU region (from @pr_write) with index @sel to the HW */ +void write_protection_region(const pr_t *pr_write, uint8_t sel); + #endif /* __ARM_MPU_MM_H__ */ /* diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 2f31b7b787..9c5789cdf1 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include struct page_info *frame_table; @@ -26,6 +28,35 @@ DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR) \ /* EL2 Xen MPU memory region mapping table. */ pr_t __cacheline_aligned __section(".data") xen_mpumap[MAX_MPU_REGION_NR]; +#ifdef CONFIG_ARM_64 +/* + * The following are needed for the cases: GENERATE_WRITE_PR_REG_CASE + * and GENERATE_READ_PR_REG_CASE with num==0 + */ +#define PRBAR0_EL2 PRBAR_EL2 +#define PRLAR0_EL2 PRLAR_EL2 + +#define PRBAR_EL2_(n) PRBAR##n##_EL2 +#define PRLAR_EL2_(n) PRLAR##n##_EL2 + +#endif /* CONFIG_ARM_64 */ + +#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits & ~MPU_REGION_RES0, PRBAR_EL2_(num)); \ + WRITE_SYSREG(pr->prlar.bits & ~MPU_REGION_RES0, PRLAR_EL2_(num)); \ + break; \ + } + +#define GENERATE_READ_PR_REG_CASE(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(PRBAR_EL2_(num)); \ + pr->prlar.bits = READ_SYSREG(PRLAR_EL2_(num)); \ + break; \ + } + static void __init __maybe_unused build_assertions(void) { /* @@ -36,6 +67,96 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(PAGE_SIZE != SZ_4K); } +#ifdef CONFIG_ARM_64 +/* + * Armv8-R supports direct access and indirect access to the MPU regions through + * registers: + * - indirect access involves changing the MPU region selector, issuing an isb + * barrier and accessing the selected region through specific registers + * - direct access involves accessing specific registers that point to + * specific MPU regions, without changing the selector, avoiding the use of + * a barrier. + * For Arm64 the PR{B,L}AR_ELx (for n=0) and PR{B,L}AR_ELx (for n=1..15) are + * used for the direct access to the regions selected by + * PRSELR_EL2.REGION<7:4>:n, so 16 regions can be directly accessed when the + * selector is a multiple of 16, giving access to all the supported memory + * regions. + */ +static void prepare_selector(uint8_t *sel) +{ + uint8_t cur_sel = *sel; + + /* + * {read,write}_protection_region works using the direct access to the 0..15 + * regions, so in order to save the isb() overhead, change the PRSELR_EL2 + * only when needed, so when the upper 4 bits of the selector will change. + */ + cur_sel &= 0xF0U; + if ( READ_SYSREG(PRSELR_EL2) != cur_sel ) + { + WRITE_SYSREG(cur_sel, PRSELR_EL2); + isb(); + } + *sel &= 0xFU; +} + +void read_protection_region(pr_t *pr_read, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_READ_PR_REG_CASE(0, pr_read); + GENERATE_READ_PR_REG_CASE(1, pr_read); + GENERATE_READ_PR_REG_CASE(2, pr_read); + GENERATE_READ_PR_REG_CASE(3, pr_read); + GENERATE_READ_PR_REG_CASE(4, pr_read); + GENERATE_READ_PR_REG_CASE(5, pr_read); + GENERATE_READ_PR_REG_CASE(6, pr_read); + GENERATE_READ_PR_REG_CASE(7, pr_read); + GENERATE_READ_PR_REG_CASE(8, pr_read); + GENERATE_READ_PR_REG_CASE(9, pr_read); + GENERATE_READ_PR_REG_CASE(10, pr_read); + GENERATE_READ_PR_REG_CASE(11, pr_read); + GENERATE_READ_PR_REG_CASE(12, pr_read); + GENERATE_READ_PR_REG_CASE(13, pr_read); + GENERATE_READ_PR_REG_CASE(14, pr_read); + GENERATE_READ_PR_REG_CASE(15, pr_read); + default: + BUG(); /* Can't happen */ + break; + } +} + +void write_protection_region(const pr_t *pr_write, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_WRITE_PR_REG_CASE(0, pr_write); + GENERATE_WRITE_PR_REG_CASE(1, pr_write); + GENERATE_WRITE_PR_REG_CASE(2, pr_write); + GENERATE_WRITE_PR_REG_CASE(3, pr_write); + GENERATE_WRITE_PR_REG_CASE(4, pr_write); + GENERATE_WRITE_PR_REG_CASE(5, pr_write); + GENERATE_WRITE_PR_REG_CASE(6, pr_write); + GENERATE_WRITE_PR_REG_CASE(7, pr_write); + GENERATE_WRITE_PR_REG_CASE(8, pr_write); + GENERATE_WRITE_PR_REG_CASE(9, pr_write); + GENERATE_WRITE_PR_REG_CASE(10, pr_write); + GENERATE_WRITE_PR_REG_CASE(11, pr_write); + GENERATE_WRITE_PR_REG_CASE(12, pr_write); + GENERATE_WRITE_PR_REG_CASE(13, pr_write); + GENERATE_WRITE_PR_REG_CASE(14, pr_write); + GENERATE_WRITE_PR_REG_CASE(15, pr_write); + default: + BUG(); /* Can't happen */ + break; + } +} +#endif /* CONFIG_ARM_64 */ + void __init setup_mm(void) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:22:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000478.1380716 (Exim 4.92) (envelope-from ) id 1uKu4r-00005o-Nb; Fri, 30 May 2025 07:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000478.1380716; Fri, 30 May 2025 07:22: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 1uKu4r-00005g-L9; Fri, 30 May 2025 07:22:53 +0000 Received: by outflank-mailman (input) for mailman id 1000478; Fri, 30 May 2025 07:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu4q-00005W-HF for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu4q-009xKr-1d for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu4q-00CpMy-1X for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:22: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=/3phdswSnmE7ZvZhre4wqozJkXlS2JU8BZlBZxU64wE=; b=tud+FjO50dByJWvxRW8zWWIecS WuDe7Le65+cTkPNrnzMCx43r7ELz1ENdPCdj5+VYBg2dEgze6JjAsL/xLyy30Wnk4dCWnZg8WOHnH CeOekQGbtURTb3NNfIqyahl/+bO6LrIc4g7tYfvigDz5ulA9wtYzI9AZ7V9Jxd64NmtE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Introduce utility functions for the pr_t type Message-Id: Date: Fri, 30 May 2025 07:22:52 +0000 commit f8a98a39b832d03347989fbf0e8333417ef31d75 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:05 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:21 2025 +0200 arm/mpu: Introduce utility functions for the pr_t type Introduce a few utility functions to manipulate and handle the pr_t type. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/mpu.h | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index fb93b8b19d..8f06ddac0f 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -23,6 +23,72 @@ #define NUM_MPU_REGIONS_MASK (NUM_MPU_REGIONS - 1) #define MAX_MPU_REGION_NR NUM_MPU_REGIONS_MASK +#ifndef __ASSEMBLY__ + +#ifdef CONFIG_ARM_64 +/* + * Set base address of MPU protection region. + * + * @pr: pointer to the protection region structure. + * @base: base address as base of the protection region. + */ +static inline void pr_set_base(pr_t *pr, paddr_t base) +{ + pr->prbar.reg.base = ((base & ~MPU_REGION_RES0) >> MPU_REGION_SHIFT); +} + +/* + * Set limit address of MPU protection region. + * + * @pr: pointer to the protection region structure. + * @limit: exclusive address as limit of the protection region. + */ +static inline void pr_set_limit(pr_t *pr, paddr_t limit) +{ + /* PRLAR_ELx.LIMIT expects inclusive limit */ + pr->prlar.reg.limit = (((limit - 1) & ~MPU_REGION_RES0) + >> MPU_REGION_SHIFT); +} + +/* + * Access to get base address of MPU protection region. + * The base address shall be zero extended. + * + * @pr: pointer to the protection region structure. + * @return: Base address configured for the passed protection region. + */ +static inline paddr_t pr_get_base(const pr_t *pr) +{ + return (paddr_t)(pr->prbar.reg.base << MPU_REGION_SHIFT); +} + +/* + * Access to get limit address of MPU protection region. + * The limit address shall be concatenated with 0x3f. + * + * @pr: pointer to the protection region structure. + * @return: Inclusive limit address configured for the passed protection region. + */ +static inline paddr_t pr_get_limit(const pr_t *pr) +{ + return (paddr_t)((pr->prlar.reg.limit << MPU_REGION_SHIFT) + | ~MPU_REGION_MASK); +} + +/* + * Check if the protection region is valid (enabled). + * + * @pr: pointer to the protection region structure. + * @return: True if the region is valid (enabled), false otherwise. + */ +static inline bool region_is_valid(const pr_t *pr) +{ + return pr->prlar.reg.en; +} +#endif /* CONFIG_ARM_64 */ + +#endif /* __ASSEMBLY__ */ + #endif /* __ARM_MPU_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:23:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000479.1380719 (Exim 4.92) (envelope-from ) id 1uKu51-00008M-P2; Fri, 30 May 2025 07:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000479.1380719; Fri, 30 May 2025 07:23: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 1uKu51-00008F-Me; Fri, 30 May 2025 07:23:03 +0000 Received: by outflank-mailman (input) for mailman id 1000479; Fri, 30 May 2025 07:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu50-00007v-K7 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu50-009xLA-1u for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu50-00CpZv-1o for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:23: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=nkK/xgd80tRgt4y5/37Bhyf3KZ9O3Dk7eWMyo0hO8WM=; b=Nra391v9dY3J0hQBD0EttkACAZ 6jeJyRelkEs6vbT/x/+FIsj/j0ff96c9NgNLBd3t11yr8FYBzVeYLuxpHuE8YdZGfJn63EKjtK5GI rKZ6tLfnLKlFXAnyL6MZ4BKGY3qASvEjYr9akjsiuhn7bOrGRRQ9wdzEkoZmEk7iMU6A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Provide a constructor for pr_t type Message-Id: Date: Fri, 30 May 2025 07:23:02 +0000 commit a37f924e74850fa92f62cc0a37880fb9b4d7e9da Author: Luca Fancellu AuthorDate: Fri May 23 07:54:06 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:21 2025 +0200 arm/mpu: Provide a constructor for pr_t type Provide a function that creates a pr_t object from a memory range and some attributes. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/mpu/mm.h | 10 ++++++ xen/arch/arm/mpu/mm.c | 68 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index d7950d9b4f..a7f970b465 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -65,6 +65,16 @@ void read_protection_region(pr_t *pr_read, uint8_t sel); /* Writes the MPU region (from @pr_write) with index @sel to the HW */ void write_protection_region(const pr_t *pr_write, uint8_t sel); +/* + * Creates a pr_t structure describing a protection region. + * + * @base: base address as base of the protection region. + * @limit: exclusive address as limit of the protection region. + * @flags: memory flags for the mapping. + * @return: pr_t structure describing a protection region. + */ +pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags); + #endif /* __ARM_MPU_MM_H__ */ /* diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 9c5789cdf1..86fbe105af 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -9,6 +9,7 @@ #include #include #include +#include #include struct page_info *frame_table; @@ -155,6 +156,73 @@ void write_protection_region(const pr_t *pr_write, uint8_t sel) break; } } + +pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) +{ + unsigned int attr_idx = PAGE_AI_MASK(flags); + prbar_t prbar; + prlar_t prlar; + pr_t region; + + /* Build up value for PRBAR_EL2. */ + prbar = (prbar_t) { + .reg = { + .xn_0 = 0, + .xn = PAGE_XN_MASK(flags), + .ap_0 = 0, + .ro = PAGE_RO_MASK(flags) + }}; + + switch ( attr_idx ) + { + /* + * ARM ARM: Shareable, Inner Shareable, and Outer Shareable Normal memory + * (DDI 0487L.a B2.10.1.1.1 Note section): + * + * Because all data accesses to Non-cacheable locations are data coherent + * to all observers, Non-cacheable locations are always treated as Outer + * Shareable + * + * ARM ARM: Device memory (DDI 0487L.a B2.10.2) + * + * All of these memory types have the following properties: + * [...] + * - Data accesses to memory locations are coherent for all observers in + * the system, and correspondingly are treated as being Outer Shareable + */ + case MT_NORMAL_NC: + /* Fall through */ + case MT_DEVICE_nGnRnE: + /* Fall through */ + case MT_DEVICE_nGnRE: + prbar.reg.sh = LPAE_SH_OUTER; + break; + default: + /* Xen mappings are SMP coherent */ + prbar.reg.sh = LPAE_SH_INNER; + break; + } + + /* Build up value for PRLAR_EL2. */ + prlar = (prlar_t) { + .reg = { + .ns = 0, /* Hyp mode is in secure world */ + .ai = attr_idx, + .en = 1, /* Region enabled */ + }}; + + /* Build up MPU memory region. */ + region = (pr_t) { + .prbar = prbar, + .prlar = prlar, + }; + + /* Set base address and limit address. */ + pr_set_base(®ion, base); + pr_set_limit(®ion, limit); + + return region; +} #endif /* CONFIG_ARM_64 */ void __init setup_mm(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 07:23:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 07:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000480.1380723 (Exim 4.92) (envelope-from ) id 1uKu5B-0000BI-Rv; Fri, 30 May 2025 07:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000480.1380723; Fri, 30 May 2025 07:23: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 1uKu5B-0000BA-PU; Fri, 30 May 2025 07:23:13 +0000 Received: by outflank-mailman (input) for mailman id 1000480; Fri, 30 May 2025 07:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKu5A-0000B2-NB for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKu5A-009xLG-2B for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKu5A-00Cpct-25 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 07:23: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=WVsNCHefLhOKsLA2HBpcNlLmm2IcwOb2pbt4Zcr5ak0=; b=jkiS2yqLDgqbVf0CljumUBHNeh 3ClZJs8LhGpV9APZF7Y9oOouDyLKaB4vn8bfGZdt6NjsqdqFBx8r6kWkqpS7uRyvW3RpoyeYPiaCN p6etiMZMj48IdnaJO/XZCDyXUrBO6WfShnCLmVgIXc2jQWgbs2Zo0xnkpPxCilLcfoo0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: vpsci: Fix typo in comment (SCCC changed to SSSC) Message-Id: Date: Fri, 30 May 2025 07:23:12 +0000 commit d7d55c27cc3253fb3634a0e468ef5df30487552b Author: Mykola Kvach AuthorDate: Thu May 29 22:40:25 2025 +0300 Commit: Michal Orzel CommitDate: Fri May 30 08:47:29 2025 +0200 xen/arm: vpsci: Fix typo in comment (SCCC changed to SSSC) Corrected a typo in a comment within vpsci.c: replaced "SCCC_SMCCC_*_REVISION" with the correct "SSSC_SMCCC_*_REVISION". This change improves clarity but does not affect functionality. Signed-off-by: Mykola Kvach Reviewed-by: Michal Orzel --- xen/arch/arm/vpsci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index d1615be8a6..7ba9ccd94b 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -268,7 +268,7 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) { /* * /!\ VPSCI_NR_FUNCS (in asm/vpsci.h) should be updated when - * adding/removing a function. SCCC_SMCCC_*_REVISION should be + * adding/removing a function. SSSC_SMCCC_*_REVISION should be * updated once per release. */ switch ( fid ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000556.1380754 (Exim 4.92) (envelope-from ) id 1uKupT-00080U-Lq; Fri, 30 May 2025 08:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000556.1380754; Fri, 30 May 2025 08: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 1uKupT-00080M-J2; Fri, 30 May 2025 08:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1000556; Fri, 30 May 2025 08:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKupR-0007z7-MA for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKupR-009yjZ-1u for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKupR-00DntX-1m for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08: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=0h3OQ0/+hjmkb8WY+kIPMYx5hEg/pkcUXGeed8T1UJY=; b=4xwelTAcmA+hLYVTx1kZzSVr8L hzgrz6MBny8QVyfeEuBLnChm3HSPISLPPv+Jr9NwROFbG785jEsYWhwaU+qB5pkQMcPYS/yQtYhdz qKwK42aqfF39pDJZNRhacGzAdz9EGtFsUnmD8l5XKdcT3jgl6j9JY8gwb9rLfmTp/w4o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] device-tree: Move Arm's static-evtchn feature to common Message-Id: Date: Fri, 30 May 2025 08:11:01 +0000 commit 902db088395b13ce620f5a201a751556b760c0ef Author: Michal Orzel AuthorDate: Tue May 27 10:21:17 2025 +0200 Commit: Michal Orzel CommitDate: Fri May 30 08:41:12 2025 +0200 device-tree: Move Arm's static-evtchn feature to common There's nothing Arm specific about this feature. Move it to common as part of a larger activity to commonalize device tree related features. For now, select it only for ARM until others (e.g. RISC-V) verify it works for them too. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- xen/arch/arm/Kconfig | 8 -- xen/arch/arm/Makefile | 1 - xen/arch/arm/include/asm/static-evtchn.h | 25 ----- xen/arch/arm/setup.c | 2 +- xen/arch/arm/static-evtchn.c | 161 ------------------------------- xen/common/Kconfig | 8 ++ xen/common/device-tree/Makefile | 1 + xen/common/device-tree/static-evtchn.c | 160 ++++++++++++++++++++++++++++++ xen/include/xen/static-evtchn.h | 25 +++++ 9 files changed, 195 insertions(+), 196 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index a5aad97a68..57919d8b3a 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -253,14 +253,6 @@ config STATIC_SHM help This option enables statically shared memory on a dom0less system. -config STATIC_EVTCHN - bool "Static event channel support on a dom0less system" - depends on DOM0LESS_BOOT - default y - help - This option enables establishing static event channel communication - between domains on a dom0less system (domU-domU as well as domU-dom0). - config PARTIAL_EMULATION bool "Enable partial emulation of system/coprocessor registers" default y diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 129a109d6e..eeeac4e653 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -51,7 +51,6 @@ obj-y += setup.o obj-y += shutdown.o obj-y += smp.o obj-y += smpboot.o -obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o obj-y += sysctl.o diff --git a/xen/arch/arm/include/asm/static-evtchn.h b/xen/arch/arm/include/asm/static-evtchn.h deleted file mode 100644 index f964522f6a..0000000000 --- a/xen/arch/arm/include/asm/static-evtchn.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_STATIC_EVTCHN_H_ -#define __ASM_STATIC_EVTCHN_H_ - -#ifdef CONFIG_STATIC_EVTCHN - -void alloc_static_evtchn(void); - -#else /* !CONFIG_STATIC_EVTCHN */ - -static inline void alloc_static_evtchn(void) {}; - -#endif /* CONFIG_STATIC_EVTCHN */ - -#endif /* __ASM_STATIC_EVTCHN_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 10b46d0684..734e23da44 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/arm/static-evtchn.c b/xen/arch/arm/static-evtchn.c deleted file mode 100644 index 49db08d5c6..0000000000 --- a/xen/arch/arm/static-evtchn.c +++ /dev/null @@ -1,161 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include - -#include - -#define STATIC_EVTCHN_NODE_SIZE_CELLS 2 - -static int __init get_evtchn_dt_property(const struct dt_device_node *np, - uint32_t *port, uint32_t *phandle) -{ - const __be32 *prop = NULL; - uint32_t len; - - prop = dt_get_property(np, "xen,evtchn", &len); - if ( !prop ) - { - printk(XENLOG_ERR "xen,evtchn property should not be empty.\n"); - return -EINVAL; - } - - if ( !len || len < dt_cells_to_size(STATIC_EVTCHN_NODE_SIZE_CELLS) ) - { - printk(XENLOG_ERR "xen,evtchn property value is not valid.\n"); - return -EINVAL; - } - - *port = dt_next_cell(1, &prop); - *phandle = dt_next_cell(1, &prop); - - return 0; -} - -static int __init alloc_domain_evtchn(struct dt_device_node *node) -{ - int rc; - uint32_t domU1_port, domU2_port, remote_phandle; - struct dt_device_node *remote_node; - const struct dt_device_node *p1_node, *p2_node; - struct evtchn_alloc_unbound alloc_unbound; - struct evtchn_bind_interdomain bind_interdomain; - struct domain *d1 = NULL, *d2 = NULL; - - if ( !dt_device_is_compatible(node, "xen,evtchn-v1") ) - return 0; - - /* - * Event channel is already created while parsing the other side of - * evtchn node. - */ - if ( dt_device_static_evtchn_created(node) ) - return 0; - - rc = get_evtchn_dt_property(node, &domU1_port, &remote_phandle); - if ( rc ) - return rc; - - remote_node = dt_find_node_by_phandle(remote_phandle); - if ( !remote_node ) - { - printk(XENLOG_ERR - "evtchn: could not find remote evtchn phandle\n"); - return -EINVAL; - } - - rc = get_evtchn_dt_property(remote_node, &domU2_port, &remote_phandle); - if ( rc ) - return rc; - - if ( node->phandle != remote_phandle ) - { - printk(XENLOG_ERR "xen,evtchn property is not setup correctly.\n"); - return -EINVAL; - } - - p1_node = dt_get_parent(node); - if ( !p1_node ) - { - printk(XENLOG_ERR "evtchn: evtchn parent node is NULL\n" ); - return -EINVAL; - } - - p2_node = dt_get_parent(remote_node); - if ( !p2_node ) - { - printk(XENLOG_ERR "evtchn: remote parent node is NULL\n" ); - return -EINVAL; - } - - d1 = get_domain_by_id(p1_node->used_by); - d2 = get_domain_by_id(p2_node->used_by); - - if ( !d1 || !d2 ) - { - printk(XENLOG_ERR "evtchn: could not find domains\n" ); - return -EINVAL; - } - - alloc_unbound.dom = d1->domain_id; - alloc_unbound.remote_dom = d2->domain_id; - - rc = evtchn_alloc_unbound(&alloc_unbound, domU1_port); - if ( rc < 0 ) - { - printk(XENLOG_ERR - "evtchn_alloc_unbound() failure (Error %d) \n", rc); - return rc; - } - - bind_interdomain.remote_dom = d1->domain_id; - bind_interdomain.remote_port = domU1_port; - - rc = evtchn_bind_interdomain(&bind_interdomain, d2, domU2_port); - if ( rc < 0 ) - { - printk(XENLOG_ERR - "evtchn_bind_interdomain() failure (Error %d) \n", rc); - return rc; - } - - dt_device_set_static_evtchn_created(node); - dt_device_set_static_evtchn_created(remote_node); - - return 0; -} - -void __init alloc_static_evtchn(void) -{ - struct dt_device_node *node, *evtchn_node; - struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); - - BUG_ON(chosen == NULL); - - if ( hardware_domain ) - dt_device_set_used_by(chosen, hardware_domain->domain_id); - - dt_for_each_child_node(chosen, node) - { - if ( hardware_domain ) - { - if ( alloc_domain_evtchn(node) != 0 ) - panic("Could not set up domains evtchn\n"); - } - - dt_for_each_child_node(node, evtchn_node) - { - if ( alloc_domain_evtchn(evtchn_node) != 0 ) - panic("Could not set up domains evtchn\n"); - } - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 3d66d09397..0951d4c2f2 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -162,6 +162,14 @@ config STATIC_MEMORY If unsure, say N. +config STATIC_EVTCHN + bool "Static event channel support on a dom0less system" + depends on DOM0LESS_BOOT && ARM + default y + help + This option enables establishing static event channel communication + between domains on a dom0less system (domU-domU as well as domU-dom0). + menu "Speculative hardening" config INDIRECT_THUNK diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index ff54a8ef2b..57b9e6ca00 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o +obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o diff --git a/xen/common/device-tree/static-evtchn.c b/xen/common/device-tree/static-evtchn.c new file mode 100644 index 0000000000..8b82e6b3d8 --- /dev/null +++ b/xen/common/device-tree/static-evtchn.c @@ -0,0 +1,160 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#define STATIC_EVTCHN_NODE_SIZE_CELLS 2 + +static int __init get_evtchn_dt_property(const struct dt_device_node *np, + uint32_t *port, uint32_t *phandle) +{ + const __be32 *prop = NULL; + uint32_t len; + + prop = dt_get_property(np, "xen,evtchn", &len); + if ( !prop ) + { + printk(XENLOG_ERR "xen,evtchn property should not be empty.\n"); + return -EINVAL; + } + + if ( !len || len < dt_cells_to_size(STATIC_EVTCHN_NODE_SIZE_CELLS) ) + { + printk(XENLOG_ERR "xen,evtchn property value is not valid.\n"); + return -EINVAL; + } + + *port = dt_next_cell(1, &prop); + *phandle = dt_next_cell(1, &prop); + + return 0; +} + +static int __init alloc_domain_evtchn(struct dt_device_node *node) +{ + int rc; + uint32_t domU1_port, domU2_port, remote_phandle; + struct dt_device_node *remote_node; + const struct dt_device_node *p1_node, *p2_node; + struct evtchn_alloc_unbound alloc_unbound; + struct evtchn_bind_interdomain bind_interdomain; + struct domain *d1 = NULL, *d2 = NULL; + + if ( !dt_device_is_compatible(node, "xen,evtchn-v1") ) + return 0; + + /* + * Event channel is already created while parsing the other side of + * evtchn node. + */ + if ( dt_device_static_evtchn_created(node) ) + return 0; + + rc = get_evtchn_dt_property(node, &domU1_port, &remote_phandle); + if ( rc ) + return rc; + + remote_node = dt_find_node_by_phandle(remote_phandle); + if ( !remote_node ) + { + printk(XENLOG_ERR + "evtchn: could not find remote evtchn phandle\n"); + return -EINVAL; + } + + rc = get_evtchn_dt_property(remote_node, &domU2_port, &remote_phandle); + if ( rc ) + return rc; + + if ( node->phandle != remote_phandle ) + { + printk(XENLOG_ERR "xen,evtchn property is not setup correctly.\n"); + return -EINVAL; + } + + p1_node = dt_get_parent(node); + if ( !p1_node ) + { + printk(XENLOG_ERR "evtchn: evtchn parent node is NULL\n" ); + return -EINVAL; + } + + p2_node = dt_get_parent(remote_node); + if ( !p2_node ) + { + printk(XENLOG_ERR "evtchn: remote parent node is NULL\n" ); + return -EINVAL; + } + + d1 = get_domain_by_id(p1_node->used_by); + d2 = get_domain_by_id(p2_node->used_by); + + if ( !d1 || !d2 ) + { + printk(XENLOG_ERR "evtchn: could not find domains\n" ); + return -EINVAL; + } + + alloc_unbound.dom = d1->domain_id; + alloc_unbound.remote_dom = d2->domain_id; + + rc = evtchn_alloc_unbound(&alloc_unbound, domU1_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_alloc_unbound() failure (Error %d) \n", rc); + return rc; + } + + bind_interdomain.remote_dom = d1->domain_id; + bind_interdomain.remote_port = domU1_port; + + rc = evtchn_bind_interdomain(&bind_interdomain, d2, domU2_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_bind_interdomain() failure (Error %d) \n", rc); + return rc; + } + + dt_device_set_static_evtchn_created(node); + dt_device_set_static_evtchn_created(remote_node); + + return 0; +} + +void __init alloc_static_evtchn(void) +{ + struct dt_device_node *node, *evtchn_node; + struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); + + BUG_ON(chosen == NULL); + + if ( hardware_domain ) + dt_device_set_used_by(chosen, hardware_domain->domain_id); + + dt_for_each_child_node(chosen, node) + { + if ( hardware_domain ) + { + if ( alloc_domain_evtchn(node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + + dt_for_each_child_node(node, evtchn_node) + { + if ( alloc_domain_evtchn(evtchn_node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/static-evtchn.h b/xen/include/xen/static-evtchn.h new file mode 100644 index 0000000000..31ae92741a --- /dev/null +++ b/xen/include/xen/static-evtchn.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef XEN_STATIC_EVTCHN_H +#define XEN_STATIC_EVTCHN_H + +#ifdef CONFIG_STATIC_EVTCHN + +void alloc_static_evtchn(void); + +#else /* !CONFIG_STATIC_EVTCHN */ + +static inline void alloc_static_evtchn(void) {}; + +#endif /* CONFIG_STATIC_EVTCHN */ + +#endif /* XEN_STATIC_EVTCHN_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000557.1380758 (Exim 4.92) (envelope-from ) id 1uKupc-00084e-NL; Fri, 30 May 2025 08:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000557.1380758; Fri, 30 May 2025 08:11: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 1uKupc-00084W-KR; Fri, 30 May 2025 08:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1000557; Fri, 30 May 2025 08:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKupb-000835-Nx for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKupb-009yjd-2H for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKupb-00DoAR-25 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08: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=nHS+Fuy+doh/RQHBl5+smU6SrZx1eabVTT/JOtnLJE8=; b=t/CsN9P+ROajE8dBj9Oav9KtzK 6hieWTOufdXinebkNnWP2EL9I1JTwpwuN4JC4/CVcVmOX8sLEM7xaL21uS0uD33iZWpm7YtmeB4jN 1UemzRU6ITKsTOO9dxrBrDIh4G5FuOz0NCGySMoTBZ1DQWsCMAMQVCczXXGcLWMYLBRk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/arm: Document Xen booting protocol on Armv8-R Message-Id: Date: Fri, 30 May 2025 08:11:11 +0000 commit 92ad25fe3d547b622ba50226cfae8902650e1ce2 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:01 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:44:15 2025 +0200 docs/arm: Document Xen booting protocol on Armv8-R Document the requirement needed to boot Xen on Armv8-R platforms. Signed-off-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Reviewed-by: Michal Orzel Acked-by: Julien Grall --- docs/misc/arm/booting.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/misc/arm/booting.txt b/docs/misc/arm/booting.txt index 21ae74837d..e9b511cae4 100644 --- a/docs/misc/arm/booting.txt +++ b/docs/misc/arm/booting.txt @@ -56,12 +56,17 @@ image header to determine the load address, entry point, etc. Firmware/bootloader requirements -------------------------------- -Xen relies on some settings the firmware has to configure in EL3 before starting Xen. +Xen relies on some settings the firmware has to configure before starting Xen. -* Xen must be entered in NS EL2 mode +* Xen must be entered in: + * Non-Secure EL2 mode for Armv8-A Arm64 and Arm32, Armv8-R Arm32. + * Secure EL2 mode for Armv8-R Arm64. -* The bit SCR_EL3.HCE (resp. SCR.HCE for 32-bit ARM) must be set to 1. +* When EL3 is supported, the bit SCR_EL3.HCE (resp. SCR.HCE for 32-bit ARM) must + be set to 1. +* Xen must be entered with MMU/MPU off and data cache disabled (SCTLR_EL2.M bit + and SCTLR_EL2.C set to 0). Cache state shall follow [1], [2] for MPU. [1] linux/Documentation/arm/booting.rst Latest version: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/arch/arm/booting.rst -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:11:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000558.1380762 (Exim 4.92) (envelope-from ) id 1uKupm-00087E-OP; Fri, 30 May 2025 08:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000558.1380762; Fri, 30 May 2025 08:11: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 1uKupm-000876-Lq; Fri, 30 May 2025 08:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1000558; Fri, 30 May 2025 08:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKupl-00086v-QX for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKupl-009yjh-2Y for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKupl-00DoO7-2R for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11: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=OC9d0WCCo2EQMv7FfIpYQ0VEGx/nejDvBNFj2ZVa6J8=; b=o9O88MGeKdZuiQUP9npINXqpUg tCtjAeteRJxKcuaG+z5cuh5fuXKUTuVfo5jev28EdCVG4ilcyLyJzOTZcfZBIeLmegYB85TVlgwkN 542P/p9V2fgYki++rB6Eg7MdtHqeRhISQB5yw321WoPM92YCIpQcbihQbBctF8G7pv1w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Introduce MPU memory region map structure Message-Id: Date: Fri, 30 May 2025 08:11:21 +0000 commit e67914d91ba0c15fd2e17cb2ddab8b02a988634d Author: Penny Zheng AuthorDate: Fri May 23 07:54:02 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:44:15 2025 +0200 arm/mpu: Introduce MPU memory region map structure Introduce pr_t typedef which is a structure having the prbar and prlar members, each being structured as the registers of the AArch64 Armv8-R architecture. Signed-off-by: Penny Zheng Signed-off-by: Wei Chen Signed-off-by: Luca Fancellu Acked-by: Julien Grall Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/arm64/mpu.h | 52 ++++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/mpu.h | 4 +++ 2 files changed, 56 insertions(+) diff --git a/xen/arch/arm/include/asm/arm64/mpu.h b/xen/arch/arm/include/asm/arm64/mpu.h new file mode 100644 index 0000000000..4737868507 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/mpu.h @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ARM_ARM64_MPU_H +#define ARM_ARM64_MPU_H + +#ifndef __ASSEMBLY__ + +/* Protection Region Base Address Register */ +typedef union { + struct __packed { + unsigned long xn_0:1; /* Execute-Never XN[0] */ + unsigned long xn:1; /* Execute-Never XN[1] */ + unsigned long ap_0:1; /* Access Permission AP[0] */ + unsigned long ro:1; /* Access Permission AP[1] */ + unsigned long sh:2; /* Shareability */ + unsigned long base:42; /* Base Address */ + unsigned long res0:16; /* RES0 */ + } reg; + uint64_t bits; +} prbar_t; + +/* Protection Region Limit Address Register */ +typedef union { + struct __packed { + unsigned long en:1; /* Region enable */ + unsigned long ai:3; /* Memory Attribute Index */ + unsigned long ns:1; /* Not-Secure */ + unsigned long res0:1; /* RES0 */ + unsigned long limit:42; /* Limit Address */ + unsigned long res1:16; /* RES0 */ + } reg; + uint64_t bits; +} prlar_t; + +/* MPU Protection Region */ +typedef struct { + prbar_t prbar; + prlar_t prlar; +} pr_t; + +#endif /* __ASSEMBLY__ */ + +#endif /* ARM_ARM64_MPU_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index d4ec4248b6..bb83f5a5f5 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -6,6 +6,10 @@ #ifndef __ARM_MPU_H__ #define __ARM_MPU_H__ +#if defined(CONFIG_ARM_64) +# include +#endif + #define MPU_REGION_SHIFT 6 #define MPU_REGION_ALIGN (_AC(1, UL) << MPU_REGION_SHIFT) #define MPU_REGION_MASK (~(MPU_REGION_ALIGN - 1)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:11:32 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:11:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000559.1380766 (Exim 4.92) (envelope-from ) id 1uKupw-00089Y-Q0; Fri, 30 May 2025 08:11:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000559.1380766; Fri, 30 May 2025 08:11: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 1uKupw-00089Q-ND; Fri, 30 May 2025 08:11:32 +0000 Received: by outflank-mailman (input) for mailman id 1000559; Fri, 30 May 2025 08:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKupv-00089I-VP for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKupv-009yjl-30 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKupv-00DoZ3-2j for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11: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=CVaDbwCE9ZBEfky3QchfGr4aLE0EkpW4lqt0Y5C5u3E=; b=UAql8nRrOQev/uzOj1LRhOwyFR n8sy7llUaALm8lLJJTxTAmt5du0GUXiqIvASsA8HoaTbiC3sbNqCBtJAxMkVJi+z441a2r11IuXYe YSPSufs0HNuGLgZtmPuiSkol+/rdhyiX+calHl9LdUkf5QdShyc1s226sMV7QogliI5I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Provide and populate MPU C data structures Message-Id: Date: Fri, 30 May 2025 08:11:31 +0000 commit ca5df936c473da69a05c4769aef4b3c2fe2b07e4 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:03 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:20 2025 +0200 arm/mpu: Provide and populate MPU C data structures Provide some data structure in the C world to track the MPU status, these structures will be filled at boot by the assembly early code with the boot MPU regions and afterwards they will be used at runtime. Provide methods to update a bitmap created with DECLARE_BITMAP from the assembly code for both Arm32 and Arm64. Modify Arm64 assembly boot code to reset any unused MPU region, initialise 'max_mpu_regions' with the number of supported MPU regions and modify the common asm macro 'prepare_xen_region' to load into xen_mpumap the MPU status and set/clear the bitmap 'xen_mpumap_mask' used to track the enabled regions. Provide a stub implementation for the pr_t type and asm macro for the Arm32 to prevent compilation break, they will be implemented later. Signed-off-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/arm64/asm-offsets.c | 7 ++++ xen/arch/arm/arm64/cache.S | 21 +++++++++++ xen/arch/arm/arm64/mpu/head.S | 25 +++++++++++++ xen/arch/arm/include/asm/arm32/mpu.h | 25 +++++++++++++ xen/arch/arm/include/asm/bitmap-op.inc | 63 ++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/mpu.h | 5 +++ xen/arch/arm/include/asm/mpu/mm.h | 7 ++++ xen/arch/arm/include/asm/mpu/regions.inc | 38 +++++++++++++++++++ xen/arch/arm/mpu/mm.c | 16 ++++++++ 9 files changed, 207 insertions(+) diff --git a/xen/arch/arm/arm64/asm-offsets.c b/xen/arch/arm/arm64/asm-offsets.c index 602ffa5b54..320289b281 100644 --- a/xen/arch/arm/arm64/asm-offsets.c +++ b/xen/arch/arm/arm64/asm-offsets.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,12 @@ void __dummy__(void) OFFSET(ARM_SMCCC_1_2_REGS_X14_OFFS, struct arm_smccc_1_2_regs, a14); OFFSET(ARM_SMCCC_1_2_REGS_X16_OFFS, struct arm_smccc_1_2_regs, a16); BLANK(); + +#ifdef CONFIG_MPU + DEFINE(XEN_MPUMAP_MASK_sizeof, sizeof(xen_mpumap_mask)); + DEFINE(XEN_MPUMAP_sizeof, sizeof(xen_mpumap)); + BLANK(); +#endif } /* diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S index c0a8ca163a..d3c13d98cc 100644 --- a/xen/arch/arm/arm64/cache.S +++ b/xen/arch/arm/arm64/cache.S @@ -50,3 +50,24 @@ FUNC(__flush_dcache_area) dsb sy ret END(__flush_dcache_area) + +/* + * __invalidate_dcache_area(addr, size) + * + * Ensure that the data held in the cache for the buffer is invalidated. + * + * - addr - start address of the buffer + * - size - size of the buffer + */ +FUNC(__invalidate_dcache_area) + dcache_line_size x2, x3 + add x1, x0, x1 + sub x3, x2, #1 + bic x0, x0, x3 +1: dc ivac, x0 /* invalidate D line / unified line */ + add x0, x0, x2 + cmp x0, x1 + b.lo 1b + dsb sy + ret +END(__invalidate_dcache_area) diff --git a/xen/arch/arm/arm64/mpu/head.S b/xen/arch/arm/arm64/mpu/head.S index 6d336cafbb..5df0af571e 100644 --- a/xen/arch/arm/arm64/mpu/head.S +++ b/xen/arch/arm/arm64/mpu/head.S @@ -40,6 +40,10 @@ FUNC(enable_boot_cpu_mm) mrs x5, MPUIR_EL2 and x5, x5, #NUM_MPU_REGIONS_MASK + ldr x0, =max_mpu_regions + strb w5, [x0] + dc ivac, x0 /* Invalidate cache for max_mpu_regions addr */ + /* x0: region sel */ mov x0, xzr /* Xen text section. */ @@ -74,6 +78,27 @@ FUNC(enable_boot_cpu_mm) prepare_xen_region x0, x1, x2, x3, x4, x5, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR #endif +zero_mpu: + /* Reset remaining MPU regions */ + cmp x0, x5 + beq out_zero_mpu + mov x1, #0 + mov x2, #1 + prepare_xen_region x0, x1, x2, x3, x4, x5, attr_prlar=REGION_DISABLED_PRLAR + b zero_mpu + +out_zero_mpu: + /* Invalidate data cache for MPU data structures */ + mov x4, lr + ldr x0, =xen_mpumap_mask + mov x1, #XEN_MPUMAP_MASK_sizeof + bl __invalidate_dcache_area + + ldr x0, =xen_mpumap + mov x1, #XEN_MPUMAP_sizeof + bl __invalidate_dcache_area + mov lr, x4 + b enable_mpu ret END(enable_boot_cpu_mm) diff --git a/xen/arch/arm/include/asm/arm32/mpu.h b/xen/arch/arm/include/asm/arm32/mpu.h new file mode 100644 index 0000000000..f0d4d4055c --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/mpu.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ARM_ARM32_MPU_H +#define ARM_ARM32_MPU_H + +#ifndef __ASSEMBLY__ + +/* MPU Protection Region */ +typedef struct { + uint32_t prbar; + uint32_t prlar; +} pr_t; + +#endif /* __ASSEMBLY__ */ + +#endif /* ARM_ARM32_MPU_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/bitmap-op.inc b/xen/arch/arm/include/asm/bitmap-op.inc new file mode 100644 index 0000000000..dd8563e02a --- /dev/null +++ b/xen/arch/arm/include/asm/bitmap-op.inc @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * Sets a bit in a bitmap declared by DECLARE_BITMAP, symbol name passed through + * bitmap_symbol. + * + * bitmap_set_bit: symbol of the bitmap declared by DECLARE_BITMAP + * bit: bit number to be set in the bitmap + * tmp1-tmp4: temporary registers used for the computation + * + * Preserves: bit. + * Clobbers: tmp1, tmp2, tmp3, tmp4. + */ +.macro bitmap_set_bit bitmap_symbol, bit, tmp1, tmp2, tmp3, tmp4 + adr_l \tmp1, \bitmap_symbol + mov \tmp2, #(BYTES_PER_LONG - 1) + mvn \tmp2, \tmp2 /* mask for the alignment ~(BYTES_PER_LONG - 1) */ + lsr \tmp3, \bit, #3 /* retrieve byte offset (bit/8) */ + and \tmp2, \tmp3, \tmp2 /* word offset = (bit/8) & ~(BYTES_PER_LONG - 1) */ + add \tmp1, \tmp1, \tmp2 /* bitmap_symbol + word offset */ + and \tmp2, \bit, #(BITS_PER_LONG - 1) /* bit offset inside word */ + + ldr \tmp3, [\tmp1] + mov \tmp4, #1 + lsl \tmp4, \tmp4, \tmp2 /* (1 << offset) */ + orr \tmp3, \tmp3, \tmp4 /* set the bit */ + str \tmp3, [\tmp1] +.endm + +/* + * Clears a bit in a bitmap declared by DECLARE_BITMAP, symbol name passed + * through bitmap_symbol. + * + * bitmap_set_bit: symbol of the bitmap declared by DECLARE_BITMAP + * bit: bit number to be set in the bitmap + * tmp1-tmp4: temporary registers used for the computation + * + * Preserves: bit. + * Clobbers: tmp1, tmp2, tmp3, tmp4. + */ +.macro bitmap_clear_bit bitmap_symbol, bit, tmp1, tmp2, tmp3, tmp4 + adr_l \tmp1, \bitmap_symbol + mov \tmp2, #(BYTES_PER_LONG - 1) + mvn \tmp2, \tmp2 /* mask for the alignment ~(BYTES_PER_LONG - 1) */ + lsr \tmp3, \bit, #3 /* retrieve byte offset (bit/8) */ + and \tmp2, \tmp3, \tmp2 /* word offset = (bit/8) & ~(BYTES_PER_LONG - 1) */ + add \tmp1, \tmp1, \tmp2 /* bitmap_symbol + word offset */ + and \tmp2, \bit, #(BITS_PER_LONG - 1) /* bit offset inside word */ + + ldr \tmp3, [\tmp1] + mov \tmp4, #1 + lsl \tmp4, \tmp4, \tmp2 /* (1 << offset) */ + mvn \tmp4, \tmp4 /* ~(1 << offset) */ + and \tmp3, \tmp3, \tmp4 /* clear the bit */ + str \tmp3, [\tmp1] +.endm + +/* + * Local variables: + * mode: ASM + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index bb83f5a5f5..fb93b8b19d 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -8,6 +8,10 @@ #if defined(CONFIG_ARM_64) # include +#elif defined(CONFIG_ARM_32) +# include +#else +# error "unknown ARM variant" #endif #define MPU_REGION_SHIFT 6 @@ -17,6 +21,7 @@ #define NUM_MPU_REGIONS_SHIFT 8 #define NUM_MPU_REGIONS (_AC(1, UL) << NUM_MPU_REGIONS_SHIFT) #define NUM_MPU_REGIONS_MASK (NUM_MPU_REGIONS - 1) +#define MAX_MPU_REGION_NR NUM_MPU_REGIONS_MASK #endif /* __ARM_MPU_H__ */ diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index bfd840fa5d..409b4dd53d 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -8,9 +8,16 @@ #include #include #include +#include extern struct page_info *frame_table; +extern uint8_t max_mpu_regions; + +extern DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR); + +extern pr_t xen_mpumap[MAX_MPU_REGION_NR]; + #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK)) #ifdef CONFIG_ARM_32 diff --git a/xen/arch/arm/include/asm/mpu/regions.inc b/xen/arch/arm/include/asm/mpu/regions.inc index 47868a1526..6b8c233e6c 100644 --- a/xen/arch/arm/include/asm/mpu/regions.inc +++ b/xen/arch/arm/include/asm/mpu/regions.inc @@ -1,14 +1,34 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include /* Backgroud region enable/disable */ #define SCTLR_ELx_BR BIT(17, UL) +#define REGION_DISABLED_PRLAR 0x00 /* NS=0 ATTR=000 EN=0 */ #define REGION_NORMAL_PRLAR 0x0f /* NS=0 ATTR=111 EN=1 */ #define REGION_DEVICE_PRLAR 0x09 /* NS=0 ATTR=100 EN=1 */ +#define PRLAR_ELx_EN 0x1 + +#ifdef CONFIG_ARM_64 +#define XEN_MPUMAP_ENTRY_SHIFT 0x4 /* 16 byte structure */ + +.macro store_pair reg1, reg2, dst + stp \reg1, \reg2, [\dst] +.endm + +#else +#define XEN_MPUMAP_ENTRY_SHIFT 0x3 /* 8 byte structure */ + +.macro store_pair reg1, reg2, dst + .word 0xe7f000f0 /* unimplemented */ +.endm + +#endif + /* * Macro to prepare and set a EL2 MPU memory region. * We will also create an according MPU memory region entry, which @@ -59,6 +79,24 @@ dsb sy isb + /* Load pair into xen_mpumap */ + adr_l \base, xen_mpumap + add \base, \base, \sel, LSL #XEN_MPUMAP_ENTRY_SHIFT + store_pair \prbar, \prlar, \base + + /* Set/clear xen_mpumap_mask bitmap */ + tst \prlar, #PRLAR_ELx_EN + bne 2f + /* Region is disabled, clear the bit in the bitmap */ + bitmap_clear_bit xen_mpumap_mask, \sel, \base, \limit, \prbar, \prlar + b 3f + +2: + /* Region is enabled, set the bit in the bitmap */ + bitmap_set_bit xen_mpumap_mask, \sel, \base, \limit, \prbar, \prlar + +3: + add \sel, \sel, #1 1: diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 07c8959f4e..2f31b7b787 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -7,9 +7,25 @@ #include #include #include +#include struct page_info *frame_table; +/* Maximum number of supported MPU memory regions by the EL2 MPU. */ +uint8_t __ro_after_init max_mpu_regions; + +/* + * Bitmap xen_mpumap_mask is to record the usage of EL2 MPU memory regions. + * Bit 0 represents MPU memory region 0, bit 1 represents MPU memory + * region 1, ..., and so on. + * If a MPU memory region gets enabled, set the according bit to 1. + */ +DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR) \ + __cacheline_aligned __section(".data"); + +/* EL2 Xen MPU memory region mapping table. */ +pr_t __cacheline_aligned __section(".data") xen_mpumap[MAX_MPU_REGION_NR]; + static void __init __maybe_unused build_assertions(void) { /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:11:42 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:11:42 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000560.1380769 (Exim 4.92) (envelope-from ) id 1uKuq6-0008Ca-Sd; Fri, 30 May 2025 08:11:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000560.1380769; Fri, 30 May 2025 08:11:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKuq6-0008CT-Q8; Fri, 30 May 2025 08:11:42 +0000 Received: by outflank-mailman (input) for mailman id 1000560; Fri, 30 May 2025 08:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKuq6-0008CL-2Z for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKuq6-009yk9-06 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKuq5-00Don1-3B for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11: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=yFb6lochQs3bQFghpSc422r4qKlCyoEHoyvB6kzYzPc=; b=FVU7qzx+PKNfbljtDzKb1KIEox mZhUte3Itz4sjEZ/I3TkvSXWGCAaAeW41Truu7FJaMKVZhS3+7qu5U3ja62uxWbeuV1s2JXvaIT/Y OJn/0+CpoPuAFWgI1ljdpkeB74WQIY7I6WSvbQ1necjPwyIca8TNPIOAkT8KKk3bOt9I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Provide access to the MPU region from the C code Message-Id: Date: Fri, 30 May 2025 08:11:41 +0000 commit 54f34554b566b1ce6ce2a673fabb8ef60ff05cc6 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:04 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:21 2025 +0200 arm/mpu: Provide access to the MPU region from the C code Implement some utility functions in order to access the MPU regions from the C world. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/arm64/mpu.h | 2 + xen/arch/arm/include/asm/mpu/mm.h | 24 +++++++ xen/arch/arm/mpu/mm.c | 121 +++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/xen/arch/arm/include/asm/arm64/mpu.h b/xen/arch/arm/include/asm/arm64/mpu.h index 4737868507..f0ce344e78 100644 --- a/xen/arch/arm/include/asm/arm64/mpu.h +++ b/xen/arch/arm/include/asm/arm64/mpu.h @@ -5,6 +5,8 @@ #ifndef __ASSEMBLY__ +#define MPU_REGION_RES0 (0xFFFFULL << 48) + /* Protection Region Base Address Register */ typedef union { struct __packed { diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index 409b4dd53d..d7950d9b4f 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -41,6 +41,30 @@ static inline struct page_info *virt_to_page(const void *v) return mfn_to_page(mfn); } +/* Utility function to be used whenever MPU regions are modified */ +static inline void context_sync_mpu(void) +{ + /* + * ARM DDI 0600B.a, C1.7.1 + * Writes to MPU registers are only guaranteed to be visible following a + * Context synchronization event and DSB operation. + */ + dsb(sy); + isb(); +} + +/* + * The following API requires context_sync_mpu() after being used to modify MPU + * regions: + * - write_protection_region + */ + +/* Reads the MPU region (into @pr_read) with index @sel from the HW */ +void read_protection_region(pr_t *pr_read, uint8_t sel); + +/* Writes the MPU region (from @pr_write) with index @sel to the HW */ +void write_protection_region(const pr_t *pr_write, uint8_t sel); + #endif /* __ARM_MPU_MM_H__ */ /* diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 2f31b7b787..9c5789cdf1 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include struct page_info *frame_table; @@ -26,6 +28,35 @@ DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR) \ /* EL2 Xen MPU memory region mapping table. */ pr_t __cacheline_aligned __section(".data") xen_mpumap[MAX_MPU_REGION_NR]; +#ifdef CONFIG_ARM_64 +/* + * The following are needed for the cases: GENERATE_WRITE_PR_REG_CASE + * and GENERATE_READ_PR_REG_CASE with num==0 + */ +#define PRBAR0_EL2 PRBAR_EL2 +#define PRLAR0_EL2 PRLAR_EL2 + +#define PRBAR_EL2_(n) PRBAR##n##_EL2 +#define PRLAR_EL2_(n) PRLAR##n##_EL2 + +#endif /* CONFIG_ARM_64 */ + +#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits & ~MPU_REGION_RES0, PRBAR_EL2_(num)); \ + WRITE_SYSREG(pr->prlar.bits & ~MPU_REGION_RES0, PRLAR_EL2_(num)); \ + break; \ + } + +#define GENERATE_READ_PR_REG_CASE(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(PRBAR_EL2_(num)); \ + pr->prlar.bits = READ_SYSREG(PRLAR_EL2_(num)); \ + break; \ + } + static void __init __maybe_unused build_assertions(void) { /* @@ -36,6 +67,96 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(PAGE_SIZE != SZ_4K); } +#ifdef CONFIG_ARM_64 +/* + * Armv8-R supports direct access and indirect access to the MPU regions through + * registers: + * - indirect access involves changing the MPU region selector, issuing an isb + * barrier and accessing the selected region through specific registers + * - direct access involves accessing specific registers that point to + * specific MPU regions, without changing the selector, avoiding the use of + * a barrier. + * For Arm64 the PR{B,L}AR_ELx (for n=0) and PR{B,L}AR_ELx (for n=1..15) are + * used for the direct access to the regions selected by + * PRSELR_EL2.REGION<7:4>:n, so 16 regions can be directly accessed when the + * selector is a multiple of 16, giving access to all the supported memory + * regions. + */ +static void prepare_selector(uint8_t *sel) +{ + uint8_t cur_sel = *sel; + + /* + * {read,write}_protection_region works using the direct access to the 0..15 + * regions, so in order to save the isb() overhead, change the PRSELR_EL2 + * only when needed, so when the upper 4 bits of the selector will change. + */ + cur_sel &= 0xF0U; + if ( READ_SYSREG(PRSELR_EL2) != cur_sel ) + { + WRITE_SYSREG(cur_sel, PRSELR_EL2); + isb(); + } + *sel &= 0xFU; +} + +void read_protection_region(pr_t *pr_read, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_READ_PR_REG_CASE(0, pr_read); + GENERATE_READ_PR_REG_CASE(1, pr_read); + GENERATE_READ_PR_REG_CASE(2, pr_read); + GENERATE_READ_PR_REG_CASE(3, pr_read); + GENERATE_READ_PR_REG_CASE(4, pr_read); + GENERATE_READ_PR_REG_CASE(5, pr_read); + GENERATE_READ_PR_REG_CASE(6, pr_read); + GENERATE_READ_PR_REG_CASE(7, pr_read); + GENERATE_READ_PR_REG_CASE(8, pr_read); + GENERATE_READ_PR_REG_CASE(9, pr_read); + GENERATE_READ_PR_REG_CASE(10, pr_read); + GENERATE_READ_PR_REG_CASE(11, pr_read); + GENERATE_READ_PR_REG_CASE(12, pr_read); + GENERATE_READ_PR_REG_CASE(13, pr_read); + GENERATE_READ_PR_REG_CASE(14, pr_read); + GENERATE_READ_PR_REG_CASE(15, pr_read); + default: + BUG(); /* Can't happen */ + break; + } +} + +void write_protection_region(const pr_t *pr_write, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_WRITE_PR_REG_CASE(0, pr_write); + GENERATE_WRITE_PR_REG_CASE(1, pr_write); + GENERATE_WRITE_PR_REG_CASE(2, pr_write); + GENERATE_WRITE_PR_REG_CASE(3, pr_write); + GENERATE_WRITE_PR_REG_CASE(4, pr_write); + GENERATE_WRITE_PR_REG_CASE(5, pr_write); + GENERATE_WRITE_PR_REG_CASE(6, pr_write); + GENERATE_WRITE_PR_REG_CASE(7, pr_write); + GENERATE_WRITE_PR_REG_CASE(8, pr_write); + GENERATE_WRITE_PR_REG_CASE(9, pr_write); + GENERATE_WRITE_PR_REG_CASE(10, pr_write); + GENERATE_WRITE_PR_REG_CASE(11, pr_write); + GENERATE_WRITE_PR_REG_CASE(12, pr_write); + GENERATE_WRITE_PR_REG_CASE(13, pr_write); + GENERATE_WRITE_PR_REG_CASE(14, pr_write); + GENERATE_WRITE_PR_REG_CASE(15, pr_write); + default: + BUG(); /* Can't happen */ + break; + } +} +#endif /* CONFIG_ARM_64 */ + void __init setup_mm(void) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:11:52 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:11:52 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000561.1380774 (Exim 4.92) (envelope-from ) id 1uKuqG-0008Ey-U3; Fri, 30 May 2025 08:11:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000561.1380774; Fri, 30 May 2025 08:11:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKuqG-0008Eq-RY; Fri, 30 May 2025 08:11:52 +0000 Received: by outflank-mailman (input) for mailman id 1000561; Fri, 30 May 2025 08:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKuqG-0008Eh-4v for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKuqG-009ykD-0N for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKuqG-00DouB-0H for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:11: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=9M+wSe73gPHOAYPxV0vvqDB2dNgODrDSVpE5ouAnbrI=; b=YpHv86NCV6zB1ZiWqG+pGYmRtG IlJRqBTVpeS26OIaRgxRWr1TcWp9KRfr3FuhvHwhCcZ8tGOBr2f3XzSIHno4B6UGuOfnfaCAOgYyA 8W6PqO/iEI4tkewU7Vo4XqbJSwL04rQPWyXpZSHpCFsAf0AVsOWrjD31Z0wTMqZRWLfc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Introduce utility functions for the pr_t type Message-Id: Date: Fri, 30 May 2025 08:11:52 +0000 commit f8a98a39b832d03347989fbf0e8333417ef31d75 Author: Luca Fancellu AuthorDate: Fri May 23 07:54:05 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:21 2025 +0200 arm/mpu: Introduce utility functions for the pr_t type Introduce a few utility functions to manipulate and handle the pr_t type. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/mpu.h | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index fb93b8b19d..8f06ddac0f 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -23,6 +23,72 @@ #define NUM_MPU_REGIONS_MASK (NUM_MPU_REGIONS - 1) #define MAX_MPU_REGION_NR NUM_MPU_REGIONS_MASK +#ifndef __ASSEMBLY__ + +#ifdef CONFIG_ARM_64 +/* + * Set base address of MPU protection region. + * + * @pr: pointer to the protection region structure. + * @base: base address as base of the protection region. + */ +static inline void pr_set_base(pr_t *pr, paddr_t base) +{ + pr->prbar.reg.base = ((base & ~MPU_REGION_RES0) >> MPU_REGION_SHIFT); +} + +/* + * Set limit address of MPU protection region. + * + * @pr: pointer to the protection region structure. + * @limit: exclusive address as limit of the protection region. + */ +static inline void pr_set_limit(pr_t *pr, paddr_t limit) +{ + /* PRLAR_ELx.LIMIT expects inclusive limit */ + pr->prlar.reg.limit = (((limit - 1) & ~MPU_REGION_RES0) + >> MPU_REGION_SHIFT); +} + +/* + * Access to get base address of MPU protection region. + * The base address shall be zero extended. + * + * @pr: pointer to the protection region structure. + * @return: Base address configured for the passed protection region. + */ +static inline paddr_t pr_get_base(const pr_t *pr) +{ + return (paddr_t)(pr->prbar.reg.base << MPU_REGION_SHIFT); +} + +/* + * Access to get limit address of MPU protection region. + * The limit address shall be concatenated with 0x3f. + * + * @pr: pointer to the protection region structure. + * @return: Inclusive limit address configured for the passed protection region. + */ +static inline paddr_t pr_get_limit(const pr_t *pr) +{ + return (paddr_t)((pr->prlar.reg.limit << MPU_REGION_SHIFT) + | ~MPU_REGION_MASK); +} + +/* + * Check if the protection region is valid (enabled). + * + * @pr: pointer to the protection region structure. + * @return: True if the region is valid (enabled), false otherwise. + */ +static inline bool region_is_valid(const pr_t *pr) +{ + return pr->prlar.reg.en; +} +#endif /* CONFIG_ARM_64 */ + +#endif /* __ASSEMBLY__ */ + #endif /* __ARM_MPU_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:12:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:12:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000562.1380777 (Exim 4.92) (envelope-from ) id 1uKuqQ-0008HG-VU; Fri, 30 May 2025 08:12:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000562.1380777; Fri, 30 May 2025 08:12: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 1uKuqQ-0008H9-T0; Fri, 30 May 2025 08:12:02 +0000 Received: by outflank-mailman (input) for mailman id 1000562; Fri, 30 May 2025 08:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKuqQ-0008H1-9D for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKuqQ-009ykU-0e for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKuqQ-00Dozi-0Y for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:12: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=ZiLrnaUC5UoK+HK6ClmVBOQdEVaxLtzqC5UORQnMS+o=; b=JSmNzrTVdXrDwgfrI4UV2rdG7w wurd+cRP6roxaiBzScJgqYxd76fWNTp8VNTKDbxSEFokPqK2PGV7bK++b+TkFcpvkd4loi3dJRe7i mcwMgIukPYDVB4yQZD4dHg5F5vjRRalE5AnUYTRMG4yu+P0FEQg4zFrjtbRhCTk1AYis=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Provide a constructor for pr_t type Message-Id: Date: Fri, 30 May 2025 08:12:02 +0000 commit a37f924e74850fa92f62cc0a37880fb9b4d7e9da Author: Luca Fancellu AuthorDate: Fri May 23 07:54:06 2025 +0100 Commit: Michal Orzel CommitDate: Fri May 30 08:46:21 2025 +0200 arm/mpu: Provide a constructor for pr_t type Provide a function that creates a pr_t object from a memory range and some attributes. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/mpu/mm.h | 10 ++++++ xen/arch/arm/mpu/mm.c | 68 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index d7950d9b4f..a7f970b465 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -65,6 +65,16 @@ void read_protection_region(pr_t *pr_read, uint8_t sel); /* Writes the MPU region (from @pr_write) with index @sel to the HW */ void write_protection_region(const pr_t *pr_write, uint8_t sel); +/* + * Creates a pr_t structure describing a protection region. + * + * @base: base address as base of the protection region. + * @limit: exclusive address as limit of the protection region. + * @flags: memory flags for the mapping. + * @return: pr_t structure describing a protection region. + */ +pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags); + #endif /* __ARM_MPU_MM_H__ */ /* diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 9c5789cdf1..86fbe105af 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -9,6 +9,7 @@ #include #include #include +#include #include struct page_info *frame_table; @@ -155,6 +156,73 @@ void write_protection_region(const pr_t *pr_write, uint8_t sel) break; } } + +pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) +{ + unsigned int attr_idx = PAGE_AI_MASK(flags); + prbar_t prbar; + prlar_t prlar; + pr_t region; + + /* Build up value for PRBAR_EL2. */ + prbar = (prbar_t) { + .reg = { + .xn_0 = 0, + .xn = PAGE_XN_MASK(flags), + .ap_0 = 0, + .ro = PAGE_RO_MASK(flags) + }}; + + switch ( attr_idx ) + { + /* + * ARM ARM: Shareable, Inner Shareable, and Outer Shareable Normal memory + * (DDI 0487L.a B2.10.1.1.1 Note section): + * + * Because all data accesses to Non-cacheable locations are data coherent + * to all observers, Non-cacheable locations are always treated as Outer + * Shareable + * + * ARM ARM: Device memory (DDI 0487L.a B2.10.2) + * + * All of these memory types have the following properties: + * [...] + * - Data accesses to memory locations are coherent for all observers in + * the system, and correspondingly are treated as being Outer Shareable + */ + case MT_NORMAL_NC: + /* Fall through */ + case MT_DEVICE_nGnRnE: + /* Fall through */ + case MT_DEVICE_nGnRE: + prbar.reg.sh = LPAE_SH_OUTER; + break; + default: + /* Xen mappings are SMP coherent */ + prbar.reg.sh = LPAE_SH_INNER; + break; + } + + /* Build up value for PRLAR_EL2. */ + prlar = (prlar_t) { + .reg = { + .ns = 0, /* Hyp mode is in secure world */ + .ai = attr_idx, + .en = 1, /* Region enabled */ + }}; + + /* Build up MPU memory region. */ + region = (pr_t) { + .prbar = prbar, + .prlar = prlar, + }; + + /* Set base address and limit address. */ + pr_set_base(®ion, base); + pr_set_limit(®ion, limit); + + return region; +} #endif /* CONFIG_ARM_64 */ void __init setup_mm(void) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 08:12:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 08:12:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1000563.1380782 (Exim 4.92) (envelope-from ) id 1uKuqb-0008JZ-0o; Fri, 30 May 2025 08:12:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1000563.1380782; Fri, 30 May 2025 08:12: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 1uKuqa-0008JR-UT; Fri, 30 May 2025 08:12:12 +0000 Received: by outflank-mailman (input) for mailman id 1000563; Fri, 30 May 2025 08:12:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKuqa-0008JJ-AH for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:12:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uKuqa-009ykY-0v for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:12:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uKuqa-00DpK0-0o for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 08:12: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=dE1XmAv5VpJRxJYz9PBPDxzNXF7SYIA0WuspjxFGSaQ=; b=QSR4D3xTAXYvwHU98SWQLiSaJp bjFld8mEpsITzRXNGv5foFFdPzESC9GQhmYwnjpcIYWnRA3wBdoD+SDchWn3ow4GQcq1wanzq4XFd J6SqQHJzjnRgttKtFJWH//DgEy7Mpr0gNcs2r4T23Zu1810zrgqBOJ8XXEX+ysxwpzAk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: vpsci: Fix typo in comment (SCCC changed to SSSC) Message-Id: Date: Fri, 30 May 2025 08:12:12 +0000 commit d7d55c27cc3253fb3634a0e468ef5df30487552b Author: Mykola Kvach AuthorDate: Thu May 29 22:40:25 2025 +0300 Commit: Michal Orzel CommitDate: Fri May 30 08:47:29 2025 +0200 xen/arm: vpsci: Fix typo in comment (SCCC changed to SSSC) Corrected a typo in a comment within vpsci.c: replaced "SCCC_SMCCC_*_REVISION" with the correct "SSSC_SMCCC_*_REVISION". This change improves clarity but does not affect functionality. Signed-off-by: Mykola Kvach Reviewed-by: Michal Orzel --- xen/arch/arm/vpsci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index d1615be8a6..7ba9ccd94b 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -268,7 +268,7 @@ bool do_vpsci_0_2_call(struct cpu_user_regs *regs, uint32_t fid) { /* * /!\ VPSCI_NR_FUNCS (in asm/vpsci.h) should be updated when - * adding/removing a function. SCCC_SMCCC_*_REVISION should be + * adding/removing a function. SSSC_SMCCC_*_REVISION should be * updated once per release. */ switch ( fid ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 15:00:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 15:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1001351.1381536 (Exim 4.92) (envelope-from ) id 1uL1DH-0000hl-6t; Fri, 30 May 2025 15:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1001351.1381536; Fri, 30 May 2025 15: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 1uL1DH-0000hd-3x; Fri, 30 May 2025 15:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1001351; Fri, 30 May 2025 15:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uL1DG-0000YA-9q for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 15:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uL1DG-00A6lL-0d for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 15:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uL1DG-003zP1-0M for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 15:00: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=L4QBeiHo1mdctrVqps8ussnptFr8gKwcA7FHO5WzKTg=; b=VkdPLpDBsLjLdUq6KLomallyle YRN4U5UFzODJx9PJTCOUPrAji8kHrDsS/sK1Eq0eo/nOBTnHhlAHoT1Fj/SeevXg348R6pG8IETzp fmhTsNA0ns211yy3cPvNMzPulovDhn8Wgfclddln64/GsY4rK9PVqfAxm4ScYOufRWZg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: Add install/uninstall targets to tests/x86_emulator Message-Id: Date: Fri, 30 May 2025 15:00:02 +0000 commit e773c257af858737baf7b2b8581f2611d04f0f47 Author: Alejandro Vallejo AuthorDate: Thu May 16 12:07:10 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 30 15:18:46 2025 +0100 tools: Add install/uninstall targets to tests/x86_emulator Bring test_x86_emulator in line with other tests by adding install/uninstall rules. Signed-off-by: Alejandro Vallejo Acked-by: Stefano Stabellini Acked-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/tests/x86_emulator/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 3f57ac6159..34f48d83b3 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -266,8 +266,15 @@ clean: .PHONY: distclean distclean: clean -.PHONY: install uninstall -install uninstall: +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(if $(TARGET-y),$(INSTALL_PROG) $(TARGET-y) $(DESTDIR)$(LIBEXEC)/tests) + +.PHONY: uninstall +uninstall: + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGET-y)) + .PHONY: run32 clean32 ifeq ($(XEN_COMPILE_ARCH),x86_64) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 15:00:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 15:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1001352.1381539 (Exim 4.92) (envelope-from ) id 1uL1DR-0001Na-80; Fri, 30 May 2025 15:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1001352.1381539; Fri, 30 May 2025 15:00: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 1uL1DR-0001NT-5M; Fri, 30 May 2025 15:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1001352; Fri, 30 May 2025 15:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uL1DQ-0001NL-AV for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 15:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uL1DQ-00A6lQ-0v for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 15:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uL1DQ-003ztG-0o for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 15:00: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=XZhmUKdlJZN2eXhayb8R1h0Q2ez8kVZf39nrf8LJuE8=; b=Y4EH+b1GM1IM0dq/sSgjJgW4H8 gqL/yq2hflGqBG5XL2tx0z1inZ7JO1nr8whHrhgBARoc/Vr82gwyJKGlAUxNvkTbJIob1zWf4g95x 0oRVhXZML+UIXNomz/wx/8ed+qefnS9sPqfQVCZc9r4S3AMwTOUg2Z8WIao8h7n0LPlc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: Add install target for vPCI Message-Id: Date: Fri, 30 May 2025 15:00:12 +0000 commit 96a587a057363e519ca74498882fac42d72670b6 Author: Andrew Cooper AuthorDate: Tue May 20 22:33:11 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 30 15:18:47 2025 +0100 tools/tests: Add install target for vPCI This lets it run automagically in CI. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- tools/tests/vpci/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/tests/vpci/Makefile b/tools/tests/vpci/Makefile index 62f21f341a..9450f7593a 100644 --- a/tools/tests/vpci/Makefile +++ b/tools/tests/vpci/Makefile @@ -21,7 +21,13 @@ clean: distclean: clean .PHONY: install -install: +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests + +.PHONY: uninstall +uninstall: + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) vpci.c: $(XEN_ROOT)/xen/drivers/vpci/vpci.c # Remove includes and add the test harness header -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 30 20:00:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 20:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1001489.1381623 (Exim 4.92) (envelope-from ) id 1uL5tb-0003Qp-A1; Fri, 30 May 2025 20:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1001489.1381623; Fri, 30 May 2025 20: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 1uL5tb-0003QQ-7S; Fri, 30 May 2025 20:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1001489; Fri, 30 May 2025 20:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uL5ta-0003DK-4S for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 20:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uL5ta-00AD9x-09 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 20:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uL5ta-0091Vv-00 for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 20:00: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=eci5aK2tG3gVA261fEyXzZbZ9uKtJ+CK5KTjdarYgd8=; b=aS+jCWL6dGPsMUXfwh0gudDeCp YJjoMBh0AtA5wH5FG0/xnF9KkyOMnvwkA1Fb77PD2zfjax8BSBXE0GcSw+MkfX4jqJgtOeNUUHIeY vVgz4xZ7bBQl+b9c7g3gdE7wGIXt6JEKCwvq5vtPnkJP0BHe0lyEqpG+qyrwCnGFXdKk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Add install/uninstall targets to tests/x86_emulator Message-Id: Date: Fri, 30 May 2025 20:00:02 +0000 commit e773c257af858737baf7b2b8581f2611d04f0f47 Author: Alejandro Vallejo AuthorDate: Thu May 16 12:07:10 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 30 15:18:46 2025 +0100 tools: Add install/uninstall targets to tests/x86_emulator Bring test_x86_emulator in line with other tests by adding install/uninstall rules. Signed-off-by: Alejandro Vallejo Acked-by: Stefano Stabellini Acked-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/tests/x86_emulator/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 3f57ac6159..34f48d83b3 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -266,8 +266,15 @@ clean: .PHONY: distclean distclean: clean -.PHONY: install uninstall -install uninstall: +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(if $(TARGET-y),$(INSTALL_PROG) $(TARGET-y) $(DESTDIR)$(LIBEXEC)/tests) + +.PHONY: uninstall +uninstall: + $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC)/tests/,$(TARGET-y)) + .PHONY: run32 clean32 ifeq ($(XEN_COMPILE_ARCH),x86_64) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 30 20:00:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 May 2025 20:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1001490.1381628 (Exim 4.92) (envelope-from ) id 1uL5tl-0003zw-BH; Fri, 30 May 2025 20:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1001490.1381628; Fri, 30 May 2025 20:00: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 1uL5tl-0003zo-8p; Fri, 30 May 2025 20:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1001490; Fri, 30 May 2025 20:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uL5tk-0003zg-6v for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 20:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uL5tk-00ADA2-0T for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 20:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uL5tk-0091bk-0J for xen-changelog@lists.xenproject.org; Fri, 30 May 2025 20:00: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=14dCqkupvp7cWO5HpVjZ4/EjrIJBO4PrvK0U69bWhvQ=; b=pWpp3hLzVMGpoL9xSY6aoxj3DN fFcV8YfsXONWEMNMXZOn+C65u21rSojr+zmh+Q4c3sIo0qX5V1T7fo7H/hHdfYMyqMRc8+w39YLzT yed5f7AP+XO2p9x39ykrh5lvgbcvPWF8tlDaZYp5vKWg6dWrYOg+xiVIzXXuIO90HEgY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: Add install target for vPCI Message-Id: Date: Fri, 30 May 2025 20:00:12 +0000 commit 96a587a057363e519ca74498882fac42d72670b6 Author: Andrew Cooper AuthorDate: Tue May 20 22:33:11 2025 +0100 Commit: Andrew Cooper CommitDate: Fri May 30 15:18:47 2025 +0100 tools/tests: Add install target for vPCI This lets it run automagically in CI. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- tools/tests/vpci/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/tests/vpci/Makefile b/tools/tests/vpci/Makefile index 62f21f341a..9450f7593a 100644 --- a/tools/tests/vpci/Makefile +++ b/tools/tests/vpci/Makefile @@ -21,7 +21,13 @@ clean: distclean: clean .PHONY: install -install: +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(LIBEXEC)/tests + +.PHONY: uninstall +uninstall: + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) vpci.c: $(XEN_ROOT)/xen/drivers/vpci/vpci.c # Remove includes and add the test harness header -- generated by git-patchbot for /home/xen/git/xen.git#master