From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:55:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733934.1140202 (Exim 4.92) (envelope-from ) id 1sDDxY-0006Yi-T7; Sat, 01 Jun 2024 01:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733934.1140202; Sat, 01 Jun 2024 01: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 1sDDxY-0006Ya-QF; Sat, 01 Jun 2024 01:55:04 +0000 Received: by outflank-mailman (input) for mailman id 733934; Sat, 01 Jun 2024 01:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDxX-0006YU-UY for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDxX-00041n-RX for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDxX-0007bR-Pi for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZQCRGTFp380iTFIxiJ2V5T6uRRXJbmrUxwdsFv7tpOI=; b=wS/WGtphqCb74onrUTO9gV7b4K 4xU1n/N+OrbhpWd3IqhC+meRyuw8mgNAxs8QDxcvFoMtZPRpUJn9m96Y7fHQJfWLi5EcV8wMZ1Bbq KuhhT/u4P/3/mkziLXa3RNaqm7ZMQ/Sny34QxIdsF0y40in+qBPSNNFdf4JF7AyPOHrU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Delete find_first_set_bit() Message-Id: Date: Sat, 01 Jun 2024 01:55:03 +0000 commit 1408cf7a2840c0839d988f8cbf910eecac1655ef Author: Andrew Cooper AuthorDate: Thu Mar 14 20:38:44 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Delete find_first_set_bit() No more users. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/include/asm/bitops.h | 12 ------------ xen/arch/ppc/include/asm/bitops.h | 9 --------- xen/arch/x86/include/asm/bitops.h | 12 ------------ 3 files changed, 33 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index ab030b6cb0..6c5ec34e66 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -160,18 +160,6 @@ static inline int fls(unsigned int x) #define ffs(x) ({ unsigned int __t = (x); fls(ISOLATE_LSB(__t)); }) #define ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); }) -/** - * find_first_set_bit - find the first set bit in @word - * @word: the word to search - * - * Returns the bit-number of the first set bit (first bit being 0). - * The input must *not* be zero. - */ -static inline unsigned int find_first_set_bit(unsigned long word) -{ - return ffsl(word) - 1; -} - /** * hweightN - returns the hamming weight of a N-bit word * @x: the word to weigh diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index bea655796d..f984789e28 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -187,13 +187,4 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define hweight16(x) __builtin_popcount((uint16_t)(x)) #define hweight8(x) __builtin_popcount((uint8_t)(x)) -/** - * find_first_set_bit - find the first set bit in @word - * @word: the word to search - * - * Returns the bit-number of the first set bit (first bit being 0). - * The input must *not* be zero. - */ -#define find_first_set_bit(x) (ffsl(x) - 1) - #endif /* _ASM_PPC_BITOPS_H */ diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 5a71afbc89..674c48397f 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -401,18 +401,6 @@ static always_inline unsigned int __scanbit(unsigned long val, unsigned int max) r__; \ }) -/** - * find_first_set_bit - find the first set bit in @word - * @word: the word to search - * - * Returns the bit-number of the first set bit. The input must *not* be zero. - */ -static inline unsigned int find_first_set_bit(unsigned long word) -{ - asm ( "rep; bsf %1,%0" : "=r" (word) : "rm" (word) ); - return (unsigned int)word; -} - /** * ffs - find first bit set * @x: the word to search -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733935.1140205 (Exim 4.92) (envelope-from ) id 1sDDxi-0006ay-Vh; Sat, 01 Jun 2024 01:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733935.1140205; Sat, 01 Jun 2024 01: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 1sDDxi-0006aq-T2; Sat, 01 Jun 2024 01:55:14 +0000 Received: by outflank-mailman (input) for mailman id 733935; Sat, 01 Jun 2024 01:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDxi-0006ai-0G for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDxh-00041r-Vi for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDxh-0007bw-Tq for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jYYtzfwtQPYsFCNiKlFxdfhPaugnGcQ1rZ7NzREbWTc=; b=SkJ7NZsZSgxnqLldHzYXz/yQSF Qo/tfkKCL2aenk5jGUy0HDrmJEi0F8jZk1Nc6gxdHqLf5o87WblFetqOPvwx4kOHZnQDukEjiOzA0 V2OFu/OeWDJFh+2uPmQqwvvn3yVW2atp3rXTdmbHSL/Nv/nCNMQIaUQBa7KnR1pHLJMk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Cleanup and new infrastructure ahead of rearrangements Message-Id: Date: Sat, 01 Jun 2024 01:55:13 +0000 commit ea59e7d780d9506793226b8cd1b402e341b195a7 Author: Andrew Cooper AuthorDate: Fri Mar 8 23:45:08 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Cleanup and new infrastructure ahead of rearrangements * Rename __attribute_pure__ to just __pure before it gains users. * Introduce __constructor which is going to be used in lib/, and is unconditionally cf_check. * Identify the areas of xen/bitops.h which are a mess. * Introduce xen/self-tests.h as helpers for compile and boot time testing. This provides a statement of the ABI, and a confirmation that arch-specific implementations behave as expected. * Introduce HIDE() in macros.h. While it's only used in self-tests.h for now, we're going to consolidate similar constructs in due course. Sadly Clang 7 and older isn't happy with the compile time checks. Skip them, and just rely on the runtime checks. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/include/xen/bitops.h | 13 +++++++--- xen/include/xen/compiler.h | 3 ++- xen/include/xen/macros.h | 8 +++++++ xen/include/xen/self-tests.h | 56 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index e3c5a4ccf3..9b40f20381 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -1,5 +1,7 @@ -#ifndef _LINUX_BITOPS_H -#define _LINUX_BITOPS_H +#ifndef XEN_BITOPS_H +#define XEN_BITOPS_H + +#include #include /* @@ -103,8 +105,13 @@ static inline int generic_flsl(unsigned long x) * Include this here because some architectures need generic_ffs/fls in * scope */ + +/* --------------------- Please tidy above here --------------------- */ + #include +/* --------------------- Please tidy below here --------------------- */ + #ifndef find_next_bit /** * find_next_bit - find the next set bit in a memory region @@ -294,4 +301,4 @@ static inline __u32 ror32(__u32 word, unsigned int shift) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) -#endif +#endif /* XEN_BITOPS_H */ diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 179ff23e62..444bf80142 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -86,7 +86,8 @@ #define inline inline __init #endif -#define __attribute_pure__ __attribute__((__pure__)) +#define __constructor __attribute__((__constructor__)) cf_check +#define __pure __attribute__((__pure__)) #define __attribute_const__ __attribute__((__const__)) #define __transparent__ __attribute__((__transparent_union__)) diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h index e64373f018..ec89f4654f 100644 --- a/xen/include/xen/macros.h +++ b/xen/include/xen/macros.h @@ -59,6 +59,14 @@ #define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) #endif +/* Hide a value from the optimiser. */ +#define HIDE(x) \ + ({ \ + typeof(x) _x = (x); \ + asm volatile ( "" : "+r" (_x) ); \ + _x; \ + }) + #define ABS(x) ({ \ typeof(x) x_ = (x); \ (x_ < 0) ? -x_ : x_; \ diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h new file mode 100644 index 0000000000..8410db7aaa --- /dev/null +++ b/xen/include/xen/self-tests.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* + * Helpers for Xen self-tests of basic logic, including confirming that + * examples which should be calculated by the compiler are. + */ +#ifndef XEN_SELF_TESTS_H +#define XEN_SELF_TESTS_H + +#include + +/* + * Check that fn(val) can be calcuated by the compiler, and that it gives the + * expected answer. + * + * Clang < 8 can't fold constants through static inlines, causing this to + * fail. Simply skip it for incredibly old compilers. + */ +#if !CONFIG_CC_IS_CLANG || CONFIG_CLANG_VERSION >= 80000 +#define COMPILE_CHECK(fn, val, res) \ + do { \ + typeof(fn(val)) real = fn(val); \ + \ + if ( !__builtin_constant_p(real) ) \ + asm ( ".error \"'" STR(fn(val)) "' not compile-time constant\"" ); \ + else if ( real != res ) \ + asm ( ".error \"Compile time check '" STR(fn(val) == res) "' failed\"" ); \ + } while ( 0 ) +#else +#define COMPILE_CHECK(fn, val, res) +#endif + +/* + * Check that Xen's runtime logic for fn(val) gives the expected answer. This + * requires using HIDE() to prevent the optimiser from collapsing the logic + * into a constant. + */ +#define RUNTIME_CHECK(fn, val, res) \ + do { \ + typeof(fn(val)) real = fn(HIDE(val)); \ + \ + if ( real != res ) \ + panic("%s: %s(%s) expected %u, got %u\n", \ + __func__, #fn, #val, real, res); \ + } while ( 0 ) + +/* + * Perform compile-time and runtime checks for fn(val) == res. + */ +#define CHECK(fn, val, res) \ + do { \ + COMPILE_CHECK(fn, val, res); \ + RUNTIME_CHECK(fn, val, res); \ + } while ( 0 ) + +#endif /* XEN_SELF_TESTS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:55:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733936.1140209 (Exim 4.92) (envelope-from ) id 1sDDxt-0006dm-0u; Sat, 01 Jun 2024 01:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733936.1140209; Sat, 01 Jun 2024 01:55: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 1sDDxs-0006dg-UX; Sat, 01 Jun 2024 01:55:24 +0000 Received: by outflank-mailman (input) for mailman id 733936; Sat, 01 Jun 2024 01:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDxs-0006dR-3q for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDxs-000423-33 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDxs-0007cP-1o for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Q5X3JASR+qJeUspCNJQ1gjeo7nFi5zPrGQNqC5olsY0=; b=rAtovItk/Ba1ZcHkiWNQIuYlCx pkuZTMk6Pby4WIkffc6w1aH7w/IfCssTTfClNJdG3wF7Km5g9eeAJl5NdmGTdX8v2RUSQMw3VlNsW /A+pIQ8d1G7KQn4vbTN5C0iFg7ZQdXXuc1ECxUG/xTOXuTF2rSeJgwl5LeehR760PuJE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Implement generic_ffsl()/generic_flsl() in lib/ Message-Id: Date: Sat, 01 Jun 2024 01:55:24 +0000 commit 95ddb7e9b00c1d3ce38930e631c8892b6a137759 Author: Andrew Cooper AuthorDate: Fri May 24 13:36:25 2024 +0100 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement generic_ffsl()/generic_flsl() in lib/ generic_ffs()/generic_fls*( being static inline is the cause of lots of the complexity between the common and arch-specific bitops.h They appear to be static inline for constant-folding reasons (ARM), but there are better ways to achieve the same effect. It is presumptuous that an unrolled binary search is the right algorithm to use on all microarchitectures. Indeed, it's not for the eventual users, but that can be addressed at a later point. It is also nonsense to implement the int form as the base primitive and construct the long form from 2x int in 64-bit builds, when it's just one extra step to operate at the native register width. Therefore, implement generic_ffsl()/generic_flsl() in lib/. They're not actually needed in x86/ARM/PPC by the end of the cleanup (i.e. the functions will be dropped by the linker), and they're only expected be needed by RISC-V on hardware which lacks the Zbb extension. Implement generic_fls() in terms of generic_flsl() for now, but this will be cleaned up in due course. Provide basic runtime testing using __constructor inside the lib/ file. This is important, as it means testing runs if and only if generic_f?sl() are used elsewhere in Xen. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/bitops.h | 2 +- xen/arch/ppc/include/asm/bitops.h | 2 +- xen/include/xen/bitops.h | 89 +++------------------------------------ xen/lib/Makefile | 2 + xen/lib/generic-ffsl.c | 67 +++++++++++++++++++++++++++++ xen/lib/generic-flsl.c | 70 ++++++++++++++++++++++++++++++ 6 files changed, 146 insertions(+), 86 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index 6c5ec34e66..685abfafb2 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -150,7 +150,7 @@ static inline int fls(unsigned int x) int ret; if (__builtin_constant_p(x)) - return generic_fls(x); + return generic_flsl(x); asm("clz\t%"__OP32"0, %"__OP32"1" : "=r" (ret) : "r" (x)); return 32 - ret; diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index f984789e28..c8b11326ad 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -172,7 +172,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) } #define flsl(x) generic_flsl(x) -#define fls(x) generic_fls(x) +#define fls(x) generic_flsl(x) #define ffs(x) ({ unsigned int t_ = (x); fls(t_ & -t_); }) #define ffsl(x) ({ unsigned long t_ = (x); flsl(t_ & -t_); }) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 9b40f20381..218c346af2 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -15,91 +15,12 @@ (((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LLONG - 1 - (h)))) /* - * ffs: find first bit set. This is defined the same way as - * the libc and compiler builtin ffs routines, therefore - * differs in spirit from the above ffz (man ffs). - */ - -static inline int generic_ffs(unsigned int x) -{ - int r = 1; - - if (!x) - return 0; - if (!(x & 0xffff)) { - x >>= 16; - r += 16; - } - if (!(x & 0xff)) { - x >>= 8; - r += 8; - } - if (!(x & 0xf)) { - x >>= 4; - r += 4; - } - if (!(x & 3)) { - x >>= 2; - r += 2; - } - if (!(x & 1)) { - x >>= 1; - r += 1; - } - return r; -} - -/* - * fls: find last bit set. + * Find First/Last Set bit (all forms). + * + * Bits are labelled from 1. Returns 0 if given 0. */ - -static inline int generic_fls(unsigned int x) -{ - int r = 32; - - if (!x) - return 0; - if (!(x & 0xffff0000u)) { - x <<= 16; - r -= 16; - } - if (!(x & 0xff000000u)) { - x <<= 8; - r -= 8; - } - if (!(x & 0xf0000000u)) { - x <<= 4; - r -= 4; - } - if (!(x & 0xc0000000u)) { - x <<= 2; - r -= 2; - } - if (!(x & 0x80000000u)) { - x <<= 1; - r -= 1; - } - return r; -} - -#if BITS_PER_LONG == 64 - -static inline int generic_ffsl(unsigned long x) -{ - return !x || (u32)x ? generic_ffs(x) : generic_ffs(x >> 32) + 32; -} - -static inline int generic_flsl(unsigned long x) -{ - u32 h = x >> 32; - - return h ? generic_fls(h) + 32 : generic_fls(x); -} - -#else -# define generic_ffsl generic_ffs -# define generic_flsl generic_fls -#endif +unsigned int __pure generic_ffsl(unsigned long x); +unsigned int __pure generic_flsl(unsigned long x); /* * Include this here because some architectures need generic_ffs/fls in diff --git a/xen/lib/Makefile b/xen/lib/Makefile index e63798e1d4..a485415964 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -4,6 +4,8 @@ lib-y += bsearch.o lib-y += ctors.o lib-y += ctype.o lib-y += find-next-bit.o +lib-y += generic-ffsl.o +lib-y += generic-flsl.o lib-y += list-sort.o lib-y += memchr.o lib-y += memchr_inv.o diff --git a/xen/lib/generic-ffsl.c b/xen/lib/generic-ffsl.c new file mode 100644 index 0000000000..c9fb34ffcd --- /dev/null +++ b/xen/lib/generic-ffsl.c @@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +unsigned int generic_ffsl(unsigned long x) +{ + unsigned int r = 1; + + if ( !x ) + return 0; + + BUILD_BUG_ON(BITS_PER_LONG > 64); /* Extend me when necessary. */ + +#if BITS_PER_LONG > 32 + if ( !(x & 0xffffffffU) ) + { + x >>= 32; + r += 32; + } +#endif + if ( !(x & 0xffff) ) + { + x >>= 16; + r += 16; + } + if ( !(x & 0xff) ) + { + x >>= 8; + r += 8; + } + if ( !(x & 0xf) ) + { + x >>= 4; + r += 4; + } + if ( !(x & 3) ) + { + x >>= 2; + r += 2; + } + if ( !(x & 1) ) + { + x >>= 1; + r += 1; + } + + return r; +} + +#ifdef CONFIG_SELF_TESTS +static void __init __constructor test_generic_ffsl(void) +{ + RUNTIME_CHECK(generic_ffsl, 0, 0); + RUNTIME_CHECK(generic_ffsl, 1, 1); + RUNTIME_CHECK(generic_ffsl, 3, 1); + RUNTIME_CHECK(generic_ffsl, 7, 1); + RUNTIME_CHECK(generic_ffsl, 6, 2); + + RUNTIME_CHECK(generic_ffsl, 1UL << (BITS_PER_LONG - 1), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + RUNTIME_CHECK(generic_ffsl, 1UL << 32, 33); + RUNTIME_CHECK(generic_ffsl, 1UL << 63, 64); +#endif +} +#endif /* CONFIG_SELF_TESTS */ diff --git a/xen/lib/generic-flsl.c b/xen/lib/generic-flsl.c new file mode 100644 index 0000000000..8f44f670fb --- /dev/null +++ b/xen/lib/generic-flsl.c @@ -0,0 +1,70 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +/* Mask of type UL with the upper x bits set. */ +#define UPPER_MASK(x) (~0UL << (BITS_PER_LONG - (x))) + +unsigned int generic_flsl(unsigned long x) +{ + unsigned int r = BITS_PER_LONG; + + if ( !x ) + return 0; + + BUILD_BUG_ON(BITS_PER_LONG > 64); /* Extend me when necessary. */ + +#if BITS_PER_LONG > 32 + if ( !(x & UPPER_MASK(32)) ) + { + x <<= 32; + r -= 32; + } +#endif + if ( !(x & UPPER_MASK(16)) ) + { + x <<= 16; + r -= 16; + } + if ( !(x & UPPER_MASK(8)) ) + { + x <<= 8; + r -= 8; + } + if ( !(x & UPPER_MASK(4)) ) + { + x <<= 4; + r -= 4; + } + if ( !(x & UPPER_MASK(2)) ) + { + x <<= 2; + r -= 2; + } + if ( !(x & UPPER_MASK(1)) ) + { + x <<= 1; + r -= 1; + } + + return r; +} + +#ifdef CONFIG_SELF_TESTS +static void __init __constructor test_generic_flsl(void) +{ + RUNTIME_CHECK(generic_flsl, 0, 0); + RUNTIME_CHECK(generic_flsl, 1, 1); + RUNTIME_CHECK(generic_flsl, 3, 2); + RUNTIME_CHECK(generic_flsl, 7, 3); + RUNTIME_CHECK(generic_flsl, 6, 3); + + RUNTIME_CHECK(generic_flsl, 1 | (1UL << (BITS_PER_LONG - 1)), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + RUNTIME_CHECK(generic_flsl, 1 | (1UL << 32), 33); + RUNTIME_CHECK(generic_flsl, 1 | (1UL << 63), 64); +#endif +} +#endif /* CONFIG_SELF_TESTS */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:55:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733937.1140213 (Exim 4.92) (envelope-from ) id 1sDDy4-0006h3-2F; Sat, 01 Jun 2024 01:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733937.1140213; Sat, 01 Jun 2024 01:55: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 1sDDy3-0006gv-W2; Sat, 01 Jun 2024 01:55:35 +0000 Received: by outflank-mailman (input) for mailman id 733937; Sat, 01 Jun 2024 01:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDy2-0006gj-7M for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDy2-00042A-65 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDy2-0007dG-5L for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=njfpNzDRSx+Ker/kSQx6vr4bsNJiod0KYhhxryY7BVI=; b=IrCsS47W/rAazj+IL4i59UWlqO LVMyVPllR8jGQ7p/iBV8neYqPjwVRIKV3gNghswFNjdi2ojjfdFqN0HlDKk1dl+73JdOybkwSdo9N lFyGOG7SILpZl873ty18f4CiRvhDlZrXbbaCO/xKWqm9LMZYlWuz2Xtel0MhhRS58C88=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Implement ffs() in common logic Message-Id: Date: Sat, 01 Jun 2024 01:55:34 +0000 commit ef1dd8dff438444747997ae78b4dfa87b5fb9157 Author: Andrew Cooper AuthorDate: Wed Jan 31 18:31:16 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement ffs() in common logic Perform constant-folding unconditionally, rather than having it implemented inconsistency between architectures. Confirm the expected behaviour with compile time and boot time tests. For non-constant inputs, use arch_ffs() if provided but fall back to generic_ffsl() if not. In particular, RISC-V doesn't have a builtin that works in all configurations. For x86, rename ffs() to arch_ffs() and adjust the prototype. For PPC, __builtin_ctz() is 1/3 of the size of size of the transform to generic_fls(). Drop the definition entirely. ARM too benefits in the general case by using __builtin_ctz(), but less dramatically because it using optimised asm(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/bitops.h | 2 +- xen/arch/ppc/include/asm/bitops.h | 2 +- xen/arch/x86/include/asm/bitops.h | 3 ++- xen/common/Makefile | 1 + xen/common/bitops.c | 21 +++++++++++++++++++++ xen/include/xen/bitops.h | 17 +++++++++++++++++ 6 files changed, 43 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index 685abfafb2..3204d51af4 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -157,7 +157,7 @@ static inline int fls(unsigned int x) } -#define ffs(x) ({ unsigned int __t = (x); fls(ISOLATE_LSB(__t)); }) +#define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); }) /** diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index c8b11326ad..f4946c82c6 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -173,7 +173,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define flsl(x) generic_flsl(x) #define fls(x) generic_flsl(x) -#define ffs(x) ({ unsigned int t_ = (x); fls(t_ & -t_); }) +#define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define ffsl(x) ({ unsigned long t_ = (x); flsl(t_ & -t_); }) /** diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 674c48397f..13e3730138 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -418,7 +418,7 @@ static inline int ffsl(unsigned long x) return (int)r+1; } -static inline int ffs(unsigned int x) +static always_inline unsigned int arch_ffs(unsigned int x) { int r; @@ -428,6 +428,7 @@ static inline int ffs(unsigned int x) "1:" : "=r" (r) : "rm" (x)); return r + 1; } +#define arch_ffs arch_ffs /** * fls - find last bit set diff --git a/xen/common/Makefile b/xen/common/Makefile index d512cad524..f12a474d40 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_ARGO) += argo.o obj-y += bitmap.o +obj-bin-$(CONFIG_SELF_TESTS) += bitops.init.o obj-$(CONFIG_GENERIC_BUG_FRAME) += bug.o obj-$(CONFIG_HYPFS_CONFIG) += config_data.o obj-$(CONFIG_CORE_PARKING) += core_parking.o diff --git a/xen/common/bitops.c b/xen/common/bitops.c new file mode 100644 index 0000000000..1d3323effc --- /dev/null +++ b/xen/common/bitops.c @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include +#include +#include + +static void __init test_ffs(void) +{ + /* unsigned int ffs(unsigned int) */ + CHECK(ffs, 0, 0); + CHECK(ffs, 1, 1); + CHECK(ffs, 3, 1); + CHECK(ffs, 7, 1); + CHECK(ffs, 6, 2); + CHECK(ffs, 0x80000000U, 32); +} + +static void __init __constructor test_bitops(void) +{ + test_ffs(); +} diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 218c346af2..5fb31e42e4 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -31,6 +31,23 @@ unsigned int __pure generic_flsl(unsigned long x); #include +/* + * Find First/Last Set bit (all forms). + * + * Bits are labelled from 1. Returns 0 if given 0. + */ +static always_inline __pure unsigned int ffs(unsigned int x) +{ + if ( __builtin_constant_p(x) ) + return __builtin_ffs(x); + +#ifdef arch_ffs + return arch_ffs(x); +#else + return generic_ffsl(x); +#endif +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:55:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733938.1140217 (Exim 4.92) (envelope-from ) id 1sDDyE-0006jl-3o; Sat, 01 Jun 2024 01:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733938.1140217; Sat, 01 Jun 2024 01:55: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 1sDDyE-0006jb-1A; Sat, 01 Jun 2024 01:55:46 +0000 Received: by outflank-mailman (input) for mailman id 733938; Sat, 01 Jun 2024 01:55:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyC-0006jN-Ah for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyC-00042a-9A for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDyC-0007e0-8F for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=G18DeS/sw38gMbwf147coa4UinskSu2yhysqtTd4BL0=; b=jnkSRH1HDj5gcjk/0k5fkRocPd ojARE/M+JkU/u0zek3x0SYLFI9wIO7rqnQ3GhQyPHEw0lq82HsD4+W2F+MCs40IeXEAb5yW24sD2C TEj4Ad83SeIxgwZ7UAtojGEXHBRcH+Qb/aYSnZblkiPh52XW1lyphEljQcquwYGFOPXU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/bitops: Improve arch_ffs() in the general case Message-Id: Date: Sat, 01 Jun 2024 01:55:44 +0000 commit 989e5f08d33e2642d25fd60d7b373d3d8ff39990 Author: Andrew Cooper AuthorDate: Thu Mar 14 23:31:11 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 x86/bitops: Improve arch_ffs() in the general case The asm in arch_ffs() is safe but inefficient. CMOV would be an improvement over a conditional branch, but for 64bit CPUs both Intel and AMD have provided enough details about the behaviour for a zero input. It is safe to pre-load the destination register with -1 and drop the conditional logic. However, it is common to find ffs() in a context where the optimiser knows that x is non-zero even if it the value isn't known precisely. In this case, it's safe to drop the preload of -1 too. There are only a handful of uses of ffs() in the x86 build, and all of them improve as a result of this: add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-92 (-92) Function old new delta mask_write 121 113 -8 xmem_pool_alloc 1076 1056 -20 test_bitops 390 358 -32 pt_update_contig_markers 1236 1204 -32 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/bitops.h | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 13e3730138..a8e70d7ed7 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -420,12 +420,39 @@ static inline int ffsl(unsigned long x) static always_inline unsigned int arch_ffs(unsigned int x) { - int r; + unsigned int r; + + if ( __builtin_constant_p(x > 0) && x > 0 ) + { + /* + * A common code pattern is: + * + * while ( bits ) + * { + * bit = ffs(bits); + * ... + * + * and the optimiser really can work with the knowledge of x being + * non-zero without knowing it's exact value, in which case we don't + * need to compensate for BSF's corner cases. Otherwise... + */ + asm ( "bsf %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + } + else + { + /* + * ... the AMD manual states that BSF won't modify the destination + * register if x=0. The Intel manual states that the result is + * undefined, but the architects have said that the register is + * written back with it's old value (zero extended as normal). + */ + asm ( "bsf %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); + } - asm ( "bsf %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); return r + 1; } #define arch_ffs arch_ffs -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:55:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733939.1140220 (Exim 4.92) (envelope-from ) id 1sDDyO-0006mv-6l; Sat, 01 Jun 2024 01:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733939.1140220; Sat, 01 Jun 2024 01: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 1sDDyO-0006mo-4D; Sat, 01 Jun 2024 01:55:56 +0000 Received: by outflank-mailman (input) for mailman id 733939; Sat, 01 Jun 2024 01:55:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyM-0006ma-G0 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyM-00042m-DK for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:55:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDyM-0007ep-BW for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9IF1XpdFJJjlJP7DzI6ZD4/Hoe0UXxPGTIeNhKgRVaY=; b=U+k9BjhgojqSzFcItsqkulx8Lt AKqprbnlB/+F2mkmIIp1xuGNhGMv5Wl2E8tt24j+L42FaB+i+zpryymGAiDnhikxBc4yV1oZrO6Ry dVnOECHMGIgeFDl7rPj8U4ZKBGxm9hXjHNo1tSrEKBOzB6UC7hEqqhXFJo62FaRV8haU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Implement ffsl() in common logic Message-Id: Date: Sat, 01 Jun 2024 01:55:54 +0000 commit 5ed26fc0768d4759f0eabe118b37a6f610c5ca5c Author: Andrew Cooper AuthorDate: Wed Jan 31 18:31:16 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement ffsl() in common logic ... just as with ffs() previously. Express the upper bound of the testing in terms of BITS_PER_LONG as it varies between architectures. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/bitops.h | 2 +- xen/arch/ppc/include/asm/bitops.h | 2 +- xen/arch/x86/include/asm/bitops.h | 35 ++++++++++++++++++----------------- xen/common/bitops.c | 13 +++++++++++++ xen/include/xen/bitops.h | 12 ++++++++++++ 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index 3204d51af4..d30ba44598 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -158,7 +158,7 @@ static inline int fls(unsigned int x) #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) -#define ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); }) +#define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index f4946c82c6..761361291e 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -174,7 +174,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define flsl(x) generic_flsl(x) #define fls(x) generic_flsl(x) #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) -#define ffsl(x) ({ unsigned long t_ = (x); flsl(t_ & -t_); }) +#define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index a8e70d7ed7..90d892e1dd 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -401,23 +401,6 @@ static always_inline unsigned int __scanbit(unsigned long val, unsigned int max) r__; \ }) -/** - * ffs - find first bit set - * @x: the word to search - * - * This is defined the same way as the libc and compiler builtin ffs routines. - */ -static inline int ffsl(unsigned long x) -{ - long r; - - asm ( "bsf %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); - return (int)r+1; -} - static always_inline unsigned int arch_ffs(unsigned int x) { unsigned int r; @@ -457,6 +440,24 @@ static always_inline unsigned int arch_ffs(unsigned int x) } #define arch_ffs arch_ffs +static always_inline unsigned int arch_ffsl(unsigned long x) +{ + unsigned int r; + + /* See arch_ffs() for safety discussions. */ + if ( __builtin_constant_p(x > 0) && x > 0 ) + asm ( "bsf %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + else + asm ( "bsf %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); + + return r + 1; +} +#define arch_ffsl arch_ffsl + /** * fls - find last bit set * @x: the word to search diff --git a/xen/common/bitops.c b/xen/common/bitops.c index 1d3323effc..df0e9bacbc 100644 --- a/xen/common/bitops.c +++ b/xen/common/bitops.c @@ -13,6 +13,19 @@ static void __init test_ffs(void) CHECK(ffs, 7, 1); CHECK(ffs, 6, 2); CHECK(ffs, 0x80000000U, 32); + + /* unsigned int ffsl(unsigned long) */ + CHECK(ffsl, 0, 0); + CHECK(ffsl, 1, 1); + CHECK(ffsl, 3, 1); + CHECK(ffsl, 7, 1); + CHECK(ffsl, 6, 2); + + CHECK(ffsl, 1UL << (BITS_PER_LONG - 1), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + CHECK(ffsl, 1UL << 32, 33); + CHECK(ffsl, 1UL << 63, 64); +#endif } static void __init __constructor test_bitops(void) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 5fb31e42e4..5aa8d7aa5a 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -48,6 +48,18 @@ static always_inline __pure unsigned int ffs(unsigned int x) #endif } +static always_inline __pure unsigned int ffsl(unsigned long x) +{ + if ( __builtin_constant_p(x) ) + return __builtin_ffsl(x); + +#ifdef arch_ffs + return arch_ffsl(x); +#else + return generic_ffsl(x); +#endif +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:56:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733940.1140225 (Exim 4.92) (envelope-from ) id 1sDDyY-0006pc-8X; Sat, 01 Jun 2024 01:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733940.1140225; Sat, 01 Jun 2024 01:56: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 1sDDyY-0006pT-5m; Sat, 01 Jun 2024 01:56:06 +0000 Received: by outflank-mailman (input) for mailman id 733940; Sat, 01 Jun 2024 01:56:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyW-0006pD-Ht for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyW-00043C-H3 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDyW-0007gI-Fl for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DLBbjSWm61E7ck4D+EQOBmRn7M0DDxQ1IWZuOv2M5L0=; b=dycGEr+nixuyPSs2ABZZ2H2wPR ZAUbdBSjcsVbwla8yLKznRVH5DJZHKutCt8qxaBQ5/KSC/MOepo3YGD+HEAToOniournx4nxZJdpy 3cHpShpdr5sd4TMZVkCMQBVPZA5R6rTk/gwcAwTRY5O0v69Sb1MgqA6DIM1myx22QlWs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Implement fls()/flsl() in common logic Message-Id: Date: Sat, 01 Jun 2024 01:56:04 +0000 commit 54b10ef6c810b3e0579b8efb6e5257d9f8969641 Author: Oleksii Kurochko AuthorDate: Fri May 24 16:49:53 2024 +0100 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement fls()/flsl() in common logic This is most easily done together because of how arm32 is currently structured, but it does just mirror the existing ffs()/ffsl() work. Introduce compile and boot time testing. Signed-off-by: Oleksii Kurochko Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/arm32/bitops.h | 2 -- xen/arch/arm/include/asm/arm64/bitops.h | 12 --------- xen/arch/arm/include/asm/bitops.h | 19 ++------------ xen/arch/ppc/include/asm/bitops.h | 4 +-- xen/arch/x86/include/asm/bitops.h | 46 +++++++++++++++++++-------------- xen/common/bitops.c | 25 ++++++++++++++++++ xen/include/xen/bitops.h | 24 +++++++++++++++++ 7 files changed, 80 insertions(+), 52 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/bitops.h b/xen/arch/arm/include/asm/arm32/bitops.h index d0309d47c1..0d7bb12d5c 100644 --- a/xen/arch/arm/include/asm/arm32/bitops.h +++ b/xen/arch/arm/include/asm/arm32/bitops.h @@ -1,8 +1,6 @@ #ifndef _ARM_ARM32_BITOPS_H #define _ARM_ARM32_BITOPS_H -#define flsl fls - /* * Little endian assembly bitops. nr = 0 -> byte 0 bit 0. */ diff --git a/xen/arch/arm/include/asm/arm64/bitops.h b/xen/arch/arm/include/asm/arm64/bitops.h index 906d84e5f2..a6135838dc 100644 --- a/xen/arch/arm/include/asm/arm64/bitops.h +++ b/xen/arch/arm/include/asm/arm64/bitops.h @@ -1,18 +1,6 @@ #ifndef _ARM_ARM64_BITOPS_H #define _ARM_ARM64_BITOPS_H -static inline int flsl(unsigned long x) -{ - uint64_t ret; - - if (__builtin_constant_p(x)) - return generic_flsl(x); - - asm("clz\t%0, %1" : "=r" (ret) : "r" (x)); - - return BITS_PER_LONG - ret; -} - /* Based on linux/include/asm-generic/bitops/find.h */ #ifndef CONFIG_GENERIC_FIND_FIRST_BIT diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index d30ba44598..8f4bdc09d1 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -140,25 +140,10 @@ static inline int test_bit(int nr, const volatile void *addr) return 1UL & (p[BITOP_WORD(nr)] >> (nr & (BITOP_BITS_PER_WORD-1))); } -/* - * On ARMv5 and above those functions can be implemented around - * the clz instruction for much better code efficiency. - */ - -static inline int fls(unsigned int x) -{ - int ret; - - if (__builtin_constant_p(x)) - return generic_flsl(x); - - asm("clz\t%"__OP32"0, %"__OP32"1" : "=r" (ret) : "r" (x)); - return 32 - ret; -} - - #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) +#define arch_fls(x) ((x) ? 32 - __builtin_clz(x) : 0) +#define arch_flsl(x) ((x) ? BITS_PER_LONG - __builtin_clzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index 761361291e..8119b5ace8 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -171,10 +171,10 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) return (old & mask) != 0; } -#define flsl(x) generic_flsl(x) -#define fls(x) generic_flsl(x) #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) +#define arch_fls(x) ((x) ? 32 - __builtin_clz(x) : 0) +#define arch_flsl(x) ((x) ? BITS_PER_LONG - __builtin_clzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 90d892e1dd..aa71542e7b 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -458,33 +458,41 @@ static always_inline unsigned int arch_ffsl(unsigned long x) } #define arch_ffsl arch_ffsl -/** - * fls - find last bit set - * @x: the word to search - * - * This is defined the same way as ffs. - */ -static inline int flsl(unsigned long x) +static always_inline unsigned int arch_fls(unsigned int x) { - long r; + unsigned int r; + + /* See arch_ffs() for safety discussions. */ + if ( __builtin_constant_p(x > 0) && x > 0 ) + asm ( "bsr %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + else + asm ( "bsr %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); - asm ( "bsr %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); - return (int)r+1; + return r + 1; } +#define arch_fls arch_fls -static inline int fls(unsigned int x) +static always_inline unsigned int arch_flsl(unsigned long x) { - int r; + unsigned int r; + + /* See arch_ffs() for safety discussions. */ + if ( __builtin_constant_p(x > 0) && x > 0 ) + asm ( "bsr %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + else + asm ( "bsr %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); - asm ( "bsr %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); return r + 1; } +#define arch_flsl arch_flsl /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/common/bitops.c b/xen/common/bitops.c index df0e9bacbc..0e1cc1f509 100644 --- a/xen/common/bitops.c +++ b/xen/common/bitops.c @@ -28,7 +28,32 @@ static void __init test_ffs(void) #endif } +static void __init test_fls(void) +{ + /* unsigned int fls(unsigned int) */ + CHECK(fls, 0, 0); + CHECK(fls, 1, 1); + CHECK(fls, 3, 2); + CHECK(fls, 7, 3); + CHECK(fls, 6, 3); + CHECK(fls, 0x80000000U, 32); + + /* unsigned int flsl(unsigned long) */ + CHECK(flsl, 0, 0); + CHECK(flsl, 1, 1); + CHECK(flsl, 3, 2); + CHECK(flsl, 7, 3); + CHECK(flsl, 6, 3); + + CHECK(flsl, 1 | (1UL << (BITS_PER_LONG - 1)), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + CHECK(flsl, 1 | (1UL << 32), 33); + CHECK(flsl, 1 | (1UL << 63), 64); +#endif +} + static void __init __constructor test_bitops(void) { test_ffs(); + test_fls(); } diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 5aa8d7aa5a..9f8d9eff11 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -60,6 +60,30 @@ static always_inline __pure unsigned int ffsl(unsigned long x) #endif } +static always_inline __pure unsigned int fls(unsigned int x) +{ + if ( __builtin_constant_p(x) ) + return x ? 32 - __builtin_clz(x) : 0; + +#ifdef arch_fls + return arch_fls(x); +#else + return generic_flsl(x); +#endif +} + +static always_inline __pure unsigned int flsl(unsigned long x) +{ + if ( __builtin_constant_p(x) ) + return x ? BITS_PER_LONG - __builtin_clzl(x) : 0; + +#ifdef arch_fls + return arch_flsl(x); +#else + return generic_flsl(x); +#endif +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:56:16 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:56:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733941.1140229 (Exim 4.92) (envelope-from ) id 1sDDyi-0006sB-A0; Sat, 01 Jun 2024 01:56:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733941.1140229; Sat, 01 Jun 2024 01:56: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 1sDDyi-0006s2-7H; Sat, 01 Jun 2024 01:56:16 +0000 Received: by outflank-mailman (input) for mailman id 733941; Sat, 01 Jun 2024 01:56:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyg-0006rs-Ke for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyg-00043M-Jp for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDyg-0007gu-J8 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6aSnSXihbTP0NWSnHAEMweifrf9++DsrYFhuW12uHIQ=; b=5SADra+ZeBVoJekL1gyQG+vkdN ANRkmGuCgUlQVoR+TdEWmKxmcuOEGEoHvCQqxoggIlx64blwmON/vZZ8CfFk54SVt7difo4iYCSXQ /MO/GubudrTrv9TnY9qr3RQj9t7JaZammV34R3AXUTl/W7ZuYULguN7qVJ8W9tVJikeE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Clean up ffs64()/fls64() definitions Message-Id: Date: Sat, 01 Jun 2024 01:56:14 +0000 commit 04e70af5f240965ec0475caef813653e06782273 Author: Andrew Cooper AuthorDate: Sat Mar 9 02:44:56 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Clean up ffs64()/fls64() definitions Implement ffs64() and fls64() as plain static inlines, dropping the ifdefary and intermediate generic_f?s64() forms. Add tests for all interesting bit positions at 32bit boundaries. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/common/bitops.c | 32 ++++++++++++++++++++++++++++++++ xen/include/xen/bitops.h | 42 ++++++++++++++++++++---------------------- 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/xen/common/bitops.c b/xen/common/bitops.c index 0e1cc1f509..94a8983af9 100644 --- a/xen/common/bitops.c +++ b/xen/common/bitops.c @@ -26,6 +26,22 @@ static void __init test_ffs(void) CHECK(ffsl, 1UL << 32, 33); CHECK(ffsl, 1UL << 63, 64); #endif + + /* + * unsigned int ffs64(uint64_t) + * + * 32-bit builds of Xen have to split this into two adjacent operations, + * so test all interesting bit positions across the divide. + */ + CHECK(ffs64, 0, 0); + CHECK(ffs64, 1, 1); + CHECK(ffs64, 3, 1); + CHECK(ffs64, 7, 1); + CHECK(ffs64, 6, 2); + + CHECK(ffs64, 0x8000000080000000ULL, 32); + CHECK(ffs64, 0x8000000100000000ULL, 33); + CHECK(ffs64, 0x8000000000000000ULL, 64); } static void __init test_fls(void) @@ -50,6 +66,22 @@ static void __init test_fls(void) CHECK(flsl, 1 | (1UL << 32), 33); CHECK(flsl, 1 | (1UL << 63), 64); #endif + + /* + * unsigned int fls64(uint64_t) + * + * 32-bit builds of Xen have to split this into two adjacent operations, + * so test all interesting bit positions across the divide. + */ + CHECK(fls64, 0, 0); + CHECK(fls64, 1, 1); + CHECK(fls64, 3, 2); + CHECK(fls64, 7, 3); + CHECK(fls64, 6, 3); + + CHECK(fls64, 0x0000000080000001ULL, 32); + CHECK(fls64, 0x0000000100000001ULL, 33); + CHECK(fls64, 0x8000000000000001ULL, 64); } static void __init __constructor test_bitops(void) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 9f8d9eff11..d216fead17 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -60,6 +60,14 @@ static always_inline __pure unsigned int ffsl(unsigned long x) #endif } +static always_inline __pure unsigned int ffs64(uint64_t x) +{ + if ( BITS_PER_LONG == 64 ) + return ffsl(x); + else + return !x || (uint32_t)x ? ffs(x) : ffs(x >> 32) + 32; +} + static always_inline __pure unsigned int fls(unsigned int x) { if ( __builtin_constant_p(x) ) @@ -84,6 +92,18 @@ static always_inline __pure unsigned int flsl(unsigned long x) #endif } +static always_inline __pure unsigned int fls64(uint64_t x) +{ + if ( BITS_PER_LONG == 64 ) + return flsl(x); + else + { + uint32_t h = x >> 32; + + return h ? fls(h) + 32 : fls(x); + } +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit @@ -134,28 +154,6 @@ extern unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size); #endif -#if BITS_PER_LONG == 64 -# define fls64 flsl -# define ffs64 ffsl -#else -# ifndef ffs64 -static inline int generic_ffs64(__u64 x) -{ - return !x || (__u32)x ? ffs(x) : ffs(x >> 32) + 32; -} -# define ffs64 generic_ffs64 -# endif -# ifndef fls64 -static inline int generic_fls64(__u64 x) -{ - __u32 h = x >> 32; - - return h ? fls(h) + 32 : fls(x); -} -# define fls64 generic_fls64 -# endif -#endif - static inline int get_bitmask_order(unsigned int count) { int order; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 01:56:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 01:56:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733942.1140233 (Exim 4.92) (envelope-from ) id 1sDDys-0006vE-Bb; Sat, 01 Jun 2024 01:56:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733942.1140233; Sat, 01 Jun 2024 01:56: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 1sDDys-0006v4-8r; Sat, 01 Jun 2024 01:56:26 +0000 Received: by outflank-mailman (input) for mailman id 733942; Sat, 01 Jun 2024 01:56:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyq-0006us-NT for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDDyq-00043Y-Mh for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDDyq-0007hk-Lr for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 01:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Tbhd8h+mZGEYoiBmJDDvF9xCBu1HmNgXqQU6Y4alQMs=; b=RrKtgFehFyoVIzk545BlckcUiR 9UxMHlZ3RS1zog3tALu86onf7WD+szpFDAbOjKPhkDNz7wI/0+NXhBo5fKYxnRN+kaZTVZBqa+Tt3 I+C2V1kbru90MUTODVMxI1DtIAovHQtM69/ykXyaWisiQYNrHDyIbkt/o3l3YT6vCYww=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Rearrange the top of xen/bitops.h Message-Id: Date: Sat, 01 Jun 2024 01:56:24 +0000 commit 5f7606c048f7cca1a4301b321af70791c1d22378 Author: Andrew Cooper AuthorDate: Fri May 24 20:37:50 2024 +0100 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Rearrange the top of xen/bitops.h The #include can move to the top of the file now now that generic_ffs()/generic_fls() have been untangled. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/include/xen/bitops.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index d216fead17..6a5e28730a 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -4,6 +4,8 @@ #include #include +#include + /* * Create a contiguous bitmask starting at bit position @l and ending at * position @h. For example GENMASK(30, 21) gives us 0x7fe00000ul. @@ -22,20 +24,6 @@ unsigned int __pure generic_ffsl(unsigned long x); unsigned int __pure generic_flsl(unsigned long x); -/* - * Include this here because some architectures need generic_ffs/fls in - * scope - */ - -/* --------------------- Please tidy above here --------------------- */ - -#include - -/* - * Find First/Last Set bit (all forms). - * - * Bits are labelled from 1. Returns 0 if given 0. - */ static always_inline __pure unsigned int ffs(unsigned int x) { if ( __builtin_constant_p(x) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 08:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 08:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734065.1140277 (Exim 4.92) (envelope-from ) id 1sDK02-0001kG-Cr; Sat, 01 Jun 2024 08:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734065.1140277; Sat, 01 Jun 2024 08: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 1sDK02-0001k9-9k; Sat, 01 Jun 2024 08:22:02 +0000 Received: by outflank-mailman (input) for mailman id 734065; Sat, 01 Jun 2024 08:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK01-0001k3-KN for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK01-0007kW-HK for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDK01-00026w-FW for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YBa510neXFwMp6CGkqo8sHSn/xaMETIXetywqSCt1jE=; b=i7cfaXxvNBQH5nGLLaKjjBKZJO oIHskch7W27yiDjbKkxTPQH7NG/+uVaccpFsIkvkwrBhHU5TAJoac6ps/Y1TQE7lpa9f6xVR1tf6W 7BT6lO84k3ReuuOiKgizaL7np+IOcOzzQZty38HK4WcflQPaBGYjLPn++ilrZvr64ZGI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Use a debug build of Xen for the Xilinx HW tests Message-Id: Date: Sat, 01 Jun 2024 08:22:01 +0000 commit 2ff6d17bc37e6d8bc412436e8734ea868cea124d Author: Andrew Cooper AuthorDate: Wed May 29 14:20:39 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 CI: Use a debug build of Xen for the Xilinx HW tests ... like the other hardware tests. This gets more value out of the testing. Signed-off-by: Andrew Cooper Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/gitlab-ci/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ad249fa0a5..902139e148 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -143,21 +143,21 @@ build-each-commit-gcc: tags: - x86_64 -xilinx-smoke-dom0less-arm64-gcc: +xilinx-smoke-dom0less-arm64-gcc-debug: extends: .xilinx-arm64 script: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.18-gcc-debug-arm64 -xilinx-smoke-dom0less-arm64-gcc-gem-passthrough: +xilinx-smoke-dom0less-arm64-gcc-debug-gem-passthrough: extends: .xilinx-arm64 script: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.18-gcc-debug-arm64 adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 08:22:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 08:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734066.1140280 (Exim 4.92) (envelope-from ) id 1sDK0C-0001nU-Dy; Sat, 01 Jun 2024 08:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734066.1140280; Sat, 01 Jun 2024 08: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 1sDK0C-0001nM-BL; Sat, 01 Jun 2024 08:22:12 +0000 Received: by outflank-mailman (input) for mailman id 734066; Sat, 01 Jun 2024 08:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK0B-0001nE-M8 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK0B-0007kh-LQ for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDK0B-00028Q-JW for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=17ZsMVL8biKJkxmcCFU04UmuKXHO2m3bNSnx0kb4Ipk=; b=haseeVn/z8KjOQArTc+puYgyWu Kzf8KjlOxJuojCKE6kpdxFqzh7hTiT0ImIwKm+8katjE0fX+Eq+39DeUAE/dV6wEbKhUwNBEZNeSK JQLvgkuvYbqbK59YiPTtWV+8dKSTc8GVKirAm4SAgRUDTiye4qYePcTf4qR65/iNB12w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Improve serial handling in qemu-smoke-ppc64le.sh Message-Id: Date: Sat, 01 Jun 2024 08:22:11 +0000 commit 16884ac6c88da7d964adfd5d14cae411193554d1 Author: Andrew Cooper AuthorDate: Wed May 29 14:21:12 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 CI: Improve serial handling in qemu-smoke-ppc64le.sh Have PPC put serial to stdout like all other tests, so it shows up in the main job log. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/scripts/qemu-smoke-ppc64le.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh index 2adbdac87e..701d81107d 100755 --- a/automation/scripts/qemu-smoke-ppc64le.sh +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -2,15 +2,15 @@ set -ex +serial_log="$(pwd)/smoke.serial" + # machine type from first arg passed directly to qemu -M machine=$1 # Run the test -rm -f smoke.serial +rm -f ${serial_log} set +e -touch smoke.serial - timeout -k 1 20 \ binaries/qemu-system-ppc64 \ -bios binaries/skiboot.lid \ @@ -20,9 +20,10 @@ binaries/qemu-system-ppc64 \ -vga none \ -monitor none \ -nographic \ - -serial file:smoke.serial \ - -kernel binaries/xen + -serial stdio \ + -kernel binaries/xen \ + |& tee ${serial_log} | sed 's/\r//' set -e -(grep -q "Hello, ppc64le!" smoke.serial) || exit 1 +(grep -q "Hello, ppc64le!" ${serial_log}) || exit 1 exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 08:22:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 08:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734067.1140286 (Exim 4.92) (envelope-from ) id 1sDK0M-0001qz-Hw; Sat, 01 Jun 2024 08:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734067.1140286; Sat, 01 Jun 2024 08: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 1sDK0M-0001qr-Eh; Sat, 01 Jun 2024 08:22:22 +0000 Received: by outflank-mailman (input) for mailman id 734067; Sat, 01 Jun 2024 08:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK0L-0001qh-PW for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK0L-0007mL-Oi for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDK0L-00029Z-Ng for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nktv9fdz84hdxsH1+nn6vDMonVG66lAmTNNXRAh+toE=; b=h0uQ0+fbceXhfXKkaHRD10VpRz wkGt8v+F5J2auDESlQCxkov/pVJrJF+itC2pvSKMuEBQvaTr0ady0LivdoP5BXuJwytWxqr+366IT GHDJuL79wFtp0NlEhew/XEnfddzoIrbDbJs7eInRcu646tE5x0k6a1ZXkkhZxtmpmggs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arch/irq: Make irq_ack_none() mandatory Message-Id: Date: Sat, 01 Jun 2024 08:22:21 +0000 commit 8aeda4a241ab9bc3e891dce140218be953631718 Author: Andrew Cooper AuthorDate: Thu May 30 19:00:45 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 arch/irq: Make irq_ack_none() mandatory Any non-stub implementation is going to have to do something here. The related hook irq_end_none() is more complicated and has arch-specific interactions with irq_ack_none(), so make it optional. For PPC, introduce a stub irq_ack_none(). For ARM and x86, export the existing {ack,end}_none() helpers, gaining an irq_ prefix for consisntency with everything else in no_irq_type. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/irq.h | 3 +++ xen/arch/arm/irq.c | 8 ++++---- xen/arch/ppc/stubs.c | 6 ++++++ xen/arch/x86/irq.c | 4 ++-- xen/include/xen/irq.h | 6 ++++++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h index 1bae538887..ec437add09 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -98,6 +98,9 @@ void irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask); */ bool irq_type_set_by_domain(const struct domain *d); +void irq_end_none(struct irq_desc *irq); +#define irq_end_none irq_end_none + #endif /* _ASM_HW_IRQ_H */ /* * Local variables: diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index bcce80a4d6..7138f9e7c2 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -31,12 +31,12 @@ struct irq_guest unsigned int virq; }; -static void ack_none(struct irq_desc *irq) +void irq_ack_none(struct irq_desc *irq) { printk("unexpected IRQ trap at irq %02x\n", irq->irq); } -static void end_none(struct irq_desc *irq) +void irq_end_none(struct irq_desc *irq) { /* * Still allow a CPU to end an interrupt if we receive a spurious @@ -51,8 +51,8 @@ hw_irq_controller no_irq_type = { .shutdown = irq_shutdown_none, .enable = irq_enable_none, .disable = irq_disable_none, - .ack = ack_none, - .end = end_none + .ack = irq_ack_none, + .end = irq_end_none }; static irq_desc_t irq_desc[NR_IRQS]; diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index da193839bd..4e03428e07 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -134,12 +134,18 @@ void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) BUG_ON("unimplemented"); } +void irq_ack_none(struct irq_desc *desc) +{ + BUG_ON("unimplemented"); +} + hw_irq_controller no_irq_type = { .typename = "none", .startup = irq_startup_none, .shutdown = irq_shutdown_none, .enable = irq_enable_none, .disable = irq_disable_none, + .ack = irq_ack_none, }; int arch_init_one_irq_desc(struct irq_desc *desc) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index c16205a9be..cfd7a08479 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -467,7 +467,7 @@ int __init init_irq_data(void) return 0; } -static void cf_check ack_none(struct irq_desc *desc) +void cf_check irq_ack_none(struct irq_desc *desc) { ack_bad_irq(desc->irq); } @@ -478,7 +478,7 @@ hw_irq_controller no_irq_type = { irq_shutdown_none, irq_enable_none, irq_disable_none, - ack_none, + irq_ack_none, }; static vmask_t *irq_get_used_vector_mask(int irq) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 89f7a8317a..8fa8ef2e50 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -130,6 +130,12 @@ void cf_check irq_actor_none(struct irq_desc *desc); #define irq_disable_none irq_actor_none #define irq_enable_none irq_actor_none +/* + * irq_ack_none() must be provided by the architecture. + * irq_end_none() is optional, and opted into using a define. + */ +void cf_check irq_ack_none(struct irq_desc *irq); + /* * Per-cpu interrupted context register state - the inner-most interrupt frame * on the stack. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 08:22:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 08:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734068.1140289 (Exim 4.92) (envelope-from ) id 1sDK0X-0001uO-JM; Sat, 01 Jun 2024 08:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734068.1140289; Sat, 01 Jun 2024 08: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 1sDK0X-0001uG-GA; Sat, 01 Jun 2024 08:22:33 +0000 Received: by outflank-mailman (input) for mailman id 734068; Sat, 01 Jun 2024 08:22:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK0V-0001tk-TT for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDK0V-0007mT-Sh for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDK0V-0002A0-R6 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 08: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yc5NewE1/7ZlOXn6u6FwCAKd+EM7y+8sAsxHlwUQ/6Q=; b=x0iPyhIF0WZBNSYIVHdYQhpxxX aGXYjdp/cqx0YEcQnJ83GQtMzKcFz88QXP5huU03pnf49+tC+Vh/UsCBtGBQw0N965BHT3wU+/PNn s1Qa9+JASjX8BzgwcbAFlDGUiPCanJbJydK7GD0wqY3tH1WBo6TnGRo4Ga9OJCf0nj+8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arch/irq: Centralise no_irq_type Message-Id: Date: Sat, 01 Jun 2024 08:22:31 +0000 commit 03147e6837ff045dbc328be876b9600f7040c771 Author: Andrew Cooper AuthorDate: Thu May 30 18:58:18 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 arch/irq: Centralise no_irq_type Having no_irq_type defined per arch, but using common callbacks is a mess, and is particualrly hard to bootstrap a new architecture with. Now that the ack()/end() hooks have been exported suitably, move the definition of no_irq_type into common/irq.c, and make it const too for good measure. No functional change, but a whole lot less tangled. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/irq.c | 10 ---------- xen/arch/ppc/stubs.c | 9 --------- xen/arch/x86/irq.c | 9 --------- xen/common/irq.c | 13 +++++++++++++ xen/include/xen/irq.h | 2 +- 5 files changed, 14 insertions(+), 29 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 7138f9e7c2..e5fb26a3de 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -45,16 +45,6 @@ void irq_end_none(struct irq_desc *irq) gic_hw_ops->gic_host_irq_type->end(irq); } -hw_irq_controller no_irq_type = { - .typename = "none", - .startup = irq_startup_none, - .shutdown = irq_shutdown_none, - .enable = irq_enable_none, - .disable = irq_disable_none, - .ack = irq_ack_none, - .end = irq_end_none -}; - static irq_desc_t irq_desc[NR_IRQS]; static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc); diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index 4e03428e07..923f0e7b20 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -139,15 +139,6 @@ void irq_ack_none(struct irq_desc *desc) BUG_ON("unimplemented"); } -hw_irq_controller no_irq_type = { - .typename = "none", - .startup = irq_startup_none, - .shutdown = irq_shutdown_none, - .enable = irq_enable_none, - .disable = irq_disable_none, - .ack = irq_ack_none, -}; - int arch_init_one_irq_desc(struct irq_desc *desc) { BUG_ON("unimplemented"); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index cfd7a08479..e36e06deaa 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -472,15 +472,6 @@ void cf_check irq_ack_none(struct irq_desc *desc) ack_bad_irq(desc->irq); } -hw_irq_controller no_irq_type = { - "none", - irq_startup_none, - irq_shutdown_none, - irq_enable_none, - irq_disable_none, - irq_ack_none, -}; - static vmask_t *irq_get_used_vector_mask(int irq) { vmask_t *ret = NULL; diff --git a/xen/common/irq.c b/xen/common/irq.c index 7225b46374..29729349a6 100644 --- a/xen/common/irq.c +++ b/xen/common/irq.c @@ -3,6 +3,19 @@ DEFINE_PER_CPU(const struct cpu_user_regs *, irq_regs); +const hw_irq_controller no_irq_type = { + .typename = "none", + .startup = irq_startup_none, + .shutdown = irq_shutdown_none, + .enable = irq_enable_none, + .disable = irq_disable_none, + .ack = irq_ack_none, + +#ifdef irq_end_none /* Hook is optional per arch */ + .end = irq_end_none, +#endif +}; + int init_one_irq_desc(struct irq_desc *desc) { int err; diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 8fa8ef2e50..adf33547d2 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -122,7 +122,7 @@ extern int request_irq(unsigned int irq, unsigned int irqflags, void (*handler)(int irq, void *dev_id), const char *devname, void *dev_id); -extern hw_irq_controller no_irq_type; +extern const hw_irq_controller no_irq_type; void cf_check no_action(int cpl, void *dev_id); unsigned int cf_check irq_startup_none(struct irq_desc *desc); void cf_check irq_actor_none(struct irq_desc *desc); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 14:44:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 14:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734245.1140443 (Exim 4.92) (envelope-from ) id 1sDPxl-0003J0-1n; Sat, 01 Jun 2024 14:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734245.1140443; Sat, 01 Jun 2024 14: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 1sDPxk-0003Is-UO; Sat, 01 Jun 2024 14:44:04 +0000 Received: by outflank-mailman (input) for mailman id 734245; Sat, 01 Jun 2024 14:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDPxk-0003Im-2k for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 14:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDPxj-0005qy-V0 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 14:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDPxj-00006j-U4 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 14:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yjotCoSzFA2qRetfdgst34b6dt5uFBCb+Pbcd82pB20=; b=rBrrYoJNlneg+zMieBhp/bujRp Qlsf+aXPaV2HCzp8JfQHP0Qqo2EoBiWpGzdmn56wZl0E8q5Svr6r1qooizPbDo2GxcGrCCt/Wfs0g 3o1mOQr0htBbSAKJbkrRvUxtf6Bikjz76RwqzW3k3br7EWR5Odp0zkIRC54p6A1a85vY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: fix MISRA regressions on rule 20.9 and 20.12 Message-Id: Date: Sat, 01 Jun 2024 14:44:03 +0000 commit c2d5e63c7380c7cb435d00211b512c53accb528e Author: Nicola Vetrini AuthorDate: Sat Jun 1 12:16:56 2024 +0200 Commit: Andrew Cooper CommitDate: Sat Jun 1 15:32:13 2024 +0100 xen: fix MISRA regressions on rule 20.9 and 20.12 Commit ea59e7d780d9 ("xen/bitops: Cleanup and new infrastructure ahead of rearrangements") introduced new violations on previously clean rules 20.9 and 20.12 (clean on ARM only, right now). The first is introduced because CONFIG_CC_IS_CLANG in xen/self-tests.h is not defined in the configuration under analysis. Using "defined()" instead avoids relying on the preprocessor's behaviour upon encountering an undedfined identifier and addresses the violation. The violation of Rule 20.12 is due to "val" being used both as an ordinary argument in macro RUNTIME_CHECK, and as a stringification operator. No functional change. Fixes: ea59e7d780d9 ("xen/bitops: Cleanup and new infrastructure ahead of rearrangements") Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/deviations.ecl | 2 +- xen/include/xen/self-tests.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index cf62a874d9..447c1e6661 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -473,7 +473,7 @@ deliberate." -doc_begin="Uses of a macro parameter for ordinary expansion and as an operand to the # or ## operators within the following macros are deliberate, to provide useful diagnostic messages to the user." --config=MC3R1.R20.12,macros+={deliberate, "name(ASSERT||BUILD_BUG_ON||BUILD_BUG_ON_ZERO)"} +-config=MC3R1.R20.12,macros+={deliberate, "name(ASSERT||BUILD_BUG_ON||BUILD_BUG_ON_ZERO||RUNTIME_CHECK)"} -doc_end -doc_begin="The helper macro GENERATE_CASE may use a macro parameter for ordinary diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h index 8410db7aaa..42a4cc4d17 100644 --- a/xen/include/xen/self-tests.h +++ b/xen/include/xen/self-tests.h @@ -16,7 +16,7 @@ * Clang < 8 can't fold constants through static inlines, causing this to * fail. Simply skip it for incredibly old compilers. */ -#if !CONFIG_CC_IS_CLANG || CONFIG_CLANG_VERSION >= 80000 +#if !defined(CONFIG_CC_IS_CLANG) || CONFIG_CLANG_VERSION >= 80000 #define COMPILE_CHECK(fn, val, res) \ do { \ typeof(fn(val)) real = fn(val); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734331.1140507 (Exim 4.92) (envelope-from ) id 1sDWAt-0001E0-A5; Sat, 01 Jun 2024 21:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734331.1140507; Sat, 01 Jun 2024 21: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 1sDWAt-0001Di-70; Sat, 01 Jun 2024 21:22:03 +0000 Received: by outflank-mailman (input) for mailman id 734331; Sat, 01 Jun 2024 21:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWAs-0001DA-4m for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWAr-0004bW-Tw for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWAr-0006qw-RM for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qPnDgpn0VE7P6Lql+WNoXUXhxETfpN3ZYihcqS5MgzU=; b=nyQSXOwQwgr2vnnpZ5/Iz6afVH ues97PGqgyL+mKoqN0ZmtT9rZOA+6tXEoxS79ONDZO5HjxU3911Ho1/7CIleBxCXnMkW+NGmNQGKa vWabJ8DjGbOWrqvkvmRM21Sm086SJ+jz50rzYMjL2oHSyyyVb6/0e9XongD71h4G2gQ4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Delete find_first_set_bit() Message-Id: Date: Sat, 01 Jun 2024 21:22:01 +0000 commit 1408cf7a2840c0839d988f8cbf910eecac1655ef Author: Andrew Cooper AuthorDate: Thu Mar 14 20:38:44 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Delete find_first_set_bit() No more users. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/include/asm/bitops.h | 12 ------------ xen/arch/ppc/include/asm/bitops.h | 9 --------- xen/arch/x86/include/asm/bitops.h | 12 ------------ 3 files changed, 33 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index ab030b6cb0..6c5ec34e66 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -160,18 +160,6 @@ static inline int fls(unsigned int x) #define ffs(x) ({ unsigned int __t = (x); fls(ISOLATE_LSB(__t)); }) #define ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); }) -/** - * find_first_set_bit - find the first set bit in @word - * @word: the word to search - * - * Returns the bit-number of the first set bit (first bit being 0). - * The input must *not* be zero. - */ -static inline unsigned int find_first_set_bit(unsigned long word) -{ - return ffsl(word) - 1; -} - /** * hweightN - returns the hamming weight of a N-bit word * @x: the word to weigh diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index bea655796d..f984789e28 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -187,13 +187,4 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define hweight16(x) __builtin_popcount((uint16_t)(x)) #define hweight8(x) __builtin_popcount((uint8_t)(x)) -/** - * find_first_set_bit - find the first set bit in @word - * @word: the word to search - * - * Returns the bit-number of the first set bit (first bit being 0). - * The input must *not* be zero. - */ -#define find_first_set_bit(x) (ffsl(x) - 1) - #endif /* _ASM_PPC_BITOPS_H */ diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 5a71afbc89..674c48397f 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -401,18 +401,6 @@ static always_inline unsigned int __scanbit(unsigned long val, unsigned int max) r__; \ }) -/** - * find_first_set_bit - find the first set bit in @word - * @word: the word to search - * - * Returns the bit-number of the first set bit. The input must *not* be zero. - */ -static inline unsigned int find_first_set_bit(unsigned long word) -{ - asm ( "rep; bsf %1,%0" : "=r" (word) : "rm" (word) ); - return (unsigned int)word; -} - /** * ffs - find first bit set * @x: the word to search -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734332.1140511 (Exim 4.92) (envelope-from ) id 1sDWB3-0001GX-B8; Sat, 01 Jun 2024 21:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734332.1140511; Sat, 01 Jun 2024 21: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 1sDWB3-0001GP-8R; Sat, 01 Jun 2024 21:22:13 +0000 Received: by outflank-mailman (input) for mailman id 734332; Sat, 01 Jun 2024 21:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWB2-0001GF-2c for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWB2-0004bc-1G for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWB1-0006rg-WA for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xly18q+z407k9twI1GRXg9C95aiPpNI9Zggeu4BnMno=; b=xEAwPLA8J4Ev3VyXtLjnhrb+IL aAjH4Kfaxi/iCmEPl6elo0KySPiLBJKLQouI3mkQxeoUcc9bEd/jKy+52MzH7lGjPZ5K2NgVcbY+a knRK6eZzyMTZNsb+fEZrNvWWhXCuJew0mMy+K6raQYNQ9d2bQj+LvaRJrZFT8el0kWUo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Cleanup and new infrastructure ahead of rearrangements Message-Id: Date: Sat, 01 Jun 2024 21:22:11 +0000 commit ea59e7d780d9506793226b8cd1b402e341b195a7 Author: Andrew Cooper AuthorDate: Fri Mar 8 23:45:08 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Cleanup and new infrastructure ahead of rearrangements * Rename __attribute_pure__ to just __pure before it gains users. * Introduce __constructor which is going to be used in lib/, and is unconditionally cf_check. * Identify the areas of xen/bitops.h which are a mess. * Introduce xen/self-tests.h as helpers for compile and boot time testing. This provides a statement of the ABI, and a confirmation that arch-specific implementations behave as expected. * Introduce HIDE() in macros.h. While it's only used in self-tests.h for now, we're going to consolidate similar constructs in due course. Sadly Clang 7 and older isn't happy with the compile time checks. Skip them, and just rely on the runtime checks. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/include/xen/bitops.h | 13 +++++++--- xen/include/xen/compiler.h | 3 ++- xen/include/xen/macros.h | 8 +++++++ xen/include/xen/self-tests.h | 56 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index e3c5a4ccf3..9b40f20381 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -1,5 +1,7 @@ -#ifndef _LINUX_BITOPS_H -#define _LINUX_BITOPS_H +#ifndef XEN_BITOPS_H +#define XEN_BITOPS_H + +#include #include /* @@ -103,8 +105,13 @@ static inline int generic_flsl(unsigned long x) * Include this here because some architectures need generic_ffs/fls in * scope */ + +/* --------------------- Please tidy above here --------------------- */ + #include +/* --------------------- Please tidy below here --------------------- */ + #ifndef find_next_bit /** * find_next_bit - find the next set bit in a memory region @@ -294,4 +301,4 @@ static inline __u32 ror32(__u32 word, unsigned int shift) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) -#endif +#endif /* XEN_BITOPS_H */ diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 179ff23e62..444bf80142 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -86,7 +86,8 @@ #define inline inline __init #endif -#define __attribute_pure__ __attribute__((__pure__)) +#define __constructor __attribute__((__constructor__)) cf_check +#define __pure __attribute__((__pure__)) #define __attribute_const__ __attribute__((__const__)) #define __transparent__ __attribute__((__transparent_union__)) diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h index e64373f018..ec89f4654f 100644 --- a/xen/include/xen/macros.h +++ b/xen/include/xen/macros.h @@ -59,6 +59,14 @@ #define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) #endif +/* Hide a value from the optimiser. */ +#define HIDE(x) \ + ({ \ + typeof(x) _x = (x); \ + asm volatile ( "" : "+r" (_x) ); \ + _x; \ + }) + #define ABS(x) ({ \ typeof(x) x_ = (x); \ (x_ < 0) ? -x_ : x_; \ diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h new file mode 100644 index 0000000000..8410db7aaa --- /dev/null +++ b/xen/include/xen/self-tests.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* + * Helpers for Xen self-tests of basic logic, including confirming that + * examples which should be calculated by the compiler are. + */ +#ifndef XEN_SELF_TESTS_H +#define XEN_SELF_TESTS_H + +#include + +/* + * Check that fn(val) can be calcuated by the compiler, and that it gives the + * expected answer. + * + * Clang < 8 can't fold constants through static inlines, causing this to + * fail. Simply skip it for incredibly old compilers. + */ +#if !CONFIG_CC_IS_CLANG || CONFIG_CLANG_VERSION >= 80000 +#define COMPILE_CHECK(fn, val, res) \ + do { \ + typeof(fn(val)) real = fn(val); \ + \ + if ( !__builtin_constant_p(real) ) \ + asm ( ".error \"'" STR(fn(val)) "' not compile-time constant\"" ); \ + else if ( real != res ) \ + asm ( ".error \"Compile time check '" STR(fn(val) == res) "' failed\"" ); \ + } while ( 0 ) +#else +#define COMPILE_CHECK(fn, val, res) +#endif + +/* + * Check that Xen's runtime logic for fn(val) gives the expected answer. This + * requires using HIDE() to prevent the optimiser from collapsing the logic + * into a constant. + */ +#define RUNTIME_CHECK(fn, val, res) \ + do { \ + typeof(fn(val)) real = fn(HIDE(val)); \ + \ + if ( real != res ) \ + panic("%s: %s(%s) expected %u, got %u\n", \ + __func__, #fn, #val, real, res); \ + } while ( 0 ) + +/* + * Perform compile-time and runtime checks for fn(val) == res. + */ +#define CHECK(fn, val, res) \ + do { \ + COMPILE_CHECK(fn, val, res); \ + RUNTIME_CHECK(fn, val, res); \ + } while ( 0 ) + +#endif /* XEN_SELF_TESTS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:22:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734333.1140515 (Exim 4.92) (envelope-from ) id 1sDWBD-0001Im-CS; Sat, 01 Jun 2024 21:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734333.1140515; Sat, 01 Jun 2024 21: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 1sDWBD-0001Ie-9t; Sat, 01 Jun 2024 21:22:23 +0000 Received: by outflank-mailman (input) for mailman id 734333; Sat, 01 Jun 2024 21:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBC-0001IP-5e for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBC-0004br-4o for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWBC-0006sQ-3W for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=n5Vr74tnJbUSACLT+hHbfPyDPBS8VjWAuC4z53GPIaI=; b=QNT6JDDF0if7ES36SwMqJhXvXf 2+bs75S+BCPIw+yFmGyU+qicuFJnlVjYSEryH6jIc8ZXFAk7zxpYuw87oxeir/16ltzFhtuySLP7d wGreIv3ok/47JoJvvSOnA6RvaNNdh0vommsVUdzwRqK3mrDF3v6cD+fBRx4LvG5/8HwI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Implement generic_ffsl()/generic_flsl() in lib/ Message-Id: Date: Sat, 01 Jun 2024 21:22:22 +0000 commit 95ddb7e9b00c1d3ce38930e631c8892b6a137759 Author: Andrew Cooper AuthorDate: Fri May 24 13:36:25 2024 +0100 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement generic_ffsl()/generic_flsl() in lib/ generic_ffs()/generic_fls*( being static inline is the cause of lots of the complexity between the common and arch-specific bitops.h They appear to be static inline for constant-folding reasons (ARM), but there are better ways to achieve the same effect. It is presumptuous that an unrolled binary search is the right algorithm to use on all microarchitectures. Indeed, it's not for the eventual users, but that can be addressed at a later point. It is also nonsense to implement the int form as the base primitive and construct the long form from 2x int in 64-bit builds, when it's just one extra step to operate at the native register width. Therefore, implement generic_ffsl()/generic_flsl() in lib/. They're not actually needed in x86/ARM/PPC by the end of the cleanup (i.e. the functions will be dropped by the linker), and they're only expected be needed by RISC-V on hardware which lacks the Zbb extension. Implement generic_fls() in terms of generic_flsl() for now, but this will be cleaned up in due course. Provide basic runtime testing using __constructor inside the lib/ file. This is important, as it means testing runs if and only if generic_f?sl() are used elsewhere in Xen. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/bitops.h | 2 +- xen/arch/ppc/include/asm/bitops.h | 2 +- xen/include/xen/bitops.h | 89 +++------------------------------------ xen/lib/Makefile | 2 + xen/lib/generic-ffsl.c | 67 +++++++++++++++++++++++++++++ xen/lib/generic-flsl.c | 70 ++++++++++++++++++++++++++++++ 6 files changed, 146 insertions(+), 86 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index 6c5ec34e66..685abfafb2 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -150,7 +150,7 @@ static inline int fls(unsigned int x) int ret; if (__builtin_constant_p(x)) - return generic_fls(x); + return generic_flsl(x); asm("clz\t%"__OP32"0, %"__OP32"1" : "=r" (ret) : "r" (x)); return 32 - ret; diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index f984789e28..c8b11326ad 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -172,7 +172,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) } #define flsl(x) generic_flsl(x) -#define fls(x) generic_fls(x) +#define fls(x) generic_flsl(x) #define ffs(x) ({ unsigned int t_ = (x); fls(t_ & -t_); }) #define ffsl(x) ({ unsigned long t_ = (x); flsl(t_ & -t_); }) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 9b40f20381..218c346af2 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -15,91 +15,12 @@ (((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LLONG - 1 - (h)))) /* - * ffs: find first bit set. This is defined the same way as - * the libc and compiler builtin ffs routines, therefore - * differs in spirit from the above ffz (man ffs). - */ - -static inline int generic_ffs(unsigned int x) -{ - int r = 1; - - if (!x) - return 0; - if (!(x & 0xffff)) { - x >>= 16; - r += 16; - } - if (!(x & 0xff)) { - x >>= 8; - r += 8; - } - if (!(x & 0xf)) { - x >>= 4; - r += 4; - } - if (!(x & 3)) { - x >>= 2; - r += 2; - } - if (!(x & 1)) { - x >>= 1; - r += 1; - } - return r; -} - -/* - * fls: find last bit set. + * Find First/Last Set bit (all forms). + * + * Bits are labelled from 1. Returns 0 if given 0. */ - -static inline int generic_fls(unsigned int x) -{ - int r = 32; - - if (!x) - return 0; - if (!(x & 0xffff0000u)) { - x <<= 16; - r -= 16; - } - if (!(x & 0xff000000u)) { - x <<= 8; - r -= 8; - } - if (!(x & 0xf0000000u)) { - x <<= 4; - r -= 4; - } - if (!(x & 0xc0000000u)) { - x <<= 2; - r -= 2; - } - if (!(x & 0x80000000u)) { - x <<= 1; - r -= 1; - } - return r; -} - -#if BITS_PER_LONG == 64 - -static inline int generic_ffsl(unsigned long x) -{ - return !x || (u32)x ? generic_ffs(x) : generic_ffs(x >> 32) + 32; -} - -static inline int generic_flsl(unsigned long x) -{ - u32 h = x >> 32; - - return h ? generic_fls(h) + 32 : generic_fls(x); -} - -#else -# define generic_ffsl generic_ffs -# define generic_flsl generic_fls -#endif +unsigned int __pure generic_ffsl(unsigned long x); +unsigned int __pure generic_flsl(unsigned long x); /* * Include this here because some architectures need generic_ffs/fls in diff --git a/xen/lib/Makefile b/xen/lib/Makefile index e63798e1d4..a485415964 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -4,6 +4,8 @@ lib-y += bsearch.o lib-y += ctors.o lib-y += ctype.o lib-y += find-next-bit.o +lib-y += generic-ffsl.o +lib-y += generic-flsl.o lib-y += list-sort.o lib-y += memchr.o lib-y += memchr_inv.o diff --git a/xen/lib/generic-ffsl.c b/xen/lib/generic-ffsl.c new file mode 100644 index 0000000000..c9fb34ffcd --- /dev/null +++ b/xen/lib/generic-ffsl.c @@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +unsigned int generic_ffsl(unsigned long x) +{ + unsigned int r = 1; + + if ( !x ) + return 0; + + BUILD_BUG_ON(BITS_PER_LONG > 64); /* Extend me when necessary. */ + +#if BITS_PER_LONG > 32 + if ( !(x & 0xffffffffU) ) + { + x >>= 32; + r += 32; + } +#endif + if ( !(x & 0xffff) ) + { + x >>= 16; + r += 16; + } + if ( !(x & 0xff) ) + { + x >>= 8; + r += 8; + } + if ( !(x & 0xf) ) + { + x >>= 4; + r += 4; + } + if ( !(x & 3) ) + { + x >>= 2; + r += 2; + } + if ( !(x & 1) ) + { + x >>= 1; + r += 1; + } + + return r; +} + +#ifdef CONFIG_SELF_TESTS +static void __init __constructor test_generic_ffsl(void) +{ + RUNTIME_CHECK(generic_ffsl, 0, 0); + RUNTIME_CHECK(generic_ffsl, 1, 1); + RUNTIME_CHECK(generic_ffsl, 3, 1); + RUNTIME_CHECK(generic_ffsl, 7, 1); + RUNTIME_CHECK(generic_ffsl, 6, 2); + + RUNTIME_CHECK(generic_ffsl, 1UL << (BITS_PER_LONG - 1), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + RUNTIME_CHECK(generic_ffsl, 1UL << 32, 33); + RUNTIME_CHECK(generic_ffsl, 1UL << 63, 64); +#endif +} +#endif /* CONFIG_SELF_TESTS */ diff --git a/xen/lib/generic-flsl.c b/xen/lib/generic-flsl.c new file mode 100644 index 0000000000..8f44f670fb --- /dev/null +++ b/xen/lib/generic-flsl.c @@ -0,0 +1,70 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +/* Mask of type UL with the upper x bits set. */ +#define UPPER_MASK(x) (~0UL << (BITS_PER_LONG - (x))) + +unsigned int generic_flsl(unsigned long x) +{ + unsigned int r = BITS_PER_LONG; + + if ( !x ) + return 0; + + BUILD_BUG_ON(BITS_PER_LONG > 64); /* Extend me when necessary. */ + +#if BITS_PER_LONG > 32 + if ( !(x & UPPER_MASK(32)) ) + { + x <<= 32; + r -= 32; + } +#endif + if ( !(x & UPPER_MASK(16)) ) + { + x <<= 16; + r -= 16; + } + if ( !(x & UPPER_MASK(8)) ) + { + x <<= 8; + r -= 8; + } + if ( !(x & UPPER_MASK(4)) ) + { + x <<= 4; + r -= 4; + } + if ( !(x & UPPER_MASK(2)) ) + { + x <<= 2; + r -= 2; + } + if ( !(x & UPPER_MASK(1)) ) + { + x <<= 1; + r -= 1; + } + + return r; +} + +#ifdef CONFIG_SELF_TESTS +static void __init __constructor test_generic_flsl(void) +{ + RUNTIME_CHECK(generic_flsl, 0, 0); + RUNTIME_CHECK(generic_flsl, 1, 1); + RUNTIME_CHECK(generic_flsl, 3, 2); + RUNTIME_CHECK(generic_flsl, 7, 3); + RUNTIME_CHECK(generic_flsl, 6, 3); + + RUNTIME_CHECK(generic_flsl, 1 | (1UL << (BITS_PER_LONG - 1)), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + RUNTIME_CHECK(generic_flsl, 1 | (1UL << 32), 33); + RUNTIME_CHECK(generic_flsl, 1 | (1UL << 63), 64); +#endif +} +#endif /* CONFIG_SELF_TESTS */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:22:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734334.1140519 (Exim 4.92) (envelope-from ) id 1sDWBN-0001Li-Ea; Sat, 01 Jun 2024 21:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734334.1140519; Sat, 01 Jun 2024 21: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 1sDWBN-0001La-BQ; Sat, 01 Jun 2024 21:22:33 +0000 Received: by outflank-mailman (input) for mailman id 734334; Sat, 01 Jun 2024 21:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBM-0001LP-8t for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBM-0004c0-86 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWBM-0006sr-7A for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CX+5I37TDH2ICi/GqLkUqG/z6uxNabFfd6XjRgoJ7hg=; b=AQFAMDxyvFlDBlo3Qi2xcZ5hJ5 /1TL/WFsPSt75r//HwZ7xx7pylTN1sc7w37cWkTetlXIUUbj+lpgJ6CsX/6gCuT3mWGwtyuALVhv7 ppwjvbhwihFzxrlh2EhEhHkJRLRVudhFiuBLlI+18CRn6JQ4FudNmLJP7ORd8iolkwms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Implement ffs() in common logic Message-Id: Date: Sat, 01 Jun 2024 21:22:32 +0000 commit ef1dd8dff438444747997ae78b4dfa87b5fb9157 Author: Andrew Cooper AuthorDate: Wed Jan 31 18:31:16 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement ffs() in common logic Perform constant-folding unconditionally, rather than having it implemented inconsistency between architectures. Confirm the expected behaviour with compile time and boot time tests. For non-constant inputs, use arch_ffs() if provided but fall back to generic_ffsl() if not. In particular, RISC-V doesn't have a builtin that works in all configurations. For x86, rename ffs() to arch_ffs() and adjust the prototype. For PPC, __builtin_ctz() is 1/3 of the size of size of the transform to generic_fls(). Drop the definition entirely. ARM too benefits in the general case by using __builtin_ctz(), but less dramatically because it using optimised asm(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/bitops.h | 2 +- xen/arch/ppc/include/asm/bitops.h | 2 +- xen/arch/x86/include/asm/bitops.h | 3 ++- xen/common/Makefile | 1 + xen/common/bitops.c | 21 +++++++++++++++++++++ xen/include/xen/bitops.h | 17 +++++++++++++++++ 6 files changed, 43 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index 685abfafb2..3204d51af4 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -157,7 +157,7 @@ static inline int fls(unsigned int x) } -#define ffs(x) ({ unsigned int __t = (x); fls(ISOLATE_LSB(__t)); }) +#define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); }) /** diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index c8b11326ad..f4946c82c6 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -173,7 +173,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define flsl(x) generic_flsl(x) #define fls(x) generic_flsl(x) -#define ffs(x) ({ unsigned int t_ = (x); fls(t_ & -t_); }) +#define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define ffsl(x) ({ unsigned long t_ = (x); flsl(t_ & -t_); }) /** diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 674c48397f..13e3730138 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -418,7 +418,7 @@ static inline int ffsl(unsigned long x) return (int)r+1; } -static inline int ffs(unsigned int x) +static always_inline unsigned int arch_ffs(unsigned int x) { int r; @@ -428,6 +428,7 @@ static inline int ffs(unsigned int x) "1:" : "=r" (r) : "rm" (x)); return r + 1; } +#define arch_ffs arch_ffs /** * fls - find last bit set diff --git a/xen/common/Makefile b/xen/common/Makefile index d512cad524..f12a474d40 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_ARGO) += argo.o obj-y += bitmap.o +obj-bin-$(CONFIG_SELF_TESTS) += bitops.init.o obj-$(CONFIG_GENERIC_BUG_FRAME) += bug.o obj-$(CONFIG_HYPFS_CONFIG) += config_data.o obj-$(CONFIG_CORE_PARKING) += core_parking.o diff --git a/xen/common/bitops.c b/xen/common/bitops.c new file mode 100644 index 0000000000..1d3323effc --- /dev/null +++ b/xen/common/bitops.c @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include +#include +#include + +static void __init test_ffs(void) +{ + /* unsigned int ffs(unsigned int) */ + CHECK(ffs, 0, 0); + CHECK(ffs, 1, 1); + CHECK(ffs, 3, 1); + CHECK(ffs, 7, 1); + CHECK(ffs, 6, 2); + CHECK(ffs, 0x80000000U, 32); +} + +static void __init __constructor test_bitops(void) +{ + test_ffs(); +} diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 218c346af2..5fb31e42e4 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -31,6 +31,23 @@ unsigned int __pure generic_flsl(unsigned long x); #include +/* + * Find First/Last Set bit (all forms). + * + * Bits are labelled from 1. Returns 0 if given 0. + */ +static always_inline __pure unsigned int ffs(unsigned int x) +{ + if ( __builtin_constant_p(x) ) + return __builtin_ffs(x); + +#ifdef arch_ffs + return arch_ffs(x); +#else + return generic_ffsl(x); +#endif +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:22:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734335.1140523 (Exim 4.92) (envelope-from ) id 1sDWBX-0001PC-H2; Sat, 01 Jun 2024 21:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734335.1140523; Sat, 01 Jun 2024 21: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 1sDWBX-0001P4-EH; Sat, 01 Jun 2024 21:22:43 +0000 Received: by outflank-mailman (input) for mailman id 734335; Sat, 01 Jun 2024 21:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBW-0001Ol-C3 for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBW-0004cC-BG for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWBW-0006tI-AK for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wQk7I4AWh/hhuPvbfnNIOquJ9kZLQFXhwjhrvxwgITo=; b=XYrReOrFVN5UKd8jNcxnJBls3v bQPGmX7vXj4Dy5xXtXjbG6QaLfmy+xK9CarAbYxu5IhmJV7cmnaqapFjmRpxdBrxnqtn1gS8QJyVS yPPo+YHheZWowMQfdQAzxFitGv3bffd70QBjQlquJdrJILb/KQOZl+pZC+3FqtTu+bcQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/bitops: Improve arch_ffs() in the general case Message-Id: Date: Sat, 01 Jun 2024 21:22:42 +0000 commit 989e5f08d33e2642d25fd60d7b373d3d8ff39990 Author: Andrew Cooper AuthorDate: Thu Mar 14 23:31:11 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 x86/bitops: Improve arch_ffs() in the general case The asm in arch_ffs() is safe but inefficient. CMOV would be an improvement over a conditional branch, but for 64bit CPUs both Intel and AMD have provided enough details about the behaviour for a zero input. It is safe to pre-load the destination register with -1 and drop the conditional logic. However, it is common to find ffs() in a context where the optimiser knows that x is non-zero even if it the value isn't known precisely. In this case, it's safe to drop the preload of -1 too. There are only a handful of uses of ffs() in the x86 build, and all of them improve as a result of this: add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-92 (-92) Function old new delta mask_write 121 113 -8 xmem_pool_alloc 1076 1056 -20 test_bitops 390 358 -32 pt_update_contig_markers 1236 1204 -32 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/bitops.h | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 13e3730138..a8e70d7ed7 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -420,12 +420,39 @@ static inline int ffsl(unsigned long x) static always_inline unsigned int arch_ffs(unsigned int x) { - int r; + unsigned int r; + + if ( __builtin_constant_p(x > 0) && x > 0 ) + { + /* + * A common code pattern is: + * + * while ( bits ) + * { + * bit = ffs(bits); + * ... + * + * and the optimiser really can work with the knowledge of x being + * non-zero without knowing it's exact value, in which case we don't + * need to compensate for BSF's corner cases. Otherwise... + */ + asm ( "bsf %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + } + else + { + /* + * ... the AMD manual states that BSF won't modify the destination + * register if x=0. The Intel manual states that the result is + * undefined, but the architects have said that the register is + * written back with it's old value (zero extended as normal). + */ + asm ( "bsf %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); + } - asm ( "bsf %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); return r + 1; } #define arch_ffs arch_ffs -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:22:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734336.1140528 (Exim 4.92) (envelope-from ) id 1sDWBh-0001SH-Ip; Sat, 01 Jun 2024 21:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734336.1140528; Sat, 01 Jun 2024 21: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 1sDWBh-0001S5-Fh; Sat, 01 Jun 2024 21:22:53 +0000 Received: by outflank-mailman (input) for mailman id 734336; Sat, 01 Jun 2024 21:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBg-0001Rp-Ff for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBg-0004cL-Eu for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWBg-0006ts-DW for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KaM9NJWUGlbl0FDOa8Y+VZzVSWTn3CDprxz+x9BxhCQ=; b=3P049IcXFxZWCikmwRy+8rdBWR DYFCgqAc1u1j5eyj+i18yV2VCXoS2S1CLRe2Lh1P71DXNu6v3VT6HTjkiY4at56+oMOH78Oyy+1jk QP5KD2fqFLpDn+DfOo9U27JBETCtQNg9/3djLUnBMq+DbDQebfHLerqqR0+HBbHWWsIY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Implement ffsl() in common logic Message-Id: Date: Sat, 01 Jun 2024 21:22:52 +0000 commit 5ed26fc0768d4759f0eabe118b37a6f610c5ca5c Author: Andrew Cooper AuthorDate: Wed Jan 31 18:31:16 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement ffsl() in common logic ... just as with ffs() previously. Express the upper bound of the testing in terms of BITS_PER_LONG as it varies between architectures. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/bitops.h | 2 +- xen/arch/ppc/include/asm/bitops.h | 2 +- xen/arch/x86/include/asm/bitops.h | 35 ++++++++++++++++++----------------- xen/common/bitops.c | 13 +++++++++++++ xen/include/xen/bitops.h | 12 ++++++++++++ 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index 3204d51af4..d30ba44598 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -158,7 +158,7 @@ static inline int fls(unsigned int x) #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) -#define ffsl(x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); }) +#define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index f4946c82c6..761361291e 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -174,7 +174,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define flsl(x) generic_flsl(x) #define fls(x) generic_flsl(x) #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) -#define ffsl(x) ({ unsigned long t_ = (x); flsl(t_ & -t_); }) +#define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index a8e70d7ed7..90d892e1dd 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -401,23 +401,6 @@ static always_inline unsigned int __scanbit(unsigned long val, unsigned int max) r__; \ }) -/** - * ffs - find first bit set - * @x: the word to search - * - * This is defined the same way as the libc and compiler builtin ffs routines. - */ -static inline int ffsl(unsigned long x) -{ - long r; - - asm ( "bsf %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); - return (int)r+1; -} - static always_inline unsigned int arch_ffs(unsigned int x) { unsigned int r; @@ -457,6 +440,24 @@ static always_inline unsigned int arch_ffs(unsigned int x) } #define arch_ffs arch_ffs +static always_inline unsigned int arch_ffsl(unsigned long x) +{ + unsigned int r; + + /* See arch_ffs() for safety discussions. */ + if ( __builtin_constant_p(x > 0) && x > 0 ) + asm ( "bsf %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + else + asm ( "bsf %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); + + return r + 1; +} +#define arch_ffsl arch_ffsl + /** * fls - find last bit set * @x: the word to search diff --git a/xen/common/bitops.c b/xen/common/bitops.c index 1d3323effc..df0e9bacbc 100644 --- a/xen/common/bitops.c +++ b/xen/common/bitops.c @@ -13,6 +13,19 @@ static void __init test_ffs(void) CHECK(ffs, 7, 1); CHECK(ffs, 6, 2); CHECK(ffs, 0x80000000U, 32); + + /* unsigned int ffsl(unsigned long) */ + CHECK(ffsl, 0, 0); + CHECK(ffsl, 1, 1); + CHECK(ffsl, 3, 1); + CHECK(ffsl, 7, 1); + CHECK(ffsl, 6, 2); + + CHECK(ffsl, 1UL << (BITS_PER_LONG - 1), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + CHECK(ffsl, 1UL << 32, 33); + CHECK(ffsl, 1UL << 63, 64); +#endif } static void __init __constructor test_bitops(void) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 5fb31e42e4..5aa8d7aa5a 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -48,6 +48,18 @@ static always_inline __pure unsigned int ffs(unsigned int x) #endif } +static always_inline __pure unsigned int ffsl(unsigned long x) +{ + if ( __builtin_constant_p(x) ) + return __builtin_ffsl(x); + +#ifdef arch_ffs + return arch_ffsl(x); +#else + return generic_ffsl(x); +#endif +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:23:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734337.1140531 (Exim 4.92) (envelope-from ) id 1sDWBr-0001VA-Jx; Sat, 01 Jun 2024 21:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734337.1140531; Sat, 01 Jun 2024 21: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 1sDWBr-0001V3-HC; Sat, 01 Jun 2024 21:23:03 +0000 Received: by outflank-mailman (input) for mailman id 734337; Sat, 01 Jun 2024 21:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBq-0001Ur-Ie for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWBq-0004eb-Hm for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWBq-0006uS-HC for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z65Bbd3GnabGmHPo0XfqYriWV9e9aM2r4fzM27fo3uA=; b=KfwJcOtz+wh/2Sf+cQVo0UPo4p xqWoAMpK2IPzDg5hneE3UrIARIaWJ+iAst21wPLuuaBlDTKpimIN7hZGYjRTd0Nt8hScP/ekGVokb uXYTkdAV0akKjFtCxGxEx+4A5tUoMszdiVdCB8fkZnv16AkxTOoimqUiL4H0tm6TZKO4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Implement fls()/flsl() in common logic Message-Id: Date: Sat, 01 Jun 2024 21:23:02 +0000 commit 54b10ef6c810b3e0579b8efb6e5257d9f8969641 Author: Oleksii Kurochko AuthorDate: Fri May 24 16:49:53 2024 +0100 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Implement fls()/flsl() in common logic This is most easily done together because of how arm32 is currently structured, but it does just mirror the existing ffs()/ffsl() work. Introduce compile and boot time testing. Signed-off-by: Oleksii Kurochko Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/arm32/bitops.h | 2 -- xen/arch/arm/include/asm/arm64/bitops.h | 12 --------- xen/arch/arm/include/asm/bitops.h | 19 ++------------ xen/arch/ppc/include/asm/bitops.h | 4 +-- xen/arch/x86/include/asm/bitops.h | 46 +++++++++++++++++++-------------- xen/common/bitops.c | 25 ++++++++++++++++++ xen/include/xen/bitops.h | 24 +++++++++++++++++ 7 files changed, 80 insertions(+), 52 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/bitops.h b/xen/arch/arm/include/asm/arm32/bitops.h index d0309d47c1..0d7bb12d5c 100644 --- a/xen/arch/arm/include/asm/arm32/bitops.h +++ b/xen/arch/arm/include/asm/arm32/bitops.h @@ -1,8 +1,6 @@ #ifndef _ARM_ARM32_BITOPS_H #define _ARM_ARM32_BITOPS_H -#define flsl fls - /* * Little endian assembly bitops. nr = 0 -> byte 0 bit 0. */ diff --git a/xen/arch/arm/include/asm/arm64/bitops.h b/xen/arch/arm/include/asm/arm64/bitops.h index 906d84e5f2..a6135838dc 100644 --- a/xen/arch/arm/include/asm/arm64/bitops.h +++ b/xen/arch/arm/include/asm/arm64/bitops.h @@ -1,18 +1,6 @@ #ifndef _ARM_ARM64_BITOPS_H #define _ARM_ARM64_BITOPS_H -static inline int flsl(unsigned long x) -{ - uint64_t ret; - - if (__builtin_constant_p(x)) - return generic_flsl(x); - - asm("clz\t%0, %1" : "=r" (ret) : "r" (x)); - - return BITS_PER_LONG - ret; -} - /* Based on linux/include/asm-generic/bitops/find.h */ #ifndef CONFIG_GENERIC_FIND_FIRST_BIT diff --git a/xen/arch/arm/include/asm/bitops.h b/xen/arch/arm/include/asm/bitops.h index d30ba44598..8f4bdc09d1 100644 --- a/xen/arch/arm/include/asm/bitops.h +++ b/xen/arch/arm/include/asm/bitops.h @@ -140,25 +140,10 @@ static inline int test_bit(int nr, const volatile void *addr) return 1UL & (p[BITOP_WORD(nr)] >> (nr & (BITOP_BITS_PER_WORD-1))); } -/* - * On ARMv5 and above those functions can be implemented around - * the clz instruction for much better code efficiency. - */ - -static inline int fls(unsigned int x) -{ - int ret; - - if (__builtin_constant_p(x)) - return generic_flsl(x); - - asm("clz\t%"__OP32"0, %"__OP32"1" : "=r" (ret) : "r" (x)); - return 32 - ret; -} - - #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) +#define arch_fls(x) ((x) ? 32 - __builtin_clz(x) : 0) +#define arch_flsl(x) ((x) ? BITS_PER_LONG - __builtin_clzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index 761361291e..8119b5ace8 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -171,10 +171,10 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) return (old & mask) != 0; } -#define flsl(x) generic_flsl(x) -#define fls(x) generic_flsl(x) #define arch_ffs(x) ((x) ? 1 + __builtin_ctz(x) : 0) #define arch_ffsl(x) ((x) ? 1 + __builtin_ctzl(x) : 0) +#define arch_fls(x) ((x) ? 32 - __builtin_clz(x) : 0) +#define arch_flsl(x) ((x) ? BITS_PER_LONG - __builtin_clzl(x) : 0) /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 90d892e1dd..aa71542e7b 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -458,33 +458,41 @@ static always_inline unsigned int arch_ffsl(unsigned long x) } #define arch_ffsl arch_ffsl -/** - * fls - find last bit set - * @x: the word to search - * - * This is defined the same way as ffs. - */ -static inline int flsl(unsigned long x) +static always_inline unsigned int arch_fls(unsigned int x) { - long r; + unsigned int r; + + /* See arch_ffs() for safety discussions. */ + if ( __builtin_constant_p(x > 0) && x > 0 ) + asm ( "bsr %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + else + asm ( "bsr %[val], %[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); - asm ( "bsr %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); - return (int)r+1; + return r + 1; } +#define arch_fls arch_fls -static inline int fls(unsigned int x) +static always_inline unsigned int arch_flsl(unsigned long x) { - int r; + unsigned int r; + + /* See arch_ffs() for safety discussions. */ + if ( __builtin_constant_p(x > 0) && x > 0 ) + asm ( "bsr %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x) ); + else + asm ( "bsr %[val], %q[res]" + : [res] "=r" (r) + : [val] "rm" (x), "[res]" (-1) ); - asm ( "bsr %1,%0\n\t" - "jnz 1f\n\t" - "mov $-1,%0\n" - "1:" : "=r" (r) : "rm" (x)); return r + 1; } +#define arch_flsl arch_flsl /** * hweightN - returns the hamming weight of a N-bit word diff --git a/xen/common/bitops.c b/xen/common/bitops.c index df0e9bacbc..0e1cc1f509 100644 --- a/xen/common/bitops.c +++ b/xen/common/bitops.c @@ -28,7 +28,32 @@ static void __init test_ffs(void) #endif } +static void __init test_fls(void) +{ + /* unsigned int fls(unsigned int) */ + CHECK(fls, 0, 0); + CHECK(fls, 1, 1); + CHECK(fls, 3, 2); + CHECK(fls, 7, 3); + CHECK(fls, 6, 3); + CHECK(fls, 0x80000000U, 32); + + /* unsigned int flsl(unsigned long) */ + CHECK(flsl, 0, 0); + CHECK(flsl, 1, 1); + CHECK(flsl, 3, 2); + CHECK(flsl, 7, 3); + CHECK(flsl, 6, 3); + + CHECK(flsl, 1 | (1UL << (BITS_PER_LONG - 1)), BITS_PER_LONG); +#if BITS_PER_LONG > 32 + CHECK(flsl, 1 | (1UL << 32), 33); + CHECK(flsl, 1 | (1UL << 63), 64); +#endif +} + static void __init __constructor test_bitops(void) { test_ffs(); + test_fls(); } diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 5aa8d7aa5a..9f8d9eff11 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -60,6 +60,30 @@ static always_inline __pure unsigned int ffsl(unsigned long x) #endif } +static always_inline __pure unsigned int fls(unsigned int x) +{ + if ( __builtin_constant_p(x) ) + return x ? 32 - __builtin_clz(x) : 0; + +#ifdef arch_fls + return arch_fls(x); +#else + return generic_flsl(x); +#endif +} + +static always_inline __pure unsigned int flsl(unsigned long x) +{ + if ( __builtin_constant_p(x) ) + return x ? BITS_PER_LONG - __builtin_clzl(x) : 0; + +#ifdef arch_fls + return arch_flsl(x); +#else + return generic_flsl(x); +#endif +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:23:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734338.1140535 (Exim 4.92) (envelope-from ) id 1sDWC1-0001Xl-Lb; Sat, 01 Jun 2024 21:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734338.1140535; Sat, 01 Jun 2024 21: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 1sDWC1-0001Xe-In; Sat, 01 Jun 2024 21:23:13 +0000 Received: by outflank-mailman (input) for mailman id 734338; Sat, 01 Jun 2024 21:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWC0-0001XU-LT for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWC0-0004en-Kg for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWC0-0006v2-Jw for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tNGW+y7cUKwPZNcA+Hn9pLPgFItOtxPTc1UypRDKL+4=; b=GYcigT4LqFY4iyt9TS00AYGg4x tj21nAhs9eSrT3n6rJ2vS1gg6SLJxgz5w310koPv/uSUb416kKXi4XrVNWo7WpRWZH6qkQDHE6i7Q hmW5r/ubzwJlHGN+RWPqzRAb0+DidMkurLLAudMUf5ZhNaLGJORxBhYNLzSr0iVg8Na0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Clean up ffs64()/fls64() definitions Message-Id: Date: Sat, 01 Jun 2024 21:23:12 +0000 commit 04e70af5f240965ec0475caef813653e06782273 Author: Andrew Cooper AuthorDate: Sat Mar 9 02:44:56 2024 +0000 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Clean up ffs64()/fls64() definitions Implement ffs64() and fls64() as plain static inlines, dropping the ifdefary and intermediate generic_f?s64() forms. Add tests for all interesting bit positions at 32bit boundaries. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/common/bitops.c | 32 ++++++++++++++++++++++++++++++++ xen/include/xen/bitops.h | 42 ++++++++++++++++++++---------------------- 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/xen/common/bitops.c b/xen/common/bitops.c index 0e1cc1f509..94a8983af9 100644 --- a/xen/common/bitops.c +++ b/xen/common/bitops.c @@ -26,6 +26,22 @@ static void __init test_ffs(void) CHECK(ffsl, 1UL << 32, 33); CHECK(ffsl, 1UL << 63, 64); #endif + + /* + * unsigned int ffs64(uint64_t) + * + * 32-bit builds of Xen have to split this into two adjacent operations, + * so test all interesting bit positions across the divide. + */ + CHECK(ffs64, 0, 0); + CHECK(ffs64, 1, 1); + CHECK(ffs64, 3, 1); + CHECK(ffs64, 7, 1); + CHECK(ffs64, 6, 2); + + CHECK(ffs64, 0x8000000080000000ULL, 32); + CHECK(ffs64, 0x8000000100000000ULL, 33); + CHECK(ffs64, 0x8000000000000000ULL, 64); } static void __init test_fls(void) @@ -50,6 +66,22 @@ static void __init test_fls(void) CHECK(flsl, 1 | (1UL << 32), 33); CHECK(flsl, 1 | (1UL << 63), 64); #endif + + /* + * unsigned int fls64(uint64_t) + * + * 32-bit builds of Xen have to split this into two adjacent operations, + * so test all interesting bit positions across the divide. + */ + CHECK(fls64, 0, 0); + CHECK(fls64, 1, 1); + CHECK(fls64, 3, 2); + CHECK(fls64, 7, 3); + CHECK(fls64, 6, 3); + + CHECK(fls64, 0x0000000080000001ULL, 32); + CHECK(fls64, 0x0000000100000001ULL, 33); + CHECK(fls64, 0x8000000000000001ULL, 64); } static void __init __constructor test_bitops(void) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 9f8d9eff11..d216fead17 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -60,6 +60,14 @@ static always_inline __pure unsigned int ffsl(unsigned long x) #endif } +static always_inline __pure unsigned int ffs64(uint64_t x) +{ + if ( BITS_PER_LONG == 64 ) + return ffsl(x); + else + return !x || (uint32_t)x ? ffs(x) : ffs(x >> 32) + 32; +} + static always_inline __pure unsigned int fls(unsigned int x) { if ( __builtin_constant_p(x) ) @@ -84,6 +92,18 @@ static always_inline __pure unsigned int flsl(unsigned long x) #endif } +static always_inline __pure unsigned int fls64(uint64_t x) +{ + if ( BITS_PER_LONG == 64 ) + return flsl(x); + else + { + uint32_t h = x >> 32; + + return h ? fls(h) + 32 : fls(x); + } +} + /* --------------------- Please tidy below here --------------------- */ #ifndef find_next_bit @@ -134,28 +154,6 @@ extern unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size); #endif -#if BITS_PER_LONG == 64 -# define fls64 flsl -# define ffs64 ffsl -#else -# ifndef ffs64 -static inline int generic_ffs64(__u64 x) -{ - return !x || (__u32)x ? ffs(x) : ffs(x >> 32) + 32; -} -# define ffs64 generic_ffs64 -# endif -# ifndef fls64 -static inline int generic_fls64(__u64 x) -{ - __u32 h = x >> 32; - - return h ? fls(h) + 32 : fls(x); -} -# define fls64 generic_fls64 -# endif -#endif - static inline int get_bitmask_order(unsigned int count) { int order; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 01 21:23:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jun 2024 21:23:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734339.1140538 (Exim 4.92) (envelope-from ) id 1sDWCC-0001aW-Mt; Sat, 01 Jun 2024 21:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734339.1140538; Sat, 01 Jun 2024 21: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 1sDWCC-0001aO-KL; Sat, 01 Jun 2024 21:23:24 +0000 Received: by outflank-mailman (input) for mailman id 734339; Sat, 01 Jun 2024 21:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWCA-0001a4-OI for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDWCA-0004ex-NW for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDWCA-0006vT-Mj for xen-changelog@lists.xenproject.org; Sat, 01 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Pcz0ejBPIVYnwpmv4AsovWMCvUv+X7RZck6nuQtHiAk=; b=gCCk6HvViznpoQBxw3DWqBmK4w rOsSNXBdv/DJ1ZzeviNqw6E+3WckSRyIpAHe+6BxJpQHMA2A+5z4/PiCQsA2ZsafqRl/Q69d186+I 0m48cz97lKqWdNLZBNkxgIF1jB+b7DVt/jA6Y8QA+OeCy4bBTP8TGDuIIHg4hl5jLY/o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Rearrange the top of xen/bitops.h Message-Id: Date: Sat, 01 Jun 2024 21:23:22 +0000 commit 5f7606c048f7cca1a4301b321af70791c1d22378 Author: Andrew Cooper AuthorDate: Fri May 24 20:37:50 2024 +0100 Commit: Andrew Cooper CommitDate: Sat Jun 1 02:28:14 2024 +0100 xen/bitops: Rearrange the top of xen/bitops.h The #include can move to the top of the file now now that generic_ffs()/generic_fls() have been untangled. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/include/xen/bitops.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index d216fead17..6a5e28730a 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -4,6 +4,8 @@ #include #include +#include + /* * Create a contiguous bitmask starting at bit position @l and ending at * position @h. For example GENMASK(30, 21) gives us 0x7fe00000ul. @@ -22,20 +24,6 @@ unsigned int __pure generic_ffsl(unsigned long x); unsigned int __pure generic_flsl(unsigned long x); -/* - * Include this here because some architectures need generic_ffs/fls in - * scope - */ - -/* --------------------- Please tidy above here --------------------- */ - -#include - -/* - * Find First/Last Set bit (all forms). - * - * Bits are labelled from 1. Returns 0 if given 0. - */ static always_inline __pure unsigned int ffs(unsigned int x) { if ( __builtin_constant_p(x) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jun 02 06:55:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Jun 2024 06:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.734411.1140593 (Exim 4.92) (envelope-from ) id 1sDf7O-0001N2-4L; Sun, 02 Jun 2024 06:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 734411.1140593; Sun, 02 Jun 2024 06:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDf7O-0001Mp-1B; Sun, 02 Jun 2024 06:55:02 +0000 Received: by outflank-mailman (input) for mailman id 734411; Sun, 02 Jun 2024 06:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDf7N-0001MV-J3 for xen-changelog@lists.xenproject.org; Sun, 02 Jun 2024 06:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDf7N-0008WN-I6 for xen-changelog@lists.xenproject.org; Sun, 02 Jun 2024 06:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDf7N-00041y-GN for xen-changelog@lists.xenproject.org; Sun, 02 Jun 2024 06: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ltQV8KVOJ8BNvCiyhNCh4eXOKtlsI2Qf3HMTJUXr9O0=; b=UqTSADi+YZnS8tUBaTCRA3AnNe tFCbTBnx4bNR8tlJ28I116jx256zU4Qo0Qznr2U7jSJmu9LEfS680pG0VulP6BTXDpV4GFiFPhAZ2 jw4uSirQrjqjgTOAYYLNwwJTcuMKTu7dreZKzpi1ySweC9elqSaC2rETY7eeQLfSrzis=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: fix MISRA regressions on rule 20.9 and 20.12 Message-Id: Date: Sun, 02 Jun 2024 06:55:01 +0000 commit c2d5e63c7380c7cb435d00211b512c53accb528e Author: Nicola Vetrini AuthorDate: Sat Jun 1 12:16:56 2024 +0200 Commit: Andrew Cooper CommitDate: Sat Jun 1 15:32:13 2024 +0100 xen: fix MISRA regressions on rule 20.9 and 20.12 Commit ea59e7d780d9 ("xen/bitops: Cleanup and new infrastructure ahead of rearrangements") introduced new violations on previously clean rules 20.9 and 20.12 (clean on ARM only, right now). The first is introduced because CONFIG_CC_IS_CLANG in xen/self-tests.h is not defined in the configuration under analysis. Using "defined()" instead avoids relying on the preprocessor's behaviour upon encountering an undedfined identifier and addresses the violation. The violation of Rule 20.12 is due to "val" being used both as an ordinary argument in macro RUNTIME_CHECK, and as a stringification operator. No functional change. Fixes: ea59e7d780d9 ("xen/bitops: Cleanup and new infrastructure ahead of rearrangements") Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/deviations.ecl | 2 +- xen/include/xen/self-tests.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index cf62a874d9..447c1e6661 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -473,7 +473,7 @@ deliberate." -doc_begin="Uses of a macro parameter for ordinary expansion and as an operand to the # or ## operators within the following macros are deliberate, to provide useful diagnostic messages to the user." --config=MC3R1.R20.12,macros+={deliberate, "name(ASSERT||BUILD_BUG_ON||BUILD_BUG_ON_ZERO)"} +-config=MC3R1.R20.12,macros+={deliberate, "name(ASSERT||BUILD_BUG_ON||BUILD_BUG_ON_ZERO||RUNTIME_CHECK)"} -doc_end -doc_begin="The helper macro GENERATE_CASE may use a macro parameter for ordinary diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h index 8410db7aaa..42a4cc4d17 100644 --- a/xen/include/xen/self-tests.h +++ b/xen/include/xen/self-tests.h @@ -16,7 +16,7 @@ * Clang < 8 can't fold constants through static inlines, causing this to * fail. Simply skip it for incredibly old compilers. */ -#if !CONFIG_CC_IS_CLANG || CONFIG_CLANG_VERSION >= 80000 +#if !defined(CONFIG_CC_IS_CLANG) || CONFIG_CLANG_VERSION >= 80000 #define COMPILE_CHECK(fn, val, res) \ do { \ typeof(fn(val)) real = fn(val); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 10 08:44:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jun 2024 08:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.737058.1143180 (Exim 4.92) (envelope-from ) id 1sGadJ-0001jZ-7q; Mon, 10 Jun 2024 08:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 737058.1143180; Mon, 10 Jun 2024 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 1sGadJ-0001jQ-4H; Mon, 10 Jun 2024 08:44:05 +0000 Received: by outflank-mailman (input) for mailman id 737058; Mon, 10 Jun 2024 08:44:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGadH-0001jK-Hm for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 08:44:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGadH-0000uL-Es for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 08:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sGadH-0002Jk-D5 for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 08:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UJfn/71+eL1BLejVAxwM4OpSwH6NFGq9M1mmPj9c6CY=; b=6uXvI00/w4mxanD+K7nEoU3yEY hEQQLeEuykvO60ZrtMMBWiRkX4bDcZzq1GLmSnTx4OB4kjnkPaNvVM3Fd58qNdeD5edZKBiOkU+03 S31tWvDisZ+Y9S5ZxqwSjE3mKqxrdw01g+mZowgHJ40I1WEXAasfhQjdKozCJVtrmkUI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count Message-Id: Date: Mon, 10 Jun 2024 08:44:03 +0000 commit e63209d3ba2fd1b2f232babd14c9c679ffa7b09a Author: Roger Pau Monné AuthorDate: Mon Jun 10 10:33:22 2024 +0200 Commit: Jan Beulich CommitDate: Mon Jun 10 10:33:22 2024 +0200 x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count When adjusting move_cleanup_count to account for CPUs that are offline also adjust old_cpu_mask, otherwise further calls to fixup_irqs() could subtract those again and create an imbalance in move_cleanup_count. Fixes: 472e0b74c5c4 ('x86/IRQ: deal with move cleanup count state in fixup_irqs()') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e36e06deaa..d101ffeaf9 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2563,6 +2563,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) desc->arch.move_cleanup_count -= cpumask_weight(affinity); if ( !desc->arch.move_cleanup_count ) release_old_vec(desc); + else + /* + * Adjust old_cpu_mask to account for the offline CPUs, + * otherwise further calls to fixup_irqs() could subtract those + * again and possibly underflow the counter. + */ + cpumask_andnot(desc->arch.old_cpu_mask, desc->arch.old_cpu_mask, + affinity); } if ( !desc->action || cpumask_subset(desc->affinity, mask) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 10 08:44:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jun 2024 08:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.737059.1143183 (Exim 4.92) (envelope-from ) id 1sGadT-0001lO-95; Mon, 10 Jun 2024 08:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 737059.1143183; Mon, 10 Jun 2024 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 1sGadT-0001lE-5j; Mon, 10 Jun 2024 08:44:15 +0000 Received: by outflank-mailman (input) for mailman id 737059; Mon, 10 Jun 2024 08:44:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGadR-0001l6-Kl for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 08:44:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGadR-0000vy-JE for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 08:44:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sGadR-0002KC-H3 for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 08:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BzGo6RXz3XJtWBQktpzKneBqEL5AUd0yEbA54ZdxLgo=; b=n+/wuLcNdNmnicmU5Dfe6sg6++ 6DgG9n0Rwjua3iEKNdsmKulvq8vYsMnGLXRj5pFRMKPBL6eXX5XykVVeoTm/Cp+rtdE+QcbpXtgZv k/Mup+mNUFku8H7m7LR6p7ZEjcHxmp9KBMeaJpwbJmlWf8yPmu3YKJqc5Q88OlODMNd4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/domain: deviate violation of MISRA C Rule 20.12 Message-Id: Date: Mon, 10 Jun 2024 08:44:13 +0000 commit 0a5b2ca32c1506bbb0e636a2dfab7502a52fe136 Author: Nicola Vetrini AuthorDate: Mon Jun 10 10:34:05 2024 +0200 Commit: Jan Beulich CommitDate: Mon Jun 10 10:34:05 2024 +0200 x86/domain: deviate violation of MISRA C Rule 20.12 MISRA C Rule 20.12 states: "A macro parameter used as an operand to the # or ## operators, which is itself subject to further macro replacement, shall only be used as an operand to these operators". In this case, builds where CONFIG_COMPAT=y the fpu_ctxt macro is used both as a regular macro argument and as an operand for stringification in the expansion of CHECK_FIELD_. This is deviated using a SAF-x-safe comment. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- docs/misra/safe.json | 8 ++++++++ xen/arch/x86/domain.c | 1 + xen/arch/x86/domctl.c | 1 + 3 files changed, 10 insertions(+) diff --git a/docs/misra/safe.json b/docs/misra/safe.json index 9b13bcf717..c213e0a0be 100644 --- a/docs/misra/safe.json +++ b/docs/misra/safe.json @@ -52,6 +52,14 @@ }, { "id": "SAF-6-safe", + "analyser": { + "eclair": "MC3R1.R20.12" + }, + "name": "MC3R1.R20.12: use of a macro argument that deliberately violates the Rule", + "text": "A macro parameter that is itself a macro is intentionally used within the macro both as a regular parameter and for text replacement." + }, + { + "id": "SAF-7-safe", "analyser": {}, "name": "Sentinel", "text": "Next ID to be used" diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 536542841e..ccadfe0c9e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1084,6 +1084,7 @@ void arch_domain_creation_finished(struct domain *d) #ifdef CONFIG_COMPAT #define xen_vcpu_guest_context vcpu_guest_context #define fpu_ctxt fpu_ctxt.x +/* SAF-6-safe Rule 20.12 expansion of macro fpu_ctxt with CONFIG_COMPAT */ CHECK_FIELD_(struct, vcpu_guest_context, fpu_ctxt); #undef fpu_ctxt #undef xen_vcpu_guest_context diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9a72d57333..335aedf46d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1326,6 +1326,7 @@ long arch_do_domctl( #ifdef CONFIG_COMPAT #define xen_vcpu_guest_context vcpu_guest_context #define fpu_ctxt fpu_ctxt.x +/* SAF-6-safe Rule 20.12 expansion of macro fpu_ctxt with CONFIG_COMPAT */ CHECK_FIELD_(struct, vcpu_guest_context, fpu_ctxt); #undef fpu_ctxt #undef xen_vcpu_guest_context -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 10 11:33:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jun 2024 11:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.737194.1143376 (Exim 4.92) (envelope-from ) id 1sGdGq-0008NF-VQ; Mon, 10 Jun 2024 11:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 737194.1143376; Mon, 10 Jun 2024 11:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGdGq-0008N7-SS; Mon, 10 Jun 2024 11:33:04 +0000 Received: by outflank-mailman (input) for mailman id 737194; Mon, 10 Jun 2024 11:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGdGp-0008N1-L9 for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 11:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGdGp-0004rS-HV for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 11:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sGdGp-0003YG-GV for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IG3T+kn+nkqvQ+N5ekYsowf4vBU2Kp6tzzZL1ULGxQA=; b=pKXYpcXBI+hhNl8T/ztF/ytoQ1 o7J9thzp6U3lh5gkEIdWYAjGzAothfTQP+40ZUGVs/Hi6KY8BLM6stHGhZ1Aa+eqNmAR2u6HNx+cP MbunEGX2ibyqpr4aDdVJIE+Qb5+S4zACjpzU3YQ8RMtMcLYSXQisCcLvY7l1HSYMARuk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pvh: declare PVH dom0 supported with caveats Message-Id: Date: Mon, 10 Jun 2024 11:33:03 +0000 commit ea1cb444c28ce3ae7915d9c94c4344f4bf6d87d3 Author: Roger Pau Monné AuthorDate: Mon Jun 10 13:29:25 2024 +0200 Commit: Jan Beulich CommitDate: Mon Jun 10 13:29:25 2024 +0200 x86/pvh: declare PVH dom0 supported with caveats PVH dom0 is functionally very similar to PVH domU except for the domain builder and the added set of hypercalls available to it. The main concern with declaring it "Supported" is the lack of some features when compared to classic PV dom0, hence switch it's status to supported with caveats. List the known missing features, there might be more features missing or not working as expected apart from the ones listed. Note there's some (limited) PVH dom0 testing on both osstest and gitlab. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + SUPPORT.md | 15 ++++++++++++++- xen/arch/x86/hvm/dom0_build.c | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 201478aa1c..1778419cae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - HVM PIRQs are disabled by default. - Reduce IOMMU setup time for hardware domain. - Allow HVM/PVH domains to map foreign pages. + - Declare PVH dom0 supported with caveats. - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. - Increase the maximum number of CPUs Xen can be built for from 4095 to 16383. diff --git a/SUPPORT.md b/SUPPORT.md index d5d60c62ec..711aacf346 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -161,7 +161,20 @@ Requires hardware virtualisation support (Intel VMX / AMD SVM). Dom0 support requires an IOMMU (Intel VT-d / AMD IOMMU). Status, domU: Supported - Status, dom0: Experimental + Status, dom0: Supported, with caveats + +PVH dom0 hasn't received the same test coverage as PV dom0, so it can exhibit +unexpected behavior or issues on some hardware. + +At least the following features are missing on a PVH dom0: + + * PCI SR-IOV and Resizable BARs. + + * Native NMI forwarding (nmi=dom0 command line option). + + * MCE handling. + + * PCI Passthrough to any kind of domUs. ### ARM diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 6acbaceb94..f3eddb6846 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -1360,7 +1360,6 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, print_e820_memory_map(d->arch.e820, d->arch.nr_e820); } - printk("WARNING: PVH is an experimental mode with limited functionality\n"); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 10 23:11:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jun 2024 23:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.737572.1143939 (Exim 4.92) (envelope-from ) id 1sGoAJ-0001bK-VP; Mon, 10 Jun 2024 23:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 737572.1143939; Mon, 10 Jun 2024 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 1sGoAJ-0001bC-Su; Mon, 10 Jun 2024 23:11:03 +0000 Received: by outflank-mailman (input) for mailman id 737572; Mon, 10 Jun 2024 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 1sGoAI-0001b6-5a for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 23:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGoAI-0002aA-3F for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 23:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sGoAI-000540-10 for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SEiZIYUSGX82GPyLO8haknCcvMiHUvV7uf0A/fNzJwk=; b=GyF+7IyF+CYAgzuDW9yb2Mk6/x D9KzjpFjVQEQ8ckY6/8FMdIjajQlIcAk/zRLV2YWaWJkqRBUgFB8xn26jaa+i0vEOP+FSqbE6cbxl Bzs64e8aJ8VL7pgnoWOVaal29tZ9siiAlh9hdXpx+FEMYhm8sLyVdcPc7ISEMnZYrH3I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count Message-Id: Date: Mon, 10 Jun 2024 23:11:02 +0000 commit e63209d3ba2fd1b2f232babd14c9c679ffa7b09a Author: Roger Pau Monné AuthorDate: Mon Jun 10 10:33:22 2024 +0200 Commit: Jan Beulich CommitDate: Mon Jun 10 10:33:22 2024 +0200 x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count When adjusting move_cleanup_count to account for CPUs that are offline also adjust old_cpu_mask, otherwise further calls to fixup_irqs() could subtract those again and create an imbalance in move_cleanup_count. Fixes: 472e0b74c5c4 ('x86/IRQ: deal with move cleanup count state in fixup_irqs()') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e36e06deaa..d101ffeaf9 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2563,6 +2563,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) desc->arch.move_cleanup_count -= cpumask_weight(affinity); if ( !desc->arch.move_cleanup_count ) release_old_vec(desc); + else + /* + * Adjust old_cpu_mask to account for the offline CPUs, + * otherwise further calls to fixup_irqs() could subtract those + * again and possibly underflow the counter. + */ + cpumask_andnot(desc->arch.old_cpu_mask, desc->arch.old_cpu_mask, + affinity); } if ( !desc->action || cpumask_subset(desc->affinity, mask) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 10 23:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jun 2024 23:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.737573.1143944 (Exim 4.92) (envelope-from ) id 1sGoAU-0001cx-0q; Mon, 10 Jun 2024 23:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 737573.1143944; Mon, 10 Jun 2024 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 1sGoAT-0001cp-UQ; Mon, 10 Jun 2024 23:11:13 +0000 Received: by outflank-mailman (input) for mailman id 737573; Mon, 10 Jun 2024 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 1sGoAS-0001ch-8n for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 23:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGoAS-0002aP-6v for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 23:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sGoAS-00054f-5X for xen-changelog@lists.xenproject.org; Mon, 10 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ResyEwmBZSidqiXqBcAlo8msZc9G04X73Kkw59ZdXo8=; b=Zki2CXAkAHAXmSmIE8YoRSlOVc BNwoz+ormMXFRHUK7XMV4VpgqKHPGXe/3KPmLLbV4FTY6hVQ0rlmGJS+IK96dek3nD62QeoUgjM1V zvdn2iiefXgtiFlLvlbf4XM384RMg/pR1NBQfiakVlWO9PR88t19oP1ZwMhURIozCSC0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/domain: deviate violation of MISRA C Rule 20.12 Message-Id: Date: Mon, 10 Jun 2024 23:11:12 +0000 commit 0a5b2ca32c1506bbb0e636a2dfab7502a52fe136 Author: Nicola Vetrini AuthorDate: Mon Jun 10 10:34:05 2024 +0200 Commit: Jan Beulich CommitDate: Mon Jun 10 10:34:05 2024 +0200 x86/domain: deviate violation of MISRA C Rule 20.12 MISRA C Rule 20.12 states: "A macro parameter used as an operand to the # or ## operators, which is itself subject to further macro replacement, shall only be used as an operand to these operators". In this case, builds where CONFIG_COMPAT=y the fpu_ctxt macro is used both as a regular macro argument and as an operand for stringification in the expansion of CHECK_FIELD_. This is deviated using a SAF-x-safe comment. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- docs/misra/safe.json | 8 ++++++++ xen/arch/x86/domain.c | 1 + xen/arch/x86/domctl.c | 1 + 3 files changed, 10 insertions(+) diff --git a/docs/misra/safe.json b/docs/misra/safe.json index 9b13bcf717..c213e0a0be 100644 --- a/docs/misra/safe.json +++ b/docs/misra/safe.json @@ -52,6 +52,14 @@ }, { "id": "SAF-6-safe", + "analyser": { + "eclair": "MC3R1.R20.12" + }, + "name": "MC3R1.R20.12: use of a macro argument that deliberately violates the Rule", + "text": "A macro parameter that is itself a macro is intentionally used within the macro both as a regular parameter and for text replacement." + }, + { + "id": "SAF-7-safe", "analyser": {}, "name": "Sentinel", "text": "Next ID to be used" diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 536542841e..ccadfe0c9e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1084,6 +1084,7 @@ void arch_domain_creation_finished(struct domain *d) #ifdef CONFIG_COMPAT #define xen_vcpu_guest_context vcpu_guest_context #define fpu_ctxt fpu_ctxt.x +/* SAF-6-safe Rule 20.12 expansion of macro fpu_ctxt with CONFIG_COMPAT */ CHECK_FIELD_(struct, vcpu_guest_context, fpu_ctxt); #undef fpu_ctxt #undef xen_vcpu_guest_context diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9a72d57333..335aedf46d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1326,6 +1326,7 @@ long arch_do_domctl( #ifdef CONFIG_COMPAT #define xen_vcpu_guest_context vcpu_guest_context #define fpu_ctxt fpu_ctxt.x +/* SAF-6-safe Rule 20.12 expansion of macro fpu_ctxt with CONFIG_COMPAT */ CHECK_FIELD_(struct, vcpu_guest_context, fpu_ctxt); #undef fpu_ctxt #undef xen_vcpu_guest_context -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 11 06:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Jun 2024 06:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.737877.1144368 (Exim 4.92) (envelope-from ) id 1sGutO-00036q-U1; Tue, 11 Jun 2024 06:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 737877.1144368; Tue, 11 Jun 2024 06: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 1sGutO-00036i-RC; Tue, 11 Jun 2024 06:22:02 +0000 Received: by outflank-mailman (input) for mailman id 737877; Tue, 11 Jun 2024 06:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGutO-00036Z-7p for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 06:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sGutO-0002qP-6F for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 06:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sGutO-0003z1-43 for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 06: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zJO37ncej1uU2YQgUsT+XN/lU4JgFhE2PKLMxuEv5YI=; b=aYddV9pF18MllJI+pVXbtxlG0n PerkcnnVkVqI6McuftWhuwuwtdnGTfL7cJY5RFCfyxPWLgFwt4l9c3l2TgyyJRmTJnYKusYoHSJLS CZVNIQWGRc7iHwS1yPAMjqI47C0OcadqpiMi9ytcQqtJC+XNbr4/Msnq7ArP1zYKDz7Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pvh: declare PVH dom0 supported with caveats Message-Id: Date: Tue, 11 Jun 2024 06:22:02 +0000 commit ea1cb444c28ce3ae7915d9c94c4344f4bf6d87d3 Author: Roger Pau Monné AuthorDate: Mon Jun 10 13:29:25 2024 +0200 Commit: Jan Beulich CommitDate: Mon Jun 10 13:29:25 2024 +0200 x86/pvh: declare PVH dom0 supported with caveats PVH dom0 is functionally very similar to PVH domU except for the domain builder and the added set of hypercalls available to it. The main concern with declaring it "Supported" is the lack of some features when compared to classic PV dom0, hence switch it's status to supported with caveats. List the known missing features, there might be more features missing or not working as expected apart from the ones listed. Note there's some (limited) PVH dom0 testing on both osstest and gitlab. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + SUPPORT.md | 15 ++++++++++++++- xen/arch/x86/hvm/dom0_build.c | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 201478aa1c..1778419cae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - HVM PIRQs are disabled by default. - Reduce IOMMU setup time for hardware domain. - Allow HVM/PVH domains to map foreign pages. + - Declare PVH dom0 supported with caveats. - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. - Increase the maximum number of CPUs Xen can be built for from 4095 to 16383. diff --git a/SUPPORT.md b/SUPPORT.md index d5d60c62ec..711aacf346 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -161,7 +161,20 @@ Requires hardware virtualisation support (Intel VMX / AMD SVM). Dom0 support requires an IOMMU (Intel VT-d / AMD IOMMU). Status, domU: Supported - Status, dom0: Experimental + Status, dom0: Supported, with caveats + +PVH dom0 hasn't received the same test coverage as PV dom0, so it can exhibit +unexpected behavior or issues on some hardware. + +At least the following features are missing on a PVH dom0: + + * PCI SR-IOV and Resizable BARs. + + * Native NMI forwarding (nmi=dom0 command line option). + + * MCE handling. + + * PCI Passthrough to any kind of domUs. ### ARM diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 6acbaceb94..f3eddb6846 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -1360,7 +1360,6 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, print_e820_memory_map(d->arch.e820, d->arch.nr_e820); } - printk("WARNING: PVH is an experimental mode with limited functionality\n"); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 11 12:55:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Jun 2024 12:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.738372.1145112 (Exim 4.92) (envelope-from ) id 1sH11l-0002qn-HT; Tue, 11 Jun 2024 12:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 738372.1145112; Tue, 11 Jun 2024 12: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 1sH11l-0002qf-Eq; Tue, 11 Jun 2024 12:55:05 +0000 Received: by outflank-mailman (input) for mailman id 738372; Tue, 11 Jun 2024 12:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sH11j-0002qZ-TL for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 12:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sH11j-0002Sq-QB for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 12:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sH11j-0003KJ-Bb for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QijiNf2nxu5ouLMQe2B9wuzW/MG+C/BEfD/e9qjMC3c=; b=M+Tk747wkVRIFSriYYogJ9M1/X U7ZwCwp/OFr8kNwjuOUqsaSaKwmLYNVljYM7fDtW205MYEX7bHKb/G+5ILa+DBkmIDDuNHBLUNiYe 8mUDw3Fh8/4y5Ri8pr/+owTmdwV+MtvWvwrr0c/HYjc7hZ4sxrZiCX/6jMK1hcqopLwY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: add a test for HVM domU on PVH dom0 Message-Id: Date: Tue, 11 Jun 2024 12:55:03 +0000 commit 43de96a70f00b631d0f4c658c232204079b2f2b2 Author: Marek Marczykowski-Górecki AuthorDate: Mon Jun 10 15:32:09 2024 +0200 Commit: Andrew Cooper CommitDate: Tue Jun 11 12:06:46 2024 +0100 automation: add a test for HVM domU on PVH dom0 This tests if QEMU works in PVH dom0. QEMU in dom0 requires enabling TUN in the kernel, so do that too. Add it to both x86 runners, similar to the PVH domU test. Signed-off-by: Marek Marczykowski-Górecki Release-Acked-By: Oleksii Kurochko Acked-by: Andrew Cooper --- automation/gitlab-ci/test.yaml | 16 ++++++++++++++++ automation/scripts/qubes-x86-64.sh | 19 ++++++++++++++++--- automation/tests-artifacts/kernel/6.1.19.dockerfile | 1 + 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 902139e148..898d2adc8c 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -175,6 +175,14 @@ adl-smoke-x86-64-dom0pvh-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +adl-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .adl-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 + adl-suspend-x86-64-gcc-debug: extends: .adl-x86-64 script: @@ -215,6 +223,14 @@ zen3p-smoke-x86-64-dom0pvh-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .zen3p-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 + zen3p-pci-hvm-x86-64-gcc-debug: extends: .zen3p-x86-64 script: diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index d81ed7b931..bfa60c912a 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -19,8 +19,8 @@ vif = [ "bridge=xenbr0", ] disk = [ ] ' -### test: smoke test & smoke test PVH -if [ -z "${test_variant}" ] || [ "${test_variant}" = "dom0pvh" ]; then +### test: smoke test & smoke test PVH & smoke test HVM +if [ -z "${test_variant}" ] || [ "${test_variant}" = "dom0pvh" ] || [ "${test_variant}" = "dom0pvh-hvm" ]; then passed="ping test passed" domU_check=" ifconfig eth0 192.168.0.2 @@ -37,10 +37,23 @@ done set -x echo \"${passed}\" " -if [ "${test_variant}" = "dom0pvh" ]; then +if [ "${test_variant}" = "dom0pvh" ] || [ "${test_variant}" = "dom0pvh-hvm" ]; then extra_xen_opts="dom0=pvh" fi +if [ "${test_variant}" = "dom0pvh-hvm" ]; then + domU_config=' +type = "hvm" +name = "domU" +kernel = "/boot/vmlinuz" +ramdisk = "/boot/initrd-domU" +extra = "root=/dev/ram0 console=hvc0" +memory = 512 +vif = [ "bridge=xenbr0", ] +disk = [ ] +' +fi + ### test: S3 elif [ "${test_variant}" = "s3" ]; then passed="suspend test passed" diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile index 3a4096780d..021bde26c7 100644 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ b/automation/tests-artifacts/kernel/6.1.19.dockerfile @@ -32,6 +32,7 @@ RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSI 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 && \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 11 16:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Jun 2024 16:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.738629.1145442 (Exim 4.92) (envelope-from ) id 1sH45Q-0005YI-As; Tue, 11 Jun 2024 16:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 738629.1145442; Tue, 11 Jun 2024 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 1sH45Q-0005YA-8H; Tue, 11 Jun 2024 16:11:04 +0000 Received: by outflank-mailman (input) for mailman id 738629; Tue, 11 Jun 2024 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 1sH45P-0005Wg-Mo for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 16:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sH45P-0006MS-Lh for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 16:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sH45P-0006aI-Jt for xen-changelog@lists.xenproject.org; Tue, 11 Jun 2024 16: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fHl3Dzr5BwNWiw/WXDaefiE4qql94IZzux2rHk4utYE=; b=MXUZxEJPIzLQ9radhAsbw5rpjO rlvnHdTH9vKlfLQbPOSs6UbO5Oi8pmOU6PcKGU7wmL4/MlNkcYmBeHIXIP5aRNegS9dbPypYp1u63 Ca7c7scXWHlsfuTznCYy6pymzK5Chg5mg6Smz9iUYyXyrXyPJKUAyDSl5jZfj7pJV2pE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Update FreeBSD to 13.3 Message-Id: Date: Tue, 11 Jun 2024 16:11:03 +0000 commit 5ea7f2c9d7a1334b3b2bd5f67fab4d447b60613d Author: Andrew Cooper AuthorDate: Tue Jun 11 12:59:12 2024 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 11 17:00:10 2024 +0100 CI: Update FreeBSD to 13.3 Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d0a9021a77..c431d8d244 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,7 @@ freebsd_template: &FREEBSD_TEMPLATE task: name: 'FreeBSD 13' freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-3 << : *FREEBSD_TEMPLATE task: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 00:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 00:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.738788.1145646 (Exim 4.92) (envelope-from ) id 1sHBkY-00048K-W9; Wed, 12 Jun 2024 00:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 738788.1145646; Wed, 12 Jun 2024 00: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 1sHBkY-00048C-TT; Wed, 12 Jun 2024 00:22:02 +0000 Received: by outflank-mailman (input) for mailman id 738788; Wed, 12 Jun 2024 00:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHBkX-000482-F1 for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 00:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHBkX-0000Ez-Dv for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 00:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHBkX-0004Wo-CB for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=habmUbXDoP1m2HJlL0BRdHdpc2ep9iB8mH+A3hLTXCE=; b=u2FxD6I04lbcurH+7Zh4GI+jgi vSthCLZpLMMW5jDcTSr/+XL+6gdW8z2lsgh8yeYYNfBPH2JZ9Nq5MdOqamJrZO/oqltdkWnGIv6TY +wft+21Y9ou+eWYOnDArONemgStSaD2Df/Kl+8gSMSgbaDHfXdlxv5KsPRww/LMml12U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: add a test for HVM domU on PVH dom0 Message-Id: Date: Wed, 12 Jun 2024 00:22:01 +0000 commit 43de96a70f00b631d0f4c658c232204079b2f2b2 Author: Marek Marczykowski-Górecki AuthorDate: Mon Jun 10 15:32:09 2024 +0200 Commit: Andrew Cooper CommitDate: Tue Jun 11 12:06:46 2024 +0100 automation: add a test for HVM domU on PVH dom0 This tests if QEMU works in PVH dom0. QEMU in dom0 requires enabling TUN in the kernel, so do that too. Add it to both x86 runners, similar to the PVH domU test. Signed-off-by: Marek Marczykowski-Górecki Release-Acked-By: Oleksii Kurochko Acked-by: Andrew Cooper --- automation/gitlab-ci/test.yaml | 16 ++++++++++++++++ automation/scripts/qubes-x86-64.sh | 19 ++++++++++++++++--- automation/tests-artifacts/kernel/6.1.19.dockerfile | 1 + 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 902139e148..898d2adc8c 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -175,6 +175,14 @@ adl-smoke-x86-64-dom0pvh-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +adl-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .adl-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 + adl-suspend-x86-64-gcc-debug: extends: .adl-x86-64 script: @@ -215,6 +223,14 @@ zen3p-smoke-x86-64-dom0pvh-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug: + extends: .zen3p-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 + zen3p-pci-hvm-x86-64-gcc-debug: extends: .zen3p-x86-64 script: diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index d81ed7b931..bfa60c912a 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -19,8 +19,8 @@ vif = [ "bridge=xenbr0", ] disk = [ ] ' -### test: smoke test & smoke test PVH -if [ -z "${test_variant}" ] || [ "${test_variant}" = "dom0pvh" ]; then +### test: smoke test & smoke test PVH & smoke test HVM +if [ -z "${test_variant}" ] || [ "${test_variant}" = "dom0pvh" ] || [ "${test_variant}" = "dom0pvh-hvm" ]; then passed="ping test passed" domU_check=" ifconfig eth0 192.168.0.2 @@ -37,10 +37,23 @@ done set -x echo \"${passed}\" " -if [ "${test_variant}" = "dom0pvh" ]; then +if [ "${test_variant}" = "dom0pvh" ] || [ "${test_variant}" = "dom0pvh-hvm" ]; then extra_xen_opts="dom0=pvh" fi +if [ "${test_variant}" = "dom0pvh-hvm" ]; then + domU_config=' +type = "hvm" +name = "domU" +kernel = "/boot/vmlinuz" +ramdisk = "/boot/initrd-domU" +extra = "root=/dev/ram0 console=hvc0" +memory = 512 +vif = [ "bridge=xenbr0", ] +disk = [ ] +' +fi + ### test: S3 elif [ "${test_variant}" = "s3" ]; then passed="suspend test passed" diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile index 3a4096780d..021bde26c7 100644 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ b/automation/tests-artifacts/kernel/6.1.19.dockerfile @@ -32,6 +32,7 @@ RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSI 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 && \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 08:55:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 08:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.738994.1145885 (Exim 4.92) (envelope-from ) id 1sHJl3-000531-18; Wed, 12 Jun 2024 08:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 738994.1145885; Wed, 12 Jun 2024 08: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 1sHJl2-00052t-Uu; Wed, 12 Jun 2024 08:55:04 +0000 Received: by outflank-mailman (input) for mailman id 738994; Wed, 12 Jun 2024 08:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHJl2-00052n-3f for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 08:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHJl2-0001u7-04 for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 08:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHJl1-0004BO-UT for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 08: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=A10MuAlG7CIwYyZMWysrOwYUYddNvTMUi2yazFmzwd0=; b=keo8k2BAcioq61GNaHMOE5ScBt rKicrOT477vJgXRMVxwXXSrwqH2p/PQQRqKm2IFH22x4VSFy/C9k4YEC9jg2E+W1ur9YMeoyn/TKK un+B06Bz03/b1C5CCGR+x49ZuUe3eHS8FiHoko6O8Z+W1qBrjpYbRFUBsmhy5HNOg8dI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: add me as scheduler maintainer Message-Id: Date: Wed, 12 Jun 2024 08:55:03 +0000 commit d05d97c090889c0424f4f63c90e7035da5a42948 Author: Juergen Gross AuthorDate: Wed Jun 12 10:52:22 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 10:52:22 2024 +0200 MAINTAINERS: add me as scheduler maintainer I've been active in the scheduling code since many years now. Add me as a maintainer. Signed-off-by: Juergen Gross Reviewed-by: George Dunlap --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6ba7d2765f..cc40c0be9d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -490,6 +490,7 @@ F: xen/common/sched/rt.c SCHEDULING M: George Dunlap M: Dario Faggioli +M: Juergen Gross S: Supported F: xen/common/sched/ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 08:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 08:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.738995.1145890 (Exim 4.92) (envelope-from ) id 1sHJlD-00054t-2b; Wed, 12 Jun 2024 08:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 738995.1145890; Wed, 12 Jun 2024 08: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 1sHJlD-00054l-04; Wed, 12 Jun 2024 08:55:15 +0000 Received: by outflank-mailman (input) for mailman id 738995; Wed, 12 Jun 2024 08:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHJlC-00054f-3f for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 08:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHJlC-0001uF-2w for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 08:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHJlC-0004Bz-24 for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 08: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fSIWiAH0Q4kvYbudOZcR2cjX5kJSwRISIYXxmIQ/KlE=; b=5T6blbUKox14MmiHJ7E5S+is9b 7sgmxDRhmC/QXTzlYbz0XiglSYDBhoNVLWr4z5fvToMTuufS8sTfCV80pRaRVJ7Qi7hWLgSm8f60n siERKpHTwZTV/+U3Sz7Z0COtR+pwa+ZQugcrYoLsHI8JORPDNE8w8OE0nRfpWOIEWXDI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: alter EFI section Message-Id: Date: Wed, 12 Jun 2024 08:55:14 +0000 commit b0e5352c600ce42f109ddb43a4233ac2c9e0abbd Author: Jan Beulich AuthorDate: Wed Jun 12 10:52:56 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 10:52:56 2024 +0200 MAINTAINERS: alter EFI section To get past the recurring friction on the approach to take wrt workarounds needed for various firmware flaws, I'm stepping down as the maintainer of our code interfacing with EFI firmware. Two new maintainers are being introduced in my place. Signed-off-by: Jan Beulich Acked-by: Marek Marczykowski Acked-by: Daniel P. Smith Release-Acked-by: Oleksii Kurochko --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index cc40c0be9d..8e2b30a345 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -308,7 +308,9 @@ F: automation/eclair_analysis/ F: automation/scripts/eclair EFI -M: Jan Beulich +M: Daniel P. Smith +M: Marek Marczykowski-Górecki +R: Jan Beulich S: Supported F: xen/arch/x86/efi/ F: xen/arch/x86/include/asm/efi*.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 10:44:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 10:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739173.1146134 (Exim 4.92) (envelope-from ) id 1sHLSV-0005ce-Jd; Wed, 12 Jun 2024 10:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739173.1146134; Wed, 12 Jun 2024 10:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHLSV-0005cW-Gx; Wed, 12 Jun 2024 10:44:03 +0000 Received: by outflank-mailman (input) for mailman id 739173; Wed, 12 Jun 2024 10:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHLSU-0005cQ-7B for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 10:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHLSU-00042q-5a for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 10:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHLSU-0002HJ-4X for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 10: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4bQJIKpeH8JSgt+wEgxKD23S5XBe8D/8+ZQ51PcB67Y=; b=DVcU47bTsz5wqX+IMoudNLQfuU hzpe40B5amFZ0HHD+mz6iRueHiA5I4OzXmfrAf+0TXsEoctrOfzhYB/+uRjbh+VaY1XvKJDWKAAVg 1BGLcBPkMYLB4gaRrVWuvV/2jzfxHHQE4sWBd8egB0PmqgxDGMy2bLIsIGhdOL8RL6+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Update FreeBSD to 13.3 Message-Id: Date: Wed, 12 Jun 2024 10:44:02 +0000 commit 5ea7f2c9d7a1334b3b2bd5f67fab4d447b60613d Author: Andrew Cooper AuthorDate: Tue Jun 11 12:59:12 2024 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 11 17:00:10 2024 +0100 CI: Update FreeBSD to 13.3 Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d0a9021a77..c431d8d244 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,7 @@ freebsd_template: &FREEBSD_TEMPLATE task: name: 'FreeBSD 13' freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-3 << : *FREEBSD_TEMPLATE task: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 12:33:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 12:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739303.1146287 (Exim 4.92) (envelope-from ) id 1sHNA1-0001Qh-DH; Wed, 12 Jun 2024 12:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739303.1146287; Wed, 12 Jun 2024 12: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 1sHNA1-0001Qa-As; Wed, 12 Jun 2024 12:33:05 +0000 Received: by outflank-mailman (input) for mailman id 739303; Wed, 12 Jun 2024 12:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHNA0-0001QO-0q for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHN9z-0006Jk-Df for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHN9z-0000Ke-C9 for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5IQa8ZUqWZj+NcqHNJR4sZ9mYjKStY2AmRDFLSk2Fzg=; b=f4jKmaIScZSQ3CWioO4i1iUyVo GYXTmu6wW3NVSLRESOt74NoK6SHV7oOGLZo+vA3scoOD+MMnnzJGvy+YlYeatfkQm6mbxe26T3ln/ 66xgG8edx6Xq0XkZEDaxgyopDDjfDNMx2ATrfafekx7SvUyOZCJNGTLROvMWJh1oDIxE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Message-Id: Date: Wed, 12 Jun 2024 12:33:03 +0000 commit 171c52fba5d94e050d704770480dcb983490d0ad Author: Roger Pau Monné AuthorDate: Wed Jun 12 14:29:31 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:29:31 2024 +0200 x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Due to the current rwlock logic, if the CPU calling get_cpu_maps() does so from a cpu_hotplug_{begin,done}() region the function will still return success, because a CPU taking the rwlock in read mode after having taken it in write mode is allowed. Such corner case makes using get_cpu_maps() alone not enough to prevent using the shorthand in CPU hotplug regions. Introduce a new helper to detect whether the current caller is between a cpu_hotplug_{begin,done}() region and use it in send_IPI_mask() to restrict shorthand usage. Fixes: 5500d265a2a8 ('x86/smp: use APIC ALLBUT destination shorthand when possible') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/smp.c | 2 +- xen/common/cpu.c | 5 +++++ xen/include/xen/cpu.h | 10 ++++++++++ xen/include/xen/rwlock.h | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 7443ad2033..04c6a05723 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -88,7 +88,7 @@ void send_IPI_mask(const cpumask_t *mask, int vector) * the system have been accounted for. */ if ( system_state > SYS_STATE_smp_boot && - !unaccounted_cpus && !disabled_cpus && + !unaccounted_cpus && !disabled_cpus && !cpu_in_hotplug_context() && /* NB: get_cpu_maps lock requires enabled interrupts. */ local_irq_is_enabled() && (cpus_locked = get_cpu_maps()) && (park_offline_cpus || diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 8709db4d29..6e35b114c0 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -68,6 +68,11 @@ void cpu_hotplug_done(void) write_unlock(&cpu_add_remove_lock); } +bool cpu_in_hotplug_context(void) +{ + return rw_is_write_locked_by_me(&cpu_add_remove_lock); +} + static NOTIFIER_HEAD(cpu_chain); void __init register_cpu_notifier(struct notifier_block *nb) diff --git a/xen/include/xen/cpu.h b/xen/include/xen/cpu.h index e1d4eb5967..6bf5786750 100644 --- a/xen/include/xen/cpu.h +++ b/xen/include/xen/cpu.h @@ -13,6 +13,16 @@ void put_cpu_maps(void); void cpu_hotplug_begin(void); void cpu_hotplug_done(void); +/* + * Returns true when the caller CPU is between a cpu_hotplug_{begin,done}() + * region. + * + * This is required to safely identify hotplug contexts, as get_cpu_maps() + * would otherwise succeed because a caller holding the lock in write mode is + * allowed to acquire the same lock in read mode. + */ +bool cpu_in_hotplug_context(void); + /* Receive notification of CPU hotplug events. */ void register_cpu_notifier(struct notifier_block *nb); diff --git a/xen/include/xen/rwlock.h b/xen/include/xen/rwlock.h index a2e98cad34..4e78028218 100644 --- a/xen/include/xen/rwlock.h +++ b/xen/include/xen/rwlock.h @@ -316,6 +316,8 @@ static always_inline void write_lock_irq(rwlock_t *l) #define rw_is_locked(l) _rw_is_locked(l) #define rw_is_write_locked(l) _rw_is_write_locked(l) +#define rw_is_write_locked_by_me(l) \ + lock_evaluate_nospec(_is_write_locked_by_me(atomic_read(&(l)->cnts))) typedef struct percpu_rwlock percpu_rwlock_t; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 12:33:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 12:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739304.1146292 (Exim 4.92) (envelope-from ) id 1sHNAA-0001Sa-F1; Wed, 12 Jun 2024 12:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739304.1146292; Wed, 12 Jun 2024 12:33: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 1sHNAA-0001SU-CH; Wed, 12 Jun 2024 12:33:14 +0000 Received: by outflank-mailman (input) for mailman id 739304; Wed, 12 Jun 2024 12:33:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHNA9-0001SC-I1 for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHNA9-0006K7-Gt for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHNA9-0000LQ-Fh for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Cn5s2B88uMnFb0fTwSndDuGdQKft/gUitXkGQeK+s+s=; b=dtEK3KedyUhQvJzyygHWi55PFf VrPWANGm5yKAGXKBaukOpMVMcKJa4xpVGJRNwxZoXCSK0lO16R1UGfU6xRRScsJqZJv6B4zXGYsgx Jws3Dcg0ddVL5WXemVObwlJsNxV/OMdYaSDhHnLG3XFSndnZFGDg3Oplc9x1X38PjJ9E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/irq: describe how the interrupt CPU movement works Message-Id: Date: Wed, 12 Jun 2024 12:33:13 +0000 commit 0e8cde58848b85c93cea3797333874222e614f9b Author: Roger Pau Monné AuthorDate: Wed Jun 12 14:30:06 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:30:06 2024 +0200 x86/irq: describe how the interrupt CPU movement works The logic to move interrupts across CPUs is complex, attempt to provide a comment that describes the expected behavior so users of the interrupt system have more context about the usage of the arch_irq_desc structure fields. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/irq.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 413994d213..94f634ce10 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -28,6 +28,44 @@ typedef struct { struct irq_desc; +/* + * Xen logic for moving interrupts around CPUs allows manipulating interrupts + * that target remote CPUs. The logic to move an interrupt from CPU(s) is as + * follows: + * + * 1. irq_set_affinity() is called with the new destination mask, such mask is + * copied into pending_mask and IRQ_MOVE_PENDING is set in status to notice + * an affinity change has been requested. + * 2. An interrupt acked with the IRQ_MOVE_PENDING will trigger the logic to + * migrate it to a destination in pending_mask as long as the mask contains + * any online CPUs. + * 3. cpu_mask and vector is copied to old_cpu_mask and old_vector. + * 4. New cpu_mask and vector are set, vector is setup at the new destination. + * 5. move_in_progress is set. + * 6. Interrupt source is updated to target new CPU and vector. + * 7. Interrupts arriving at old_cpu_mask are processed normally. + * 8. When the first interrupt is delivered at the new destination (cpu_mask) as + * part of acking the interrupt the cleanup of the old destination(s) is + * engaged. move_in_progress is cleared and old_cpu_mask is + * reduced to the online CPUs. If the result is empty the old vector is + * released. Otherwise move_cleanup_count is set to the weight of online + * CPUs in old_cpu_mask and IRQ_MOVE_CLEANUP_VECTOR is sent to them. + * 9. When receiving IRQ_MOVE_CLEANUP_VECTOR CPUs in old_cpu_mask clean the + * vector entry and decrease the count in move_cleanup_count. The CPU that + * sets move_cleanup_count to 0 releases the vector. + * + * Note that when interrupt movement (either move_in_progress or + * move_cleanup_count set) is in progress it's not possible to move the + * interrupt to yet a different CPU. + * + * Interrupt movements done by fixup_irqs() skip setting IRQ_MOVE_PENDING and + * pending_mask as the movement must be performed right away, and so start + * directly from step 3. + * + * By keeping the vector in the old CPU(s) configured until the interrupt is + * acked on the new destination Xen allows draining any pending interrupts at + * the old destinations. + */ struct arch_irq_desc { s16 vector; /* vector itself is only 8 bits, */ s16 old_vector; /* but we use -1 for unassigned */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 12:33:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 12:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739305.1146296 (Exim 4.92) (envelope-from ) id 1sHNAK-0001VT-GF; Wed, 12 Jun 2024 12:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739305.1146296; Wed, 12 Jun 2024 12: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 1sHNAK-0001VL-Df; Wed, 12 Jun 2024 12:33:24 +0000 Received: by outflank-mailman (input) for mailman id 739305; Wed, 12 Jun 2024 12:33:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHNAJ-0001VD-Ke for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHNAJ-0006KL-Jy for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHNAJ-0000Ls-J0 for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CMoftjVDLJqoUsPwi2kCobkDEJKpVGDmmLZqbZ5+DTg=; b=N5oUHJ1STJNRObS/5I7ZHCnPOK IIh9lgdqnLaJz36TfYRvwT0Y1cDDMpRTFMtkjsot5vtSRHAQLHCu9cEgj6vnKa92S+EwqPcuk7T08 BDsA5yJ75Xzq/cscLcAIDclYlOIsHroWvWSNyTcYJu3GVqk5RMTs4esJj4qX09mc9N3E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/irq: limit interrupt movement done by fixup_irqs() Message-Id: Date: Wed, 12 Jun 2024 12:33:23 +0000 commit c7564d7366d865cc407e3d64bca816d07edee174 Author: Roger Pau Monné AuthorDate: Wed Jun 12 14:30:40 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:30:40 2024 +0200 x86/irq: limit interrupt movement done by fixup_irqs() The current check used in fixup_irqs() to decide whether to move around interrupts is based on the affinity mask, but such mask can have all bits set, and hence is unlikely to be a subset of the input mask. For example if an interrupt has an affinity mask of all 1s, any input to fixup_irqs() that's not an all set CPU mask would cause that interrupt to be shuffled around unconditionally. What fixup_irqs() care about is evacuating interrupts from CPUs not set on the input CPU mask, and for that purpose it should check whether the interrupt is assigned to a CPU not present in the input mask. Assume that ->arch.cpu_mask is a subset of the ->affinity mask, and keep the current logic that resets the ->affinity mask if the interrupt has to be shuffled around. Doing the affinity movement based on ->arch.cpu_mask requires removing the special handling to ->arch.cpu_mask done for high priority vectors, otherwise the adjustment done to cpu_mask makes them always skip the CPU interrupt movement. While there also adjust the comment as to the purpose of fixup_irqs(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/include/asm/irq.h | 2 +- xen/arch/x86/irq.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 94f634ce10..5f445299be 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -168,7 +168,7 @@ void free_domain_pirqs(struct domain *d); int map_domain_emuirq_pirq(struct domain *d, int pirq, int emuirq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose); void fixup_eoi(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index d101ffeaf9..263e502bc0 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2516,7 +2516,7 @@ static int __init cf_check setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose) { unsigned int irq; @@ -2540,19 +2540,15 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && - vector <= LAST_HIPRIORITY_VECTOR ) + vector <= LAST_HIPRIORITY_VECTOR && + desc->handler == &no_irq_type ) { - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); - /* * This can in particular happen when parking secondary threads * during boot and when the serial console wants to use a PCI IRQ. */ - if ( desc->handler == &no_irq_type ) - { - spin_unlock(&desc->lock); - continue; - } + spin_unlock(&desc->lock); + continue; } if ( desc->arch.move_cleanup_count ) @@ -2573,7 +2569,12 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } - if ( !desc->action || cpumask_subset(desc->affinity, mask) ) + /* + * Avoid shuffling the interrupt around as long as current target CPUs + * are a subset of the input mask. What fixup_irqs() cares about is + * evacuating interrupts from CPUs not in the input mask. + */ + if ( !desc->action || cpumask_subset(desc->arch.cpu_mask, mask) ) { spin_unlock(&desc->lock); continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 12 12:33:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jun 2024 12:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739306.1146299 (Exim 4.92) (envelope-from ) id 1sHNAU-0001Yo-Hj; Wed, 12 Jun 2024 12:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739306.1146299; Wed, 12 Jun 2024 12:33: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 1sHNAU-0001Yh-F6; Wed, 12 Jun 2024 12:33:34 +0000 Received: by outflank-mailman (input) for mailman id 739306; Wed, 12 Jun 2024 12:33:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHNAT-0001YS-OU for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHNAT-0006KS-Nh for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHNAT-0000MV-Lv for xen-changelog@lists.xenproject.org; Wed, 12 Jun 2024 12:33: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oQiwwcGe1tRPBklXQV0tA8eRDKhAOKbio118B6NywKg=; b=hLSDZRNwStJidOc4fWeAR4lG8g xCVM5/j/8ImL/aQa0p2R5yOtHjcPhrTMxMBJ43Jd4MNeYDXkofEmRr1n/lHCHp3yWuhzyDQkJ4IlJ XfOpHavziyKYzxXQFnW8b/7UnmgRe5e18rayq+Y7z9XcTK8hS1AugU6Fhd6Iqcnd0XtE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/physdev: replace physdev_{,un}map_pirq() checking against DOMID_SELF Message-Id: Date: Wed, 12 Jun 2024 12:33:33 +0000 commit 401448f2d12f969956fac3ef3d29dc065430fd56 Author: Jan Beulich AuthorDate: Wed Jun 12 14:31:21 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:31:21 2024 +0200 x86/physdev: replace physdev_{,un}map_pirq() checking against DOMID_SELF It's hardly ever correct to check for just DOMID_SELF, as guests have ways to figure out their domain IDs and hence could instead use those as inputs to respective hypercalls. Note, however, that for ordinary DomU-s the adjustment is relaxing things rather than tightening them, since - as a result of XSA-237 - the respective XSM checks would have rejected self (un)mapping attempts for other than the control domain. Since in physdev_map_pirq() handling overall is a little easier this way, move obtaining of the domain pointer into the caller. Doing the same for physdev_unmap_pirq() is just to keep both consistent in this regard. Fixes: 0b469cd68708 ("Interrupt remapping to PIRQs in HVM guests") Fixes: 9e1a3415b773 ("x86: fixes after emuirq changes") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/physdev.c | 57 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 7efa17cf4c..d6dd622952 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -18,9 +18,9 @@ #include #include -int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, +int physdev_map_pirq(struct domain *d, int type, int *index, int *pirq_p, struct msi_info *msi); -int physdev_unmap_pirq(domid_t domid, int pirq); +int physdev_unmap_pirq(struct domain *d, int pirq); #include "x86_64/mmconfig.h" @@ -88,13 +88,12 @@ static int physdev_hvm_map_pirq( return ret; } -int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, +int physdev_map_pirq(struct domain *d, int type, int *index, int *pirq_p, struct msi_info *msi) { - struct domain *d = current->domain; int ret; - if ( domid == DOMID_SELF && is_hvm_domain(d) && has_pirq(d) ) + if ( d == current->domain && is_hvm_domain(d) && has_pirq(d) ) { /* * Only makes sense for vector-based callback, else HVM-IRQ logic @@ -106,13 +105,9 @@ int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, return physdev_hvm_map_pirq(d, type, index, pirq_p); } - d = rcu_lock_domain_by_any_id(domid); - if ( d == NULL ) - return -ESRCH; - ret = xsm_map_domain_pirq(XSM_DM_PRIV, d); if ( ret ) - goto free_domain; + return ret; /* Verify or get irq. */ switch ( type ) @@ -135,24 +130,17 @@ int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, break; } - free_domain: - rcu_unlock_domain(d); return ret; } -int physdev_unmap_pirq(domid_t domid, int pirq) +int physdev_unmap_pirq(struct domain *d, int pirq) { - struct domain *d; int ret = 0; - d = rcu_lock_domain_by_any_id(domid); - if ( d == NULL ) - return -ESRCH; - - if ( domid != DOMID_SELF || !is_hvm_domain(d) || !has_pirq(d) ) + if ( d != current->domain || !is_hvm_domain(d) || !has_pirq(d) ) ret = xsm_unmap_domain_pirq(XSM_DM_PRIV, d); if ( ret ) - goto free_domain; + return ret; if ( is_hvm_domain(d) && has_pirq(d) ) { @@ -160,8 +148,8 @@ int physdev_unmap_pirq(domid_t domid, int pirq) if ( domain_pirq_to_emuirq(d, pirq) != IRQ_UNBOUND ) ret = unmap_domain_pirq_emuirq(d, pirq); write_unlock(&d->event_lock); - if ( domid == DOMID_SELF || ret ) - goto free_domain; + if ( d == current->domain || ret ) + return ret; } pcidevs_lock(); @@ -170,8 +158,6 @@ int physdev_unmap_pirq(domid_t domid, int pirq) write_unlock(&d->event_lock); pcidevs_unlock(); - free_domain: - rcu_unlock_domain(d); return ret; } #endif /* COMPAT */ @@ -180,7 +166,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { int irq; ret_t ret; - struct domain *currd = current->domain; + struct domain *d, *currd = current->domain; switch ( cmd ) { @@ -331,8 +317,15 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) msi.sbdf.devfn = map.devfn; msi.entry_nr = map.entry_nr; msi.table_base = map.table_base; - ret = physdev_map_pirq(map.domid, map.type, &map.index, &map.pirq, - &msi); + + d = rcu_lock_domain_by_any_id(map.domid); + ret = -ESRCH; + if ( !d ) + break; + + ret = physdev_map_pirq(d, map.type, &map.index, &map.pirq, &msi); + + rcu_unlock_domain(d); if ( map.type == MAP_PIRQ_TYPE_MULTI_MSI ) map.entry_nr = msi.entry_nr; @@ -348,7 +341,15 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&unmap, arg, 1) != 0 ) break; - ret = physdev_unmap_pirq(unmap.domid, unmap.pirq); + d = rcu_lock_domain_by_any_id(unmap.domid); + ret = -ESRCH; + if ( !d ) + break; + + ret = physdev_unmap_pirq(d, unmap.pirq); + + rcu_unlock_domain(d); + break; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 07:11:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 07:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739654.1146573 (Exim 4.92) (envelope-from ) id 1sHebw-00074x-3E; Thu, 13 Jun 2024 07:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739654.1146573; Thu, 13 Jun 2024 07: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 1sHebw-00074q-0O; Thu, 13 Jun 2024 07:11:04 +0000 Received: by outflank-mailman (input) for mailman id 739654; Thu, 13 Jun 2024 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 1sHebu-00074k-MG for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHebu-0001Zq-7j for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHebu-0002uD-5m for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zl8HNM2ra9tw7oDeHS40NoF/u96keBBi3jgxLwYlT+E=; b=UhcDBWbRfoMGxZurHObdqEG4b+ qv8epLisaqzpumyoXw/7VHrYPuDR71wGsCLwT3e29fnwu/AnwvP9TB2wFho6qzeXtykWx9aCJRpA9 memSN1PbIqeSFnuoB4iOU8urSS+D1Vy1jV09frDBCFuRb6DlY+0GHjAsn0MQMl4Y1G+k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: add me as scheduler maintainer Message-Id: Date: Thu, 13 Jun 2024 07:11:02 +0000 commit d05d97c090889c0424f4f63c90e7035da5a42948 Author: Juergen Gross AuthorDate: Wed Jun 12 10:52:22 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 10:52:22 2024 +0200 MAINTAINERS: add me as scheduler maintainer I've been active in the scheduling code since many years now. Add me as a maintainer. Signed-off-by: Juergen Gross Reviewed-by: George Dunlap --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6ba7d2765f..cc40c0be9d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -490,6 +490,7 @@ F: xen/common/sched/rt.c SCHEDULING M: George Dunlap M: Dario Faggioli +M: Juergen Gross S: Supported F: xen/common/sched/ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 07:11:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 07:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739655.1146577 (Exim 4.92) (envelope-from ) id 1sHec5-00076q-4y; Thu, 13 Jun 2024 07:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739655.1146577; Thu, 13 Jun 2024 07: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 1sHec5-00076j-2A; Thu, 13 Jun 2024 07:11:13 +0000 Received: by outflank-mailman (input) for mailman id 739655; Thu, 13 Jun 2024 07:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHec4-00076L-CQ for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHec4-0001a9-Aw for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHec4-0002v5-9s for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZyvDjm+j8C4caEDDGm1pp8RRUZ6IBdlBVX8OwtwU+lE=; b=lEP+ZWGZVPTJMFYFTS2ivwk1bq GZcAiczpwJdHa6vk5moSjTQj5+fjMZe4AYxPYEU57aTHBK2XXQo3e5G3+5SWxyAOjSaVG9WSF54LF Nsw8ZzGwTzD/dS+5HDQzSUf1zFQnmyIVuN/r39bPJABNaB2wYi/wi6KJOWNBgZyYg3W8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: alter EFI section Message-Id: Date: Thu, 13 Jun 2024 07:11:12 +0000 commit b0e5352c600ce42f109ddb43a4233ac2c9e0abbd Author: Jan Beulich AuthorDate: Wed Jun 12 10:52:56 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 10:52:56 2024 +0200 MAINTAINERS: alter EFI section To get past the recurring friction on the approach to take wrt workarounds needed for various firmware flaws, I'm stepping down as the maintainer of our code interfacing with EFI firmware. Two new maintainers are being introduced in my place. Signed-off-by: Jan Beulich Acked-by: Marek Marczykowski Acked-by: Daniel P. Smith Release-Acked-by: Oleksii Kurochko --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index cc40c0be9d..8e2b30a345 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -308,7 +308,9 @@ F: automation/eclair_analysis/ F: automation/scripts/eclair EFI -M: Jan Beulich +M: Daniel P. Smith +M: Marek Marczykowski-Górecki +R: Jan Beulich S: Supported F: xen/arch/x86/efi/ F: xen/arch/x86/include/asm/efi*.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 07:11:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 07:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739656.1146582 (Exim 4.92) (envelope-from ) id 1sHecF-00079w-8C; Thu, 13 Jun 2024 07:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739656.1146582; Thu, 13 Jun 2024 07: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 1sHecF-00079m-5L; Thu, 13 Jun 2024 07:11:23 +0000 Received: by outflank-mailman (input) for mailman id 739656; Thu, 13 Jun 2024 07:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHecE-00079e-Fh for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHecE-0001ae-Ew for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHecE-0002xF-D3 for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GFTU6DDIyKS0yaAIO3yXGf5urhMsssrqdRe6weGSfF0=; b=wuF/X7VzqbB4ZgE04cKN+PE2+w Hq+NnzbIU5Z/5YMHeyet707PK7buKDSGrzh+xOR2+AdM4yUu8A2NEtTTllQ2c/tc7uOI1hHVRqslI vRysN+xsusVbIG+qJRgqCT6n1dlHmVA9eQc719kEUNqKY/wW4kNwAC10cwP3tlZ0Mpac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Message-Id: Date: Thu, 13 Jun 2024 07:11:22 +0000 commit 171c52fba5d94e050d704770480dcb983490d0ad Author: Roger Pau Monné AuthorDate: Wed Jun 12 14:29:31 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:29:31 2024 +0200 x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Due to the current rwlock logic, if the CPU calling get_cpu_maps() does so from a cpu_hotplug_{begin,done}() region the function will still return success, because a CPU taking the rwlock in read mode after having taken it in write mode is allowed. Such corner case makes using get_cpu_maps() alone not enough to prevent using the shorthand in CPU hotplug regions. Introduce a new helper to detect whether the current caller is between a cpu_hotplug_{begin,done}() region and use it in send_IPI_mask() to restrict shorthand usage. Fixes: 5500d265a2a8 ('x86/smp: use APIC ALLBUT destination shorthand when possible') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/smp.c | 2 +- xen/common/cpu.c | 5 +++++ xen/include/xen/cpu.h | 10 ++++++++++ xen/include/xen/rwlock.h | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 7443ad2033..04c6a05723 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -88,7 +88,7 @@ void send_IPI_mask(const cpumask_t *mask, int vector) * the system have been accounted for. */ if ( system_state > SYS_STATE_smp_boot && - !unaccounted_cpus && !disabled_cpus && + !unaccounted_cpus && !disabled_cpus && !cpu_in_hotplug_context() && /* NB: get_cpu_maps lock requires enabled interrupts. */ local_irq_is_enabled() && (cpus_locked = get_cpu_maps()) && (park_offline_cpus || diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 8709db4d29..6e35b114c0 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -68,6 +68,11 @@ void cpu_hotplug_done(void) write_unlock(&cpu_add_remove_lock); } +bool cpu_in_hotplug_context(void) +{ + return rw_is_write_locked_by_me(&cpu_add_remove_lock); +} + static NOTIFIER_HEAD(cpu_chain); void __init register_cpu_notifier(struct notifier_block *nb) diff --git a/xen/include/xen/cpu.h b/xen/include/xen/cpu.h index e1d4eb5967..6bf5786750 100644 --- a/xen/include/xen/cpu.h +++ b/xen/include/xen/cpu.h @@ -13,6 +13,16 @@ void put_cpu_maps(void); void cpu_hotplug_begin(void); void cpu_hotplug_done(void); +/* + * Returns true when the caller CPU is between a cpu_hotplug_{begin,done}() + * region. + * + * This is required to safely identify hotplug contexts, as get_cpu_maps() + * would otherwise succeed because a caller holding the lock in write mode is + * allowed to acquire the same lock in read mode. + */ +bool cpu_in_hotplug_context(void); + /* Receive notification of CPU hotplug events. */ void register_cpu_notifier(struct notifier_block *nb); diff --git a/xen/include/xen/rwlock.h b/xen/include/xen/rwlock.h index a2e98cad34..4e78028218 100644 --- a/xen/include/xen/rwlock.h +++ b/xen/include/xen/rwlock.h @@ -316,6 +316,8 @@ static always_inline void write_lock_irq(rwlock_t *l) #define rw_is_locked(l) _rw_is_locked(l) #define rw_is_write_locked(l) _rw_is_write_locked(l) +#define rw_is_write_locked_by_me(l) \ + lock_evaluate_nospec(_is_write_locked_by_me(atomic_read(&(l)->cnts))) typedef struct percpu_rwlock percpu_rwlock_t; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 07:11:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 07:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739660.1146596 (Exim 4.92) (envelope-from ) id 1sHecQ-0007ST-Hq; Thu, 13 Jun 2024 07:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739660.1146596; Thu, 13 Jun 2024 07: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 1sHecQ-0007SI-EW; Thu, 13 Jun 2024 07:11:34 +0000 Received: by outflank-mailman (input) for mailman id 739660; Thu, 13 Jun 2024 07:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHecO-0007Ra-JP for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHecO-0001aq-Hw for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHecO-0002y8-Gy for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9K4I0xebexJ/svT3L85xHsT0IA3zu9MeV6pT4VwtS1o=; b=0ZnnIThMFoX4prxhewqh1IE/LU 4Jfb4Gf8pBxMaW3yDVcBY3/eqo2Yd4vjzIUo5MeYoIVtXOGaBs5IAsctboYk/y0VIAqj11E1OTPeO wk5uHJfEPKfgl6fvVBC3kfiHNNX9Sz6qN7hEFIigll8/L3IgQd7HpCLq6MuWeAwQ8bR0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/irq: describe how the interrupt CPU movement works Message-Id: Date: Thu, 13 Jun 2024 07:11:32 +0000 commit 0e8cde58848b85c93cea3797333874222e614f9b Author: Roger Pau Monné AuthorDate: Wed Jun 12 14:30:06 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:30:06 2024 +0200 x86/irq: describe how the interrupt CPU movement works The logic to move interrupts across CPUs is complex, attempt to provide a comment that describes the expected behavior so users of the interrupt system have more context about the usage of the arch_irq_desc structure fields. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/irq.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 413994d213..94f634ce10 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -28,6 +28,44 @@ typedef struct { struct irq_desc; +/* + * Xen logic for moving interrupts around CPUs allows manipulating interrupts + * that target remote CPUs. The logic to move an interrupt from CPU(s) is as + * follows: + * + * 1. irq_set_affinity() is called with the new destination mask, such mask is + * copied into pending_mask and IRQ_MOVE_PENDING is set in status to notice + * an affinity change has been requested. + * 2. An interrupt acked with the IRQ_MOVE_PENDING will trigger the logic to + * migrate it to a destination in pending_mask as long as the mask contains + * any online CPUs. + * 3. cpu_mask and vector is copied to old_cpu_mask and old_vector. + * 4. New cpu_mask and vector are set, vector is setup at the new destination. + * 5. move_in_progress is set. + * 6. Interrupt source is updated to target new CPU and vector. + * 7. Interrupts arriving at old_cpu_mask are processed normally. + * 8. When the first interrupt is delivered at the new destination (cpu_mask) as + * part of acking the interrupt the cleanup of the old destination(s) is + * engaged. move_in_progress is cleared and old_cpu_mask is + * reduced to the online CPUs. If the result is empty the old vector is + * released. Otherwise move_cleanup_count is set to the weight of online + * CPUs in old_cpu_mask and IRQ_MOVE_CLEANUP_VECTOR is sent to them. + * 9. When receiving IRQ_MOVE_CLEANUP_VECTOR CPUs in old_cpu_mask clean the + * vector entry and decrease the count in move_cleanup_count. The CPU that + * sets move_cleanup_count to 0 releases the vector. + * + * Note that when interrupt movement (either move_in_progress or + * move_cleanup_count set) is in progress it's not possible to move the + * interrupt to yet a different CPU. + * + * Interrupt movements done by fixup_irqs() skip setting IRQ_MOVE_PENDING and + * pending_mask as the movement must be performed right away, and so start + * directly from step 3. + * + * By keeping the vector in the old CPU(s) configured until the interrupt is + * acked on the new destination Xen allows draining any pending interrupts at + * the old destinations. + */ struct arch_irq_desc { s16 vector; /* vector itself is only 8 bits, */ s16 old_vector; /* but we use -1 for unassigned */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 07:11:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 07:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739661.1146600 (Exim 4.92) (envelope-from ) id 1sHeca-0007YI-Im; Thu, 13 Jun 2024 07:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739661.1146600; Thu, 13 Jun 2024 07: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 1sHeca-0007Y8-G5; Thu, 13 Jun 2024 07:11:44 +0000 Received: by outflank-mailman (input) for mailman id 739661; Thu, 13 Jun 2024 07:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHecY-0007XF-Lb for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHecY-0001b3-Kw for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHecY-0002yv-K5 for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JmwS/hEeuPeSiD2TUu6iHFvovxpPFSEY+uuF6fE+SK8=; b=CXITWQeTcdA2Fqn5JEnO4HPilM RyY5Lqe1rXcjJRmKuq4GM36jGimCusf/flSjSisbNtGQwcZ/K6Wb11gEhaceL1LDqTDhI3BqEMlEx NgVN0vftzQ3kLNgjj6ScahpcmnJQKhOUm6o6wHN1EY3m4aWdP0jP7gmSfVVyoq22Tb90=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/irq: limit interrupt movement done by fixup_irqs() Message-Id: Date: Thu, 13 Jun 2024 07:11:42 +0000 commit c7564d7366d865cc407e3d64bca816d07edee174 Author: Roger Pau Monné AuthorDate: Wed Jun 12 14:30:40 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:30:40 2024 +0200 x86/irq: limit interrupt movement done by fixup_irqs() The current check used in fixup_irqs() to decide whether to move around interrupts is based on the affinity mask, but such mask can have all bits set, and hence is unlikely to be a subset of the input mask. For example if an interrupt has an affinity mask of all 1s, any input to fixup_irqs() that's not an all set CPU mask would cause that interrupt to be shuffled around unconditionally. What fixup_irqs() care about is evacuating interrupts from CPUs not set on the input CPU mask, and for that purpose it should check whether the interrupt is assigned to a CPU not present in the input mask. Assume that ->arch.cpu_mask is a subset of the ->affinity mask, and keep the current logic that resets the ->affinity mask if the interrupt has to be shuffled around. Doing the affinity movement based on ->arch.cpu_mask requires removing the special handling to ->arch.cpu_mask done for high priority vectors, otherwise the adjustment done to cpu_mask makes them always skip the CPU interrupt movement. While there also adjust the comment as to the purpose of fixup_irqs(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/include/asm/irq.h | 2 +- xen/arch/x86/irq.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 94f634ce10..5f445299be 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -168,7 +168,7 @@ void free_domain_pirqs(struct domain *d); int map_domain_emuirq_pirq(struct domain *d, int pirq, int emuirq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose); void fixup_eoi(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index d101ffeaf9..263e502bc0 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2516,7 +2516,7 @@ static int __init cf_check setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose) { unsigned int irq; @@ -2540,19 +2540,15 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && - vector <= LAST_HIPRIORITY_VECTOR ) + vector <= LAST_HIPRIORITY_VECTOR && + desc->handler == &no_irq_type ) { - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); - /* * This can in particular happen when parking secondary threads * during boot and when the serial console wants to use a PCI IRQ. */ - if ( desc->handler == &no_irq_type ) - { - spin_unlock(&desc->lock); - continue; - } + spin_unlock(&desc->lock); + continue; } if ( desc->arch.move_cleanup_count ) @@ -2573,7 +2569,12 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } - if ( !desc->action || cpumask_subset(desc->affinity, mask) ) + /* + * Avoid shuffling the interrupt around as long as current target CPUs + * are a subset of the input mask. What fixup_irqs() cares about is + * evacuating interrupts from CPUs not in the input mask. + */ + if ( !desc->action || cpumask_subset(desc->arch.cpu_mask, mask) ) { spin_unlock(&desc->lock); continue; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 07:11:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 07:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739663.1146604 (Exim 4.92) (envelope-from ) id 1sHeck-0007jG-Ke; Thu, 13 Jun 2024 07:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739663.1146604; Thu, 13 Jun 2024 07: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 1sHeck-0007j9-HZ; Thu, 13 Jun 2024 07:11:54 +0000 Received: by outflank-mailman (input) for mailman id 739663; Thu, 13 Jun 2024 07:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHeci-0007ic-OW for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHeci-0001bF-Nx for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHeci-0002ze-N7 for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cso/CbeR7OA2mhHlS999aWlTJ+Zbkyrh8JKad9wj4f8=; b=EQ952j4Cnde8Bnq+Ivz+63ciew pk+AwoaLH0QNOhjtePL6RI5Hypj+GyI2jUhmUAcC0jSpE/kMUpCjR1gQcGMbepkrieS9sC5lsrSrm C3V3Yt7aoP0OtHSYR8L/2IjVhAbOPM+Gb8iXeUfqWpLBlAZ3mBq1OOIQtdre+/2dhS4E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/physdev: replace physdev_{,un}map_pirq() checking against DOMID_SELF Message-Id: Date: Thu, 13 Jun 2024 07:11:52 +0000 commit 401448f2d12f969956fac3ef3d29dc065430fd56 Author: Jan Beulich AuthorDate: Wed Jun 12 14:31:21 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 12 14:31:21 2024 +0200 x86/physdev: replace physdev_{,un}map_pirq() checking against DOMID_SELF It's hardly ever correct to check for just DOMID_SELF, as guests have ways to figure out their domain IDs and hence could instead use those as inputs to respective hypercalls. Note, however, that for ordinary DomU-s the adjustment is relaxing things rather than tightening them, since - as a result of XSA-237 - the respective XSM checks would have rejected self (un)mapping attempts for other than the control domain. Since in physdev_map_pirq() handling overall is a little easier this way, move obtaining of the domain pointer into the caller. Doing the same for physdev_unmap_pirq() is just to keep both consistent in this regard. Fixes: 0b469cd68708 ("Interrupt remapping to PIRQs in HVM guests") Fixes: 9e1a3415b773 ("x86: fixes after emuirq changes") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/physdev.c | 57 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 7efa17cf4c..d6dd622952 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -18,9 +18,9 @@ #include #include -int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, +int physdev_map_pirq(struct domain *d, int type, int *index, int *pirq_p, struct msi_info *msi); -int physdev_unmap_pirq(domid_t domid, int pirq); +int physdev_unmap_pirq(struct domain *d, int pirq); #include "x86_64/mmconfig.h" @@ -88,13 +88,12 @@ static int physdev_hvm_map_pirq( return ret; } -int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, +int physdev_map_pirq(struct domain *d, int type, int *index, int *pirq_p, struct msi_info *msi) { - struct domain *d = current->domain; int ret; - if ( domid == DOMID_SELF && is_hvm_domain(d) && has_pirq(d) ) + if ( d == current->domain && is_hvm_domain(d) && has_pirq(d) ) { /* * Only makes sense for vector-based callback, else HVM-IRQ logic @@ -106,13 +105,9 @@ int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, return physdev_hvm_map_pirq(d, type, index, pirq_p); } - d = rcu_lock_domain_by_any_id(domid); - if ( d == NULL ) - return -ESRCH; - ret = xsm_map_domain_pirq(XSM_DM_PRIV, d); if ( ret ) - goto free_domain; + return ret; /* Verify or get irq. */ switch ( type ) @@ -135,24 +130,17 @@ int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, break; } - free_domain: - rcu_unlock_domain(d); return ret; } -int physdev_unmap_pirq(domid_t domid, int pirq) +int physdev_unmap_pirq(struct domain *d, int pirq) { - struct domain *d; int ret = 0; - d = rcu_lock_domain_by_any_id(domid); - if ( d == NULL ) - return -ESRCH; - - if ( domid != DOMID_SELF || !is_hvm_domain(d) || !has_pirq(d) ) + if ( d != current->domain || !is_hvm_domain(d) || !has_pirq(d) ) ret = xsm_unmap_domain_pirq(XSM_DM_PRIV, d); if ( ret ) - goto free_domain; + return ret; if ( is_hvm_domain(d) && has_pirq(d) ) { @@ -160,8 +148,8 @@ int physdev_unmap_pirq(domid_t domid, int pirq) if ( domain_pirq_to_emuirq(d, pirq) != IRQ_UNBOUND ) ret = unmap_domain_pirq_emuirq(d, pirq); write_unlock(&d->event_lock); - if ( domid == DOMID_SELF || ret ) - goto free_domain; + if ( d == current->domain || ret ) + return ret; } pcidevs_lock(); @@ -170,8 +158,6 @@ int physdev_unmap_pirq(domid_t domid, int pirq) write_unlock(&d->event_lock); pcidevs_unlock(); - free_domain: - rcu_unlock_domain(d); return ret; } #endif /* COMPAT */ @@ -180,7 +166,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { int irq; ret_t ret; - struct domain *currd = current->domain; + struct domain *d, *currd = current->domain; switch ( cmd ) { @@ -331,8 +317,15 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) msi.sbdf.devfn = map.devfn; msi.entry_nr = map.entry_nr; msi.table_base = map.table_base; - ret = physdev_map_pirq(map.domid, map.type, &map.index, &map.pirq, - &msi); + + d = rcu_lock_domain_by_any_id(map.domid); + ret = -ESRCH; + if ( !d ) + break; + + ret = physdev_map_pirq(d, map.type, &map.index, &map.pirq, &msi); + + rcu_unlock_domain(d); if ( map.type == MAP_PIRQ_TYPE_MULTI_MSI ) map.entry_nr = msi.entry_nr; @@ -348,7 +341,15 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&unmap, arg, 1) != 0 ) break; - ret = physdev_unmap_pirq(unmap.domid, unmap.pirq); + d = rcu_lock_domain_by_any_id(unmap.domid); + ret = -ESRCH; + if ( !d ) + break; + + ret = physdev_unmap_pirq(d, unmap.pirq); + + rcu_unlock_domain(d); + break; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 12:55:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 12:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739951.1146918 (Exim 4.92) (envelope-from ) id 1sHjyq-00036r-Pp; Thu, 13 Jun 2024 12:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739951.1146918; Thu, 13 Jun 2024 12: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 1sHjyq-00036k-N1; Thu, 13 Jun 2024 12:55:04 +0000 Received: by outflank-mailman (input) for mailman id 739951; Thu, 13 Jun 2024 12:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjyq-00036d-AR for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjyq-0000ih-3k for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHjyq-0005F5-1n for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zJ1Rh4JipBA/qakwBaoTicdGVF2dzp3Odr9MILIY9ss=; b=Wa0rdl1PvNnlRpWWsINawwkRIU gsfK6V5bOkhP0/Y3/590S/Iy96V+42w3i+bQe97jeGlesXXdduiWlH7bqWIavWcunrv/0WBMRHNjZ Qv/bEE0yfdpm/xQiHFwVLd4mAaEgBCwKbl4bpYKHt4rydGzQm4kPela6Nfg8N6sYztWo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: refactor ffa_handle_call() Message-Id: Date: Thu, 13 Jun 2024 12:55:04 +0000 commit 66e6e47511d1894ab18d69221207069d8e93c7b6 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:37 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:32 2024 +0100 xen/arm: ffa: refactor ffa_handle_call() Refactors the large switch block in ffa_handle_call() to use common code for the simple case where it's either an error code or success with no further parameters. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/ffa.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 8665201e34..5209612963 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -273,18 +273,10 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) case FFA_RXTX_MAP_64: e = ffa_handle_rxtx_map(fid, get_user_reg(regs, 1), get_user_reg(regs, 2), get_user_reg(regs, 3)); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_RXTX_UNMAP: e = ffa_handle_rxtx_unmap(); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_PARTITION_INFO_GET: e = ffa_handle_partition_info_get(get_user_reg(regs, 1), get_user_reg(regs, 2), @@ -299,11 +291,7 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) return true; case FFA_RX_RELEASE: e = ffa_handle_rx_release(); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_MSG_SEND_DIRECT_REQ_32: case FFA_MSG_SEND_DIRECT_REQ_64: handle_msg_send_direct_req(regs, fid); @@ -316,17 +304,19 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) e = ffa_handle_mem_reclaim(regpair_to_uint64(get_user_reg(regs, 2), get_user_reg(regs, 1)), get_user_reg(regs, 3)); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; default: gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); return true; } + + if ( e ) + ffa_set_regs_error(regs, e); + else + ffa_set_regs_success(regs, 0, 0); + return true; } static int ffa_domain_init(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 12:55:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 12:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739952.1146922 (Exim 4.92) (envelope-from ) id 1sHjz0-00038Y-RX; Thu, 13 Jun 2024 12:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739952.1146922; Thu, 13 Jun 2024 12: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 1sHjz0-00038Q-Oh; Thu, 13 Jun 2024 12:55:14 +0000 Received: by outflank-mailman (input) for mailman id 739952; Thu, 13 Jun 2024 12:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjz0-00038I-7V for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjz0-0000ip-6i for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHjz0-0005Fq-5l for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7DoE/rzXbud8ls3DhM40HKkwdnILSzUMBv/JJs2KDac=; b=KoVHrJasFOo8+ObVndS+wTDbup eG1K90fhM1IGoXv1LEOsozIeU5WWDi5eyQqd9XR9p/vK/CzyEPHOgUoBgOSC/e1d6f0SlPkaJA/Nx Oh9ePHHk0VeSBksYX3L4J8SW0+OuSr3j0FJb7Hph4y3igp8MqXhsQOVHdVPSHZkU8ku8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: use ACCESS_ONCE() Message-Id: Date: Thu, 13 Jun 2024 12:55:14 +0000 commit 4d2b1b5d6933e3ef26fb4905892007921205aaff Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:38 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:39 2024 +0100 xen/arm: ffa: use ACCESS_ONCE() Replace read_atomic() with ACCESS_ONCE() to match the intended use, that is, to prevent the compiler from (via optimization) reading shared memory more than once. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/ffa_shm.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/tee/ffa_shm.c b/xen/arch/arm/tee/ffa_shm.c index eed9ad2d29..75a5b66aeb 100644 --- a/xen/arch/arm/tee/ffa_shm.c +++ b/xen/arch/arm/tee/ffa_shm.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -171,8 +172,8 @@ static int get_shm_pages(struct domain *d, struct ffa_shm_mem *shm, for ( n = 0; n < range_count; n++ ) { - page_count = read_atomic(&range[n].page_count); - addr = read_atomic(&range[n].address); + page_count = ACCESS_ONCE(range[n].page_count); + addr = ACCESS_ONCE(range[n].address); for ( m = 0; m < page_count; m++ ) { if ( pg_idx >= shm->page_count ) @@ -527,13 +528,13 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out_unlock; mem_access = ctx->tx + trans.mem_access_offs; - if ( read_atomic(&mem_access->access_perm.perm) != FFA_MEM_ACC_RW ) + if ( ACCESS_ONCE(mem_access->access_perm.perm) != FFA_MEM_ACC_RW ) { ret = FFA_RET_NOT_SUPPORTED; goto out_unlock; } - region_offs = read_atomic(&mem_access->region_offs); + region_offs = ACCESS_ONCE(mem_access->region_offs); if ( sizeof(*region_descr) + region_offs > frag_len ) { ret = FFA_RET_NOT_SUPPORTED; @@ -541,8 +542,8 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) } region_descr = ctx->tx + region_offs; - range_count = read_atomic(®ion_descr->address_range_count); - page_count = read_atomic(®ion_descr->total_page_count); + range_count = ACCESS_ONCE(region_descr->address_range_count); + page_count = ACCESS_ONCE(region_descr->total_page_count); if ( !page_count ) { @@ -557,7 +558,7 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out_unlock; } shm->sender_id = trans.sender_id; - shm->ep_id = read_atomic(&mem_access->access_perm.endpoint_id); + shm->ep_id = ACCESS_ONCE(mem_access->access_perm.endpoint_id); /* * Check that the Composite memory region descriptor fits. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 12:55:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 12:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739953.1146925 (Exim 4.92) (envelope-from ) id 1sHjzA-0003BM-Sr; Thu, 13 Jun 2024 12:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739953.1146925; Thu, 13 Jun 2024 12: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 1sHjzA-0003BD-Q8; Thu, 13 Jun 2024 12:55:24 +0000 Received: by outflank-mailman (input) for mailman id 739953; Thu, 13 Jun 2024 12:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzA-0003B3-Au for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzA-0000jJ-AF for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHjzA-0005GP-8r for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hIIDi1P+C/mBKUOtNouihFiquPQsQc82pEkAq9XLjtU=; b=QuR4vytqNIgVQg2f1z0B9cGwGT bjVSzOSmX36VQo4E9AvAKsMKvRzxJtH9kvZktoApCXpYTGhrXcz/7ZVPJFcmi21MeLMeRrGXALGbD +oNhkTin2kIHPgLdHTuLvwFPRagsvY5IwSqLIJ3BNyxwYOHeTKll2urO/9XyrYd2SJIU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: simplify ffa_handle_mem_share() Message-Id: Date: Thu, 13 Jun 2024 12:55:24 +0000 commit 282c33cec3dc04d052078450eb98ceb2bb2515af Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:39 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:41 2024 +0100 xen/arm: ffa: simplify ffa_handle_mem_share() Simplify ffa_handle_mem_share() by removing the start_page_idx and last_page_idx parameters from get_shm_pages() and check that the number of pages matches expectations at the end of get_shm_pages(). Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/ffa_shm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/tee/ffa_shm.c b/xen/arch/arm/tee/ffa_shm.c index 75a5b66aeb..370d83ec5c 100644 --- a/xen/arch/arm/tee/ffa_shm.c +++ b/xen/arch/arm/tee/ffa_shm.c @@ -159,10 +159,9 @@ static int32_t ffa_mem_reclaim(uint32_t handle_lo, uint32_t handle_hi, */ static int get_shm_pages(struct domain *d, struct ffa_shm_mem *shm, const struct ffa_address_range *range, - uint32_t range_count, unsigned int start_page_idx, - unsigned int *last_page_idx) + uint32_t range_count) { - unsigned int pg_idx = start_page_idx; + unsigned int pg_idx = 0; gfn_t gfn; unsigned int n; unsigned int m; @@ -191,7 +190,9 @@ static int get_shm_pages(struct domain *d, struct ffa_shm_mem *shm, } } - *last_page_idx = pg_idx; + /* The ranges must add up */ + if ( pg_idx < shm->page_count ) + return FFA_RET_INVALID_PARAMETERS; return FFA_RET_OK; } @@ -460,7 +461,6 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; struct ffa_shm_mem *shm = NULL; - unsigned int last_page_idx = 0; register_t handle_hi = 0; register_t handle_lo = 0; int ret = FFA_RET_DENIED; @@ -570,15 +570,9 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out; } - ret = get_shm_pages(d, shm, region_descr->address_range_array, range_count, - 0, &last_page_idx); + ret = get_shm_pages(d, shm, region_descr->address_range_array, range_count); if ( ret ) goto out; - if ( last_page_idx != shm->page_count ) - { - ret = FFA_RET_INVALID_PARAMETERS; - goto out; - } /* Note that share_shm() uses our tx buffer */ spin_lock(&ffa_tx_buffer_lock); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 12:55:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 12:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739954.1146930 (Exim 4.92) (envelope-from ) id 1sHjzL-0003ET-UB; Thu, 13 Jun 2024 12:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739954.1146930; Thu, 13 Jun 2024 12: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 1sHjzL-0003EL-RZ; Thu, 13 Jun 2024 12:55:35 +0000 Received: by outflank-mailman (input) for mailman id 739954; Thu, 13 Jun 2024 12:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzK-0003E8-E5 for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzK-0000jQ-DM for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHjzK-0005HG-CM for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TqAOHPHO1I2WTHBAQEFhfUtQyrv+WgimYR+d3d8cJT4=; b=2Pvq2mHKII05WcbMPsrxCOD4ul LAZhjuUtsleUNFaXrm1OspRLncuqSA0MkTHmAuLazd0LmpqpSf2nIS02OImatBKXVFIf8ITZ+deH0 ZEgcVaCnblfil1UIiwGF2u4IzvogGVOuUFY9/3TRAKvQQCgRAp4YsUozg2mOuD6TC+18=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: allow dynamically assigned SGI handlers Message-Id: Date: Thu, 13 Jun 2024 12:55:34 +0000 commit 67ef3db45a6e5c35f6491b109d88286780652b9a Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:40 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:44 2024 +0100 xen/arm: allow dynamically assigned SGI handlers Updates so request_irq() can be used with a dynamically assigned SGI irq as input. This prepares for a later patch where an FF-A schedule receiver interrupt handler is installed for an SGI generated by the secure world. >From the Arm Base System Architecture v1.0C [1]: "The system shall implement at least eight Non-secure SGIs, assigned to interrupt IDs 0-7." gic_route_irq_to_xen() don't gic_set_irq_type() for SGIs since they are always edge triggered. gic_interrupt() is updated to route the dynamically assigned SGIs to do_IRQ() instead of do_sgi(). The latter still handles the statically assigned SGI handlers like for instance GIC_SGI_CALL_FUNCTION. [1] https://developer.arm.com/documentation/den0094/ Signed-off-by: Jens Wiklander Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/gic.c | 12 +++++++----- xen/arch/arm/include/asm/gic.h | 2 +- xen/arch/arm/irq.c | 18 ++++++++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index b3467a76ae..3eaf670fd7 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -38,7 +38,7 @@ const struct gic_hw_operations *gic_hw_ops; static void __init __maybe_unused build_assertions(void) { /* Check our enum gic_sgi only covers SGIs */ - BUILD_BUG_ON(GIC_SGI_MAX > NR_GIC_SGI); + BUILD_BUG_ON(GIC_SGI_STATIC_MAX > NR_GIC_SGI); } void register_gic_ops(const struct gic_hw_operations *ops) @@ -117,7 +117,9 @@ void gic_route_irq_to_xen(struct irq_desc *desc, unsigned int priority) desc->handler = gic_hw_ops->gic_host_irq_type; - gic_set_irq_type(desc, desc->arch.type); + /* SGIs are always edge-triggered, so there is need to set it */ + if ( desc->irq >= NR_GIC_SGI) + gic_set_irq_type(desc, desc->arch.type); gic_set_irq_priority(desc, priority); } @@ -322,7 +324,7 @@ void gic_disable_cpu(void) gic_hw_ops->disable_interface(); } -static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) +static void do_static_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { struct irq_desc *desc = irq_to_desc(sgi); @@ -367,7 +369,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) /* Reading IRQ will ACK it */ irq = gic_hw_ops->read_irq(); - if ( likely(irq >= 16 && irq < 1020) ) + if ( likely(irq >= GIC_SGI_STATIC_MAX && irq < 1020) ) { isb(); do_IRQ(regs, irq, is_fiq); @@ -379,7 +381,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) } else if ( unlikely(irq < 16) ) { - do_sgi(regs, irq); + do_static_sgi(regs, irq); } else { diff --git a/xen/arch/arm/include/asm/gic.h b/xen/arch/arm/include/asm/gic.h index 03f209529b..541f0eeb80 100644 --- a/xen/arch/arm/include/asm/gic.h +++ b/xen/arch/arm/include/asm/gic.h @@ -285,7 +285,7 @@ enum gic_sgi { GIC_SGI_EVENT_CHECK, GIC_SGI_DUMP_STATE, GIC_SGI_CALL_FUNCTION, - GIC_SGI_MAX, + GIC_SGI_STATIC_MAX, }; /* SGI irq mode types */ diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index e5fb26a3de..c60502444c 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -142,7 +142,13 @@ void __init init_IRQ(void) spin_lock(&local_irqs_type_lock); for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ ) - local_irqs_type[irq] = IRQ_TYPE_INVALID; + { + /* SGIs are always edge-triggered */ + if ( irq < NR_GIC_SGI ) + local_irqs_type[irq] = IRQ_TYPE_EDGE_RISING; + else + local_irqs_type[irq] = IRQ_TYPE_INVALID; + } spin_unlock(&local_irqs_type_lock); BUG_ON(init_local_irq_data(smp_processor_id()) < 0); @@ -214,9 +220,12 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) perfc_incr(irqs); - ASSERT(irq >= 16); /* SGIs do not come down this path */ + /* Statically assigned SGIs do not come down this path */ + ASSERT(irq >= GIC_SGI_STATIC_MAX); - if ( irq < 32 ) + if ( irq < NR_GIC_SGI ) + perfc_incr(ipis); + else if ( irq < NR_GIC_LOCAL_IRQS ) perfc_incr(ppis); else perfc_incr(spis); @@ -250,6 +259,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) * The irq cannot be a PPI, we only support delivery of SPIs to * guests. */ + ASSERT(irq >= NR_GIC_SGI); vgic_inject_irq(info->d, NULL, info->virq, true); goto out_no_end; } @@ -386,7 +396,7 @@ int setup_irq(unsigned int irq, unsigned int irqflags, struct irqaction *new) { gic_route_irq_to_xen(desc, GIC_PRI_IRQ); /* It's fine to use smp_processor_id() because: - * For PPI: irq_desc is banked + * For SGI and PPI: irq_desc is banked * For SPI: we don't care for now which CPU will receive the * interrupt * TODO: Handle case where SPI is setup on different CPU than -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 12:55:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 12:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739956.1146945 (Exim 4.92) (envelope-from ) id 1sHjzW-0003Xk-6k; Thu, 13 Jun 2024 12:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739956.1146945; Thu, 13 Jun 2024 12:55: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 1sHjzW-0003Xc-3b; Thu, 13 Jun 2024 12:55:46 +0000 Received: by outflank-mailman (input) for mailman id 739956; Thu, 13 Jun 2024 12:55:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzU-0003Ws-Hm for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzU-0000jY-GQ for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHjzU-0005I9-FP for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bWgTXE8quoo4I7NLgU8EbVQ+WZ/ZrdRfQ8X51srprvg=; b=mhedCsAD4hqetDLot0hrppSWHN QCac9U1P453d42GKqozD2xqdc9tjd8kbyMToFT+S8B9StGRN+GuxOA8akTsb+TgrVISP7tqcxKM90 riM/iHx7Vlj9CShTo1Fq9Vk41c+6rPB/EZ8tR4h43tINp0mCQFaNPm52MZeBitJNOMhI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add and call init_tee_secondary() Message-Id: Date: Thu, 13 Jun 2024 12:55:44 +0000 commit dd348eb0053e13e49fc162082771f6f1d9cca654 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:41 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:49 2024 +0100 xen/arm: add and call init_tee_secondary() Add init_tee_secondary() to the TEE mediator framework and call it from start_secondary() late enough that per-cpu interrupts can be configured on CPUs as they are initialized. This is needed in later patches. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/tee/tee.h | 8 ++++++++ xen/arch/arm/smpboot.c | 2 ++ xen/arch/arm/tee/tee.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h index da324467e1..6bc13da885 100644 --- a/xen/arch/arm/include/asm/tee/tee.h +++ b/xen/arch/arm/include/asm/tee/tee.h @@ -28,6 +28,9 @@ struct tee_mediator_ops { */ bool (*probe)(void); + /* Initialize secondary CPUs */ + void (*init_secondary)(void); + /* * Called during domain construction if toolstack requests to enable * TEE support so mediator can inform TEE about new @@ -66,6 +69,7 @@ int tee_domain_init(struct domain *d, uint16_t tee_type); int tee_domain_teardown(struct domain *d); int tee_relinquish_resources(struct domain *d); uint16_t tee_get_type(void); +void init_tee_secondary(void); #define REGISTER_TEE_MEDIATOR(_name, _namestr, _type, _ops) \ static const struct tee_mediator_desc __tee_desc_##_name __used \ @@ -105,6 +109,10 @@ static inline uint16_t tee_get_type(void) return XEN_DOMCTL_CONFIG_TEE_NONE; } +static inline void init_tee_secondary(void) +{ +} + #endif /* CONFIG_TEE */ #endif /* __ARCH_ARM_TEE_TEE_H__ */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 93a10d7721..04e363088d 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -29,6 +29,7 @@ #include #include #include +#include /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn @@ -401,6 +402,7 @@ void asmlinkage start_secondary(void) */ init_maintenance_interrupt(); init_timer_interrupt(); + init_tee_secondary(); local_abort_enable(); diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index ddd17506a9..9fd1d7495b 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -96,6 +96,12 @@ static int __init tee_init(void) __initcall(tee_init); +void __init init_tee_secondary(void) +{ + if ( cur_mediator && cur_mediator->ops->init_secondary ) + cur_mediator->ops->init_secondary(); +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 12:55:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 12:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739957.1146947 (Exim 4.92) (envelope-from ) id 1sHjzg-0003cx-87; Thu, 13 Jun 2024 12:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739957.1146947; Thu, 13 Jun 2024 12: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 1sHjzg-0003cq-4y; Thu, 13 Jun 2024 12:55:56 +0000 Received: by outflank-mailman (input) for mailman id 739957; Thu, 13 Jun 2024 12:55:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjze-0003cK-KJ for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjze-0000jk-Jc for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:55:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHjze-0005Ip-Ic for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WzRgkqW2NEruEe6w8HQ8wzcF+E68ylsFfgPryQQdAtw=; b=lxMptbFOjbFkjfZKMtj0kSaH2V TI+RDRMWe3BM+uR9g9cFRUVE/2LGdUrlBy3KiDH89wi2vf/SzQXa+2Sc1MAWv3qfJWx99cZQS05iu l3Pux/nB1o52jAERoWDXaSShfIvb0r2G++q1ZmLxqdWly3fTU4hCzn7i+CUegaZlbDvE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add and call tee_free_domain_ctx() Message-Id: Date: Thu, 13 Jun 2024 12:55:54 +0000 commit 452551c723d28935cba25bf9719b1a1a99abc951 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:42 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:53 2024 +0100 xen/arm: add and call tee_free_domain_ctx() Add tee_free_domain_ctx() to the TEE mediator framework. tee_free_domain_ctx() is called from arch_domain_destroy() to allow late freeing of the d->arch.tee context. This will simplify access to d->arch.tee for domains retrieved with rcu_lock_domain_by_id(). Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/domain.c | 1 + xen/arch/arm/include/asm/tee/tee.h | 6 ++++++ xen/arch/arm/tee/tee.c | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 8bde2f730d..7cfcefd279 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -843,6 +843,7 @@ int arch_domain_teardown(struct domain *d) void arch_domain_destroy(struct domain *d) { + tee_free_domain_ctx(d); /* IOMMU page table is shared with P2M, always call * iommu_domain_destroy() before p2m_final_teardown(). */ diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h index 6bc13da885..0169fd746b 100644 --- a/xen/arch/arm/include/asm/tee/tee.h +++ b/xen/arch/arm/include/asm/tee/tee.h @@ -38,6 +38,7 @@ struct tee_mediator_ops { */ int (*domain_init)(struct domain *d); int (*domain_teardown)(struct domain *d); + void (*free_domain_ctx)(struct domain *d); /* * Called during domain destruction to relinquish resources used @@ -70,6 +71,7 @@ int tee_domain_teardown(struct domain *d); int tee_relinquish_resources(struct domain *d); uint16_t tee_get_type(void); void init_tee_secondary(void); +void tee_free_domain_ctx(struct domain *d); #define REGISTER_TEE_MEDIATOR(_name, _namestr, _type, _ops) \ static const struct tee_mediator_desc __tee_desc_##_name __used \ @@ -113,6 +115,10 @@ static inline void init_tee_secondary(void) { } +static inline void tee_free_domain_ctx(struct domain *d) +{ +} + #endif /* CONFIG_TEE */ #endif /* __ARCH_ARM_TEE_TEE_H__ */ diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index 9fd1d7495b..b1cae16c17 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -102,6 +102,12 @@ void __init init_tee_secondary(void) cur_mediator->ops->init_secondary(); } +void tee_free_domain_ctx(struct domain *d) +{ + if ( cur_mediator && cur_mediator->ops->free_domain_ctx) + cur_mediator->ops->free_domain_ctx(d); +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 12:56:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 12:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.739959.1146951 (Exim 4.92) (envelope-from ) id 1sHjzq-0003mB-BJ; Thu, 13 Jun 2024 12:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 739959.1146951; Thu, 13 Jun 2024 12:56: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 1sHjzq-0003m6-8e; Thu, 13 Jun 2024 12:56:06 +0000 Received: by outflank-mailman (input) for mailman id 739959; Thu, 13 Jun 2024 12:56:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzo-0003kQ-NG for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:56:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHjzo-0000k7-MZ for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:56:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHjzo-0005KP-Li for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 12:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IjfmOPZTeg+5mS49KWi41Zw/GXkpoBg2urhZf8WkMJI=; b=qWhIaOPAs+Pa5O28kSQS0Z71pE JbtTARKGglvRuhzGrXB6SkJmRB61EWsdhy+M5+0iTEO8b8rT0yDx9HTbGeWi+zlZ5LO9DtUOYlYpN esgsE56tjVs2970re9FBsM20Z/IVLRuKu3uDflW/cnf8rR+5MBl8vnriHisx9W1C5pss=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: support notification Message-Id: Date: Thu, 13 Jun 2024 12:56:04 +0000 commit b490f470f58d0b87653bfbee23c7e9342b049ab4 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:43 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:56 2024 +0100 xen/arm: ffa: support notification Add support for FF-A notifications, currently limited to an SP (Secure Partition) sending an asynchronous notification to a guest. Guests and Xen itself are made aware of pending notifications with an interrupt. The interrupt handler triggers a tasklet to retrieve the notifications using the FF-A ABI and deliver them to their destinations. Update ffa_partinfo_domain_init() to return error code like ffa_notif_domain_init(). Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/Makefile | 1 + xen/arch/arm/tee/ffa.c | 77 +++++++- xen/arch/arm/tee/ffa_notif.c | 425 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/tee/ffa_partinfo.c | 9 +- xen/arch/arm/tee/ffa_private.h | 56 +++++- xen/arch/arm/tee/tee.c | 2 +- xen/include/public/arch-arm.h | 14 ++ 7 files changed, 569 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/tee/Makefile b/xen/arch/arm/tee/Makefile index f0112a2f92..7c0f46f7f4 100644 --- a/xen/arch/arm/tee/Makefile +++ b/xen/arch/arm/tee/Makefile @@ -2,5 +2,6 @@ obj-$(CONFIG_FFA) += ffa.o obj-$(CONFIG_FFA) += ffa_shm.o obj-$(CONFIG_FFA) += ffa_partinfo.o obj-$(CONFIG_FFA) += ffa_rxtx.o +obj-$(CONFIG_FFA) += ffa_notif.o obj-y += tee.o obj-$(CONFIG_OPTEE) += optee.o diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 5209612963..022089278e 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -39,6 +39,12 @@ * - at most 32 shared memory regions per guest * o FFA_MSG_SEND_DIRECT_REQ: * - only supported from a VM to an SP + * o FFA_NOTIFICATION_*: + * - only supports global notifications, that is, per vCPU notifications + * are not supported + * - doesn't support signalling the secondary scheduler of pending + * notification for secure partitions + * - doesn't support notifications for Xen itself * * There are some large locked sections with ffa_tx_buffer_lock and * ffa_rx_buffer_lock. Especially the ffa_tx_buffer_lock spinlock used @@ -194,6 +200,8 @@ out: static void handle_features(struct cpu_user_regs *regs) { + struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; uint32_t a1 = get_user_reg(regs, 1); unsigned int n; @@ -240,6 +248,30 @@ static void handle_features(struct cpu_user_regs *regs) BUILD_BUG_ON(PAGE_SIZE != FFA_PAGE_SIZE); ffa_set_regs_success(regs, 0, 0); break; + case FFA_FEATURE_NOTIF_PEND_INTR: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, GUEST_FFA_NOTIF_PEND_INTR_ID, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; + case FFA_FEATURE_SCHEDULE_RECV_INTR: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, GUEST_FFA_SCHEDULE_RECV_INTR_ID, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; + + case FFA_NOTIFICATION_BIND: + case FFA_NOTIFICATION_UNBIND: + case FFA_NOTIFICATION_GET: + case FFA_NOTIFICATION_SET: + case FFA_NOTIFICATION_INFO_GET_32: + case FFA_NOTIFICATION_INFO_GET_64: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, 0, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; default: ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); break; @@ -305,6 +337,22 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) get_user_reg(regs, 1)), get_user_reg(regs, 3)); break; + case FFA_NOTIFICATION_BIND: + e = ffa_handle_notification_bind(regs); + break; + case FFA_NOTIFICATION_UNBIND: + e = ffa_handle_notification_unbind(regs); + break; + case FFA_NOTIFICATION_INFO_GET_32: + case FFA_NOTIFICATION_INFO_GET_64: + ffa_handle_notification_info_get(regs); + return true; + case FFA_NOTIFICATION_GET: + ffa_handle_notification_get(regs); + return true; + case FFA_NOTIFICATION_SET: + e = ffa_handle_notification_set(regs); + break; default: gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); @@ -322,6 +370,7 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) static int ffa_domain_init(struct domain *d) { struct ffa_ctx *ctx; + int ret; if ( !ffa_version ) return -ENODEV; @@ -345,10 +394,11 @@ static int ffa_domain_init(struct domain *d) * error, so no need for cleanup in this function. */ - if ( !ffa_partinfo_domain_init(d) ) - return -EIO; + ret = ffa_partinfo_domain_init(d); + if ( ret ) + return ret; - return 0; + return ffa_notif_domain_init(d); } static void ffa_domain_teardown_continue(struct ffa_ctx *ctx, bool first_time) @@ -376,13 +426,6 @@ static void ffa_domain_teardown_continue(struct ffa_ctx *ctx, bool first_time) } else { - /* - * domain_destroy() might have been called (via put_domain() in - * ffa_reclaim_shms()), so we can't touch the domain structure - * anymore. - */ - xfree(ctx); - /* Only check if there has been a change to the teardown queue */ if ( !first_time ) { @@ -423,17 +466,28 @@ static int ffa_domain_teardown(struct domain *d) return 0; ffa_rxtx_domain_destroy(d); + ffa_notif_domain_destroy(d); ffa_domain_teardown_continue(ctx, true /* first_time */); return 0; } +static void ffa_free_domain_ctx(struct domain *d) +{ + XFREE(d->arch.tee); +} + static int ffa_relinquish_resources(struct domain *d) { return 0; } +static void ffa_init_secondary(void) +{ + ffa_notif_init_interrupt(); +} + static bool ffa_probe(void) { uint32_t vers; @@ -502,6 +556,7 @@ static bool ffa_probe(void) if ( !ffa_partinfo_init() ) goto err_rxtx_destroy; + ffa_notif_init(); INIT_LIST_HEAD(&ffa_teardown_head); init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); @@ -517,8 +572,10 @@ err_rxtx_destroy: static const struct tee_mediator_ops ffa_ops = { .probe = ffa_probe, + .init_secondary = ffa_init_secondary, .domain_init = ffa_domain_init, .domain_teardown = ffa_domain_teardown, + .free_domain_ctx = ffa_free_domain_ctx, .relinquish_resources = ffa_relinquish_resources, .handle_call = ffa_handle_call, }; diff --git a/xen/arch/arm/tee/ffa_notif.c b/xen/arch/arm/tee/ffa_notif.c new file mode 100644 index 0000000000..541e61d2f6 --- /dev/null +++ b/xen/arch/arm/tee/ffa_notif.c @@ -0,0 +1,425 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2024 Linaro Limited + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "ffa_private.h" + +static bool __ro_after_init notif_enabled; +static unsigned int __ro_after_init notif_sri_irq; + +int ffa_handle_notification_bind(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t src_dst = get_user_reg(regs, 1); + uint32_t flags = get_user_reg(regs, 2); + uint32_t bitmap_lo = get_user_reg(regs, 3); + uint32_t bitmap_hi = get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + if ( flags ) /* Only global notifications are supported */ + return FFA_RET_DENIED; + + /* + * We only support notifications from SP so no need to check the sender + * endpoint ID, the SPMC will take care of that for us. + */ + return ffa_simple_call(FFA_NOTIFICATION_BIND, src_dst, flags, bitmap_hi, + bitmap_lo); +} + +int ffa_handle_notification_unbind(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t src_dst = get_user_reg(regs, 1); + uint32_t bitmap_lo = get_user_reg(regs, 3); + uint32_t bitmap_hi = get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + /* + * We only support notifications from SP so no need to check the + * destination endpoint ID, the SPMC will take care of that for us. + */ + return ffa_simple_call(FFA_NOTIFICATION_UNBIND, src_dst, 0, bitmap_hi, + bitmap_lo); +} + +void ffa_handle_notification_info_get(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; + + if ( !notif_enabled ) + { + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + return; + } + + if ( test_and_clear_bool(ctx->notif.secure_pending) ) + { + /* A pending global notification for the guest */ + ffa_set_regs(regs, FFA_SUCCESS_64, 0, + 1U << FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT, ffa_get_vm_id(d), + 0, 0, 0, 0); + } + else + { + /* Report an error if there where no pending global notification */ + ffa_set_regs_error(regs, FFA_RET_NO_DATA); + } +} + +void ffa_handle_notification_get(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t recv = get_user_reg(regs, 1); + uint32_t flags = get_user_reg(regs, 2); + uint32_t w2 = 0; + uint32_t w3 = 0; + uint32_t w4 = 0; + uint32_t w5 = 0; + uint32_t w6 = 0; + uint32_t w7 = 0; + + if ( !notif_enabled ) + { + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + return; + } + + if ( (recv & 0xFFFFU) != ffa_get_vm_id(d) ) + { + ffa_set_regs_error(regs, FFA_RET_INVALID_PARAMETERS); + return; + } + + if ( flags & ( FFA_NOTIF_FLAG_BITMAP_SP | FFA_NOTIF_FLAG_BITMAP_SPM ) ) + { + struct arm_smccc_1_2_regs arg = { + .a0 = FFA_NOTIFICATION_GET, + .a1 = recv, + .a2 = flags & ( FFA_NOTIF_FLAG_BITMAP_SP | + FFA_NOTIF_FLAG_BITMAP_SPM ), + }; + struct arm_smccc_1_2_regs resp; + int32_t e; + + /* + * Clear secure pending if both FFA_NOTIF_FLAG_BITMAP_SP and + * FFA_NOTIF_FLAG_BITMAP_SPM are set since secure world can't have + * any more pending notifications. + */ + if ( ( flags & FFA_NOTIF_FLAG_BITMAP_SP ) && + ( flags & FFA_NOTIF_FLAG_BITMAP_SPM ) ) + { + struct ffa_ctx *ctx = d->arch.tee; + + ACCESS_ONCE(ctx->notif.secure_pending) = false; + } + + arm_smccc_1_2_smc(&arg, &resp); + e = ffa_get_ret_code(&resp); + if ( e ) + { + ffa_set_regs_error(regs, e); + return; + } + + if ( flags & FFA_NOTIF_FLAG_BITMAP_SP ) + { + w2 = resp.a2; + w3 = resp.a3; + } + + if ( flags & FFA_NOTIF_FLAG_BITMAP_SPM ) + w6 = resp.a6; + } + + ffa_set_regs(regs, FFA_SUCCESS_32, 0, w2, w3, w4, w5, w6, w7); +} + +int ffa_handle_notification_set(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t src_dst = get_user_reg(regs, 1); + uint32_t flags = get_user_reg(regs, 2); + uint32_t bitmap_lo = get_user_reg(regs, 3); + uint32_t bitmap_hi = get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst >> 16) != ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + /* Let the SPMC check the destination of the notification */ + return ffa_simple_call(FFA_NOTIFICATION_SET, src_dst, flags, bitmap_lo, + bitmap_hi); +} + +/* + * Extract a 16-bit ID (index n) from the successful return value from + * FFA_NOTIFICATION_INFO_GET_64 or FFA_NOTIFICATION_INFO_GET_32. IDs are + * returned in registers 3 to 7 with four IDs per register for 64-bit + * calling convention and two IDs per register for 32-bit calling + * convention. + */ +static uint16_t get_id_from_resp(struct arm_smccc_1_2_regs *resp, + unsigned int n) +{ + unsigned int ids_per_reg; + unsigned int reg_idx; + unsigned int reg_shift; + + if ( smccc_is_conv_64(resp->a0) ) + ids_per_reg = 4; + else + ids_per_reg = 2; + + reg_idx = n / ids_per_reg + 3; + reg_shift = ( n % ids_per_reg ) * 16; + + switch ( reg_idx ) + { + case 3: + return resp->a3 >> reg_shift; + case 4: + return resp->a4 >> reg_shift; + case 5: + return resp->a5 >> reg_shift; + case 6: + return resp->a6 >> reg_shift; + case 7: + return resp->a7 >> reg_shift; + default: + ASSERT(0); /* "Can't happen" */ + return 0; + } +} + +static void notif_vm_pend_intr(uint16_t vm_id) +{ + struct ffa_ctx *ctx; + struct domain *d; + struct vcpu *v; + + /* + * vm_id == 0 means a notifications pending for Xen itself, but + * we don't support that yet. + */ + if ( !vm_id ) + return; + + /* + * This can fail if the domain has been destroyed after + * FFA_NOTIFICATION_INFO_GET_64. Ignoring this is harmless since the + * guest doesn't exist any more. + */ + d = ffa_rcu_lock_domain_by_vm_id(vm_id); + if ( !d ) + return; + + /* + * Failing here is unlikely since the domain ID must have been reused + * for a new domain between the FFA_NOTIFICATION_INFO_GET_64 and + * ffa_rcu_lock_domain_by_vm_id() calls. + * + * Continuing on the scenario above if the domain has FF-A enabled. We + * can't tell here if the domain ID has been reused for a new domain so + * we inject an NPI. When the NPI handler in the domain calls + * FFA_NOTIFICATION_GET it will have accurate information, the worst + * case is a spurious NPI. + */ + ctx = d->arch.tee; + if ( !ctx ) + goto out_unlock; + + /* + * arch.tee is freed from complete_domain_destroy() so the RCU lock + * guarantees that the data structure isn't freed while we're accessing + * it. + */ + ACCESS_ONCE(ctx->notif.secure_pending) = true; + + /* + * Since we're only delivering global notification, always + * deliver to the first online vCPU. It doesn't matter + * which we chose, as long as it's available. + */ + for_each_vcpu(d, v) + { + if ( is_vcpu_online(v) ) + { + vgic_inject_irq(d, v, GUEST_FFA_NOTIF_PEND_INTR_ID, + true); + break; + } + } + if ( !v ) + printk(XENLOG_ERR "ffa: can't inject NPI, all vCPUs offline\n"); + +out_unlock: + rcu_unlock_domain(d); +} + +static void notif_sri_action(void *unused) +{ + const struct arm_smccc_1_2_regs arg = { + .a0 = FFA_NOTIFICATION_INFO_GET_64, + }; + struct arm_smccc_1_2_regs resp; + unsigned int id_pos; + unsigned int list_count; + uint64_t ids_count; + unsigned int n; + int32_t res; + + do { + arm_smccc_1_2_smc(&arg, &resp); + res = ffa_get_ret_code(&resp); + if ( res ) + { + if ( res != FFA_RET_NO_DATA ) + printk(XENLOG_ERR "ffa: notification info get failed: error %d\n", + res); + return; + } + + ids_count = resp.a2 >> FFA_NOTIF_INFO_GET_ID_LIST_SHIFT; + list_count = ( resp.a2 >> FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT ) & + FFA_NOTIF_INFO_GET_ID_COUNT_MASK; + + id_pos = 0; + for ( n = 0; n < list_count; n++ ) + { + unsigned int count = ((ids_count >> 2 * n) & 0x3) + 1; + uint16_t vm_id = get_id_from_resp(&resp, id_pos); + + notif_vm_pend_intr(vm_id); + + id_pos += count; + } + + } while (resp.a2 & FFA_NOTIF_INFO_GET_MORE_FLAG); +} + +static DECLARE_TASKLET(notif_sri_tasklet, notif_sri_action, NULL); + +static void notif_irq_handler(int irq, void *data) +{ + tasklet_schedule(¬if_sri_tasklet); +} + +static int32_t ffa_notification_bitmap_create(uint16_t vm_id, + uint32_t vcpu_count) +{ + return ffa_simple_call(FFA_NOTIFICATION_BITMAP_CREATE, vm_id, vcpu_count, + 0, 0); +} + +static int32_t ffa_notification_bitmap_destroy(uint16_t vm_id) +{ + return ffa_simple_call(FFA_NOTIFICATION_BITMAP_DESTROY, vm_id, 0, 0, 0); +} + +void ffa_notif_init_interrupt(void) +{ + int ret; + + if ( notif_enabled && notif_sri_irq < NR_GIC_SGI ) + { + /* + * An error here is unlikely since the primary CPU has already + * succeeded in installing the interrupt handler. If this fails it + * may lead to a problem with notifictaions. + * + * The CPUs without an notification handler installed will fail to + * trigger on the SGI indicating that there are notifications + * pending, while the SPMC in the secure world will not notice that + * the interrupt was lost. + */ + ret = request_irq(notif_sri_irq, 0, notif_irq_handler, "FF-A notif", + NULL); + if ( ret ) + printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", + notif_sri_irq, ret); + } +} + +void ffa_notif_init(void) +{ + const struct arm_smccc_1_2_regs arg = { + .a0 = FFA_FEATURES, + .a1 = FFA_FEATURE_SCHEDULE_RECV_INTR, + }; + struct arm_smccc_1_2_regs resp; + unsigned int irq; + int ret; + + arm_smccc_1_2_smc(&arg, &resp); + if ( resp.a0 != FFA_SUCCESS_32 ) + return; + + irq = resp.a2; + notif_sri_irq = irq; + if ( irq >= NR_GIC_SGI ) + irq_set_type(irq, IRQ_TYPE_EDGE_RISING); + ret = request_irq(irq, 0, notif_irq_handler, "FF-A notif", NULL); + if ( ret ) + { + printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", + irq, ret); + return; + } + + notif_enabled = true; +} + +int ffa_notif_domain_init(struct domain *d) +{ + struct ffa_ctx *ctx = d->arch.tee; + int32_t res; + + if ( !notif_enabled ) + return 0; + + res = ffa_notification_bitmap_create(ffa_get_vm_id(d), d->max_vcpus); + if ( res ) + return -ENOMEM; + + ctx->notif.enabled = true; + + return 0; +} + +void ffa_notif_domain_destroy(struct domain *d) +{ + struct ffa_ctx *ctx = d->arch.tee; + + if ( ctx->notif.enabled ) + { + ffa_notification_bitmap_destroy(ffa_get_vm_id(d)); + ctx->notif.enabled = false; + } +} diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinfo.c index dc10595848..93a03c6bc6 100644 --- a/xen/arch/arm/tee/ffa_partinfo.c +++ b/xen/arch/arm/tee/ffa_partinfo.c @@ -306,7 +306,7 @@ static void vm_destroy_bitmap_init(struct ffa_ctx *ctx, } } -bool ffa_partinfo_domain_init(struct domain *d) +int ffa_partinfo_domain_init(struct domain *d) { unsigned int count = BITS_TO_LONGS(subscr_vm_destroyed_count); struct ffa_ctx *ctx = d->arch.tee; @@ -315,7 +315,7 @@ bool ffa_partinfo_domain_init(struct domain *d) ctx->vm_destroy_bitmap = xzalloc_array(unsigned long, count); if ( !ctx->vm_destroy_bitmap ) - return false; + return -ENOMEM; for ( n = 0; n < subscr_vm_created_count; n++ ) { @@ -330,7 +330,10 @@ bool ffa_partinfo_domain_init(struct domain *d) } vm_destroy_bitmap_init(ctx, n); - return n == subscr_vm_created_count; + if ( n != subscr_vm_created_count ) + return -EIO; + + return 0; } bool ffa_partinfo_domain_destroy(struct domain *d) diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index 98236cbf14..7c6b06f686 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -25,6 +25,7 @@ #define FFA_RET_DENIED -6 #define FFA_RET_RETRY -7 #define FFA_RET_ABORTED -8 +#define FFA_RET_NO_DATA -9 /* FFA_VERSION helpers */ #define FFA_VERSION_MAJOR_SHIFT 16U @@ -175,6 +176,21 @@ */ #define FFA_PARTITION_INFO_GET_COUNT_FLAG BIT(0, U) +/* Flags used in calls to FFA_NOTIFICATION_GET interface */ +#define FFA_NOTIF_FLAG_BITMAP_SP BIT(0, U) +#define FFA_NOTIF_FLAG_BITMAP_VM BIT(1, U) +#define FFA_NOTIF_FLAG_BITMAP_SPM BIT(2, U) +#define FFA_NOTIF_FLAG_BITMAP_HYP BIT(3, U) + +#define FFA_NOTIF_INFO_GET_MORE_FLAG BIT(0, U) +#define FFA_NOTIF_INFO_GET_ID_LIST_SHIFT 12 +#define FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT 7 +#define FFA_NOTIF_INFO_GET_ID_COUNT_MASK 0x1F + +/* Feature IDs used with FFA_FEATURES */ +#define FFA_FEATURE_NOTIF_PEND_INTR 0x1U +#define FFA_FEATURE_SCHEDULE_RECV_INTR 0x2U + /* Function IDs */ #define FFA_ERROR 0x84000060U #define FFA_SUCCESS_32 0x84000061U @@ -213,6 +229,24 @@ #define FFA_MEM_FRAG_TX 0x8400007BU #define FFA_MSG_SEND 0x8400006EU #define FFA_MSG_POLL 0x8400006AU +#define FFA_NOTIFICATION_BITMAP_CREATE 0x8400007DU +#define FFA_NOTIFICATION_BITMAP_DESTROY 0x8400007EU +#define FFA_NOTIFICATION_BIND 0x8400007FU +#define FFA_NOTIFICATION_UNBIND 0x84000080U +#define FFA_NOTIFICATION_SET 0x84000081U +#define FFA_NOTIFICATION_GET 0x84000082U +#define FFA_NOTIFICATION_INFO_GET_32 0x84000083U +#define FFA_NOTIFICATION_INFO_GET_64 0xC4000083U + +struct ffa_ctx_notif { + bool enabled; + + /* + * True if domain is reported by FFA_NOTIFICATION_INFO_GET to have + * pending global notifications. + */ + bool secure_pending; +}; struct ffa_ctx { void *rx; @@ -228,6 +262,7 @@ struct ffa_ctx { struct list_head shm_list; /* Number of allocated shared memory object */ unsigned int shm_count; + struct ffa_ctx_notif notif; /* * tx_lock is used to serialize access to tx * rx_lock is used to serialize access to rx @@ -257,7 +292,7 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs); int ffa_handle_mem_reclaim(uint64_t handle, uint32_t flags); bool ffa_partinfo_init(void); -bool ffa_partinfo_domain_init(struct domain *d); +int ffa_partinfo_domain_init(struct domain *d); bool ffa_partinfo_domain_destroy(struct domain *d); int32_t ffa_handle_partition_info_get(uint32_t w1, uint32_t w2, uint32_t w3, uint32_t w4, uint32_t w5, uint32_t *count, @@ -271,12 +306,31 @@ uint32_t ffa_handle_rxtx_map(uint32_t fid, register_t tx_addr, uint32_t ffa_handle_rxtx_unmap(void); int32_t ffa_handle_rx_release(void); +void ffa_notif_init(void); +void ffa_notif_init_interrupt(void); +int ffa_notif_domain_init(struct domain *d); +void ffa_notif_domain_destroy(struct domain *d); + +int ffa_handle_notification_bind(struct cpu_user_regs *regs); +int ffa_handle_notification_unbind(struct cpu_user_regs *regs); +void ffa_handle_notification_info_get(struct cpu_user_regs *regs); +void ffa_handle_notification_get(struct cpu_user_regs *regs); +int ffa_handle_notification_set(struct cpu_user_regs *regs); + static inline uint16_t ffa_get_vm_id(const struct domain *d) { /* +1 since 0 is reserved for the hypervisor in FF-A */ return d->domain_id + 1; } +static inline struct domain *ffa_rcu_lock_domain_by_vm_id(uint16_t vm_id) +{ + ASSERT(vm_id); + + /* -1 to match ffa_get_vm_id() */ + return rcu_lock_domain_by_id(vm_id - 1); +} + static inline void ffa_set_regs(struct cpu_user_regs *regs, register_t v0, register_t v1, register_t v2, register_t v3, register_t v4, register_t v5, register_t v6, diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index b1cae16c17..3f65e45a78 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -94,7 +94,7 @@ static int __init tee_init(void) return 0; } -__initcall(tee_init); +presmp_initcall(tee_init); void __init init_tee_secondary(void) { diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 289af81bd6..e2412a1747 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -505,6 +505,7 @@ typedef uint64_t xen_callback_t; #define GUEST_MAX_VCPUS 128 /* Interrupts */ + #define GUEST_TIMER_VIRT_PPI 27 #define GUEST_TIMER_PHYS_S_PPI 29 #define GUEST_TIMER_PHYS_NS_PPI 30 @@ -515,6 +516,19 @@ typedef uint64_t xen_callback_t; #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 #define GUEST_VIRTIO_MMIO_SPI_LAST 43 +/* + * SGI is the preferred delivery mechanism of FF-A pending notifications or + * schedule recveive interrupt. SGIs 8-15 are normally not used by a guest + * as they in a non-virtualized system typically are assigned to the secure + * world. Here we're free to use SGI 8-15 since they are virtual and have + * nothing to do with the secure world. + * + * For partitioning of SGIs see also Arm Base System Architecture v1.0C, + * https://developer.arm.com/documentation/den0094/ + */ +#define GUEST_FFA_NOTIF_PEND_INTR_ID 8 +#define GUEST_FFA_SCHEDULE_RECV_INTR_ID 9 + /* PSCI functions */ #define PSCI_cpu_suspend 0 #define PSCI_cpu_off 1 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 15:00:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 15:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740051.1147055 (Exim 4.92) (envelope-from ) id 1sHlvp-0004Dx-AD; Thu, 13 Jun 2024 15:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740051.1147055; Thu, 13 Jun 2024 15: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 1sHlvp-0004Dg-74; Thu, 13 Jun 2024 15:00:05 +0000 Received: by outflank-mailman (input) for mailman id 740051; Thu, 13 Jun 2024 15:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHlvo-00042N-AB for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHlvo-0002zA-7e for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHlvo-0005PD-5U for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LXnghYFTo9L9NMsX1XLbvapR2HLWhgAL9omn5n3mXb0=; b=PHBltANjHVBKPh347q19amP1pn 8Ua574O1QSCCxGYVsSng/BZzut8kbuLdqk/0tCWpvD0XuL/V891MR/Zu4FbUThs3B5wil0WatjFjI UN9Z+m4qVWC6UdSUfGzeExVVAT9fgUqGsNBWamWK1l4YuSoG5F5Y0npPVKv9rKjcH84Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/EPT: correct special page checking in epte_get_entry_emt() Message-Id: Date: Thu, 13 Jun 2024 15:00:04 +0000 commit 5540b94e8191059eb9cbbe98ac316232a42208f6 Author: Jan Beulich AuthorDate: Thu Jun 13 16:53:34 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 13 16:53:34 2024 +0200 x86/EPT: correct special page checking in epte_get_entry_emt() mfn_valid() granularity is (currently) 256Mb. Therefore the start of a 1Gb page passing the test doesn't necessarily mean all parts of such a range would also pass. Yet using the result of mfn_to_page() on an MFN which doesn't pass mfn_valid() checking is liable to result in a crash (the invocation of mfn_to_page() alone is presumably "just" UB in such a case). Fixes: ca24b2ffdbd9 ("x86/hvm: set 'ipat' in EPT for special pages") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/mm/p2m-ept.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index f83610cb8c..9f276afaea 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -519,8 +519,12 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, } for ( special_pgs = i = 0; i < (1ul << order); i++ ) - if ( is_special_page(mfn_to_page(mfn_add(mfn, i))) ) + { + mfn_t cur = mfn_add(mfn, i); + + if ( mfn_valid(cur) && is_special_page(mfn_to_page(cur)) ) special_pgs++; + } if ( special_pgs ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 15:00:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 15:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740052.1147060 (Exim 4.92) (envelope-from ) id 1sHlvz-0004Sm-D8; Thu, 13 Jun 2024 15:00:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740052.1147060; Thu, 13 Jun 2024 15: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 1sHlvz-0004Se-Aa; Thu, 13 Jun 2024 15:00:15 +0000 Received: by outflank-mailman (input) for mailman id 740052; Thu, 13 Jun 2024 15:00:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHlvy-0004SU-Bw for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHlvy-0002zS-B9 for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHlvy-0005R2-9m for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OnWkjYGklHovCOJ3zkBTKvd+6f/0IOxjh1vyR2cvxfg=; b=2cP7u2Xcl5l9rlO7zuTOIQx4v6 uhCaPP0GTIaV9RTlDmxj7U75SC5S5Ht6v20boBwY41sR0qao4jj/3dZFczRj0VNkgUTL3CEg63IGC vK5j+mL8AdtSQ7WVz/sH52eNVXP7HYZ70hrXkWWgRwmcUCsiipvr1+irr0FZSvhpiql8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/EPT: avoid marking non-present entries for re-configuring Message-Id: Date: Thu, 13 Jun 2024 15:00:14 +0000 commit 777c71d31325bc55ba1cc3f317d4155fe519ab0b Author: Jan Beulich AuthorDate: Thu Jun 13 16:54:17 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 13 16:54:17 2024 +0200 x86/EPT: avoid marking non-present entries for re-configuring For non-present entries EMT, like most other fields, is meaningless to hardware. Make the logic in ept_set_entry() setting the field (and iPAT) conditional upon dealing with a present entry, leaving the value at 0 otherwise. This has two effects for epte_get_entry_emt() which we'll want to leverage subsequently: 1) The call moved here now won't be issued with INVALID_MFN anymore (a respective BUG_ON() is being added). 2) Neither of the other two calls could now be issued with a truncated form of INVALID_MFN anymore (as long as there's no bug anywhere marking an entry present when that was populated using INVALID_MFN). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/p2m-ept.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 9f276afaea..a3ffb97876 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -650,6 +650,8 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) if ( e.emt != MTRR_NUM_TYPES ) break; + ASSERT(is_epte_present(&e)); + if ( level == 0 ) { for ( gfn -= i, i = 0; i < EPT_PAGETABLE_ENTRIES; ++i ) @@ -915,17 +917,6 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { - bool ipat; - int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, - i * EPT_TABLE_ORDER, &ipat, - p2mt); - - if ( emt >= 0 ) - new_entry.emt = emt; - else /* ept_handle_misconfig() will need to take care of this. */ - new_entry.emt = MTRR_NUM_TYPES; - - new_entry.ipat = ipat; new_entry.sp = !!i; new_entry.sa_p2mt = p2mt; new_entry.access = p2ma; @@ -941,6 +932,22 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, need_modify_vtd_table = 0; ept_p2m_type_to_flags(p2m, &new_entry); + + if ( is_epte_present(&new_entry) ) + { + bool ipat; + int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, + i * EPT_TABLE_ORDER, &ipat, + p2mt); + + BUG_ON(mfn_eq(mfn, INVALID_MFN)); + + if ( emt >= 0 ) + new_entry.emt = emt; + else /* ept_handle_misconfig() will need to take care of this. */ + new_entry.emt = MTRR_NUM_TYPES; + new_entry.ipat = ipat; + } } if ( sve != -1 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 13 15:00:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jun 2024 15:00:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740054.1147064 (Exim 4.92) (envelope-from ) id 1sHlw9-0004W4-Ei; Thu, 13 Jun 2024 15:00:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740054.1147064; Thu, 13 Jun 2024 15:00: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 1sHlw9-0004Vx-C0; Thu, 13 Jun 2024 15:00:25 +0000 Received: by outflank-mailman (input) for mailman id 740054; Thu, 13 Jun 2024 15:00:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHlw8-0004Vn-F2 for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHlw8-0002zr-EC for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHlw8-0005SC-DL for xen-changelog@lists.xenproject.org; Thu, 13 Jun 2024 15:00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0V8h3P9srmXnn1ct+UTOup3D5ng39ibnPL7KhV20i1s=; b=6jmnwGn2mbzQJsg0GbPbxGrjth riXgOmVpAlX344unEX92WeIoKq2gZH+lBBLfdi5s/A/Fv6NMIOuw3P4FbIs4YX7Qt5xYdKEkQkxVQ 9On192SlSWUYO+GoOmGz74CiRDJRA1c/Jp1uvtLuXcZoHmdQXM+8M1fEs8JsNgqFO24A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() Message-Id: Date: Thu, 13 Jun 2024 15:00:24 +0000 commit 4fdd8d75566fdad06667a79ec0ce6f43cc466c54 Author: Jan Beulich AuthorDate: Thu Jun 13 16:55:22 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 13 16:55:22 2024 +0200 x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() mfn_valid() is RAM-focused; it will often return false for MMIO. Yet access to actual MMIO space should not generally be restricted to UC only; especially video frame buffer accesses are unduly affected by such a restriction. Since, as of 777c71d31325 ("x86/EPT: avoid marking non-present entries for re-configuring"), the function won't be called with INVALID_MFN or, worse, truncated forms thereof anymore, we call fully drop that check. Fixes: 81fd0d3ca4b2 ("x86/hvm: simplify 'mmio_direct' check in epte_get_entry_emt()") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/mm/p2m-ept.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index a3ffb97876..469e27ee93 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -501,12 +501,6 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, return -1; } - if ( !mfn_valid(mfn) ) - { - *ipat = true; - return X86_MT_UC; - } - /* * Conditional must be kept in sync with the code in * {iomem,ioports}_{permit,deny}_access(). -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:44:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740356.1147400 (Exim 4.92) (envelope-from ) id 1sHzjH-0006XU-F8; Fri, 14 Jun 2024 05:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740356.1147400; Fri, 14 Jun 2024 05: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 1sHzjH-0006XM-CW; Fri, 14 Jun 2024 05:44:03 +0000 Received: by outflank-mailman (input) for mailman id 740356; Fri, 14 Jun 2024 05:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzjG-0006XG-EZ for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzjG-0003o3-6P for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzjG-0000Lq-4r for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2YLO33wBKtUxmmQatXdISCm/8NxUIpE9dzQ/IUBy9TA=; b=yWdf0BIcTtUuqqE1fhpE7vkf/o lMjuMuh8WtphtQiIbYB2mV7J+gWwAuu0ruqp/2Xwx33iki/1vbrcRX2BYyXZh7DouATyvyyiFoDGK sJ6oLtj9OzVCxhxsri9p60iIor2R707+u2GTXNS7h3NnW/AvMTT5PeX5E+jXWsZTN1Do=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: refactor ffa_handle_call() Message-Id: Date: Fri, 14 Jun 2024 05:44:02 +0000 commit 66e6e47511d1894ab18d69221207069d8e93c7b6 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:37 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:32 2024 +0100 xen/arm: ffa: refactor ffa_handle_call() Refactors the large switch block in ffa_handle_call() to use common code for the simple case where it's either an error code or success with no further parameters. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/ffa.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 8665201e34..5209612963 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -273,18 +273,10 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) case FFA_RXTX_MAP_64: e = ffa_handle_rxtx_map(fid, get_user_reg(regs, 1), get_user_reg(regs, 2), get_user_reg(regs, 3)); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_RXTX_UNMAP: e = ffa_handle_rxtx_unmap(); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_PARTITION_INFO_GET: e = ffa_handle_partition_info_get(get_user_reg(regs, 1), get_user_reg(regs, 2), @@ -299,11 +291,7 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) return true; case FFA_RX_RELEASE: e = ffa_handle_rx_release(); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_MSG_SEND_DIRECT_REQ_32: case FFA_MSG_SEND_DIRECT_REQ_64: handle_msg_send_direct_req(regs, fid); @@ -316,17 +304,19 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) e = ffa_handle_mem_reclaim(regpair_to_uint64(get_user_reg(regs, 2), get_user_reg(regs, 1)), get_user_reg(regs, 3)); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; default: gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); return true; } + + if ( e ) + ffa_set_regs_error(regs, e); + else + ffa_set_regs_success(regs, 0, 0); + return true; } static int ffa_domain_init(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740357.1147405 (Exim 4.92) (envelope-from ) id 1sHzjR-0006Z4-GR; Fri, 14 Jun 2024 05:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740357.1147405; Fri, 14 Jun 2024 05: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 1sHzjR-0006Yw-Dv; Fri, 14 Jun 2024 05:44:13 +0000 Received: by outflank-mailman (input) for mailman id 740357; Fri, 14 Jun 2024 05:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzjQ-0006Yo-Bp for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzjQ-0003pg-B4 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzjQ-0000MR-8X for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=A4hoaQa2Y2C7fPfdAn7Btf1q8pU7VyEPt64eWlV4mOc=; b=yoNplQyYvtvvwjSRd1pNKx6Uxb RJBhTUuTZJiSpKZsNTybHY30PWlKIc5r8FuyKL7wghkC3Tn6rL+8sCciu8zmSjT3zvMmakOHC4uWX +8qiJGKRtzKbCfysAiC+be9MkEVbNKbifLZudZDmH0nhtxekUOL8r8nEclvxymUl2eKo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: use ACCESS_ONCE() Message-Id: Date: Fri, 14 Jun 2024 05:44:12 +0000 commit 4d2b1b5d6933e3ef26fb4905892007921205aaff Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:38 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:39 2024 +0100 xen/arm: ffa: use ACCESS_ONCE() Replace read_atomic() with ACCESS_ONCE() to match the intended use, that is, to prevent the compiler from (via optimization) reading shared memory more than once. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/ffa_shm.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/tee/ffa_shm.c b/xen/arch/arm/tee/ffa_shm.c index eed9ad2d29..75a5b66aeb 100644 --- a/xen/arch/arm/tee/ffa_shm.c +++ b/xen/arch/arm/tee/ffa_shm.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -171,8 +172,8 @@ static int get_shm_pages(struct domain *d, struct ffa_shm_mem *shm, for ( n = 0; n < range_count; n++ ) { - page_count = read_atomic(&range[n].page_count); - addr = read_atomic(&range[n].address); + page_count = ACCESS_ONCE(range[n].page_count); + addr = ACCESS_ONCE(range[n].address); for ( m = 0; m < page_count; m++ ) { if ( pg_idx >= shm->page_count ) @@ -527,13 +528,13 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out_unlock; mem_access = ctx->tx + trans.mem_access_offs; - if ( read_atomic(&mem_access->access_perm.perm) != FFA_MEM_ACC_RW ) + if ( ACCESS_ONCE(mem_access->access_perm.perm) != FFA_MEM_ACC_RW ) { ret = FFA_RET_NOT_SUPPORTED; goto out_unlock; } - region_offs = read_atomic(&mem_access->region_offs); + region_offs = ACCESS_ONCE(mem_access->region_offs); if ( sizeof(*region_descr) + region_offs > frag_len ) { ret = FFA_RET_NOT_SUPPORTED; @@ -541,8 +542,8 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) } region_descr = ctx->tx + region_offs; - range_count = read_atomic(®ion_descr->address_range_count); - page_count = read_atomic(®ion_descr->total_page_count); + range_count = ACCESS_ONCE(region_descr->address_range_count); + page_count = ACCESS_ONCE(region_descr->total_page_count); if ( !page_count ) { @@ -557,7 +558,7 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out_unlock; } shm->sender_id = trans.sender_id; - shm->ep_id = read_atomic(&mem_access->access_perm.endpoint_id); + shm->ep_id = ACCESS_ONCE(mem_access->access_perm.endpoint_id); /* * Check that the Composite memory region descriptor fits. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:44:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740358.1147408 (Exim 4.92) (envelope-from ) id 1sHzjb-0006bh-Ho; Fri, 14 Jun 2024 05:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740358.1147408; Fri, 14 Jun 2024 05: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 1sHzjb-0006ba-FN; Fri, 14 Jun 2024 05:44:23 +0000 Received: by outflank-mailman (input) for mailman id 740358; Fri, 14 Jun 2024 05:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzja-0006bU-G7 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzja-0003pu-FO for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzja-0000Ms-D4 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SoIjnq+Ih7PTd/ovIaaztulVIe9fbW4r3MIV5FKlhRc=; b=f+UecuEHoMKvLIEgT7a8g0zam3 sQdpPsyHsvdnzjTDcQ0B/98ws6OIrI1tVPgbAC253BSRxu2XVqJhGTWjndMejNr6JFiMxcl9iuBIV QL8qj9xqeApnlHXgX1L7ESc3dfb/cbMfD9RmhgxfKylAwNJ9+FF3Vw390ANRYg2iRPtg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: simplify ffa_handle_mem_share() Message-Id: Date: Fri, 14 Jun 2024 05:44:22 +0000 commit 282c33cec3dc04d052078450eb98ceb2bb2515af Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:39 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:41 2024 +0100 xen/arm: ffa: simplify ffa_handle_mem_share() Simplify ffa_handle_mem_share() by removing the start_page_idx and last_page_idx parameters from get_shm_pages() and check that the number of pages matches expectations at the end of get_shm_pages(). Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/ffa_shm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/tee/ffa_shm.c b/xen/arch/arm/tee/ffa_shm.c index 75a5b66aeb..370d83ec5c 100644 --- a/xen/arch/arm/tee/ffa_shm.c +++ b/xen/arch/arm/tee/ffa_shm.c @@ -159,10 +159,9 @@ static int32_t ffa_mem_reclaim(uint32_t handle_lo, uint32_t handle_hi, */ static int get_shm_pages(struct domain *d, struct ffa_shm_mem *shm, const struct ffa_address_range *range, - uint32_t range_count, unsigned int start_page_idx, - unsigned int *last_page_idx) + uint32_t range_count) { - unsigned int pg_idx = start_page_idx; + unsigned int pg_idx = 0; gfn_t gfn; unsigned int n; unsigned int m; @@ -191,7 +190,9 @@ static int get_shm_pages(struct domain *d, struct ffa_shm_mem *shm, } } - *last_page_idx = pg_idx; + /* The ranges must add up */ + if ( pg_idx < shm->page_count ) + return FFA_RET_INVALID_PARAMETERS; return FFA_RET_OK; } @@ -460,7 +461,6 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; struct ffa_shm_mem *shm = NULL; - unsigned int last_page_idx = 0; register_t handle_hi = 0; register_t handle_lo = 0; int ret = FFA_RET_DENIED; @@ -570,15 +570,9 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out; } - ret = get_shm_pages(d, shm, region_descr->address_range_array, range_count, - 0, &last_page_idx); + ret = get_shm_pages(d, shm, region_descr->address_range_array, range_count); if ( ret ) goto out; - if ( last_page_idx != shm->page_count ) - { - ret = FFA_RET_INVALID_PARAMETERS; - goto out; - } /* Note that share_shm() uses our tx buffer */ spin_lock(&ffa_tx_buffer_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:44:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740359.1147412 (Exim 4.92) (envelope-from ) id 1sHzjl-0006eu-Jk; Fri, 14 Jun 2024 05:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740359.1147412; Fri, 14 Jun 2024 05: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 1sHzjl-0006em-Gs; Fri, 14 Jun 2024 05:44:33 +0000 Received: by outflank-mailman (input) for mailman id 740359; Fri, 14 Jun 2024 05:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzjk-0006eV-Jh for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzjk-0003q1-Ie for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzjk-0000NJ-Ha for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rp3Zc8wa9OYxpIP1vCfL7eIC6B0R4DwaTf4FHgeGKCM=; b=GqPV45B1Wpu8RTb4otg0i6wPNf b0pyBOx/tuEWsfANHfXHpvX3DAulcNQnf2eYrbbk0RD/DFiY2xG4A87dtVDGeVJSaj41qrjWv8q9N h4ILqXSWMUJCMkilYKXexkHJagIyOiZtciiFbdD4RJGLpr636Qwzk82QXGWe2Yiy6+lk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: allow dynamically assigned SGI handlers Message-Id: Date: Fri, 14 Jun 2024 05:44:32 +0000 commit 67ef3db45a6e5c35f6491b109d88286780652b9a Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:40 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:44 2024 +0100 xen/arm: allow dynamically assigned SGI handlers Updates so request_irq() can be used with a dynamically assigned SGI irq as input. This prepares for a later patch where an FF-A schedule receiver interrupt handler is installed for an SGI generated by the secure world. >From the Arm Base System Architecture v1.0C [1]: "The system shall implement at least eight Non-secure SGIs, assigned to interrupt IDs 0-7." gic_route_irq_to_xen() don't gic_set_irq_type() for SGIs since they are always edge triggered. gic_interrupt() is updated to route the dynamically assigned SGIs to do_IRQ() instead of do_sgi(). The latter still handles the statically assigned SGI handlers like for instance GIC_SGI_CALL_FUNCTION. [1] https://developer.arm.com/documentation/den0094/ Signed-off-by: Jens Wiklander Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/gic.c | 12 +++++++----- xen/arch/arm/include/asm/gic.h | 2 +- xen/arch/arm/irq.c | 18 ++++++++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index b3467a76ae..3eaf670fd7 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -38,7 +38,7 @@ const struct gic_hw_operations *gic_hw_ops; static void __init __maybe_unused build_assertions(void) { /* Check our enum gic_sgi only covers SGIs */ - BUILD_BUG_ON(GIC_SGI_MAX > NR_GIC_SGI); + BUILD_BUG_ON(GIC_SGI_STATIC_MAX > NR_GIC_SGI); } void register_gic_ops(const struct gic_hw_operations *ops) @@ -117,7 +117,9 @@ void gic_route_irq_to_xen(struct irq_desc *desc, unsigned int priority) desc->handler = gic_hw_ops->gic_host_irq_type; - gic_set_irq_type(desc, desc->arch.type); + /* SGIs are always edge-triggered, so there is need to set it */ + if ( desc->irq >= NR_GIC_SGI) + gic_set_irq_type(desc, desc->arch.type); gic_set_irq_priority(desc, priority); } @@ -322,7 +324,7 @@ void gic_disable_cpu(void) gic_hw_ops->disable_interface(); } -static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) +static void do_static_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { struct irq_desc *desc = irq_to_desc(sgi); @@ -367,7 +369,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) /* Reading IRQ will ACK it */ irq = gic_hw_ops->read_irq(); - if ( likely(irq >= 16 && irq < 1020) ) + if ( likely(irq >= GIC_SGI_STATIC_MAX && irq < 1020) ) { isb(); do_IRQ(regs, irq, is_fiq); @@ -379,7 +381,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) } else if ( unlikely(irq < 16) ) { - do_sgi(regs, irq); + do_static_sgi(regs, irq); } else { diff --git a/xen/arch/arm/include/asm/gic.h b/xen/arch/arm/include/asm/gic.h index 03f209529b..541f0eeb80 100644 --- a/xen/arch/arm/include/asm/gic.h +++ b/xen/arch/arm/include/asm/gic.h @@ -285,7 +285,7 @@ enum gic_sgi { GIC_SGI_EVENT_CHECK, GIC_SGI_DUMP_STATE, GIC_SGI_CALL_FUNCTION, - GIC_SGI_MAX, + GIC_SGI_STATIC_MAX, }; /* SGI irq mode types */ diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index e5fb26a3de..c60502444c 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -142,7 +142,13 @@ void __init init_IRQ(void) spin_lock(&local_irqs_type_lock); for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ ) - local_irqs_type[irq] = IRQ_TYPE_INVALID; + { + /* SGIs are always edge-triggered */ + if ( irq < NR_GIC_SGI ) + local_irqs_type[irq] = IRQ_TYPE_EDGE_RISING; + else + local_irqs_type[irq] = IRQ_TYPE_INVALID; + } spin_unlock(&local_irqs_type_lock); BUG_ON(init_local_irq_data(smp_processor_id()) < 0); @@ -214,9 +220,12 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) perfc_incr(irqs); - ASSERT(irq >= 16); /* SGIs do not come down this path */ + /* Statically assigned SGIs do not come down this path */ + ASSERT(irq >= GIC_SGI_STATIC_MAX); - if ( irq < 32 ) + if ( irq < NR_GIC_SGI ) + perfc_incr(ipis); + else if ( irq < NR_GIC_LOCAL_IRQS ) perfc_incr(ppis); else perfc_incr(spis); @@ -250,6 +259,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) * The irq cannot be a PPI, we only support delivery of SPIs to * guests. */ + ASSERT(irq >= NR_GIC_SGI); vgic_inject_irq(info->d, NULL, info->virq, true); goto out_no_end; } @@ -386,7 +396,7 @@ int setup_irq(unsigned int irq, unsigned int irqflags, struct irqaction *new) { gic_route_irq_to_xen(desc, GIC_PRI_IRQ); /* It's fine to use smp_processor_id() because: - * For PPI: irq_desc is banked + * For SGI and PPI: irq_desc is banked * For SPI: we don't care for now which CPU will receive the * interrupt * TODO: Handle case where SPI is setup on different CPU than -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:44:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740360.1147417 (Exim 4.92) (envelope-from ) id 1sHzjv-0006iF-MM; Fri, 14 Jun 2024 05:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740360.1147417; Fri, 14 Jun 2024 05: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 1sHzjv-0006i7-Jn; Fri, 14 Jun 2024 05:44:43 +0000 Received: by outflank-mailman (input) for mailman id 740360; Fri, 14 Jun 2024 05:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzju-0006ht-MS for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzju-0003qT-Ll for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzju-0000Nk-Kp for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=p9v1jqVR1NQvKx1Vyv3JRNJG0Jdz8CtiYmc7DnYgjP0=; b=YCxfUh+/TEfPiWRjdtxP5TVLMx D3T3pAh4qNuNNIJMjAYPbOmnMGNHYp9oLKMP5qQXo/YRV9MLqjcs2+kEl455BUXE+DuPyF3O1Hyj5 R6xz3fW18ZiA4YZM4ntZDuwbzC3jxr74+hv8JJ+8UW65bIxNOYojsQbSlYbQH4izFkmQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add and call init_tee_secondary() Message-Id: Date: Fri, 14 Jun 2024 05:44:42 +0000 commit dd348eb0053e13e49fc162082771f6f1d9cca654 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:41 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:49 2024 +0100 xen/arm: add and call init_tee_secondary() Add init_tee_secondary() to the TEE mediator framework and call it from start_secondary() late enough that per-cpu interrupts can be configured on CPUs as they are initialized. This is needed in later patches. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/tee/tee.h | 8 ++++++++ xen/arch/arm/smpboot.c | 2 ++ xen/arch/arm/tee/tee.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h index da324467e1..6bc13da885 100644 --- a/xen/arch/arm/include/asm/tee/tee.h +++ b/xen/arch/arm/include/asm/tee/tee.h @@ -28,6 +28,9 @@ struct tee_mediator_ops { */ bool (*probe)(void); + /* Initialize secondary CPUs */ + void (*init_secondary)(void); + /* * Called during domain construction if toolstack requests to enable * TEE support so mediator can inform TEE about new @@ -66,6 +69,7 @@ int tee_domain_init(struct domain *d, uint16_t tee_type); int tee_domain_teardown(struct domain *d); int tee_relinquish_resources(struct domain *d); uint16_t tee_get_type(void); +void init_tee_secondary(void); #define REGISTER_TEE_MEDIATOR(_name, _namestr, _type, _ops) \ static const struct tee_mediator_desc __tee_desc_##_name __used \ @@ -105,6 +109,10 @@ static inline uint16_t tee_get_type(void) return XEN_DOMCTL_CONFIG_TEE_NONE; } +static inline void init_tee_secondary(void) +{ +} + #endif /* CONFIG_TEE */ #endif /* __ARCH_ARM_TEE_TEE_H__ */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 93a10d7721..04e363088d 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -29,6 +29,7 @@ #include #include #include +#include /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn @@ -401,6 +402,7 @@ void asmlinkage start_secondary(void) */ init_maintenance_interrupt(); init_timer_interrupt(); + init_tee_secondary(); local_abort_enable(); diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index ddd17506a9..9fd1d7495b 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -96,6 +96,12 @@ static int __init tee_init(void) __initcall(tee_init); +void __init init_tee_secondary(void) +{ + if ( cur_mediator && cur_mediator->ops->init_secondary ) + cur_mediator->ops->init_secondary(); +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:44:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740363.1147431 (Exim 4.92) (envelope-from ) id 1sHzk6-0006zE-3t; Fri, 14 Jun 2024 05:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740363.1147431; Fri, 14 Jun 2024 05: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 1sHzk6-0006z6-0O; Fri, 14 Jun 2024 05:44:54 +0000 Received: by outflank-mailman (input) for mailman id 740363; Fri, 14 Jun 2024 05:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzk4-0006l8-Pa for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzk4-0003qh-Ot for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzk4-0000OB-Nx for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+hqwQAsicIcCVQcW//L5ZMKJ9UTlKzKfnJzRWbCW7to=; b=LXRrY48EiyKnCpQscRtrOQ6S2N WXwMWekZkNIs+Cto9/gm01nZcsb3Ur+cii18swfo1+2pqA3hJpOqoP1aohLiLOD+ewOOtJAD8AX8f IRi3yZ+9bVJpQkzv7qTf1zr2+NtdEeSyjcX4Ay0wXQmdhWk0o2IulCtymbNLvS183KoA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add and call tee_free_domain_ctx() Message-Id: Date: Fri, 14 Jun 2024 05:44:52 +0000 commit 452551c723d28935cba25bf9719b1a1a99abc951 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:42 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:53 2024 +0100 xen/arm: add and call tee_free_domain_ctx() Add tee_free_domain_ctx() to the TEE mediator framework. tee_free_domain_ctx() is called from arch_domain_destroy() to allow late freeing of the d->arch.tee context. This will simplify access to d->arch.tee for domains retrieved with rcu_lock_domain_by_id(). Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/domain.c | 1 + xen/arch/arm/include/asm/tee/tee.h | 6 ++++++ xen/arch/arm/tee/tee.c | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 8bde2f730d..7cfcefd279 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -843,6 +843,7 @@ int arch_domain_teardown(struct domain *d) void arch_domain_destroy(struct domain *d) { + tee_free_domain_ctx(d); /* IOMMU page table is shared with P2M, always call * iommu_domain_destroy() before p2m_final_teardown(). */ diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h index 6bc13da885..0169fd746b 100644 --- a/xen/arch/arm/include/asm/tee/tee.h +++ b/xen/arch/arm/include/asm/tee/tee.h @@ -38,6 +38,7 @@ struct tee_mediator_ops { */ int (*domain_init)(struct domain *d); int (*domain_teardown)(struct domain *d); + void (*free_domain_ctx)(struct domain *d); /* * Called during domain destruction to relinquish resources used @@ -70,6 +71,7 @@ int tee_domain_teardown(struct domain *d); int tee_relinquish_resources(struct domain *d); uint16_t tee_get_type(void); void init_tee_secondary(void); +void tee_free_domain_ctx(struct domain *d); #define REGISTER_TEE_MEDIATOR(_name, _namestr, _type, _ops) \ static const struct tee_mediator_desc __tee_desc_##_name __used \ @@ -113,6 +115,10 @@ static inline void init_tee_secondary(void) { } +static inline void tee_free_domain_ctx(struct domain *d) +{ +} + #endif /* CONFIG_TEE */ #endif /* __ARCH_ARM_TEE_TEE_H__ */ diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index 9fd1d7495b..b1cae16c17 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -102,6 +102,12 @@ void __init init_tee_secondary(void) cur_mediator->ops->init_secondary(); } +void tee_free_domain_ctx(struct domain *d) +{ + if ( cur_mediator && cur_mediator->ops->free_domain_ctx) + cur_mediator->ops->free_domain_ctx(d); +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:45:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740365.1147435 (Exim 4.92) (envelope-from ) id 1sHzkG-00075I-5d; Fri, 14 Jun 2024 05:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740365.1147435; Fri, 14 Jun 2024 05: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 1sHzkG-000754-2f; Fri, 14 Jun 2024 05:45:04 +0000 Received: by outflank-mailman (input) for mailman id 740365; Fri, 14 Jun 2024 05:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkE-00074D-Sy for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkE-0003rP-SE for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzkE-0000P7-RC for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=apCFxzu02CFbM1BI76dG248O8Mk+2dOgbEO9uSaedD4=; b=3S7RcivTojpwNlw+G0vv4IBpeF tsMpU1AzWLgPTtQyXXAAPHuX/xyVcm0+Vk5FzIeoJlP+xRsg4k44HoiKCzRwofF8uF7S07QN4FISq wW+Y3+y5QnSamNgT1bO9PNVT7K2Kcza8Ky0ogaA/fxSPoburE9ZlxcGDCePIxT0kiFho=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: support notification Message-Id: Date: Fri, 14 Jun 2024 05:45:02 +0000 commit b490f470f58d0b87653bfbee23c7e9342b049ab4 Author: Jens Wiklander AuthorDate: Mon Jun 10 08:53:43 2024 +0200 Commit: Julien Grall CommitDate: Thu Jun 13 13:43:56 2024 +0100 xen/arm: ffa: support notification Add support for FF-A notifications, currently limited to an SP (Secure Partition) sending an asynchronous notification to a guest. Guests and Xen itself are made aware of pending notifications with an interrupt. The interrupt handler triggers a tasklet to retrieve the notifications using the FF-A ABI and deliver them to their destinations. Update ffa_partinfo_domain_init() to return error code like ffa_notif_domain_init(). Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/tee/Makefile | 1 + xen/arch/arm/tee/ffa.c | 77 +++++++- xen/arch/arm/tee/ffa_notif.c | 425 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/tee/ffa_partinfo.c | 9 +- xen/arch/arm/tee/ffa_private.h | 56 +++++- xen/arch/arm/tee/tee.c | 2 +- xen/include/public/arch-arm.h | 14 ++ 7 files changed, 569 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/tee/Makefile b/xen/arch/arm/tee/Makefile index f0112a2f92..7c0f46f7f4 100644 --- a/xen/arch/arm/tee/Makefile +++ b/xen/arch/arm/tee/Makefile @@ -2,5 +2,6 @@ obj-$(CONFIG_FFA) += ffa.o obj-$(CONFIG_FFA) += ffa_shm.o obj-$(CONFIG_FFA) += ffa_partinfo.o obj-$(CONFIG_FFA) += ffa_rxtx.o +obj-$(CONFIG_FFA) += ffa_notif.o obj-y += tee.o obj-$(CONFIG_OPTEE) += optee.o diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 5209612963..022089278e 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -39,6 +39,12 @@ * - at most 32 shared memory regions per guest * o FFA_MSG_SEND_DIRECT_REQ: * - only supported from a VM to an SP + * o FFA_NOTIFICATION_*: + * - only supports global notifications, that is, per vCPU notifications + * are not supported + * - doesn't support signalling the secondary scheduler of pending + * notification for secure partitions + * - doesn't support notifications for Xen itself * * There are some large locked sections with ffa_tx_buffer_lock and * ffa_rx_buffer_lock. Especially the ffa_tx_buffer_lock spinlock used @@ -194,6 +200,8 @@ out: static void handle_features(struct cpu_user_regs *regs) { + struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; uint32_t a1 = get_user_reg(regs, 1); unsigned int n; @@ -240,6 +248,30 @@ static void handle_features(struct cpu_user_regs *regs) BUILD_BUG_ON(PAGE_SIZE != FFA_PAGE_SIZE); ffa_set_regs_success(regs, 0, 0); break; + case FFA_FEATURE_NOTIF_PEND_INTR: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, GUEST_FFA_NOTIF_PEND_INTR_ID, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; + case FFA_FEATURE_SCHEDULE_RECV_INTR: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, GUEST_FFA_SCHEDULE_RECV_INTR_ID, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; + + case FFA_NOTIFICATION_BIND: + case FFA_NOTIFICATION_UNBIND: + case FFA_NOTIFICATION_GET: + case FFA_NOTIFICATION_SET: + case FFA_NOTIFICATION_INFO_GET_32: + case FFA_NOTIFICATION_INFO_GET_64: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, 0, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; default: ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); break; @@ -305,6 +337,22 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) get_user_reg(regs, 1)), get_user_reg(regs, 3)); break; + case FFA_NOTIFICATION_BIND: + e = ffa_handle_notification_bind(regs); + break; + case FFA_NOTIFICATION_UNBIND: + e = ffa_handle_notification_unbind(regs); + break; + case FFA_NOTIFICATION_INFO_GET_32: + case FFA_NOTIFICATION_INFO_GET_64: + ffa_handle_notification_info_get(regs); + return true; + case FFA_NOTIFICATION_GET: + ffa_handle_notification_get(regs); + return true; + case FFA_NOTIFICATION_SET: + e = ffa_handle_notification_set(regs); + break; default: gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); @@ -322,6 +370,7 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) static int ffa_domain_init(struct domain *d) { struct ffa_ctx *ctx; + int ret; if ( !ffa_version ) return -ENODEV; @@ -345,10 +394,11 @@ static int ffa_domain_init(struct domain *d) * error, so no need for cleanup in this function. */ - if ( !ffa_partinfo_domain_init(d) ) - return -EIO; + ret = ffa_partinfo_domain_init(d); + if ( ret ) + return ret; - return 0; + return ffa_notif_domain_init(d); } static void ffa_domain_teardown_continue(struct ffa_ctx *ctx, bool first_time) @@ -376,13 +426,6 @@ static void ffa_domain_teardown_continue(struct ffa_ctx *ctx, bool first_time) } else { - /* - * domain_destroy() might have been called (via put_domain() in - * ffa_reclaim_shms()), so we can't touch the domain structure - * anymore. - */ - xfree(ctx); - /* Only check if there has been a change to the teardown queue */ if ( !first_time ) { @@ -423,17 +466,28 @@ static int ffa_domain_teardown(struct domain *d) return 0; ffa_rxtx_domain_destroy(d); + ffa_notif_domain_destroy(d); ffa_domain_teardown_continue(ctx, true /* first_time */); return 0; } +static void ffa_free_domain_ctx(struct domain *d) +{ + XFREE(d->arch.tee); +} + static int ffa_relinquish_resources(struct domain *d) { return 0; } +static void ffa_init_secondary(void) +{ + ffa_notif_init_interrupt(); +} + static bool ffa_probe(void) { uint32_t vers; @@ -502,6 +556,7 @@ static bool ffa_probe(void) if ( !ffa_partinfo_init() ) goto err_rxtx_destroy; + ffa_notif_init(); INIT_LIST_HEAD(&ffa_teardown_head); init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); @@ -517,8 +572,10 @@ err_rxtx_destroy: static const struct tee_mediator_ops ffa_ops = { .probe = ffa_probe, + .init_secondary = ffa_init_secondary, .domain_init = ffa_domain_init, .domain_teardown = ffa_domain_teardown, + .free_domain_ctx = ffa_free_domain_ctx, .relinquish_resources = ffa_relinquish_resources, .handle_call = ffa_handle_call, }; diff --git a/xen/arch/arm/tee/ffa_notif.c b/xen/arch/arm/tee/ffa_notif.c new file mode 100644 index 0000000000..541e61d2f6 --- /dev/null +++ b/xen/arch/arm/tee/ffa_notif.c @@ -0,0 +1,425 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2024 Linaro Limited + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "ffa_private.h" + +static bool __ro_after_init notif_enabled; +static unsigned int __ro_after_init notif_sri_irq; + +int ffa_handle_notification_bind(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t src_dst = get_user_reg(regs, 1); + uint32_t flags = get_user_reg(regs, 2); + uint32_t bitmap_lo = get_user_reg(regs, 3); + uint32_t bitmap_hi = get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + if ( flags ) /* Only global notifications are supported */ + return FFA_RET_DENIED; + + /* + * We only support notifications from SP so no need to check the sender + * endpoint ID, the SPMC will take care of that for us. + */ + return ffa_simple_call(FFA_NOTIFICATION_BIND, src_dst, flags, bitmap_hi, + bitmap_lo); +} + +int ffa_handle_notification_unbind(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t src_dst = get_user_reg(regs, 1); + uint32_t bitmap_lo = get_user_reg(regs, 3); + uint32_t bitmap_hi = get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + /* + * We only support notifications from SP so no need to check the + * destination endpoint ID, the SPMC will take care of that for us. + */ + return ffa_simple_call(FFA_NOTIFICATION_UNBIND, src_dst, 0, bitmap_hi, + bitmap_lo); +} + +void ffa_handle_notification_info_get(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; + + if ( !notif_enabled ) + { + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + return; + } + + if ( test_and_clear_bool(ctx->notif.secure_pending) ) + { + /* A pending global notification for the guest */ + ffa_set_regs(regs, FFA_SUCCESS_64, 0, + 1U << FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT, ffa_get_vm_id(d), + 0, 0, 0, 0); + } + else + { + /* Report an error if there where no pending global notification */ + ffa_set_regs_error(regs, FFA_RET_NO_DATA); + } +} + +void ffa_handle_notification_get(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t recv = get_user_reg(regs, 1); + uint32_t flags = get_user_reg(regs, 2); + uint32_t w2 = 0; + uint32_t w3 = 0; + uint32_t w4 = 0; + uint32_t w5 = 0; + uint32_t w6 = 0; + uint32_t w7 = 0; + + if ( !notif_enabled ) + { + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + return; + } + + if ( (recv & 0xFFFFU) != ffa_get_vm_id(d) ) + { + ffa_set_regs_error(regs, FFA_RET_INVALID_PARAMETERS); + return; + } + + if ( flags & ( FFA_NOTIF_FLAG_BITMAP_SP | FFA_NOTIF_FLAG_BITMAP_SPM ) ) + { + struct arm_smccc_1_2_regs arg = { + .a0 = FFA_NOTIFICATION_GET, + .a1 = recv, + .a2 = flags & ( FFA_NOTIF_FLAG_BITMAP_SP | + FFA_NOTIF_FLAG_BITMAP_SPM ), + }; + struct arm_smccc_1_2_regs resp; + int32_t e; + + /* + * Clear secure pending if both FFA_NOTIF_FLAG_BITMAP_SP and + * FFA_NOTIF_FLAG_BITMAP_SPM are set since secure world can't have + * any more pending notifications. + */ + if ( ( flags & FFA_NOTIF_FLAG_BITMAP_SP ) && + ( flags & FFA_NOTIF_FLAG_BITMAP_SPM ) ) + { + struct ffa_ctx *ctx = d->arch.tee; + + ACCESS_ONCE(ctx->notif.secure_pending) = false; + } + + arm_smccc_1_2_smc(&arg, &resp); + e = ffa_get_ret_code(&resp); + if ( e ) + { + ffa_set_regs_error(regs, e); + return; + } + + if ( flags & FFA_NOTIF_FLAG_BITMAP_SP ) + { + w2 = resp.a2; + w3 = resp.a3; + } + + if ( flags & FFA_NOTIF_FLAG_BITMAP_SPM ) + w6 = resp.a6; + } + + ffa_set_regs(regs, FFA_SUCCESS_32, 0, w2, w3, w4, w5, w6, w7); +} + +int ffa_handle_notification_set(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + uint32_t src_dst = get_user_reg(regs, 1); + uint32_t flags = get_user_reg(regs, 2); + uint32_t bitmap_lo = get_user_reg(regs, 3); + uint32_t bitmap_hi = get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst >> 16) != ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + /* Let the SPMC check the destination of the notification */ + return ffa_simple_call(FFA_NOTIFICATION_SET, src_dst, flags, bitmap_lo, + bitmap_hi); +} + +/* + * Extract a 16-bit ID (index n) from the successful return value from + * FFA_NOTIFICATION_INFO_GET_64 or FFA_NOTIFICATION_INFO_GET_32. IDs are + * returned in registers 3 to 7 with four IDs per register for 64-bit + * calling convention and two IDs per register for 32-bit calling + * convention. + */ +static uint16_t get_id_from_resp(struct arm_smccc_1_2_regs *resp, + unsigned int n) +{ + unsigned int ids_per_reg; + unsigned int reg_idx; + unsigned int reg_shift; + + if ( smccc_is_conv_64(resp->a0) ) + ids_per_reg = 4; + else + ids_per_reg = 2; + + reg_idx = n / ids_per_reg + 3; + reg_shift = ( n % ids_per_reg ) * 16; + + switch ( reg_idx ) + { + case 3: + return resp->a3 >> reg_shift; + case 4: + return resp->a4 >> reg_shift; + case 5: + return resp->a5 >> reg_shift; + case 6: + return resp->a6 >> reg_shift; + case 7: + return resp->a7 >> reg_shift; + default: + ASSERT(0); /* "Can't happen" */ + return 0; + } +} + +static void notif_vm_pend_intr(uint16_t vm_id) +{ + struct ffa_ctx *ctx; + struct domain *d; + struct vcpu *v; + + /* + * vm_id == 0 means a notifications pending for Xen itself, but + * we don't support that yet. + */ + if ( !vm_id ) + return; + + /* + * This can fail if the domain has been destroyed after + * FFA_NOTIFICATION_INFO_GET_64. Ignoring this is harmless since the + * guest doesn't exist any more. + */ + d = ffa_rcu_lock_domain_by_vm_id(vm_id); + if ( !d ) + return; + + /* + * Failing here is unlikely since the domain ID must have been reused + * for a new domain between the FFA_NOTIFICATION_INFO_GET_64 and + * ffa_rcu_lock_domain_by_vm_id() calls. + * + * Continuing on the scenario above if the domain has FF-A enabled. We + * can't tell here if the domain ID has been reused for a new domain so + * we inject an NPI. When the NPI handler in the domain calls + * FFA_NOTIFICATION_GET it will have accurate information, the worst + * case is a spurious NPI. + */ + ctx = d->arch.tee; + if ( !ctx ) + goto out_unlock; + + /* + * arch.tee is freed from complete_domain_destroy() so the RCU lock + * guarantees that the data structure isn't freed while we're accessing + * it. + */ + ACCESS_ONCE(ctx->notif.secure_pending) = true; + + /* + * Since we're only delivering global notification, always + * deliver to the first online vCPU. It doesn't matter + * which we chose, as long as it's available. + */ + for_each_vcpu(d, v) + { + if ( is_vcpu_online(v) ) + { + vgic_inject_irq(d, v, GUEST_FFA_NOTIF_PEND_INTR_ID, + true); + break; + } + } + if ( !v ) + printk(XENLOG_ERR "ffa: can't inject NPI, all vCPUs offline\n"); + +out_unlock: + rcu_unlock_domain(d); +} + +static void notif_sri_action(void *unused) +{ + const struct arm_smccc_1_2_regs arg = { + .a0 = FFA_NOTIFICATION_INFO_GET_64, + }; + struct arm_smccc_1_2_regs resp; + unsigned int id_pos; + unsigned int list_count; + uint64_t ids_count; + unsigned int n; + int32_t res; + + do { + arm_smccc_1_2_smc(&arg, &resp); + res = ffa_get_ret_code(&resp); + if ( res ) + { + if ( res != FFA_RET_NO_DATA ) + printk(XENLOG_ERR "ffa: notification info get failed: error %d\n", + res); + return; + } + + ids_count = resp.a2 >> FFA_NOTIF_INFO_GET_ID_LIST_SHIFT; + list_count = ( resp.a2 >> FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT ) & + FFA_NOTIF_INFO_GET_ID_COUNT_MASK; + + id_pos = 0; + for ( n = 0; n < list_count; n++ ) + { + unsigned int count = ((ids_count >> 2 * n) & 0x3) + 1; + uint16_t vm_id = get_id_from_resp(&resp, id_pos); + + notif_vm_pend_intr(vm_id); + + id_pos += count; + } + + } while (resp.a2 & FFA_NOTIF_INFO_GET_MORE_FLAG); +} + +static DECLARE_TASKLET(notif_sri_tasklet, notif_sri_action, NULL); + +static void notif_irq_handler(int irq, void *data) +{ + tasklet_schedule(¬if_sri_tasklet); +} + +static int32_t ffa_notification_bitmap_create(uint16_t vm_id, + uint32_t vcpu_count) +{ + return ffa_simple_call(FFA_NOTIFICATION_BITMAP_CREATE, vm_id, vcpu_count, + 0, 0); +} + +static int32_t ffa_notification_bitmap_destroy(uint16_t vm_id) +{ + return ffa_simple_call(FFA_NOTIFICATION_BITMAP_DESTROY, vm_id, 0, 0, 0); +} + +void ffa_notif_init_interrupt(void) +{ + int ret; + + if ( notif_enabled && notif_sri_irq < NR_GIC_SGI ) + { + /* + * An error here is unlikely since the primary CPU has already + * succeeded in installing the interrupt handler. If this fails it + * may lead to a problem with notifictaions. + * + * The CPUs without an notification handler installed will fail to + * trigger on the SGI indicating that there are notifications + * pending, while the SPMC in the secure world will not notice that + * the interrupt was lost. + */ + ret = request_irq(notif_sri_irq, 0, notif_irq_handler, "FF-A notif", + NULL); + if ( ret ) + printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", + notif_sri_irq, ret); + } +} + +void ffa_notif_init(void) +{ + const struct arm_smccc_1_2_regs arg = { + .a0 = FFA_FEATURES, + .a1 = FFA_FEATURE_SCHEDULE_RECV_INTR, + }; + struct arm_smccc_1_2_regs resp; + unsigned int irq; + int ret; + + arm_smccc_1_2_smc(&arg, &resp); + if ( resp.a0 != FFA_SUCCESS_32 ) + return; + + irq = resp.a2; + notif_sri_irq = irq; + if ( irq >= NR_GIC_SGI ) + irq_set_type(irq, IRQ_TYPE_EDGE_RISING); + ret = request_irq(irq, 0, notif_irq_handler, "FF-A notif", NULL); + if ( ret ) + { + printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", + irq, ret); + return; + } + + notif_enabled = true; +} + +int ffa_notif_domain_init(struct domain *d) +{ + struct ffa_ctx *ctx = d->arch.tee; + int32_t res; + + if ( !notif_enabled ) + return 0; + + res = ffa_notification_bitmap_create(ffa_get_vm_id(d), d->max_vcpus); + if ( res ) + return -ENOMEM; + + ctx->notif.enabled = true; + + return 0; +} + +void ffa_notif_domain_destroy(struct domain *d) +{ + struct ffa_ctx *ctx = d->arch.tee; + + if ( ctx->notif.enabled ) + { + ffa_notification_bitmap_destroy(ffa_get_vm_id(d)); + ctx->notif.enabled = false; + } +} diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinfo.c index dc10595848..93a03c6bc6 100644 --- a/xen/arch/arm/tee/ffa_partinfo.c +++ b/xen/arch/arm/tee/ffa_partinfo.c @@ -306,7 +306,7 @@ static void vm_destroy_bitmap_init(struct ffa_ctx *ctx, } } -bool ffa_partinfo_domain_init(struct domain *d) +int ffa_partinfo_domain_init(struct domain *d) { unsigned int count = BITS_TO_LONGS(subscr_vm_destroyed_count); struct ffa_ctx *ctx = d->arch.tee; @@ -315,7 +315,7 @@ bool ffa_partinfo_domain_init(struct domain *d) ctx->vm_destroy_bitmap = xzalloc_array(unsigned long, count); if ( !ctx->vm_destroy_bitmap ) - return false; + return -ENOMEM; for ( n = 0; n < subscr_vm_created_count; n++ ) { @@ -330,7 +330,10 @@ bool ffa_partinfo_domain_init(struct domain *d) } vm_destroy_bitmap_init(ctx, n); - return n == subscr_vm_created_count; + if ( n != subscr_vm_created_count ) + return -EIO; + + return 0; } bool ffa_partinfo_domain_destroy(struct domain *d) diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index 98236cbf14..7c6b06f686 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -25,6 +25,7 @@ #define FFA_RET_DENIED -6 #define FFA_RET_RETRY -7 #define FFA_RET_ABORTED -8 +#define FFA_RET_NO_DATA -9 /* FFA_VERSION helpers */ #define FFA_VERSION_MAJOR_SHIFT 16U @@ -175,6 +176,21 @@ */ #define FFA_PARTITION_INFO_GET_COUNT_FLAG BIT(0, U) +/* Flags used in calls to FFA_NOTIFICATION_GET interface */ +#define FFA_NOTIF_FLAG_BITMAP_SP BIT(0, U) +#define FFA_NOTIF_FLAG_BITMAP_VM BIT(1, U) +#define FFA_NOTIF_FLAG_BITMAP_SPM BIT(2, U) +#define FFA_NOTIF_FLAG_BITMAP_HYP BIT(3, U) + +#define FFA_NOTIF_INFO_GET_MORE_FLAG BIT(0, U) +#define FFA_NOTIF_INFO_GET_ID_LIST_SHIFT 12 +#define FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT 7 +#define FFA_NOTIF_INFO_GET_ID_COUNT_MASK 0x1F + +/* Feature IDs used with FFA_FEATURES */ +#define FFA_FEATURE_NOTIF_PEND_INTR 0x1U +#define FFA_FEATURE_SCHEDULE_RECV_INTR 0x2U + /* Function IDs */ #define FFA_ERROR 0x84000060U #define FFA_SUCCESS_32 0x84000061U @@ -213,6 +229,24 @@ #define FFA_MEM_FRAG_TX 0x8400007BU #define FFA_MSG_SEND 0x8400006EU #define FFA_MSG_POLL 0x8400006AU +#define FFA_NOTIFICATION_BITMAP_CREATE 0x8400007DU +#define FFA_NOTIFICATION_BITMAP_DESTROY 0x8400007EU +#define FFA_NOTIFICATION_BIND 0x8400007FU +#define FFA_NOTIFICATION_UNBIND 0x84000080U +#define FFA_NOTIFICATION_SET 0x84000081U +#define FFA_NOTIFICATION_GET 0x84000082U +#define FFA_NOTIFICATION_INFO_GET_32 0x84000083U +#define FFA_NOTIFICATION_INFO_GET_64 0xC4000083U + +struct ffa_ctx_notif { + bool enabled; + + /* + * True if domain is reported by FFA_NOTIFICATION_INFO_GET to have + * pending global notifications. + */ + bool secure_pending; +}; struct ffa_ctx { void *rx; @@ -228,6 +262,7 @@ struct ffa_ctx { struct list_head shm_list; /* Number of allocated shared memory object */ unsigned int shm_count; + struct ffa_ctx_notif notif; /* * tx_lock is used to serialize access to tx * rx_lock is used to serialize access to rx @@ -257,7 +292,7 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs); int ffa_handle_mem_reclaim(uint64_t handle, uint32_t flags); bool ffa_partinfo_init(void); -bool ffa_partinfo_domain_init(struct domain *d); +int ffa_partinfo_domain_init(struct domain *d); bool ffa_partinfo_domain_destroy(struct domain *d); int32_t ffa_handle_partition_info_get(uint32_t w1, uint32_t w2, uint32_t w3, uint32_t w4, uint32_t w5, uint32_t *count, @@ -271,12 +306,31 @@ uint32_t ffa_handle_rxtx_map(uint32_t fid, register_t tx_addr, uint32_t ffa_handle_rxtx_unmap(void); int32_t ffa_handle_rx_release(void); +void ffa_notif_init(void); +void ffa_notif_init_interrupt(void); +int ffa_notif_domain_init(struct domain *d); +void ffa_notif_domain_destroy(struct domain *d); + +int ffa_handle_notification_bind(struct cpu_user_regs *regs); +int ffa_handle_notification_unbind(struct cpu_user_regs *regs); +void ffa_handle_notification_info_get(struct cpu_user_regs *regs); +void ffa_handle_notification_get(struct cpu_user_regs *regs); +int ffa_handle_notification_set(struct cpu_user_regs *regs); + static inline uint16_t ffa_get_vm_id(const struct domain *d) { /* +1 since 0 is reserved for the hypervisor in FF-A */ return d->domain_id + 1; } +static inline struct domain *ffa_rcu_lock_domain_by_vm_id(uint16_t vm_id) +{ + ASSERT(vm_id); + + /* -1 to match ffa_get_vm_id() */ + return rcu_lock_domain_by_id(vm_id - 1); +} + static inline void ffa_set_regs(struct cpu_user_regs *regs, register_t v0, register_t v1, register_t v2, register_t v3, register_t v4, register_t v5, register_t v6, diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index b1cae16c17..3f65e45a78 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -94,7 +94,7 @@ static int __init tee_init(void) return 0; } -__initcall(tee_init); +presmp_initcall(tee_init); void __init init_tee_secondary(void) { diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 289af81bd6..e2412a1747 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -505,6 +505,7 @@ typedef uint64_t xen_callback_t; #define GUEST_MAX_VCPUS 128 /* Interrupts */ + #define GUEST_TIMER_VIRT_PPI 27 #define GUEST_TIMER_PHYS_S_PPI 29 #define GUEST_TIMER_PHYS_NS_PPI 30 @@ -515,6 +516,19 @@ typedef uint64_t xen_callback_t; #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 #define GUEST_VIRTIO_MMIO_SPI_LAST 43 +/* + * SGI is the preferred delivery mechanism of FF-A pending notifications or + * schedule recveive interrupt. SGIs 8-15 are normally not used by a guest + * as they in a non-virtualized system typically are assigned to the secure + * world. Here we're free to use SGI 8-15 since they are virtual and have + * nothing to do with the secure world. + * + * For partitioning of SGIs see also Arm Base System Architecture v1.0C, + * https://developer.arm.com/documentation/den0094/ + */ +#define GUEST_FFA_NOTIF_PEND_INTR_ID 8 +#define GUEST_FFA_SCHEDULE_RECV_INTR_ID 9 + /* PSCI functions */ #define PSCI_cpu_suspend 0 #define PSCI_cpu_off 1 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:45:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740369.1147439 (Exim 4.92) (envelope-from ) id 1sHzkQ-0007I6-8q; Fri, 14 Jun 2024 05:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740369.1147439; Fri, 14 Jun 2024 05:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkQ-0007Hw-6C; Fri, 14 Jun 2024 05:45:14 +0000 Received: by outflank-mailman (input) for mailman id 740369; Fri, 14 Jun 2024 05:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkO-0007GP-Vs for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkO-0003rW-VE for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzkO-0000Pn-UL for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pFeERYvLNxbVqDtpKlnVkZjeT0Tq5hi7n8D4lNrMAXw=; b=2FtreveoGOodLUEkg+hNCPaSmV b79XmMO2IjUys52jpCmdxWBy+tNAMI9JIeOj9F3c711tHuNBfHItG0tKyl5aDkaiRq7xiced60YHG Dj3pskjxERwjH9G3mudkxbrDftHgbwTGu+1xqMYIwE1HgpVWcz3SUUFV87GHVe78YkQI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/EPT: correct special page checking in epte_get_entry_emt() Message-Id: Date: Fri, 14 Jun 2024 05:45:12 +0000 commit 5540b94e8191059eb9cbbe98ac316232a42208f6 Author: Jan Beulich AuthorDate: Thu Jun 13 16:53:34 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 13 16:53:34 2024 +0200 x86/EPT: correct special page checking in epte_get_entry_emt() mfn_valid() granularity is (currently) 256Mb. Therefore the start of a 1Gb page passing the test doesn't necessarily mean all parts of such a range would also pass. Yet using the result of mfn_to_page() on an MFN which doesn't pass mfn_valid() checking is liable to result in a crash (the invocation of mfn_to_page() alone is presumably "just" UB in such a case). Fixes: ca24b2ffdbd9 ("x86/hvm: set 'ipat' in EPT for special pages") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/mm/p2m-ept.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index f83610cb8c..9f276afaea 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -519,8 +519,12 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, } for ( special_pgs = i = 0; i < (1ul << order); i++ ) - if ( is_special_page(mfn_to_page(mfn_add(mfn, i))) ) + { + mfn_t cur = mfn_add(mfn, i); + + if ( mfn_valid(cur) && is_special_page(mfn_to_page(cur)) ) special_pgs++; + } if ( special_pgs ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:45:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740372.1147442 (Exim 4.92) (envelope-from ) id 1sHzka-0007Mv-AJ; Fri, 14 Jun 2024 05:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740372.1147442; Fri, 14 Jun 2024 05: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 1sHzka-0007Mn-7j; Fri, 14 Jun 2024 05:45:24 +0000 Received: by outflank-mailman (input) for mailman id 740372; Fri, 14 Jun 2024 05:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkZ-0007MU-2f for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkZ-0003rf-1v for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzkZ-0000QG-16 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bHXmMC/q0UguFA94JHZcN1Am017571M5aL+fDIyCV/I=; b=gsaczVoqN460/i7Ica7Em7ZaiK NtewjeqwsFJAzx23FV+29+7ZCSb3GaO43WfF+Rz7t0NQGFkVKGc7pclAkclUtT6eE2izn4G/K1Tz0 Ubc08ktO1WVlkzBxKUnHfE7KzfhD7O61W30/MsVu2vESXkcqSu8zaGXOUqN2m6NWmr6I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/EPT: avoid marking non-present entries for re-configuring Message-Id: Date: Fri, 14 Jun 2024 05:45:23 +0000 commit 777c71d31325bc55ba1cc3f317d4155fe519ab0b Author: Jan Beulich AuthorDate: Thu Jun 13 16:54:17 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 13 16:54:17 2024 +0200 x86/EPT: avoid marking non-present entries for re-configuring For non-present entries EMT, like most other fields, is meaningless to hardware. Make the logic in ept_set_entry() setting the field (and iPAT) conditional upon dealing with a present entry, leaving the value at 0 otherwise. This has two effects for epte_get_entry_emt() which we'll want to leverage subsequently: 1) The call moved here now won't be issued with INVALID_MFN anymore (a respective BUG_ON() is being added). 2) Neither of the other two calls could now be issued with a truncated form of INVALID_MFN anymore (as long as there's no bug anywhere marking an entry present when that was populated using INVALID_MFN). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/p2m-ept.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 9f276afaea..a3ffb97876 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -650,6 +650,8 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) if ( e.emt != MTRR_NUM_TYPES ) break; + ASSERT(is_epte_present(&e)); + if ( level == 0 ) { for ( gfn -= i, i = 0; i < EPT_PAGETABLE_ENTRIES; ++i ) @@ -915,17 +917,6 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { - bool ipat; - int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, - i * EPT_TABLE_ORDER, &ipat, - p2mt); - - if ( emt >= 0 ) - new_entry.emt = emt; - else /* ept_handle_misconfig() will need to take care of this. */ - new_entry.emt = MTRR_NUM_TYPES; - - new_entry.ipat = ipat; new_entry.sp = !!i; new_entry.sa_p2mt = p2mt; new_entry.access = p2ma; @@ -941,6 +932,22 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, need_modify_vtd_table = 0; ept_p2m_type_to_flags(p2m, &new_entry); + + if ( is_epte_present(&new_entry) ) + { + bool ipat; + int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, + i * EPT_TABLE_ORDER, &ipat, + p2mt); + + BUG_ON(mfn_eq(mfn, INVALID_MFN)); + + if ( emt >= 0 ) + new_entry.emt = emt; + else /* ept_handle_misconfig() will need to take care of this. */ + new_entry.emt = MTRR_NUM_TYPES; + new_entry.ipat = ipat; + } } if ( sve != -1 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 05:45:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 05:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740373.1147447 (Exim 4.92) (envelope-from ) id 1sHzkk-0007TE-Bm; Fri, 14 Jun 2024 05:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740373.1147447; Fri, 14 Jun 2024 05:45: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 1sHzkk-0007T5-95; Fri, 14 Jun 2024 05:45:34 +0000 Received: by outflank-mailman (input) for mailman id 740373; Fri, 14 Jun 2024 05:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkj-0007RN-5U for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sHzkj-0003ro-4l for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sHzkj-0000Qy-43 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 05:45: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=q2zK9fe6fdXf0/kTYuWiBdX0hDNM3EhJCmtRvtM2Klc=; b=kq7sFJM+kwCeTpywPyvWCzR/xe 0OvN84Fa7eC7d5xzJfY6I6bwPwQkw2A88vLRKHQF12BPkE2sAsZeaXQzEJ3PnD+P2fZPb2hKXT4Od Gt40ev98OGU04RPmC/spzFbwgjdqTyBkQSWmQtqWqyWb51XblhH/ik1FlPvXzUZ8adSE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() Message-Id: Date: Fri, 14 Jun 2024 05:45:33 +0000 commit 4fdd8d75566fdad06667a79ec0ce6f43cc466c54 Author: Jan Beulich AuthorDate: Thu Jun 13 16:55:22 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 13 16:55:22 2024 +0200 x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() mfn_valid() is RAM-focused; it will often return false for MMIO. Yet access to actual MMIO space should not generally be restricted to UC only; especially video frame buffer accesses are unduly affected by such a restriction. Since, as of 777c71d31325 ("x86/EPT: avoid marking non-present entries for re-configuring"), the function won't be called with INVALID_MFN or, worse, truncated forms thereof anymore, we call fully drop that check. Fixes: 81fd0d3ca4b2 ("x86/hvm: simplify 'mmio_direct' check in epte_get_entry_emt()") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/mm/p2m-ept.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index a3ffb97876..469e27ee93 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -501,12 +501,6 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, return -1; } - if ( !mfn_valid(mfn) ) - { - *ipat = true; - return X86_MT_UC; - } - /* * Conditional must be kept in sync with the code in * {iomem,ioports}_{permit,deny}_access(). -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 09:55:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 09:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740579.1147674 (Exim 4.92) (envelope-from ) id 1sI3eD-00038D-Pb; Fri, 14 Jun 2024 09:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740579.1147674; Fri, 14 Jun 2024 09: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 1sI3eD-000386-Mf; Fri, 14 Jun 2024 09:55:05 +0000 Received: by outflank-mailman (input) for mailman id 740579; Fri, 14 Jun 2024 09:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eC-000380-7o for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eC-0001BI-4K for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sI3eC-0001P2-2s for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=APVxfo312HMnj+noVA6OIvpoPg0WFNqjM1viqS5mjqA=; b=KzYiHgIftd1Cp/xlu40QKbIV3J GIPrWhKjSUflJ/Kw/a9d/WnaOsfwupxPt8jtGh9W5rH8T4gMLJsQEgiVM1mktxaw2Q8zEiAmclYbt eDWAnQzYyjfeWzBhctZYavWG+PZET9U2/WySdKNBgPcWlcVPVNCKHKR+QE1ujXGXtI+I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Lookup bootinfo shm bank during the mapping Message-Id: Date: Fri, 14 Jun 2024 09:55:04 +0000 commit e90f8d562dd1aba59fa1e6835ed944b15b6d1931 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:49 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:44:57 2024 +0100 xen/arm: Lookup bootinfo shm bank during the mapping The current static shared memory code is using bootinfo banks when it needs to find the number of borrowers, so every time assign_shared_memory is called, the bank is searched in the bootinfo.shmem structure. There is nothing wrong with it, however the bank can be used also to retrieve the start address and size and also to pass less argument to assign_shared_memory. When retrieving the information from the bootinfo bank, it's also possible to move the checks on alignment to process_shm_node in the early stages. So create a new function find_shm_bank_by_id() which takes a 'struct shared_meminfo' structure and the shared memory ID, to look for a bank with a matching ID, take the physical host address and size from the bank, pass the bank to assign_shared_memory() removing the now unnecessary arguments and finally remove the acquire_nr_borrower_domain() function since now the information can be extracted from the passed bank. Move the "xen,shm-id" parsing early in process_shm to bail out quickly in case of errors (unlikely), as said above, move the checks on alignment to process_shm_node. Drawback of this change is that now the bootinfo are used also when the bank doesn't need to be allocated, however it will be convenient later to use it as an argument for assign_shared_memory when dealing with the use case where the Host physical address is not supplied by the user. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/static-shmem.c | 100 +++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 78881dd1d3..0a1c327e90 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -19,29 +19,21 @@ static void __init __maybe_unused build_assertions(void) offsetof(struct shared_meminfo, bank))); } -static int __init acquire_nr_borrower_domain(struct domain *d, - paddr_t pbase, paddr_t psize, - unsigned long *nr_borrowers) +static const struct membank __init * +find_shm_bank_by_id(const struct membanks *shmem, const char *shm_id) { - const struct membanks *shmem = bootinfo_get_shmem(); unsigned int bank; - /* Iterate reserved memory to find requested shm bank. */ for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) { - paddr_t bank_start = shmem->bank[bank].start; - paddr_t bank_size = shmem->bank[bank].size; - - if ( (pbase == bank_start) && (psize == bank_size) ) + if ( strcmp(shm_id, shmem->bank[bank].shmem_extra->shm_id) == 0 ) break; } if ( bank == shmem->nr_banks ) - return -ENOENT; + return NULL; - *nr_borrowers = shmem->bank[bank].shmem_extra->nr_shm_borrowers; - - return 0; + return &shmem->bank[bank]; } /* @@ -103,14 +95,18 @@ static mfn_t __init acquire_shared_memory_bank(struct domain *d, return smfn; } -static int __init assign_shared_memory(struct domain *d, - paddr_t pbase, paddr_t psize, - paddr_t gbase) +static int __init assign_shared_memory(struct domain *d, paddr_t gbase, + const struct membank *shm_bank) { mfn_t smfn; int ret = 0; unsigned long nr_pages, nr_borrowers, i; struct page_info *page; + paddr_t pbase, psize; + + pbase = shm_bank->start; + psize = shm_bank->size; + nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; printk("%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", d, pbase, pbase + psize); @@ -135,14 +131,6 @@ static int __init assign_shared_memory(struct domain *d, } } - /* - * Get the right amount of references per page, which is the number of - * borrower domains. - */ - ret = acquire_nr_borrower_domain(d, pbase, psize, &nr_borrowers); - if ( ret ) - return ret; - /* * Instead of letting borrower domain get a page ref, we add as many * additional reference as the number of borrowers when the owner @@ -199,6 +187,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, dt_for_each_child_node(node, shm_node) { + const struct membank *boot_shm_bank; const struct dt_property *prop; const __be32 *cells; uint32_t addr_cells, size_cells; @@ -212,6 +201,23 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) continue; + if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) + { + printk("%pd: invalid \"xen,shm-id\" property", d); + return -EINVAL; + } + BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); + + boot_shm_bank = find_shm_bank_by_id(bootinfo_get_shmem(), shm_id); + if ( !boot_shm_bank ) + { + printk("%pd: static shared memory bank not found: '%s'", d, shm_id); + return -ENOENT; + } + + pbase = boot_shm_bank->start; + psize = boot_shm_bank->size; + /* * xen,shared-mem = ; * TODO: pbase is optional. @@ -221,20 +227,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, prop = dt_find_property(shm_node, "xen,shared-mem", NULL); BUG_ON(!prop); cells = (const __be32 *)prop->value; - device_tree_get_reg(&cells, addr_cells, addr_cells, &pbase, &gbase); - psize = dt_read_paddr(cells, size_cells); - if ( !IS_ALIGNED(pbase, PAGE_SIZE) || !IS_ALIGNED(gbase, PAGE_SIZE) ) - { - printk("%pd: physical address 0x%"PRIpaddr", or guest address 0x%"PRIpaddr" is not suitably aligned.\n", - d, pbase, gbase); - return -EINVAL; - } - if ( !IS_ALIGNED(psize, PAGE_SIZE) ) - { - printk("%pd: size 0x%"PRIpaddr" is not suitably aligned\n", - d, psize); - return -EINVAL; - } + gbase = dt_read_paddr(cells + addr_cells, addr_cells); for ( i = 0; i < PFN_DOWN(psize); i++ ) if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) @@ -251,13 +244,6 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) owner_dom_io = false; - if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) - { - printk("%pd: invalid \"xen,shm-id\" property", d); - return -EINVAL; - } - BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); - /* * DOMID_IO is a fake domain and is not described in the Device-Tree. * Therefore when the owner of the shared region is DOMID_IO, we will @@ -270,8 +256,8 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, * We found the first borrower of the region, the owner was not * specified, so they should be assigned to dom_io. */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, - pbase, psize, gbase); + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, + boot_shm_bank); if ( ret ) return ret; } @@ -439,12 +425,32 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, device_tree_get_reg(&cell, address_cells, address_cells, &paddr, &gaddr); size = dt_next_cell(size_cells, &cell); + if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) + { + printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", + paddr); + return -EINVAL; + } + + if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) + { + printk("fdt: guest address 0x%"PRIpaddr" is not suitably aligned.\n", + gaddr); + return -EINVAL; + } + if ( !size ) { printk("fdt: the size for static shared memory region can not be zero\n"); return -EINVAL; } + if ( !IS_ALIGNED(size, PAGE_SIZE) ) + { + printk("fdt: size 0x%"PRIpaddr" is not suitably aligned\n", size); + return -EINVAL; + } + end = paddr + size; if ( end <= paddr ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 09:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 09:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740580.1147677 (Exim 4.92) (envelope-from ) id 1sI3eN-00039y-R4; Fri, 14 Jun 2024 09:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740580.1147677; Fri, 14 Jun 2024 09: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 1sI3eN-00039r-OJ; Fri, 14 Jun 2024 09:55:15 +0000 Received: by outflank-mailman (input) for mailman id 740580; Fri, 14 Jun 2024 09:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eM-00039j-8E for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eM-0001BX-7N for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sI3eM-0001PT-6P for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tKf01cYTTWbsw88DBv//5qB+nCVwAqYGpcJyQ4GNcl0=; b=boWOLDhbTppyGPJ6idCzmd7WUK YhkK222wqqGxm2nLLMIYUyUoNZYlrjaZ7E9evmlO4RGN0cwLxnH5HgSciLGnIEuOgJ4yFDDMq98il syEMxQgPKkPEAdJRId5gYyqpxdCmQFHCMd1Tf038SqihZ3ijD7WJ0iOFGQur9HiWA6d0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Wrap shared memory mapping code in one function Message-Id: Date: Fri, 14 Jun 2024 09:55:14 +0000 commit 79a43c8838039c31ff6f06de827b71909eca76b8 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:50 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:44:57 2024 +0100 xen/arm: Wrap shared memory mapping code in one function Wrap the code and logic that is calling assign_shared_memory and map_regions_p2mt into a new function 'handle_shared_mem_bank', it will become useful later when the code will allow the user to don't pass the host physical address. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/static-shmem.c | 86 ++++++++++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 0a1c327e90..c15a651306 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -180,6 +180,53 @@ append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, return 0; } +static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, + const char *role_str, + const struct membank *shm_bank) +{ + bool owner_dom_io = true; + paddr_t pbase, psize; + int ret; + + pbase = shm_bank->start; + psize = shm_bank->size; + + /* + * "role" property is optional and if it is defined explicitly, + * then the owner domain is not the default "dom_io" domain. + */ + if ( role_str != NULL ) + owner_dom_io = false; + + /* + * DOMID_IO is a fake domain and is not described in the Device-Tree. + * Therefore when the owner of the shared region is DOMID_IO, we will + * only find the borrowers. + */ + if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || + (!owner_dom_io && strcmp(role_str, "owner") == 0) ) + { + /* + * We found the first borrower of the region, the owner was not + * specified, so they should be assigned to dom_io. + */ + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, shm_bank); + if ( ret ) + return ret; + } + + if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) + { + /* Set up P2M foreign mapping for borrower domain. */ + ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), + _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); + if ( ret ) + return ret; + } + + return 0; +} + int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { @@ -196,7 +243,6 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, unsigned int i; const char *role_str; const char *shm_id; - bool owner_dom_io = true; if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) continue; @@ -237,39 +283,13 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, return -EINVAL; } - /* - * "role" property is optional and if it is defined explicitly, - * then the owner domain is not the default "dom_io" domain. - */ - if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) - owner_dom_io = false; + /* "role" property is optional */ + if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) + role_str = NULL; - /* - * DOMID_IO is a fake domain and is not described in the Device-Tree. - * Therefore when the owner of the shared region is DOMID_IO, we will - * only find the borrowers. - */ - if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || - (!owner_dom_io && strcmp(role_str, "owner") == 0) ) - { - /* - * We found the first borrower of the region, the owner was not - * specified, so they should be assigned to dom_io. - */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, - boot_shm_bank); - if ( ret ) - return ret; - } - - if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) - { - /* Set up P2M foreign mapping for borrower domain. */ - ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), - _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); - if ( ret ) - return ret; - } + ret = handle_shared_mem_bank(d, gbase, role_str, boot_shm_bank); + if ( ret ) + return ret; /* * Record static shared memory region info for later setting -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 09:55:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 09:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740581.1147683 (Exim 4.92) (envelope-from ) id 1sI3eX-0003DW-01; Fri, 14 Jun 2024 09:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740581.1147683; Fri, 14 Jun 2024 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 1sI3eW-0003DM-Ry; Fri, 14 Jun 2024 09:55:24 +0000 Received: by outflank-mailman (input) for mailman id 740581; Fri, 14 Jun 2024 09:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eW-0003DA-BS for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eW-0001Bm-Ai for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sI3eW-0001Pw-9l for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=m9IGwErMKARsRMuoJ4J0ZUKU4iFNurMtcZ6aRm/X/nA=; b=JYeAYlol0xDAQNK6/xUjyxBdPH hHFkRjwWNfQzaza4Pv0Rzx/qaVqXVm+93TtF4QupdaWnAGKxwwF+AXDZ9tyXXdh0JwsXCCXTUYE+4 e1ei3J8J4f/TLZizS0j/vvOLSjxmyXhYNgRHZFvuvBVa2cZ1SZmyarsKIDkbi47uaECg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/p2m: put reference for level 2 superpage Message-Id: Date: Fri, 14 Jun 2024 09:55:24 +0000 commit 3e2121ce479bfcf9ad887ac77f2aa648f027ee5e Author: Penny Zheng AuthorDate: Tue May 28 13:56:03 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:45:55 2024 +0100 xen/p2m: put reference for level 2 superpage We are doing foreign memory mapping for static shared memory, and there is a great possibility that it could be super mapped. But today, p2m_put_l3_page could not handle superpages. This commits implements a new function p2m_put_l2_superpage to handle level 2 superpages, specifically for helping put extra references for foreign superpages. Modify relinquish_p2m_mapping as well to take into account preemption when we have a level-2 foreign mapping. Currently level 1 superpages are not handled because Xen is not preemptible and therefore some work is needed to handle such superpages, for which at some point Xen might end up freeing memory and therefore for such a big mapping it could end up in a very long operation. Signed-off-by: Penny Zheng Signed-off-by: Luca Fancellu Reviewed-by: Julien Grall --- xen/arch/arm/mmu/p2m.c | 81 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/mmu/p2m.c b/xen/arch/arm/mmu/p2m.c index 41fcca011c..1725cca649 100644 --- a/xen/arch/arm/mmu/p2m.c +++ b/xen/arch/arm/mmu/p2m.c @@ -753,34 +753,72 @@ static int p2m_mem_access_radix_set(struct p2m_domain *p2m, gfn_t gfn, return rc; } -/* - * Put any references on the single 4K page referenced by pte. - * TODO: Handle superpages, for now we only take special references for leaf - * pages (specifically foreign ones, which can't be super mapped today). - */ -static void p2m_put_l3_page(const lpae_t pte) +static void p2m_put_foreign_page(struct page_info *pg) { - mfn_t mfn = lpae_get_mfn(pte); - - ASSERT(p2m_is_valid(pte)); - /* - * TODO: Handle other p2m types - * * It's safe to do the put_page here because page_alloc will * flush the TLBs if the page is reallocated before the end of * this loop. */ - if ( p2m_is_foreign(pte.p2m.type) ) + put_page(pg); +} + +/* Put any references on the single 4K page referenced by mfn. */ +static void p2m_put_l3_page(mfn_t mfn, p2m_type_t type) +{ + /* TODO: Handle other p2m types */ + if ( p2m_is_foreign(type) ) { ASSERT(mfn_valid(mfn)); - put_page(mfn_to_page(mfn)); + p2m_put_foreign_page(mfn_to_page(mfn)); } /* Detect the xenheap page and mark the stored GFN as invalid. */ - else if ( p2m_is_ram(pte.p2m.type) && is_xen_heap_mfn(mfn) ) + else if ( p2m_is_ram(type) && is_xen_heap_mfn(mfn) ) page_set_xenheap_gfn(mfn_to_page(mfn), INVALID_GFN); } +/* Put any references on the superpage referenced by mfn. */ +static void p2m_put_l2_superpage(mfn_t mfn, p2m_type_t type) +{ + struct page_info *pg; + unsigned int i; + + /* + * TODO: Handle other p2m types, but be aware that any changes to handle + * different types should require an update on the relinquish code to handle + * preemption. + */ + if ( !p2m_is_foreign(type) ) + return; + + ASSERT(mfn_valid(mfn)); + + pg = mfn_to_page(mfn); + + for ( i = 0; i < XEN_PT_LPAE_ENTRIES; i++, pg++ ) + p2m_put_foreign_page(pg); +} + +/* Put any references on the page referenced by pte. */ +static void p2m_put_page(const lpae_t pte, unsigned int level) +{ + mfn_t mfn = lpae_get_mfn(pte); + + ASSERT(p2m_is_valid(pte)); + + /* + * TODO: Currently we don't handle level 1 super-page, Xen is not + * preemptible and therefore some work is needed to handle such + * superpages, for which at some point Xen might end up freeing memory + * and therefore for such a big mapping it could end up in a very long + * operation. + */ + if ( level == 2 ) + return p2m_put_l2_superpage(mfn, pte.p2m.type); + else if ( level == 3 ) + return p2m_put_l3_page(mfn, pte.p2m.type); +} + /* Free lpae sub-tree behind an entry */ static void p2m_free_entry(struct p2m_domain *p2m, lpae_t entry, unsigned int level) @@ -809,9 +847,9 @@ static void p2m_free_entry(struct p2m_domain *p2m, #endif p2m->stats.mappings[level]--; - /* Nothing to do if the entry is a super-page. */ - if ( level == 3 ) - p2m_put_l3_page(entry); + + p2m_put_page(entry, level); + return; } @@ -1558,9 +1596,12 @@ int relinquish_p2m_mapping(struct domain *d) count++; /* - * Arbitrarily preempt every 512 iterations. + * Arbitrarily preempt every 512 iterations or when we have a level-2 + * foreign mapping. */ - if ( !(count % 512) && hypercall_preempt_check() ) + if ( (!(count % 512) || + (p2m_is_foreign(t) && (order > XEN_PT_LEVEL_ORDER(2)))) && + hypercall_preempt_check() ) { rc = -ERESTART; break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 09:55:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 09:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740582.1147686 (Exim 4.92) (envelope-from ) id 1sI3eh-0003Gd-0G; Fri, 14 Jun 2024 09:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740582.1147686; Fri, 14 Jun 2024 09: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 1sI3eg-0003GV-Ta; Fri, 14 Jun 2024 09:55:34 +0000 Received: by outflank-mailman (input) for mailman id 740582; Fri, 14 Jun 2024 09:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eg-0003GP-FW for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eg-0001Bz-Ek for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sI3eg-0001Qe-D0 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NS82EJwQXkJdv1b0iZ1XuFzH918/CqO+Oc4z7qDYUJs=; b=fbjn8KD7H1P5eI31jZBsSnjvjG D6s1rJJFoRlNORurTLGefmVw93GlWPlnL429Krr3kEf2RJlqL9gdDDmgyXSJxY98kOF2rF5fBgD1E xOWYl2vE3an/NCxn0k+P29dC3CRF44gQy+AVEmZAVOP50OUgDboRA3zWWe+l2wRSZQwg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Parse xen,shared-mem when host phys address is not provided Message-Id: Date: Fri, 14 Jun 2024 09:55:34 +0000 commit 1544d355b54ff17ebddc9c79e531329510488307 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:52 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/arm: Parse xen,shared-mem when host phys address is not provided Handle the parsing of the 'xen,shared-mem' property when the host physical address is not provided, this commit is introducing the logic to parse it, but the functionality is still not implemented and will be part of future commits. Rework the logic inside process_shm_node to check the shm_id before doing the other checks, because it ease the logic itself, add more comment on the logic. Now when the host physical address is not provided, the value INVALID_PADDR is chosen to signal this condition and it is stored as start of the bank, due to that change also early_print_info_shmem and init_sharedmem_pages are changed, to not handle banks with start equal to INVALID_PADDR. Another change is done inside meminfo_overlap_check, to skip banks that are starting with the start address INVALID_PADDR, that function is used to check banks from reserved memory, shared memory and ACPI and since the comment above the function states that wrapping around is not handled, it's unlikely for these bank to have the start address as INVALID_PADDR. Same change is done inside consider_modules, find_unallocated_memory and dt_unreserved_regions functions, in order to skip banks that starts with INVALID_PADDR from any computation. The changes above holds because of this consideration. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/arm32/mmu/mm.c | 11 +++- xen/arch/arm/domain_build.c | 5 ++ xen/arch/arm/setup.c | 14 +++-- xen/arch/arm/static-shmem.c | 125 ++++++++++++++++++++++++++++++-------------- 4 files changed, 111 insertions(+), 44 deletions(-) diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index be480c31ea..30a7aa1e8e 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -101,8 +101,15 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, nr += reserved_mem->nr_banks; for ( ; i - nr < shmem->nr_banks; i++ ) { - paddr_t r_s = shmem->bank[i - nr].start; - paddr_t r_e = r_s + shmem->bank[i - nr].size; + paddr_t r_s, r_e; + + r_s = shmem->bank[i - nr].start; + + /* Shared memory banks can contain INVALID_PADDR as start */ + if ( INVALID_PADDR == r_s ) + continue; + + r_e = r_s + shmem->bank[i - nr].size; if ( s < r_e && r_s < e ) { diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 968c497efc..02e7416851 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -927,6 +927,11 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, 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)); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index c4e5c19b11..0c2fdaceaf 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -240,8 +240,15 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, offset = reserved_mem->nr_banks; for ( ; i - offset < shmem->nr_banks; i++ ) { - paddr_t r_s = shmem->bank[i - offset].start; - paddr_t r_e = r_s + shmem->bank[i - offset].size; + paddr_t r_s, r_e; + + r_s = shmem->bank[i - offset].start; + + /* Shared memory banks can contain INVALID_PADDR as start */ + if ( INVALID_PADDR == r_s ) + continue; + + r_e = r_s + shmem->bank[i - offset].size; if ( s < r_e && r_s < e ) { @@ -272,7 +279,8 @@ static bool __init meminfo_overlap_check(const struct membanks *mem, bank_start = mem->bank[i].start; bank_end = bank_start + mem->bank[i].size; - if ( region_end <= bank_start || region_start >= bank_end ) + if ( INVALID_PADDR == bank_start || region_end <= bank_start || + region_start >= bank_end ) continue; else { diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index c15a651306..bc093b9da9 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -264,6 +264,12 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, pbase = boot_shm_bank->start; psize = boot_shm_bank->size; + if ( INVALID_PADDR == pbase ) + { + printk("%pd: host physical address must be chosen by users at the moment", d); + return -EINVAL; + } + /* * xen,shared-mem = ; * TODO: pbase is optional. @@ -377,7 +383,8 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, { const struct fdt_property *prop, *prop_id, *prop_role; const __be32 *cell; - paddr_t paddr, gaddr, size, end; + paddr_t paddr = INVALID_PADDR; + paddr_t gaddr, size, end; struct membanks *mem = bootinfo_get_shmem(); struct shmem_membank_extra *shmem_extra = bootinfo_get_shmem_extra(); unsigned int i; @@ -432,24 +439,37 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, if ( !prop ) return -ENOENT; + cell = (const __be32 *)prop->data; if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) { - if ( len == dt_cells_to_size(size_cells + address_cells) ) - printk("fdt: host physical address must be chosen by users at the moment.\n"); - - printk("fdt: invalid `xen,shared-mem` property.\n"); - return -EINVAL; + if ( len == dt_cells_to_size(address_cells + size_cells) ) + device_tree_get_reg(&cell, address_cells, size_cells, &gaddr, + &size); + else + { + printk("fdt: invalid `xen,shared-mem` property.\n"); + return -EINVAL; + } } + else + { + device_tree_get_reg(&cell, address_cells, address_cells, &paddr, + &gaddr); + size = dt_next_cell(size_cells, &cell); - cell = (const __be32 *)prop->data; - device_tree_get_reg(&cell, address_cells, address_cells, &paddr, &gaddr); - size = dt_next_cell(size_cells, &cell); + if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) + { + printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", + paddr); + return -EINVAL; + } - if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) - { - printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", - paddr); - return -EINVAL; + end = paddr + size; + if ( end <= paddr ) + { + printk("fdt: static shared memory region %s overflow\n", shm_id); + return -EINVAL; + } } if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) @@ -471,39 +491,64 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, return -EINVAL; } - end = paddr + size; - if ( end <= paddr ) - { - printk("fdt: static shared memory region %s overflow\n", shm_id); - return -EINVAL; - } - for ( i = 0; i < mem->nr_banks; i++ ) { /* * Meet the following check: - * 1) The shm ID matches and the region exactly match - * 2) The shm ID doesn't match and the region doesn't overlap - * with an existing one + * - when host address is provided: + * 1) The shm ID matches and the region exactly match + * 2) The shm ID doesn't match and the region doesn't overlap + * with an existing one + * - when host address is not provided: + * 1) The shm ID matches and the region size exactly match */ - if ( paddr == mem->bank[i].start && size == mem->bank[i].size ) + bool paddr_assigned = (INVALID_PADDR != paddr); + + if ( strncmp(shm_id, shmem_extra[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) { - if ( strncmp(shm_id, shmem_extra[i].shm_id, - MAX_SHM_ID_LENGTH) == 0 ) + /* + * Regions have same shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr is equal and size is equal (same region) + * - Fail: paddr doesn't match or size doesn't match (there + * cannot exists two shmem regions with same shm_id) + * 2) physical host address is NOT supplied: + * - OK: size is equal (same region) + * - Fail: size is not equal (same shm_id must identify only one + * region, there can't be two different regions with same + * shm_id) + */ + bool start_match = paddr_assigned ? (paddr == mem->bank[i].start) : + true; + + if ( start_match && (size == mem->bank[i].size) ) break; else { - printk("fdt: xen,shm-id %s does not match for all the nodes using the same region.\n", + printk("fdt: different shared memory region could not share the same shm ID %s\n", shm_id); return -EINVAL; } } - else if ( strncmp(shm_id, shmem_extra[i].shm_id, - MAX_SHM_ID_LENGTH) != 0 ) + + /* + * Regions have different shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr different, or size different (case where paddr + * is equal but psize is different are wrong, but they + * are handled later when checking for overlapping) + * - Fail: paddr equal and size equal (the same region can't be + * identified with different shm_id) + * 2) physical host address is NOT supplied: + * - OK: Both have different shm_id so even with same size they + * can exists + */ + if ( !paddr_assigned || (paddr != mem->bank[i].start) || + (size != mem->bank[i].size) ) continue; else { - printk("fdt: different shared memory region could not share the same shm ID %s\n", + printk("fdt: xen,shm-id %s does not match for all the nodes using the same region\n", shm_id); return -EINVAL; } @@ -513,7 +558,8 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, { if (i < mem->max_banks) { - if ( check_reserved_regions_overlap(paddr, size) ) + if ( (paddr != INVALID_PADDR) && + check_reserved_regions_overlap(paddr, size) ) return -EINVAL; /* Static shared memory shall be reserved from any other use. */ @@ -583,13 +629,13 @@ void __init early_print_info_shmem(void) { const struct membanks *shmem = bootinfo_get_shmem(); unsigned int bank; + unsigned int printed = 0; - for ( bank = 0; bank < shmem->nr_banks; bank++ ) - { - printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", bank, - shmem->bank[bank].start, - shmem->bank[bank].start + shmem->bank[bank].size - 1); - } + for ( bank = 0; bank < shmem->nr_banks; bank++, printed++ ) + if ( shmem->bank[bank].start != INVALID_PADDR ) + printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", printed, + shmem->bank[bank].start, + shmem->bank[bank].start + shmem->bank[bank].size - 1); } void __init init_sharedmem_pages(void) @@ -598,7 +644,8 @@ void __init init_sharedmem_pages(void) unsigned int bank; for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) - init_staticmem_bank(&shmem->bank[bank]); + if ( shmem->bank[bank].start != INVALID_PADDR ) + init_staticmem_bank(&shmem->bank[bank]); } int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 09:55:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 09:55:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740583.1147690 (Exim 4.92) (envelope-from ) id 1sI3er-0003JI-1c; Fri, 14 Jun 2024 09:55:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740583.1147690; Fri, 14 Jun 2024 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 1sI3eq-0003JA-VE; Fri, 14 Jun 2024 09:55:44 +0000 Received: by outflank-mailman (input) for mailman id 740583; Fri, 14 Jun 2024 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 1sI3eq-0003J2-If for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3eq-0001CR-I1 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sI3eq-0001RI-H1 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PlVa7wrnwyLi+nvNRa61jW71DqzsoLB40rIMSVVAMgU=; b=rMoDHB22U9CkkwSJrD4jF/03ZX kC/LXzbV3OxgsIJPNF6IDbfnNEnd8D15trpkLI/4jdNSRYTe++KNIJ19rRkJpjaV98fjxYjl8f92H SuIhPYJgrv2bi0g6M+0hzKA5RyuZSHFDg7yET/8qMfZJbCEwqLDmhMhn8OUW4ws1+x0I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Rework heap page allocation outside allocate_bank_memory Message-Id: Date: Fri, 14 Jun 2024 09:55:44 +0000 commit a21bfc912621d1afee1c693d8590164b01ff1998 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:53 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/arm: Rework heap page allocation outside allocate_bank_memory The function allocate_bank_memory allocates pages from the heap and maps them to the guest using guest_physmap_add_page. As a preparation work to support static shared memory bank when the host physical address is not provided, Xen needs to allocate memory from the heap, so rework allocate_bank_memory moving out the page allocation in a new function called allocate_domheap_memory. The function allocate_domheap_memory takes a callback function and a pointer to some extra information passed to the callback and this function will be called for every region, until a defined size is reached. In order to keep allocate_bank_memory functionality, the callback passed to allocate_domheap_memory is a wrapper for guest_physmap_add_page. Let allocate_domheap_memory be externally visible, in order to use it in the future from the static shared memory module. Take the opportunity to change the signature of allocate_bank_memory and remove the 'struct domain' parameter, which can be retrieved from 'struct kernel_info'. No functional changes is intended. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/dom0less-build.c | 4 +- xen/arch/arm/domain_build.c | 79 ++++++++++++++++++++++----------- xen/arch/arm/include/asm/domain_build.h | 9 ++-- 3 files changed, 62 insertions(+), 30 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 5830a7051d..f919d3acf9 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -60,12 +60,12 @@ static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo) mem->nr_banks = 0; bank_size = MIN(GUEST_RAM0_SIZE, kinfo->unassigned_mem); - if ( !allocate_bank_memory(d, kinfo, gaddr_to_gfn(GUEST_RAM0_BASE), + if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(GUEST_RAM0_BASE), bank_size) ) goto fail; bank_size = MIN(GUEST_RAM1_SIZE, kinfo->unassigned_mem); - if ( !allocate_bank_memory(d, kinfo, gaddr_to_gfn(GUEST_RAM1_BASE), + if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(GUEST_RAM1_BASE), bank_size) ) goto fail; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 02e7416851..669970c86f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -417,30 +417,15 @@ static void __init allocate_memory_11(struct domain *d, } #ifdef CONFIG_DOM0LESS_BOOT -bool __init allocate_bank_memory(struct domain *d, struct kernel_info *kinfo, - gfn_t sgfn, paddr_t tot_size) +bool __init allocate_domheap_memory(struct domain *d, paddr_t tot_size, + alloc_domheap_mem_cb cb, void *extra) { - struct membanks *mem = kernel_info_get_mem(kinfo); - int res; - struct page_info *pg; - struct membank *bank; - unsigned int max_order = ~0; - - /* - * 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; + 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); @@ -463,17 +448,61 @@ bool __init allocate_bank_memory(struct domain *d, struct kernel_info *kinfo, continue; } - res = guest_physmap_add_page(d, sgfn, page_to_mfn(pg), order); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed map pages to DOMU: %d", res); + if ( !cb(d, pg, order, extra) ) return false; - } - sgfn = gfn_add(sgfn, 1UL << order); 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; diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 45936212ca..e712afbc7f 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -5,9 +5,12 @@ #include typedef __be32 gic_interrupt_t[3]; - -bool allocate_bank_memory(struct domain *d, struct kernel_info *kinfo, - gfn_t sgfn, paddr_t tot_size); +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); int construct_domain(struct domain *d, struct kernel_info *kinfo); int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); int make_chosen_node(const struct kernel_info *kinfo); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 09:55:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 09:55:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740584.1147694 (Exim 4.92) (envelope-from ) id 1sI3f1-0003MW-4T; Fri, 14 Jun 2024 09:55:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740584.1147694; Fri, 14 Jun 2024 09:55: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 1sI3f1-0003MP-1h; Fri, 14 Jun 2024 09:55:55 +0000 Received: by outflank-mailman (input) for mailman id 740584; Fri, 14 Jun 2024 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 1sI3f0-0003MH-Lh for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3f0-0001Cb-Kx for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:55:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sI3f0-0001Rr-K6 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R03Ji1B8zyYWtuvtF8roXzHFeb5mJtKYSBUDng0YeJc=; b=H/aSyxberK6DVaCmSAaL9tL05d m0Hc4rpxt5M/V2tuddfxTxeiLSdZ1jI9lCiVYV21dzSI3zWogjCaqQVzOyFzakADEH5wXZcdI9vMr fKpLK/yskzf1Zag9CKls1O7J/6zCG/zjuACxJrcEVXtGVmLPKVlh0HUAOZV0O19LwSnE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Implement the logic for static shared memory from Xen heap Message-Id: Date: Fri, 14 Jun 2024 09:55:54 +0000 commit 3deac416a3687d1ecc8d2e4dea2c135d1b28c05e Author: Luca Fancellu AuthorDate: Fri May 24 13:40:54 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/arm: Implement the logic for static shared memory from Xen heap This commit implements the logic to have the static shared memory banks from the Xen heap instead of having the host physical address passed from the user. When the host physical address is not supplied, the physical memory is taken from the Xen heap using allocate_domheap_memory, the allocation needs to occur at the first handled DT node and the allocated banks need to be saved somewhere. Introduce the 'shm_heap_banks' for that reason, a struct that will hold the banks allocated from the heap, its field bank[].shmem_extra will be used to point to the bootinfo shared memory banks .shmem_extra space, so that there is not further allocation of memory and every bank in shm_heap_banks can be safely identified by the shm_id to reconstruct its traceability and if it was allocated or not. A search into 'shm_heap_banks' will reveal if the banks were allocated or not, in case the host address is not passed, and the callback given to allocate_domheap_memory will store the banks in the structure and map them to the current domain, to do that, some changes to acquire_shared_memory_bank are made to let it differentiate if the bank is from the heap and if it is, then assign_pages is called for every bank. When the bank is already allocated, for every bank allocated with the corresponding shm_id, handle_shared_mem_bank is called and the mapping are done. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/static-shmem.c | 187 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 155 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index bc093b9da9..dbb017c7d7 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -9,6 +9,25 @@ #include #include +typedef struct { + struct domain *d; + const char *role_str; + paddr_t gbase; + struct shmem_membank_extra *bank_extra_info; +} alloc_heap_pages_cb_extra; + +static struct { + struct membanks_hdr common; + struct membank bank[NR_SHMEM_BANKS]; +} shm_heap_banks __initdata = { + .common.max_banks = NR_SHMEM_BANKS +}; + +static inline struct membanks *get_shmem_heap_banks(void) +{ + return container_of(&shm_heap_banks.common, struct membanks, common); +} + static void __init __maybe_unused build_assertions(void) { /* @@ -63,7 +82,8 @@ static bool __init is_shm_allocated_to_domio(paddr_t pbase) } static mfn_t __init acquire_shared_memory_bank(struct domain *d, - paddr_t pbase, paddr_t psize) + paddr_t pbase, paddr_t psize, + bool bank_from_heap) { mfn_t smfn; unsigned long nr_pfns; @@ -83,19 +103,31 @@ static mfn_t __init acquire_shared_memory_bank(struct domain *d, d->max_pages += nr_pfns; smfn = maddr_to_mfn(pbase); - res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + if ( bank_from_heap ) + /* + * When host address is not provided, static shared memory is + * allocated from heap and shall be assigned to owner domain. + */ + res = assign_pages(maddr_to_page(pbase), nr_pfns, d, 0); + else + res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + if ( res ) { - printk(XENLOG_ERR - "%pd: failed to acquire static memory: %d.\n", d, res); - d->max_pages -= nr_pfns; - return INVALID_MFN; + printk(XENLOG_ERR "%pd: failed to %s static memory: %d.\n", d, + bank_from_heap ? "assign" : "acquire", res); + goto fail; } return smfn; + + fail: + d->max_pages -= nr_pfns; + return INVALID_MFN; } static int __init assign_shared_memory(struct domain *d, paddr_t gbase, + bool bank_from_heap, const struct membank *shm_bank) { mfn_t smfn; @@ -108,10 +140,7 @@ static int __init assign_shared_memory(struct domain *d, paddr_t gbase, psize = shm_bank->size; nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; - printk("%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", - d, pbase, pbase + psize); - - smfn = acquire_shared_memory_bank(d, pbase, psize); + smfn = acquire_shared_memory_bank(d, pbase, psize, bank_from_heap); if ( mfn_eq(smfn, INVALID_MFN) ) return -EINVAL; @@ -182,6 +211,7 @@ append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, const char *role_str, + bool bank_from_heap, const struct membank *shm_bank) { bool owner_dom_io = true; @@ -210,7 +240,8 @@ static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, * We found the first borrower of the region, the owner was not * specified, so they should be assigned to dom_io. */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, shm_bank); + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, + bank_from_heap, shm_bank); if ( ret ) return ret; } @@ -227,6 +258,39 @@ static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, return 0; } +static bool __init save_map_heap_pages(struct domain *d, struct page_info *pg, + unsigned int order, void *extra) +{ + alloc_heap_pages_cb_extra *b_extra = (alloc_heap_pages_cb_extra *)extra; + int idx = shm_heap_banks.common.nr_banks; + int ret = -ENOSPC; + + BUG_ON(!b_extra); + + if ( idx < shm_heap_banks.common.max_banks ) + { + shm_heap_banks.bank[idx].start = page_to_maddr(pg); + shm_heap_banks.bank[idx].size = (1ULL << (PAGE_SHIFT + order)); + shm_heap_banks.bank[idx].shmem_extra = b_extra->bank_extra_info; + shm_heap_banks.common.nr_banks++; + + ret = handle_shared_mem_bank(b_extra->d, b_extra->gbase, + b_extra->role_str, true, + &shm_heap_banks.bank[idx]); + if ( !ret ) + { + /* Increment guest physical address for next mapping */ + b_extra->gbase += shm_heap_banks.bank[idx].size; + return true; + } + } + + printk("Failed to allocate static shared memory from Xen heap: (%d)\n", + ret); + + return false; +} + int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { @@ -264,38 +328,97 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, pbase = boot_shm_bank->start; psize = boot_shm_bank->size; - if ( INVALID_PADDR == pbase ) - { - printk("%pd: host physical address must be chosen by users at the moment", d); - return -EINVAL; - } + /* "role" property is optional */ + if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) + role_str = NULL; /* - * xen,shared-mem = ; - * TODO: pbase is optional. + * xen,shared-mem = <[pbase,] gbase, size>; + * pbase is optional. */ addr_cells = dt_n_addr_cells(shm_node); size_cells = dt_n_size_cells(shm_node); prop = dt_find_property(shm_node, "xen,shared-mem", NULL); BUG_ON(!prop); cells = (const __be32 *)prop->value; - gbase = dt_read_paddr(cells + addr_cells, addr_cells); - for ( i = 0; i < PFN_DOWN(psize); i++ ) - if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) - { - printk("%pd: invalid physical address 0x%"PRI_mfn"\n", - d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); - return -EINVAL; - } + if ( pbase != INVALID_PADDR ) + { + /* guest phys address is after host phys address */ + gbase = dt_read_paddr(cells + addr_cells, addr_cells); + + for ( i = 0; i < PFN_DOWN(psize); i++ ) + if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) + { + printk("%pd: invalid physical address 0x%"PRI_mfn"\n", + d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); + return -EINVAL; + } + + /* The host physical address is supplied by the user */ + ret = handle_shared_mem_bank(d, gbase, role_str, false, + boot_shm_bank); + if ( ret ) + return ret; + } + else + { + /* + * The host physical address is not supplied by the user, so it + * means that the banks needs to be allocated from the Xen heap, + * look into the already allocated banks from the heap. + */ + const struct membank *alloc_bank = + find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); - /* "role" property is optional */ - if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) - role_str = NULL; + /* guest phys address is right at the beginning */ + gbase = dt_read_paddr(cells, addr_cells); - ret = handle_shared_mem_bank(d, gbase, role_str, boot_shm_bank); - if ( ret ) - return ret; + if ( !alloc_bank ) + { + alloc_heap_pages_cb_extra cb_arg = { d, role_str, gbase, + boot_shm_bank->shmem_extra }; + + /* shm_id identified bank is not yet allocated */ + if ( !allocate_domheap_memory(NULL, psize, save_map_heap_pages, + &cb_arg) ) + { + printk(XENLOG_ERR + "Failed to allocate (%"PRIpaddr"KB) pages as static shared memory from heap\n", + psize >> 10); + return -EINVAL; + } + } + else + { + /* shm_id identified bank is already allocated */ + const struct membank *end_bank = + &shm_heap_banks.bank[shm_heap_banks.common.nr_banks]; + paddr_t gbase_bank = gbase; + + /* + * Static shared memory banks that are taken from the Xen heap + * are allocated sequentially in shm_heap_banks, so starting + * from the first bank found identified by shm_id, the code can + * just advance by one bank at the time until it reaches the end + * of the array or it finds another bank NOT identified by + * shm_id + */ + for ( ; alloc_bank < end_bank; alloc_bank++ ) + { + if ( strcmp(shm_id, alloc_bank->shmem_extra->shm_id) != 0 ) + break; + + ret = handle_shared_mem_bank(d, gbase_bank, role_str, true, + alloc_bank); + if ( ret ) + return ret; + + /* Increment guest physical address for next mapping */ + gbase_bank += alloc_bank->size; + } + } + } /* * Record static shared memory region info for later setting -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 14 09:56:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jun 2024 09:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740585.1147698 (Exim 4.92) (envelope-from ) id 1sI3fC-0003P8-5y; Fri, 14 Jun 2024 09:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740585.1147698; Fri, 14 Jun 2024 09:56: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 1sI3fC-0003P0-3E; Fri, 14 Jun 2024 09:56:06 +0000 Received: by outflank-mailman (input) for mailman id 740585; Fri, 14 Jun 2024 09:56:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3fA-0003Oo-Od for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:56:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sI3fA-0001D1-Nt for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:56:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sI3fA-0001TF-N4 for xen-changelog@lists.xenproject.org; Fri, 14 Jun 2024 09:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zhKKD6rdJKm6YUxZFxezla7PO+kbu8LeOo8fZS5VHRI=; b=fyCPpqcFfb5Yvc62Yb048cLWoN fQvWbz80AQHXmGxRS78CMD4p93DYVXsN+kq4K0sni1VzVVi7WteoZRIRIux1xJ5BbzYfIuO6XKNqw x45cfuWsSYidJr405+gKY+66Ldt4nzDp5QPTeurpAzohuGHphzhKdJ0XTsQnggE4/gdo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/docs: Describe static shared memory when host address is not provided Message-Id: Date: Fri, 14 Jun 2024 09:56:04 +0000 commit 8b4243a9b560c89bb259db5a27832c253d4bebc7 Author: Penny Zheng AuthorDate: Fri May 24 13:40:55 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/docs: Describe static shared memory when host address is not provided This commit describe the new scenario where host address is not provided in "xen,shared-mem" property and a new example is added to the page to explain in details. Take the occasion to fix some typos in the page. Signed-off-by: Penny Zheng Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- docs/misc/arm/device-tree/booting.txt | 52 ++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index f1fd069c87..aa0e614864 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -606,7 +606,7 @@ communication. An array takes a physical address, which is the base address of the shared memory region in host physical address space, a size, and a guest physical address, as the target address of the mapping. - e.g. xen,shared-mem = < [host physical address] [guest address] [size] > + e.g. xen,shared-mem = < [host physical address] [guest address] [size] >; It shall also meet the following criteria: 1) If the SHM ID matches with an existing region, the address range of the @@ -617,8 +617,8 @@ communication. The number of cells for the host address (and size) is the same as the guest pseudo-physical address and they are inherited from the parent node. - Host physical address is optional, when missing Xen decides the location - (currently unimplemented). + Host physical address is optional, when missing Xen decides the location. + e.g. xen,shared-mem = < [guest address] [size] >; - role (Optional) @@ -645,7 +645,7 @@ chosen { role = "owner"; xen,shm-id = "my-shared-mem-0"; xen,shared-mem = <0x10000000 0x10000000 0x10000000>; - } + }; domU1 { compatible = "xen,domain"; @@ -656,25 +656,36 @@ chosen { vpl011; /* - * shared memory region identified as 0x0(xen,shm-id = <0x0>) - * is shared between Dom0 and DomU1. + * shared memory region "my-shared-mem-0" is shared + * between Dom0 and DomU1. */ domU1-shared-mem@10000000 { compatible = "xen,domain-shared-memory-v1"; role = "borrower"; xen,shm-id = "my-shared-mem-0"; xen,shared-mem = <0x10000000 0x50000000 0x10000000>; - } + }; /* - * shared memory region identified as 0x1(xen,shm-id = <0x1>) - * is shared between DomU1 and DomU2. + * shared memory region "my-shared-mem-1" is shared between + * DomU1 and DomU2. */ domU1-shared-mem@50000000 { compatible = "xen,domain-shared-memory-v1"; xen,shm-id = "my-shared-mem-1"; xen,shared-mem = <0x50000000 0x60000000 0x20000000>; - } + }; + + /* + * shared memory region "my-shared-mem-2" is shared between + * DomU1 and DomU2. + */ + domU1-shared-mem-2 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-2"; + role = "owner"; + xen,shared-mem = <0x80000000 0x20000000>; + }; ...... @@ -688,14 +699,21 @@ chosen { cpus = <1>; /* - * shared memory region identified as 0x1(xen,shm-id = <0x1>) - * is shared between domU1 and domU2. + * shared memory region "my-shared-mem-1" is shared between + * domU1 and domU2. */ domU2-shared-mem@50000000 { compatible = "xen,domain-shared-memory-v1"; xen,shm-id = "my-shared-mem-1"; xen,shared-mem = <0x50000000 0x70000000 0x20000000>; - } + }; + + domU2-shared-mem-2 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-2"; + role = "borrower"; + xen,shared-mem = <0x90000000 0x20000000>; + }; ...... }; @@ -715,3 +733,11 @@ shared between DomU1 and DomU2. It will get mapped at 0x60000000 in DomU1 guest physical address space, and at 0x70000000 in DomU2 guest physical address space. DomU1 and DomU2 are both the borrower domain, the owner domain is the default owner domain DOMID_IO. + +For the static shared memory region "my-shared-mem-2", since host physical +address is not provided by user, Xen will automatically allocate 512MB +from heap as static shared memory to be shared between DomU1 and DomU2. +The automatically allocated static shared memory will get mapped at +0x80000000 in DomU1 guest physical address space, and at 0x90000000 in DomU2 +guest physical address space. DomU1 is explicitly defined as the owner domain, +and DomU2 is the borrower domain. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 15 00:11:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jun 2024 00:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740920.1147999 (Exim 4.92) (envelope-from ) id 1sIH0a-00041I-0L; Sat, 15 Jun 2024 00:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740920.1147999; Sat, 15 Jun 2024 00: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 1sIH0Z-00041A-Tf; Sat, 15 Jun 2024 00:11:03 +0000 Received: by outflank-mailman (input) for mailman id 740920; Sat, 15 Jun 2024 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 1sIH0Y-000414-Gt for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH0Y-00025Y-AU for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sIH0Y-0005xX-9S for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oOZq4qW9ybKRezTdLmO7MEs3eNIEGfe93UEi2/01QQE=; b=dVXj1JWyW18qnNHKYnsLdH12Sd rAEUXYuk3yWS3s4N4ukZgXOse7DFGZlObOMav7riq+E3S6QojftuzV07q+a7lmjJ0yBLyirGHOda4 z9RC9sECwT3rpUfzANrGTclWS59ADajnapCk4UItEEUB45x7v5unq7RN7J5jW4oGTHrk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Lookup bootinfo shm bank during the mapping Message-Id: Date: Sat, 15 Jun 2024 00:11:02 +0000 commit e90f8d562dd1aba59fa1e6835ed944b15b6d1931 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:49 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:44:57 2024 +0100 xen/arm: Lookup bootinfo shm bank during the mapping The current static shared memory code is using bootinfo banks when it needs to find the number of borrowers, so every time assign_shared_memory is called, the bank is searched in the bootinfo.shmem structure. There is nothing wrong with it, however the bank can be used also to retrieve the start address and size and also to pass less argument to assign_shared_memory. When retrieving the information from the bootinfo bank, it's also possible to move the checks on alignment to process_shm_node in the early stages. So create a new function find_shm_bank_by_id() which takes a 'struct shared_meminfo' structure and the shared memory ID, to look for a bank with a matching ID, take the physical host address and size from the bank, pass the bank to assign_shared_memory() removing the now unnecessary arguments and finally remove the acquire_nr_borrower_domain() function since now the information can be extracted from the passed bank. Move the "xen,shm-id" parsing early in process_shm to bail out quickly in case of errors (unlikely), as said above, move the checks on alignment to process_shm_node. Drawback of this change is that now the bootinfo are used also when the bank doesn't need to be allocated, however it will be convenient later to use it as an argument for assign_shared_memory when dealing with the use case where the Host physical address is not supplied by the user. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/static-shmem.c | 100 +++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 78881dd1d3..0a1c327e90 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -19,29 +19,21 @@ static void __init __maybe_unused build_assertions(void) offsetof(struct shared_meminfo, bank))); } -static int __init acquire_nr_borrower_domain(struct domain *d, - paddr_t pbase, paddr_t psize, - unsigned long *nr_borrowers) +static const struct membank __init * +find_shm_bank_by_id(const struct membanks *shmem, const char *shm_id) { - const struct membanks *shmem = bootinfo_get_shmem(); unsigned int bank; - /* Iterate reserved memory to find requested shm bank. */ for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) { - paddr_t bank_start = shmem->bank[bank].start; - paddr_t bank_size = shmem->bank[bank].size; - - if ( (pbase == bank_start) && (psize == bank_size) ) + if ( strcmp(shm_id, shmem->bank[bank].shmem_extra->shm_id) == 0 ) break; } if ( bank == shmem->nr_banks ) - return -ENOENT; + return NULL; - *nr_borrowers = shmem->bank[bank].shmem_extra->nr_shm_borrowers; - - return 0; + return &shmem->bank[bank]; } /* @@ -103,14 +95,18 @@ static mfn_t __init acquire_shared_memory_bank(struct domain *d, return smfn; } -static int __init assign_shared_memory(struct domain *d, - paddr_t pbase, paddr_t psize, - paddr_t gbase) +static int __init assign_shared_memory(struct domain *d, paddr_t gbase, + const struct membank *shm_bank) { mfn_t smfn; int ret = 0; unsigned long nr_pages, nr_borrowers, i; struct page_info *page; + paddr_t pbase, psize; + + pbase = shm_bank->start; + psize = shm_bank->size; + nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; printk("%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", d, pbase, pbase + psize); @@ -135,14 +131,6 @@ static int __init assign_shared_memory(struct domain *d, } } - /* - * Get the right amount of references per page, which is the number of - * borrower domains. - */ - ret = acquire_nr_borrower_domain(d, pbase, psize, &nr_borrowers); - if ( ret ) - return ret; - /* * Instead of letting borrower domain get a page ref, we add as many * additional reference as the number of borrowers when the owner @@ -199,6 +187,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, dt_for_each_child_node(node, shm_node) { + const struct membank *boot_shm_bank; const struct dt_property *prop; const __be32 *cells; uint32_t addr_cells, size_cells; @@ -212,6 +201,23 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) continue; + if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) + { + printk("%pd: invalid \"xen,shm-id\" property", d); + return -EINVAL; + } + BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); + + boot_shm_bank = find_shm_bank_by_id(bootinfo_get_shmem(), shm_id); + if ( !boot_shm_bank ) + { + printk("%pd: static shared memory bank not found: '%s'", d, shm_id); + return -ENOENT; + } + + pbase = boot_shm_bank->start; + psize = boot_shm_bank->size; + /* * xen,shared-mem = ; * TODO: pbase is optional. @@ -221,20 +227,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, prop = dt_find_property(shm_node, "xen,shared-mem", NULL); BUG_ON(!prop); cells = (const __be32 *)prop->value; - device_tree_get_reg(&cells, addr_cells, addr_cells, &pbase, &gbase); - psize = dt_read_paddr(cells, size_cells); - if ( !IS_ALIGNED(pbase, PAGE_SIZE) || !IS_ALIGNED(gbase, PAGE_SIZE) ) - { - printk("%pd: physical address 0x%"PRIpaddr", or guest address 0x%"PRIpaddr" is not suitably aligned.\n", - d, pbase, gbase); - return -EINVAL; - } - if ( !IS_ALIGNED(psize, PAGE_SIZE) ) - { - printk("%pd: size 0x%"PRIpaddr" is not suitably aligned\n", - d, psize); - return -EINVAL; - } + gbase = dt_read_paddr(cells + addr_cells, addr_cells); for ( i = 0; i < PFN_DOWN(psize); i++ ) if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) @@ -251,13 +244,6 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) owner_dom_io = false; - if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) - { - printk("%pd: invalid \"xen,shm-id\" property", d); - return -EINVAL; - } - BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); - /* * DOMID_IO is a fake domain and is not described in the Device-Tree. * Therefore when the owner of the shared region is DOMID_IO, we will @@ -270,8 +256,8 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, * We found the first borrower of the region, the owner was not * specified, so they should be assigned to dom_io. */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, - pbase, psize, gbase); + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, + boot_shm_bank); if ( ret ) return ret; } @@ -439,12 +425,32 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, device_tree_get_reg(&cell, address_cells, address_cells, &paddr, &gaddr); size = dt_next_cell(size_cells, &cell); + if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) + { + printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", + paddr); + return -EINVAL; + } + + if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) + { + printk("fdt: guest address 0x%"PRIpaddr" is not suitably aligned.\n", + gaddr); + return -EINVAL; + } + if ( !size ) { printk("fdt: the size for static shared memory region can not be zero\n"); return -EINVAL; } + if ( !IS_ALIGNED(size, PAGE_SIZE) ) + { + printk("fdt: size 0x%"PRIpaddr" is not suitably aligned\n", size); + return -EINVAL; + } + end = paddr + size; if ( end <= paddr ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 15 00:11:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jun 2024 00:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740921.1148004 (Exim 4.92) (envelope-from ) id 1sIH0j-00042n-1T; Sat, 15 Jun 2024 00:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740921.1148004; Sat, 15 Jun 2024 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 1sIH0i-00042f-V6; Sat, 15 Jun 2024 00:11:12 +0000 Received: by outflank-mailman (input) for mailman id 740921; Sat, 15 Jun 2024 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 1sIH0i-00042Z-Ff for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH0i-00025p-Eq for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sIH0i-0005yF-CZ for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eeJx2nI+aiFnKPrbqD8tJKVSXX7gg+ILuIXPSQuQmo4=; b=ugGLc5f/fuDDqFtyRSeou4CRBv m2sRT4BmJ+brspza663UxIsxEccXQLTVj8nCsogi4NYztn+D6oO44N2rFnisR+Iuu4Ai+r8p9lprS Qm0jz+GrdSVOArKxkDSU565WSpmJ4ytQK+AHgZuY6GS35BAFLVbNgCWBd2DsurHPrNng=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Wrap shared memory mapping code in one function Message-Id: Date: Sat, 15 Jun 2024 00:11:12 +0000 commit 79a43c8838039c31ff6f06de827b71909eca76b8 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:50 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:44:57 2024 +0100 xen/arm: Wrap shared memory mapping code in one function Wrap the code and logic that is calling assign_shared_memory and map_regions_p2mt into a new function 'handle_shared_mem_bank', it will become useful later when the code will allow the user to don't pass the host physical address. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/static-shmem.c | 86 ++++++++++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 0a1c327e90..c15a651306 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -180,6 +180,53 @@ append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, return 0; } +static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, + const char *role_str, + const struct membank *shm_bank) +{ + bool owner_dom_io = true; + paddr_t pbase, psize; + int ret; + + pbase = shm_bank->start; + psize = shm_bank->size; + + /* + * "role" property is optional and if it is defined explicitly, + * then the owner domain is not the default "dom_io" domain. + */ + if ( role_str != NULL ) + owner_dom_io = false; + + /* + * DOMID_IO is a fake domain and is not described in the Device-Tree. + * Therefore when the owner of the shared region is DOMID_IO, we will + * only find the borrowers. + */ + if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || + (!owner_dom_io && strcmp(role_str, "owner") == 0) ) + { + /* + * We found the first borrower of the region, the owner was not + * specified, so they should be assigned to dom_io. + */ + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, shm_bank); + if ( ret ) + return ret; + } + + if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) + { + /* Set up P2M foreign mapping for borrower domain. */ + ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), + _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); + if ( ret ) + return ret; + } + + return 0; +} + int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { @@ -196,7 +243,6 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, unsigned int i; const char *role_str; const char *shm_id; - bool owner_dom_io = true; if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) continue; @@ -237,39 +283,13 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, return -EINVAL; } - /* - * "role" property is optional and if it is defined explicitly, - * then the owner domain is not the default "dom_io" domain. - */ - if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) - owner_dom_io = false; + /* "role" property is optional */ + if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) + role_str = NULL; - /* - * DOMID_IO is a fake domain and is not described in the Device-Tree. - * Therefore when the owner of the shared region is DOMID_IO, we will - * only find the borrowers. - */ - if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || - (!owner_dom_io && strcmp(role_str, "owner") == 0) ) - { - /* - * We found the first borrower of the region, the owner was not - * specified, so they should be assigned to dom_io. - */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, - boot_shm_bank); - if ( ret ) - return ret; - } - - if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) - { - /* Set up P2M foreign mapping for borrower domain. */ - ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), - _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); - if ( ret ) - return ret; - } + ret = handle_shared_mem_bank(d, gbase, role_str, boot_shm_bank); + if ( ret ) + return ret; /* * Record static shared memory region info for later setting -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 15 00:11:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jun 2024 00:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740922.1148007 (Exim 4.92) (envelope-from ) id 1sIH0t-00045G-2j; Sat, 15 Jun 2024 00:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740922.1148007; Sat, 15 Jun 2024 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 1sIH0t-000459-0G; Sat, 15 Jun 2024 00:11:23 +0000 Received: by outflank-mailman (input) for mailman id 740922; Sat, 15 Jun 2024 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 1sIH0s-00044z-Jc for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH0s-000260-I2 for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sIH0s-00060N-Gx for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KbIYIkR7xepqUSl3drQbOL68whQhrAvZgGayA7lqpFA=; b=01knta1x2ZxNn3qj7zQ+meVaZt Hc0WGNrIfQcBI/ZKOpie9SZ/i4tIR8VE/GLjdE58A+lmjAO8ZyJoo3qFgGVXv7zqkbzrefGzbfma0 JWR11W/Sg5fRKsno0zJYT65L1aViLCd720S06EDn2d36DN297Yc6TBVcRrred3DKaYAo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/p2m: put reference for level 2 superpage Message-Id: Date: Sat, 15 Jun 2024 00:11:22 +0000 commit 3e2121ce479bfcf9ad887ac77f2aa648f027ee5e Author: Penny Zheng AuthorDate: Tue May 28 13:56:03 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:45:55 2024 +0100 xen/p2m: put reference for level 2 superpage We are doing foreign memory mapping for static shared memory, and there is a great possibility that it could be super mapped. But today, p2m_put_l3_page could not handle superpages. This commits implements a new function p2m_put_l2_superpage to handle level 2 superpages, specifically for helping put extra references for foreign superpages. Modify relinquish_p2m_mapping as well to take into account preemption when we have a level-2 foreign mapping. Currently level 1 superpages are not handled because Xen is not preemptible and therefore some work is needed to handle such superpages, for which at some point Xen might end up freeing memory and therefore for such a big mapping it could end up in a very long operation. Signed-off-by: Penny Zheng Signed-off-by: Luca Fancellu Reviewed-by: Julien Grall --- xen/arch/arm/mmu/p2m.c | 81 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/mmu/p2m.c b/xen/arch/arm/mmu/p2m.c index 41fcca011c..1725cca649 100644 --- a/xen/arch/arm/mmu/p2m.c +++ b/xen/arch/arm/mmu/p2m.c @@ -753,34 +753,72 @@ static int p2m_mem_access_radix_set(struct p2m_domain *p2m, gfn_t gfn, return rc; } -/* - * Put any references on the single 4K page referenced by pte. - * TODO: Handle superpages, for now we only take special references for leaf - * pages (specifically foreign ones, which can't be super mapped today). - */ -static void p2m_put_l3_page(const lpae_t pte) +static void p2m_put_foreign_page(struct page_info *pg) { - mfn_t mfn = lpae_get_mfn(pte); - - ASSERT(p2m_is_valid(pte)); - /* - * TODO: Handle other p2m types - * * It's safe to do the put_page here because page_alloc will * flush the TLBs if the page is reallocated before the end of * this loop. */ - if ( p2m_is_foreign(pte.p2m.type) ) + put_page(pg); +} + +/* Put any references on the single 4K page referenced by mfn. */ +static void p2m_put_l3_page(mfn_t mfn, p2m_type_t type) +{ + /* TODO: Handle other p2m types */ + if ( p2m_is_foreign(type) ) { ASSERT(mfn_valid(mfn)); - put_page(mfn_to_page(mfn)); + p2m_put_foreign_page(mfn_to_page(mfn)); } /* Detect the xenheap page and mark the stored GFN as invalid. */ - else if ( p2m_is_ram(pte.p2m.type) && is_xen_heap_mfn(mfn) ) + else if ( p2m_is_ram(type) && is_xen_heap_mfn(mfn) ) page_set_xenheap_gfn(mfn_to_page(mfn), INVALID_GFN); } +/* Put any references on the superpage referenced by mfn. */ +static void p2m_put_l2_superpage(mfn_t mfn, p2m_type_t type) +{ + struct page_info *pg; + unsigned int i; + + /* + * TODO: Handle other p2m types, but be aware that any changes to handle + * different types should require an update on the relinquish code to handle + * preemption. + */ + if ( !p2m_is_foreign(type) ) + return; + + ASSERT(mfn_valid(mfn)); + + pg = mfn_to_page(mfn); + + for ( i = 0; i < XEN_PT_LPAE_ENTRIES; i++, pg++ ) + p2m_put_foreign_page(pg); +} + +/* Put any references on the page referenced by pte. */ +static void p2m_put_page(const lpae_t pte, unsigned int level) +{ + mfn_t mfn = lpae_get_mfn(pte); + + ASSERT(p2m_is_valid(pte)); + + /* + * TODO: Currently we don't handle level 1 super-page, Xen is not + * preemptible and therefore some work is needed to handle such + * superpages, for which at some point Xen might end up freeing memory + * and therefore for such a big mapping it could end up in a very long + * operation. + */ + if ( level == 2 ) + return p2m_put_l2_superpage(mfn, pte.p2m.type); + else if ( level == 3 ) + return p2m_put_l3_page(mfn, pte.p2m.type); +} + /* Free lpae sub-tree behind an entry */ static void p2m_free_entry(struct p2m_domain *p2m, lpae_t entry, unsigned int level) @@ -809,9 +847,9 @@ static void p2m_free_entry(struct p2m_domain *p2m, #endif p2m->stats.mappings[level]--; - /* Nothing to do if the entry is a super-page. */ - if ( level == 3 ) - p2m_put_l3_page(entry); + + p2m_put_page(entry, level); + return; } @@ -1558,9 +1596,12 @@ int relinquish_p2m_mapping(struct domain *d) count++; /* - * Arbitrarily preempt every 512 iterations. + * Arbitrarily preempt every 512 iterations or when we have a level-2 + * foreign mapping. */ - if ( !(count % 512) && hypercall_preempt_check() ) + if ( (!(count % 512) || + (p2m_is_foreign(t) && (order > XEN_PT_LEVEL_ORDER(2)))) && + hypercall_preempt_check() ) { rc = -ERESTART; break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 15 00:11:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jun 2024 00:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740923.1148012 (Exim 4.92) (envelope-from ) id 1sIH13-000484-4f; Sat, 15 Jun 2024 00:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740923.1148012; Sat, 15 Jun 2024 00: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 1sIH13-00047w-20; Sat, 15 Jun 2024 00:11:33 +0000 Received: by outflank-mailman (input) for mailman id 740923; Sat, 15 Jun 2024 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 1sIH12-00047q-Mm for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH12-00026B-L9 for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sIH12-00060q-KH for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TNH3ayHJZHUyeW99hRjk/4yIEaPN+TBO8eQjSXhfWGY=; b=miVPRMvLoT9Td394WYBOGOoJMo o9wjG+N+g2YJS7pM6LAToht7F6nVxPQQPoOIG3nxKw0QFC373pmzpj5FRLSDqjetTWQFW1yAmmjSm Q0WgNnXVhakiTSy2Q/oliWENvtYfEYSgqgPv4ezIx9aqCdrgffIbbZrkGcbLSWSXdfBs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Parse xen,shared-mem when host phys address is not provided Message-Id: Date: Sat, 15 Jun 2024 00:11:32 +0000 commit 1544d355b54ff17ebddc9c79e531329510488307 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:52 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/arm: Parse xen,shared-mem when host phys address is not provided Handle the parsing of the 'xen,shared-mem' property when the host physical address is not provided, this commit is introducing the logic to parse it, but the functionality is still not implemented and will be part of future commits. Rework the logic inside process_shm_node to check the shm_id before doing the other checks, because it ease the logic itself, add more comment on the logic. Now when the host physical address is not provided, the value INVALID_PADDR is chosen to signal this condition and it is stored as start of the bank, due to that change also early_print_info_shmem and init_sharedmem_pages are changed, to not handle banks with start equal to INVALID_PADDR. Another change is done inside meminfo_overlap_check, to skip banks that are starting with the start address INVALID_PADDR, that function is used to check banks from reserved memory, shared memory and ACPI and since the comment above the function states that wrapping around is not handled, it's unlikely for these bank to have the start address as INVALID_PADDR. Same change is done inside consider_modules, find_unallocated_memory and dt_unreserved_regions functions, in order to skip banks that starts with INVALID_PADDR from any computation. The changes above holds because of this consideration. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/arm32/mmu/mm.c | 11 +++- xen/arch/arm/domain_build.c | 5 ++ xen/arch/arm/setup.c | 14 +++-- xen/arch/arm/static-shmem.c | 125 ++++++++++++++++++++++++++++++-------------- 4 files changed, 111 insertions(+), 44 deletions(-) diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index be480c31ea..30a7aa1e8e 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -101,8 +101,15 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, nr += reserved_mem->nr_banks; for ( ; i - nr < shmem->nr_banks; i++ ) { - paddr_t r_s = shmem->bank[i - nr].start; - paddr_t r_e = r_s + shmem->bank[i - nr].size; + paddr_t r_s, r_e; + + r_s = shmem->bank[i - nr].start; + + /* Shared memory banks can contain INVALID_PADDR as start */ + if ( INVALID_PADDR == r_s ) + continue; + + r_e = r_s + shmem->bank[i - nr].size; if ( s < r_e && r_s < e ) { diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 968c497efc..02e7416851 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -927,6 +927,11 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, 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)); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index c4e5c19b11..0c2fdaceaf 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -240,8 +240,15 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, offset = reserved_mem->nr_banks; for ( ; i - offset < shmem->nr_banks; i++ ) { - paddr_t r_s = shmem->bank[i - offset].start; - paddr_t r_e = r_s + shmem->bank[i - offset].size; + paddr_t r_s, r_e; + + r_s = shmem->bank[i - offset].start; + + /* Shared memory banks can contain INVALID_PADDR as start */ + if ( INVALID_PADDR == r_s ) + continue; + + r_e = r_s + shmem->bank[i - offset].size; if ( s < r_e && r_s < e ) { @@ -272,7 +279,8 @@ static bool __init meminfo_overlap_check(const struct membanks *mem, bank_start = mem->bank[i].start; bank_end = bank_start + mem->bank[i].size; - if ( region_end <= bank_start || region_start >= bank_end ) + if ( INVALID_PADDR == bank_start || region_end <= bank_start || + region_start >= bank_end ) continue; else { diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index c15a651306..bc093b9da9 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -264,6 +264,12 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, pbase = boot_shm_bank->start; psize = boot_shm_bank->size; + if ( INVALID_PADDR == pbase ) + { + printk("%pd: host physical address must be chosen by users at the moment", d); + return -EINVAL; + } + /* * xen,shared-mem = ; * TODO: pbase is optional. @@ -377,7 +383,8 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, { const struct fdt_property *prop, *prop_id, *prop_role; const __be32 *cell; - paddr_t paddr, gaddr, size, end; + paddr_t paddr = INVALID_PADDR; + paddr_t gaddr, size, end; struct membanks *mem = bootinfo_get_shmem(); struct shmem_membank_extra *shmem_extra = bootinfo_get_shmem_extra(); unsigned int i; @@ -432,24 +439,37 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, if ( !prop ) return -ENOENT; + cell = (const __be32 *)prop->data; if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) { - if ( len == dt_cells_to_size(size_cells + address_cells) ) - printk("fdt: host physical address must be chosen by users at the moment.\n"); - - printk("fdt: invalid `xen,shared-mem` property.\n"); - return -EINVAL; + if ( len == dt_cells_to_size(address_cells + size_cells) ) + device_tree_get_reg(&cell, address_cells, size_cells, &gaddr, + &size); + else + { + printk("fdt: invalid `xen,shared-mem` property.\n"); + return -EINVAL; + } } + else + { + device_tree_get_reg(&cell, address_cells, address_cells, &paddr, + &gaddr); + size = dt_next_cell(size_cells, &cell); - cell = (const __be32 *)prop->data; - device_tree_get_reg(&cell, address_cells, address_cells, &paddr, &gaddr); - size = dt_next_cell(size_cells, &cell); + if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) + { + printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", + paddr); + return -EINVAL; + } - if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) - { - printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", - paddr); - return -EINVAL; + end = paddr + size; + if ( end <= paddr ) + { + printk("fdt: static shared memory region %s overflow\n", shm_id); + return -EINVAL; + } } if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) @@ -471,39 +491,64 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, return -EINVAL; } - end = paddr + size; - if ( end <= paddr ) - { - printk("fdt: static shared memory region %s overflow\n", shm_id); - return -EINVAL; - } - for ( i = 0; i < mem->nr_banks; i++ ) { /* * Meet the following check: - * 1) The shm ID matches and the region exactly match - * 2) The shm ID doesn't match and the region doesn't overlap - * with an existing one + * - when host address is provided: + * 1) The shm ID matches and the region exactly match + * 2) The shm ID doesn't match and the region doesn't overlap + * with an existing one + * - when host address is not provided: + * 1) The shm ID matches and the region size exactly match */ - if ( paddr == mem->bank[i].start && size == mem->bank[i].size ) + bool paddr_assigned = (INVALID_PADDR != paddr); + + if ( strncmp(shm_id, shmem_extra[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) { - if ( strncmp(shm_id, shmem_extra[i].shm_id, - MAX_SHM_ID_LENGTH) == 0 ) + /* + * Regions have same shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr is equal and size is equal (same region) + * - Fail: paddr doesn't match or size doesn't match (there + * cannot exists two shmem regions with same shm_id) + * 2) physical host address is NOT supplied: + * - OK: size is equal (same region) + * - Fail: size is not equal (same shm_id must identify only one + * region, there can't be two different regions with same + * shm_id) + */ + bool start_match = paddr_assigned ? (paddr == mem->bank[i].start) : + true; + + if ( start_match && (size == mem->bank[i].size) ) break; else { - printk("fdt: xen,shm-id %s does not match for all the nodes using the same region.\n", + printk("fdt: different shared memory region could not share the same shm ID %s\n", shm_id); return -EINVAL; } } - else if ( strncmp(shm_id, shmem_extra[i].shm_id, - MAX_SHM_ID_LENGTH) != 0 ) + + /* + * Regions have different shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr different, or size different (case where paddr + * is equal but psize is different are wrong, but they + * are handled later when checking for overlapping) + * - Fail: paddr equal and size equal (the same region can't be + * identified with different shm_id) + * 2) physical host address is NOT supplied: + * - OK: Both have different shm_id so even with same size they + * can exists + */ + if ( !paddr_assigned || (paddr != mem->bank[i].start) || + (size != mem->bank[i].size) ) continue; else { - printk("fdt: different shared memory region could not share the same shm ID %s\n", + printk("fdt: xen,shm-id %s does not match for all the nodes using the same region\n", shm_id); return -EINVAL; } @@ -513,7 +558,8 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, { if (i < mem->max_banks) { - if ( check_reserved_regions_overlap(paddr, size) ) + if ( (paddr != INVALID_PADDR) && + check_reserved_regions_overlap(paddr, size) ) return -EINVAL; /* Static shared memory shall be reserved from any other use. */ @@ -583,13 +629,13 @@ void __init early_print_info_shmem(void) { const struct membanks *shmem = bootinfo_get_shmem(); unsigned int bank; + unsigned int printed = 0; - for ( bank = 0; bank < shmem->nr_banks; bank++ ) - { - printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", bank, - shmem->bank[bank].start, - shmem->bank[bank].start + shmem->bank[bank].size - 1); - } + for ( bank = 0; bank < shmem->nr_banks; bank++, printed++ ) + if ( shmem->bank[bank].start != INVALID_PADDR ) + printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", printed, + shmem->bank[bank].start, + shmem->bank[bank].start + shmem->bank[bank].size - 1); } void __init init_sharedmem_pages(void) @@ -598,7 +644,8 @@ void __init init_sharedmem_pages(void) unsigned int bank; for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) - init_staticmem_bank(&shmem->bank[bank]); + if ( shmem->bank[bank].start != INVALID_PADDR ) + init_staticmem_bank(&shmem->bank[bank]); } int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 15 00:11:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jun 2024 00:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740924.1148017 (Exim 4.92) (envelope-from ) id 1sIH1D-0004BK-8I; Sat, 15 Jun 2024 00:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740924.1148017; Sat, 15 Jun 2024 00: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 1sIH1D-0004B8-4p; Sat, 15 Jun 2024 00:11:43 +0000 Received: by outflank-mailman (input) for mailman id 740924; Sat, 15 Jun 2024 00:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH1C-0004B2-P3 for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH1C-00026J-OF for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sIH1C-00061J-NN for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mgfXVdabaiYPsKM/atb7sUbGDRyUtZMDbdWDpKwD9HM=; b=mtfurjxIlE561Obtz6brhTKFUy +thIBHhWXM4yR3Y3S0OklIfYbuYDFRHXSccBt3p12lZydsFKkm94W2RV9HhpljlD0J4Jf+eCFg8Gi Bw9eJZqcX7rQ6SN3CMLM+ZIVdmr8U1jy/QfwGnh8X3CRgyQe/6U0JWyIuaobppbx+fcw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Rework heap page allocation outside allocate_bank_memory Message-Id: Date: Sat, 15 Jun 2024 00:11:42 +0000 commit a21bfc912621d1afee1c693d8590164b01ff1998 Author: Luca Fancellu AuthorDate: Fri May 24 13:40:53 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/arm: Rework heap page allocation outside allocate_bank_memory The function allocate_bank_memory allocates pages from the heap and maps them to the guest using guest_physmap_add_page. As a preparation work to support static shared memory bank when the host physical address is not provided, Xen needs to allocate memory from the heap, so rework allocate_bank_memory moving out the page allocation in a new function called allocate_domheap_memory. The function allocate_domheap_memory takes a callback function and a pointer to some extra information passed to the callback and this function will be called for every region, until a defined size is reached. In order to keep allocate_bank_memory functionality, the callback passed to allocate_domheap_memory is a wrapper for guest_physmap_add_page. Let allocate_domheap_memory be externally visible, in order to use it in the future from the static shared memory module. Take the opportunity to change the signature of allocate_bank_memory and remove the 'struct domain' parameter, which can be retrieved from 'struct kernel_info'. No functional changes is intended. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/dom0less-build.c | 4 +- xen/arch/arm/domain_build.c | 79 ++++++++++++++++++++++----------- xen/arch/arm/include/asm/domain_build.h | 9 ++-- 3 files changed, 62 insertions(+), 30 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 5830a7051d..f919d3acf9 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -60,12 +60,12 @@ static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo) mem->nr_banks = 0; bank_size = MIN(GUEST_RAM0_SIZE, kinfo->unassigned_mem); - if ( !allocate_bank_memory(d, kinfo, gaddr_to_gfn(GUEST_RAM0_BASE), + if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(GUEST_RAM0_BASE), bank_size) ) goto fail; bank_size = MIN(GUEST_RAM1_SIZE, kinfo->unassigned_mem); - if ( !allocate_bank_memory(d, kinfo, gaddr_to_gfn(GUEST_RAM1_BASE), + if ( !allocate_bank_memory(kinfo, gaddr_to_gfn(GUEST_RAM1_BASE), bank_size) ) goto fail; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 02e7416851..669970c86f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -417,30 +417,15 @@ static void __init allocate_memory_11(struct domain *d, } #ifdef CONFIG_DOM0LESS_BOOT -bool __init allocate_bank_memory(struct domain *d, struct kernel_info *kinfo, - gfn_t sgfn, paddr_t tot_size) +bool __init allocate_domheap_memory(struct domain *d, paddr_t tot_size, + alloc_domheap_mem_cb cb, void *extra) { - struct membanks *mem = kernel_info_get_mem(kinfo); - int res; - struct page_info *pg; - struct membank *bank; - unsigned int max_order = ~0; - - /* - * 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; + 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); @@ -463,17 +448,61 @@ bool __init allocate_bank_memory(struct domain *d, struct kernel_info *kinfo, continue; } - res = guest_physmap_add_page(d, sgfn, page_to_mfn(pg), order); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed map pages to DOMU: %d", res); + if ( !cb(d, pg, order, extra) ) return false; - } - sgfn = gfn_add(sgfn, 1UL << order); 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; diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 45936212ca..e712afbc7f 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -5,9 +5,12 @@ #include typedef __be32 gic_interrupt_t[3]; - -bool allocate_bank_memory(struct domain *d, struct kernel_info *kinfo, - gfn_t sgfn, paddr_t tot_size); +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); int construct_domain(struct domain *d, struct kernel_info *kinfo); int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); int make_chosen_node(const struct kernel_info *kinfo); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 15 00:11:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jun 2024 00:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740925.1148019 (Exim 4.92) (envelope-from ) id 1sIH1O-0004ET-8u; Sat, 15 Jun 2024 00:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740925.1148019; Sat, 15 Jun 2024 00: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 1sIH1O-0004EL-6K; Sat, 15 Jun 2024 00:11:54 +0000 Received: by outflank-mailman (input) for mailman id 740925; Sat, 15 Jun 2024 00:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH1M-0004Dv-Sl for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH1M-00026o-Ru for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sIH1M-00061m-QO for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z/BV7wbZyVKTEsm3+hXJePP7M64icFd95WdhPYITQUs=; b=iEq+uSaeRmw2fSMRvQDX6RTYvT Fq0a+xsc1cVNPgwQj8yCDih3oox1iiuBMYTBEj0vDjTIafXuZk6vKRngbr7nl/+AerBTA1AkCcMyw /74dbRGqe0j8+GrISHfSd0Wcg6ckOHb/e4v4N6DE2y+hw7UjccdRKJtnMmNOwd8sE6Zw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Implement the logic for static shared memory from Xen heap Message-Id: Date: Sat, 15 Jun 2024 00:11:52 +0000 commit 3deac416a3687d1ecc8d2e4dea2c135d1b28c05e Author: Luca Fancellu AuthorDate: Fri May 24 13:40:54 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/arm: Implement the logic for static shared memory from Xen heap This commit implements the logic to have the static shared memory banks from the Xen heap instead of having the host physical address passed from the user. When the host physical address is not supplied, the physical memory is taken from the Xen heap using allocate_domheap_memory, the allocation needs to occur at the first handled DT node and the allocated banks need to be saved somewhere. Introduce the 'shm_heap_banks' for that reason, a struct that will hold the banks allocated from the heap, its field bank[].shmem_extra will be used to point to the bootinfo shared memory banks .shmem_extra space, so that there is not further allocation of memory and every bank in shm_heap_banks can be safely identified by the shm_id to reconstruct its traceability and if it was allocated or not. A search into 'shm_heap_banks' will reveal if the banks were allocated or not, in case the host address is not passed, and the callback given to allocate_domheap_memory will store the banks in the structure and map them to the current domain, to do that, some changes to acquire_shared_memory_bank are made to let it differentiate if the bank is from the heap and if it is, then assign_pages is called for every bank. When the bank is already allocated, for every bank allocated with the corresponding shm_id, handle_shared_mem_bank is called and the mapping are done. Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- xen/arch/arm/static-shmem.c | 187 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 155 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index bc093b9da9..dbb017c7d7 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -9,6 +9,25 @@ #include #include +typedef struct { + struct domain *d; + const char *role_str; + paddr_t gbase; + struct shmem_membank_extra *bank_extra_info; +} alloc_heap_pages_cb_extra; + +static struct { + struct membanks_hdr common; + struct membank bank[NR_SHMEM_BANKS]; +} shm_heap_banks __initdata = { + .common.max_banks = NR_SHMEM_BANKS +}; + +static inline struct membanks *get_shmem_heap_banks(void) +{ + return container_of(&shm_heap_banks.common, struct membanks, common); +} + static void __init __maybe_unused build_assertions(void) { /* @@ -63,7 +82,8 @@ static bool __init is_shm_allocated_to_domio(paddr_t pbase) } static mfn_t __init acquire_shared_memory_bank(struct domain *d, - paddr_t pbase, paddr_t psize) + paddr_t pbase, paddr_t psize, + bool bank_from_heap) { mfn_t smfn; unsigned long nr_pfns; @@ -83,19 +103,31 @@ static mfn_t __init acquire_shared_memory_bank(struct domain *d, d->max_pages += nr_pfns; smfn = maddr_to_mfn(pbase); - res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + if ( bank_from_heap ) + /* + * When host address is not provided, static shared memory is + * allocated from heap and shall be assigned to owner domain. + */ + res = assign_pages(maddr_to_page(pbase), nr_pfns, d, 0); + else + res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + if ( res ) { - printk(XENLOG_ERR - "%pd: failed to acquire static memory: %d.\n", d, res); - d->max_pages -= nr_pfns; - return INVALID_MFN; + printk(XENLOG_ERR "%pd: failed to %s static memory: %d.\n", d, + bank_from_heap ? "assign" : "acquire", res); + goto fail; } return smfn; + + fail: + d->max_pages -= nr_pfns; + return INVALID_MFN; } static int __init assign_shared_memory(struct domain *d, paddr_t gbase, + bool bank_from_heap, const struct membank *shm_bank) { mfn_t smfn; @@ -108,10 +140,7 @@ static int __init assign_shared_memory(struct domain *d, paddr_t gbase, psize = shm_bank->size; nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; - printk("%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", - d, pbase, pbase + psize); - - smfn = acquire_shared_memory_bank(d, pbase, psize); + smfn = acquire_shared_memory_bank(d, pbase, psize, bank_from_heap); if ( mfn_eq(smfn, INVALID_MFN) ) return -EINVAL; @@ -182,6 +211,7 @@ append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, const char *role_str, + bool bank_from_heap, const struct membank *shm_bank) { bool owner_dom_io = true; @@ -210,7 +240,8 @@ static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, * We found the first borrower of the region, the owner was not * specified, so they should be assigned to dom_io. */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, shm_bank); + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, + bank_from_heap, shm_bank); if ( ret ) return ret; } @@ -227,6 +258,39 @@ static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, return 0; } +static bool __init save_map_heap_pages(struct domain *d, struct page_info *pg, + unsigned int order, void *extra) +{ + alloc_heap_pages_cb_extra *b_extra = (alloc_heap_pages_cb_extra *)extra; + int idx = shm_heap_banks.common.nr_banks; + int ret = -ENOSPC; + + BUG_ON(!b_extra); + + if ( idx < shm_heap_banks.common.max_banks ) + { + shm_heap_banks.bank[idx].start = page_to_maddr(pg); + shm_heap_banks.bank[idx].size = (1ULL << (PAGE_SHIFT + order)); + shm_heap_banks.bank[idx].shmem_extra = b_extra->bank_extra_info; + shm_heap_banks.common.nr_banks++; + + ret = handle_shared_mem_bank(b_extra->d, b_extra->gbase, + b_extra->role_str, true, + &shm_heap_banks.bank[idx]); + if ( !ret ) + { + /* Increment guest physical address for next mapping */ + b_extra->gbase += shm_heap_banks.bank[idx].size; + return true; + } + } + + printk("Failed to allocate static shared memory from Xen heap: (%d)\n", + ret); + + return false; +} + int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { @@ -264,38 +328,97 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, pbase = boot_shm_bank->start; psize = boot_shm_bank->size; - if ( INVALID_PADDR == pbase ) - { - printk("%pd: host physical address must be chosen by users at the moment", d); - return -EINVAL; - } + /* "role" property is optional */ + if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) + role_str = NULL; /* - * xen,shared-mem = ; - * TODO: pbase is optional. + * xen,shared-mem = <[pbase,] gbase, size>; + * pbase is optional. */ addr_cells = dt_n_addr_cells(shm_node); size_cells = dt_n_size_cells(shm_node); prop = dt_find_property(shm_node, "xen,shared-mem", NULL); BUG_ON(!prop); cells = (const __be32 *)prop->value; - gbase = dt_read_paddr(cells + addr_cells, addr_cells); - for ( i = 0; i < PFN_DOWN(psize); i++ ) - if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) - { - printk("%pd: invalid physical address 0x%"PRI_mfn"\n", - d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); - return -EINVAL; - } + if ( pbase != INVALID_PADDR ) + { + /* guest phys address is after host phys address */ + gbase = dt_read_paddr(cells + addr_cells, addr_cells); + + for ( i = 0; i < PFN_DOWN(psize); i++ ) + if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) + { + printk("%pd: invalid physical address 0x%"PRI_mfn"\n", + d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); + return -EINVAL; + } + + /* The host physical address is supplied by the user */ + ret = handle_shared_mem_bank(d, gbase, role_str, false, + boot_shm_bank); + if ( ret ) + return ret; + } + else + { + /* + * The host physical address is not supplied by the user, so it + * means that the banks needs to be allocated from the Xen heap, + * look into the already allocated banks from the heap. + */ + const struct membank *alloc_bank = + find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); - /* "role" property is optional */ - if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) - role_str = NULL; + /* guest phys address is right at the beginning */ + gbase = dt_read_paddr(cells, addr_cells); - ret = handle_shared_mem_bank(d, gbase, role_str, boot_shm_bank); - if ( ret ) - return ret; + if ( !alloc_bank ) + { + alloc_heap_pages_cb_extra cb_arg = { d, role_str, gbase, + boot_shm_bank->shmem_extra }; + + /* shm_id identified bank is not yet allocated */ + if ( !allocate_domheap_memory(NULL, psize, save_map_heap_pages, + &cb_arg) ) + { + printk(XENLOG_ERR + "Failed to allocate (%"PRIpaddr"KB) pages as static shared memory from heap\n", + psize >> 10); + return -EINVAL; + } + } + else + { + /* shm_id identified bank is already allocated */ + const struct membank *end_bank = + &shm_heap_banks.bank[shm_heap_banks.common.nr_banks]; + paddr_t gbase_bank = gbase; + + /* + * Static shared memory banks that are taken from the Xen heap + * are allocated sequentially in shm_heap_banks, so starting + * from the first bank found identified by shm_id, the code can + * just advance by one bank at the time until it reaches the end + * of the array or it finds another bank NOT identified by + * shm_id + */ + for ( ; alloc_bank < end_bank; alloc_bank++ ) + { + if ( strcmp(shm_id, alloc_bank->shmem_extra->shm_id) != 0 ) + break; + + ret = handle_shared_mem_bank(d, gbase_bank, role_str, true, + alloc_bank); + if ( ret ) + return ret; + + /* Increment guest physical address for next mapping */ + gbase_bank += alloc_bank->size; + } + } + } /* * Record static shared memory region info for later setting -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 15 00:12:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jun 2024 00:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.740926.1148024 (Exim 4.92) (envelope-from ) id 1sIH1Y-0004HR-AX; Sat, 15 Jun 2024 00:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 740926.1148024; Sat, 15 Jun 2024 00: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 1sIH1Y-0004HH-84; Sat, 15 Jun 2024 00:12:04 +0000 Received: by outflank-mailman (input) for mailman id 740926; Sat, 15 Jun 2024 00:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH1W-0004H8-Vb for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sIH1W-00027A-Uw for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sIH1W-00063N-Tz for xen-changelog@lists.xenproject.org; Sat, 15 Jun 2024 00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yhZO3qeX3k/vpHg80NN3oMjAV4dkfz8eFNEzO3GapK0=; b=MjSqQVALKyGnV+EkQR5516UGA1 1rcRIaJ9eW1ElZLAhDtsX1GMuRSMGa05kT9nwHYC8a1GVTN/BG711sPiG2QZyUT8knTcq16fQUuCO xar43HNCDf8tebvDQs532MhEQksgap29NCEz37+hpD8zKNA86YK7PLDoswke4/k1z3Ac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/docs: Describe static shared memory when host address is not provided Message-Id: Date: Sat, 15 Jun 2024 00:12:02 +0000 commit 8b4243a9b560c89bb259db5a27832c253d4bebc7 Author: Penny Zheng AuthorDate: Fri May 24 13:40:55 2024 +0100 Commit: Julien Grall CommitDate: Fri Jun 14 10:46:01 2024 +0100 xen/docs: Describe static shared memory when host address is not provided This commit describe the new scenario where host address is not provided in "xen,shared-mem" property and a new example is added to the page to explain in details. Take the occasion to fix some typos in the page. Signed-off-by: Penny Zheng Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel --- docs/misc/arm/device-tree/booting.txt | 52 ++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index f1fd069c87..aa0e614864 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -606,7 +606,7 @@ communication. An array takes a physical address, which is the base address of the shared memory region in host physical address space, a size, and a guest physical address, as the target address of the mapping. - e.g. xen,shared-mem = < [host physical address] [guest address] [size] > + e.g. xen,shared-mem = < [host physical address] [guest address] [size] >; It shall also meet the following criteria: 1) If the SHM ID matches with an existing region, the address range of the @@ -617,8 +617,8 @@ communication. The number of cells for the host address (and size) is the same as the guest pseudo-physical address and they are inherited from the parent node. - Host physical address is optional, when missing Xen decides the location - (currently unimplemented). + Host physical address is optional, when missing Xen decides the location. + e.g. xen,shared-mem = < [guest address] [size] >; - role (Optional) @@ -645,7 +645,7 @@ chosen { role = "owner"; xen,shm-id = "my-shared-mem-0"; xen,shared-mem = <0x10000000 0x10000000 0x10000000>; - } + }; domU1 { compatible = "xen,domain"; @@ -656,25 +656,36 @@ chosen { vpl011; /* - * shared memory region identified as 0x0(xen,shm-id = <0x0>) - * is shared between Dom0 and DomU1. + * shared memory region "my-shared-mem-0" is shared + * between Dom0 and DomU1. */ domU1-shared-mem@10000000 { compatible = "xen,domain-shared-memory-v1"; role = "borrower"; xen,shm-id = "my-shared-mem-0"; xen,shared-mem = <0x10000000 0x50000000 0x10000000>; - } + }; /* - * shared memory region identified as 0x1(xen,shm-id = <0x1>) - * is shared between DomU1 and DomU2. + * shared memory region "my-shared-mem-1" is shared between + * DomU1 and DomU2. */ domU1-shared-mem@50000000 { compatible = "xen,domain-shared-memory-v1"; xen,shm-id = "my-shared-mem-1"; xen,shared-mem = <0x50000000 0x60000000 0x20000000>; - } + }; + + /* + * shared memory region "my-shared-mem-2" is shared between + * DomU1 and DomU2. + */ + domU1-shared-mem-2 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-2"; + role = "owner"; + xen,shared-mem = <0x80000000 0x20000000>; + }; ...... @@ -688,14 +699,21 @@ chosen { cpus = <1>; /* - * shared memory region identified as 0x1(xen,shm-id = <0x1>) - * is shared between domU1 and domU2. + * shared memory region "my-shared-mem-1" is shared between + * domU1 and domU2. */ domU2-shared-mem@50000000 { compatible = "xen,domain-shared-memory-v1"; xen,shm-id = "my-shared-mem-1"; xen,shared-mem = <0x50000000 0x70000000 0x20000000>; - } + }; + + domU2-shared-mem-2 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-2"; + role = "borrower"; + xen,shared-mem = <0x90000000 0x20000000>; + }; ...... }; @@ -715,3 +733,11 @@ shared between DomU1 and DomU2. It will get mapped at 0x60000000 in DomU1 guest physical address space, and at 0x70000000 in DomU2 guest physical address space. DomU1 and DomU2 are both the borrower domain, the owner domain is the default owner domain DOMID_IO. + +For the static shared memory region "my-shared-mem-2", since host physical +address is not provided by user, Xen will automatically allocate 512MB +from heap as static shared memory to be shared between DomU1 and DomU2. +The automatically allocated static shared memory will get mapped at +0x80000000 in DomU1 guest physical address space, and at 0x90000000 in DomU2 +guest physical address space. DomU1 is explicitly defined as the owner domain, +and DomU2 is the borrower domain. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 18 01:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 01:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.742647.1149488 (Exim 4.92) (envelope-from ) id 1sJNXx-0006lc-53; Tue, 18 Jun 2024 01:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 742647.1149488; Tue, 18 Jun 2024 01: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 1sJNXx-0006lU-2R; Tue, 18 Jun 2024 01:22:05 +0000 Received: by outflank-mailman (input) for mailman id 742647; Tue, 18 Jun 2024 01:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJNXv-0006lO-Th for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 01:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJNXv-0003Qu-Nt for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 01:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJNXv-0004DC-LY for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AtaLi9W0uNO4fBNsn8gfA5V73ePJBRypeEKW4xqqqA0=; b=MGWfF5cFeeworLpsgv0woXtLCG jVonqZYUKUOMnHEIipHHtWr0skS27rAW6ntb6Z14SKpCkLrbtyoQah3v/PQmIYzB/Fq+TGusNpt/G u9aRSFTO9FyyO3/bBTyA+EwzgqEURp7phF37ckxt0ro/ntn+CO18hguQSg5AnL1WXNZA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: address remaining violations of MISRA C Rule 20.12 Message-Id: Date: Tue, 18 Jun 2024 01:22:03 +0000 commit 0f0235e9e9af3ecbd642317f0d238386bd7ee42c Author: Nicola Vetrini AuthorDate: Fri Jun 7 22:13:17 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 17 18:12:36 2024 -0700 automation/eclair_analysis: address remaining violations of MISRA C Rule 20.12 The DEFINE macro in asm-offsets.c (for all architectures) still generates violations despite the file(s) being excluded from compliance, due to the fact that in its expansion it sometimes refers entities in non-excluded files. These corner cases are deviated by the configuration. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 447c1e6661..e2653f77eb 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -483,6 +483,12 @@ leads to a violation of the Rule are deviated." -config=MC3R1.R20.12,macros+={deliberate, "name(GENERATE_CASE)&&loc(file(deliberate_generate_case))"} -doc_end +-doc_begin="The macro DEFINE is defined and used in excluded files asm-offsets.c. +This may still cause violations if entities outside these files are referred to +in the expansion." +-config=MC3R1.R20.12,macros+={deliberate, "name(DEFINE)&&loc(file(asm_offsets))"} +-doc_end + # # Series 21. # -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 18 01:22:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 01:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.742648.1149493 (Exim 4.92) (envelope-from ) id 1sJNY7-0006nS-6Y; Tue, 18 Jun 2024 01:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 742648.1149493; Tue, 18 Jun 2024 01: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 1sJNY7-0006nK-3r; Tue, 18 Jun 2024 01:22:15 +0000 Received: by outflank-mailman (input) for mailman id 742648; Tue, 18 Jun 2024 01:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJNY5-0006n8-Rw for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 01:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJNY5-0003R6-Qp for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 01:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJNY5-0004Dh-Pp for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 01:22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FRfgR81iA75/s6NwGuEhTq8JYVyqCzpvRpzcPvZ3tqQ=; b=mJx++2bKKV7ccW7ClFcSX6fnJA myEEAAN94JvhuqEKbTaj0fu/wAFvl1qn9dmqoy6FyK91uyOWpdQ7gPRbakznmd1MC33+ZERiMYYFm 5Fyv1Jl+cI4HG62G0VD7SU53WLfnJ9M3HM5NjB8tEeA6KYCBBS/238rNIS7jb3Yq8F6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: add more clean MISRA guidelines Message-Id: Date: Tue, 18 Jun 2024 01:22:13 +0000 commit 77b1ed1d02d082c457924a695e8dde7076285271 Author: Nicola Vetrini AuthorDate: Fri Jun 7 22:13:18 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 17 18:14:54 2024 -0700 automation/eclair_analysis: add more clean MISRA guidelines Rules 20.12 and 14.4 are now clean on ARM and x86, so they are added to the list of clean guidelines. Some guidelines listed in the additional clean section for ARM are also clean on x86, so they can be removed from there. No functional change. Signed-off-by: Nicola Vetrini [stefano: remove 20.9 from commit message] Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index a354ff322e..b829655ca0 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -60,6 +60,7 @@ MC3R1.R11.7|| MC3R1.R11.9|| MC3R1.R12.5|| MC3R1.R14.1|| +MC3R1.R14.4|| MC3R1.R16.7|| MC3R1.R17.1|| MC3R1.R17.3|| @@ -73,6 +74,7 @@ MC3R1.R20.4|| MC3R1.R20.6|| MC3R1.R20.9|| MC3R1.R20.11|| +MC3R1.R20.12|| MC3R1.R20.13|| MC3R1.R20.14|| MC3R1.R21.3|| @@ -105,7 +107,7 @@ if(string_equal(target,"x86_64"), ) if(string_equal(target,"arm64"), - service_selector({"additional_clean_guidelines","MC3R1.R14.4||MC3R1.R16.6||MC3R1.R20.12||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.2||MC3R1.R7.3||MC3R1.R8.6||MC3R1.R9.3"}) + service_selector({"additional_clean_guidelines","MC3R1.R16.6||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.3"}) ) -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 Jun 18 13:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 13:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743088.1149977 (Exim 4.92) (envelope-from ) id 1sJYmi-00020w-LY; Tue, 18 Jun 2024 13:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743088.1149977; Tue, 18 Jun 2024 13: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 1sJYmi-00020o-J2; Tue, 18 Jun 2024 13:22:04 +0000 Received: by outflank-mailman (input) for mailman id 743088; Tue, 18 Jun 2024 13:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYmh-00020d-JO for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYmh-0001Uz-CI for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJYmh-0003Sg-As for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NxVChPW1206jq/KRWEAmICOO1GpcGXDFBKs5gmDjOVA=; b=vqkLr0ikOA+zsnmkyxoFEBO56A 703q+aGZpg6HzOm4YqFXmql/6rWM3/VOkwMq52dTJFul5FqNlt8WXo/pxLAq3WmdYKzG5AoH6PXo3 8e9DcnLj3PHnTZ2bc9N6fUH1wqTMjoFjLcDlIRRttE9QJsIGvm1qi44AdxJmpwJ7DaPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/Intel: unlock CPUID earlier for the BSP Message-Id: Date: Tue, 18 Jun 2024 13:22:03 +0000 commit fa4d026737a47cd1d66ffb797a29150b4453aa9f Author: Jan Beulich AuthorDate: Tue Jun 18 15:12:44 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 18 15:12:44 2024 +0200 x86/Intel: unlock CPUID earlier for the BSP Intel CPUs have a MSR bit to limit CPUID enumeration to leaf two. If this bit is set by the BIOS then CPUID evaluation does not work when data from any leaf greater than two is needed; early_cpu_init() in particular wants to collect leaf 7 data. Cure this by unlocking CPUID right before evaluating anything which depends on the maximum CPUID leaf being greater than two. Inspired by (and description cloned from) Linux commit 0c2f6d04619e ("x86/topology/intel: Unlock CPUID before evaluating anything"). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu/common.c | 3 ++- xen/arch/x86/cpu/cpu.h | 2 ++ xen/arch/x86/cpu/intel.c | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 28d7f34c4d..ff4cd22897 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -336,7 +336,8 @@ void __init early_cpu_init(bool verbose) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_INTEL: intel_unlock_cpuid_leaves(c); + actual_cpu = intel_cpu_dev; break; case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index e3d06278b3..8be65e975a 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -24,3 +24,5 @@ void amd_init_lfence(struct cpuinfo_x86 *c); void amd_init_ssbd(const struct cpuinfo_x86 *c); void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); + +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index ce7a77a867..af56e57bd8 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -303,10 +303,24 @@ static void __init noinline intel_init_levelling(void) ctxt_switch_masking = intel_ctxt_switch_masking; } -static void cf_check early_init_intel(struct cpuinfo_x86 *c) +/* Unmask CPUID levels if masked. */ +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) { - u64 misc_enable, disable; + uint64_t misc_enable, disable; + + rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + + disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; + if (disable) { + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); + bootsym(trampoline_misc_enable_off) |= disable; + c->cpuid_level = cpuid_eax(0); + printk(KERN_INFO "revised cpuid level: %u\n", c->cpuid_level); + } +} +static void cf_check early_init_intel(struct cpuinfo_x86 *c) +{ /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; @@ -315,16 +329,7 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c) bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE) printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); - /* Unmask CPUID levels and NX if masked: */ - rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - - disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; - if (disable) { - wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); - bootsym(trampoline_misc_enable_off) |= disable; - printk(KERN_INFO "revised cpuid level: %d\n", - cpuid_eax(0)); - } + intel_unlock_cpuid_leaves(c); /* CPUID workaround for Intel 0F33/0F34 CPU */ if (boot_cpu_data.x86 == 0xF && boot_cpu_data.x86_model == 3 && -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 18 13:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 13:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743089.1149981 (Exim 4.92) (envelope-from ) id 1sJYms-00022c-N3; Tue, 18 Jun 2024 13:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743089.1149981; Tue, 18 Jun 2024 13:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYms-00022U-KS; Tue, 18 Jun 2024 13:22:14 +0000 Received: by outflank-mailman (input) for mailman id 743089; Tue, 18 Jun 2024 13:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYmr-00022O-HU for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYmr-0001VB-Fs for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJYmr-0003T9-ES for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dI3srr7TjsbgfnSUtio/P8+1ne7Z7sGmQm8SgAf6lQE=; b=IAJFrBkq/Gu1ubydvRKszpHDNH 9G39m6dOd+0xaZOSI+obSnfyGMMLBEmwGPvhYUxFo3jattth0JGSVUXUiFlaantutsHRCK1PUPxJt r0MbIEWA8Pbyof3fX01vV3nxly7CR65VC3JNZnQoqRE2b6+WSGeQ+UjMwW3yTEDxu4Pk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Message-Id: Date: Tue, 18 Jun 2024 13:22:13 +0000 commit 817d1cd627be668c358d038f0fadbf7d24d417d3 Author: Roger Pau Monné AuthorDate: Tue Jun 18 15:14:49 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 18 15:14:49 2024 +0200 x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Given the current logic it's possible for ->arch.old_cpu_mask to get out of sync: if a CPU set in old_cpu_mask is offlined and then onlined again without old_cpu_mask having been updated the data in the mask will no longer be accurate, as when brought back online the CPU will no longer have old_vector configured to handle the old interrupt source. If there's an interrupt movement in progress, and the to be offlined CPU (which is the call context) is in the old_cpu_mask, clear it and update the mask, so it doesn't contain stale data. Note that when the system is going down fixup_irqs() will be called by smp_send_stop() from CPU 0 with a mask with only CPU 0 on it, effectively asking to move all interrupts to the current caller (CPU 0) which is the only CPU to remain online. In that case we don't care to migrate interrupts that are in the process of being moved, as it's likely we won't be able to move all interrupts to CPU 0 due to vector shortage anyway. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 263e502bc0..d305aed317 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2526,7 +2526,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { bool break_affinity = false, set_affinity = true; - unsigned int vector; + unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); if ( irq == 2 ) @@ -2569,6 +2569,33 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } + if ( desc->arch.move_in_progress && + /* + * Only attempt to adjust the mask if the current CPU is going + * offline, otherwise the whole system is going down and leaving + * stale data in the masks is fine. + */ + !cpu_online(cpu) && + cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) + { + /* + * This CPU is going offline, remove it from ->arch.old_cpu_mask + * and possibly release the old vector if the old mask becomes + * empty. + * + * Note cleaning ->arch.old_cpu_mask is required if the CPU is + * brought offline and then online again, as when re-onlined the + * per-cpu vector table will no longer have ->arch.old_vector + * setup, and hence ->arch.old_cpu_mask would be stale. + */ + cpumask_clear_cpu(cpu, desc->arch.old_cpu_mask); + if ( cpumask_empty(desc->arch.old_cpu_mask) ) + { + desc->arch.move_in_progress = 0; + release_old_vec(desc); + } + } + /* * Avoid shuffling the interrupt around as long as current target CPUs * are a subset of the input mask. What fixup_irqs() cares about is -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 18 13:22:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 13:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743090.1149985 (Exim 4.92) (envelope-from ) id 1sJYn2-00025L-OM; Tue, 18 Jun 2024 13:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743090.1149985; Tue, 18 Jun 2024 13:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYn2-00025D-Lq; Tue, 18 Jun 2024 13:22:24 +0000 Received: by outflank-mailman (input) for mailman id 743090; Tue, 18 Jun 2024 13:22:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYn1-00024u-Jh for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJYn1-0001VK-Iu for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJYn1-0003Ts-I0 for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 13:22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2Q1GB+4bmtv/YI5wb7hwkyp5Nwn8y1uxojbkGrfzTl0=; b=KSXR0cqxeBdhSBTDmzOeOGCBSg +c7gxagERYxuYV4+wT9G5o+8vx3N0++QSIRySCy0dyantmU/aSXXkVE9sN485uI9omWa6E8eeI+yk KHz+9yLRVmuBfYUsezHvc9886xFpUme78XZ8qKi/nm/NP5J2ai6segiMUWn8PxAeED4Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/irq: handle moving interrupts in _assign_irq_vector() Message-Id: Date: Tue, 18 Jun 2024 13:22:23 +0000 commit 369558924a642bbb0cb731e9a3375958867cb17b Author: Roger Pau Monné AuthorDate: Tue Jun 18 15:15:10 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 18 15:15:10 2024 +0200 x86/irq: handle moving interrupts in _assign_irq_vector() Currently there's logic in fixup_irqs() that attempts to prevent _assign_irq_vector() from failing, as fixup_irqs() is required to evacuate all interrupts from the CPUs not present in the input mask. The current logic in fixup_irqs() is incomplete, as it doesn't deal with interrupts that have move_cleanup_count > 0 and a non-empty ->arch.old_cpu_mask field. Instead of attempting to fixup the interrupt descriptor in fixup_irqs() so that _assign_irq_vector() cannot fail, introduce logic in _assign_irq_vector() to deal with interrupts that have either move_{in_progress,cleanup_count} set and no remaining online CPUs in ->arch.cpu_mask. If _assign_irq_vector() is requested to move an interrupt in the state described above, first attempt to see if ->arch.old_cpu_mask contains any valid CPUs that could be used as fallback, and if that's the case do move the interrupt back to the previous destination. Note this is easier because the vector hasn't been released yet, so there's no need to allocate and setup a new vector on the destination. Due to the logic in fixup_irqs() that clears offline CPUs from ->arch.old_cpu_mask (and releases the old vector if the mask becomes empty) it shouldn't be possible to get into _assign_irq_vector() with ->arch.move_{in_progress,cleanup_count} set but no online CPUs in ->arch.old_cpu_mask. However if ->arch.move_{in_progress,cleanup_count} is set and the interrupt has also changed affinity, it's possible the members of ->arch.old_cpu_mask are no longer part of the affinity set, move the interrupt to a different CPU part of the provided mask and keep the current ->arch.old_{cpu_mask,vector} for the pending interrupt movement to be completed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 97 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index d305aed317..d7f15c38af 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -544,7 +544,58 @@ static int _assign_irq_vector(struct irq_desc *desc, const cpumask_t *mask) } if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) - return -EAGAIN; + { + /* + * If the current destination is online refuse to shuffle. Retry after + * the in-progress movement has finished. + */ + if ( cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) + return -EAGAIN; + + /* + * Due to the logic in fixup_irqs() that clears offlined CPUs from + * ->arch.old_cpu_mask it shouldn't be possible to get here with + * ->arch.move_{in_progress,cleanup_count} set and no online CPUs in + * ->arch.old_cpu_mask. + */ + ASSERT(valid_irq_vector(desc->arch.old_vector)); + ASSERT(cpumask_intersects(desc->arch.old_cpu_mask, &cpu_online_map)); + + if ( cpumask_intersects(desc->arch.old_cpu_mask, mask) ) + { + /* + * Fallback to the old destination if moving is in progress and the + * current destination is to be offlined. This is only possible if + * the CPUs in old_cpu_mask intersect with the affinity mask passed + * in the 'mask' parameter. + */ + desc->arch.vector = desc->arch.old_vector; + cpumask_and(desc->arch.cpu_mask, desc->arch.old_cpu_mask, mask); + + /* Undo any possibly done cleanup. */ + for_each_cpu(cpu, desc->arch.cpu_mask) + per_cpu(vector_irq, cpu)[desc->arch.vector] = irq; + + /* Cancel the pending move and release the current vector. */ + desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; + cpumask_clear(desc->arch.old_cpu_mask); + desc->arch.move_in_progress = 0; + desc->arch.move_cleanup_count = 0; + if ( desc->arch.used_vectors ) + { + ASSERT(test_bit(old_vector, desc->arch.used_vectors)); + clear_bit(old_vector, desc->arch.used_vectors); + } + + return 0; + } + + /* + * There's an interrupt movement in progress but the destination(s) in + * ->arch.old_cpu_mask are not suitable given the 'mask' parameter, go + * through the full logic to find a new vector in a suitable CPU. + */ + } err = -ENOSPC; @@ -600,7 +651,22 @@ next: current_vector = vector; current_offset = offset; - if ( valid_irq_vector(old_vector) ) + if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) + { + ASSERT(!cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map)); + /* + * Special case when evacuating an interrupt from a CPU to be + * offlined and the interrupt was already in the process of being + * moved. Leave ->arch.old_{vector,cpu_mask} as-is and just + * replace ->arch.{cpu_mask,vector} with the new destination. + * Cleanup will be done normally for the old fields, just release + * the current vector here. + */ + if ( desc->arch.used_vectors && + !test_and_clear_bit(old_vector, desc->arch.used_vectors) ) + ASSERT_UNREACHABLE(); + } + else if ( valid_irq_vector(old_vector) ) { cpumask_and(desc->arch.old_cpu_mask, desc->arch.cpu_mask, &cpu_online_map); @@ -2607,33 +2673,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) continue; } - /* - * In order for the affinity adjustment below to be successful, we - * need _assign_irq_vector() to succeed. This in particular means - * clearing desc->arch.move_in_progress if this would otherwise - * prevent the function from succeeding. Since there's no way for the - * flag to get cleared anymore when there's no possible destination - * left (the only possibility then would be the IRQs enabled window - * after this loop), there's then also no race with us doing it here. - * - * Therefore the logic here and there need to remain in sync. - */ - if ( desc->arch.move_in_progress && - !cpumask_intersects(mask, desc->arch.cpu_mask) ) - { - unsigned int cpu; - - cpumask_and(affinity, desc->arch.old_cpu_mask, &cpu_online_map); - - spin_lock(&vector_lock); - for_each_cpu(cpu, affinity) - per_cpu(vector_irq, cpu)[desc->arch.old_vector] = ~irq; - spin_unlock(&vector_lock); - - release_old_vec(desc); - desc->arch.move_in_progress = 0; - } - if ( !cpumask_intersects(mask, desc->affinity) ) { break_affinity = true; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 18 14:00:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 14:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743111.1150009 (Exim 4.92) (envelope-from ) id 1sJZNV-00088Z-Lj; Tue, 18 Jun 2024 14:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743111.1150009; Tue, 18 Jun 2024 14: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 1sJZNV-00088R-J5; Tue, 18 Jun 2024 14:00:05 +0000 Received: by outflank-mailman (input) for mailman id 743111; Tue, 18 Jun 2024 14:00:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJZNT-0007nz-QR for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 14:00:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJZNT-0002GI-HY for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 14:00:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJZNT-0005lq-Fh for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 14: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=b43wJ4CTTiI4VQ6BngJ11OOgAnuapGpbVZOIz+OQVn8=; b=DwnN0N2SdICX9MALNRA+pl0G7U FuA9kBsrvD7gsjRejnJ8oP4gsAlIGnUqGnx0eDO/s54WAn0SKSlAZG4092srS5mNVqWLEtdltM0Da 2nR2Ao8kUyHr57RDgkcKHk1EyR9hInk04qiJlKlpSHqr25FDlFcIG/WJ6iMAl9+VfwgI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/ubsan: Fix UB in type_descriptor declaration Message-Id: Date: Tue, 18 Jun 2024 14:00:03 +0000 commit bd59af99700f075d06a6d47a16f777c9519928e0 Author: Andrew Cooper AuthorDate: Mon Jun 17 18:40:32 2024 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 18 14:55:04 2024 +0100 xen/ubsan: Fix UB in type_descriptor declaration struct type_descriptor is arranged with a NUL terminated string following the kind/info fields. The only reason this doesn't trip UBSAN detection itself (on more modern compilers at least) is because struct type_descriptor is only referenced in suppressed regions. Switch the declaration to be a real flexible member. No functional change. Fixes: 00fcf4dd8eb4 ("xen/ubsan: Import ubsan implementation from Linux 4.13") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/common/ubsan/ubsan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/ubsan/ubsan.h b/xen/common/ubsan/ubsan.h index a3159040fe..3db42e75b1 100644 --- a/xen/common/ubsan/ubsan.h +++ b/xen/common/ubsan/ubsan.h @@ -10,7 +10,7 @@ enum { struct type_descriptor { u16 type_kind; u16 type_info; - char type_name[1]; + char type_name[]; }; struct source_location { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 18 20:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 20:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743311.1150190 (Exim 4.92) (envelope-from ) id 1sJfr4-0003M7-Qn; Tue, 18 Jun 2024 20:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743311.1150190; Tue, 18 Jun 2024 20:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJfr4-0003Lz-Nk; Tue, 18 Jun 2024 20:55:02 +0000 Received: by outflank-mailman (input) for mailman id 743311; Tue, 18 Jun 2024 20:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJfr3-0003Lt-Lr for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 20:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJfr3-0002Hx-Kx for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 20:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJfr3-00089c-JP for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 20: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fy42cS7AimsPUIirT9ZsZLTT0yGY6l5UEfhU5Kh1Pt0=; b=YjVcYA9B9kBLNZDvBknaVUvapn UUN0eJNO98cir4X4ADtlWojEJ2KkNakV75HuUmuWED5ebD7DUDNyY97Mmy419YS90+2Y0vnzJfaAv myEbtjkK46nZvuVWJdgOF7KhV8fzqS8UROX314NFjOQtHvMx1kr72FuuJac/g7tKtIcQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: address remaining violations of MISRA C Rule 20.12 Message-Id: Date: Tue, 18 Jun 2024 20:55:01 +0000 commit 0f0235e9e9af3ecbd642317f0d238386bd7ee42c Author: Nicola Vetrini AuthorDate: Fri Jun 7 22:13:17 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 17 18:12:36 2024 -0700 automation/eclair_analysis: address remaining violations of MISRA C Rule 20.12 The DEFINE macro in asm-offsets.c (for all architectures) still generates violations despite the file(s) being excluded from compliance, due to the fact that in its expansion it sometimes refers entities in non-excluded files. These corner cases are deviated by the configuration. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 447c1e6661..e2653f77eb 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -483,6 +483,12 @@ leads to a violation of the Rule are deviated." -config=MC3R1.R20.12,macros+={deliberate, "name(GENERATE_CASE)&&loc(file(deliberate_generate_case))"} -doc_end +-doc_begin="The macro DEFINE is defined and used in excluded files asm-offsets.c. +This may still cause violations if entities outside these files are referred to +in the expansion." +-config=MC3R1.R20.12,macros+={deliberate, "name(DEFINE)&&loc(file(asm_offsets))"} +-doc_end + # # Series 21. # -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 18 20:55:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jun 2024 20:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743312.1150192 (Exim 4.92) (envelope-from ) id 1sJfrE-0003O1-Rm; Tue, 18 Jun 2024 20:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743312.1150192; Tue, 18 Jun 2024 20:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJfrE-0003Nt-PE; Tue, 18 Jun 2024 20:55:12 +0000 Received: by outflank-mailman (input) for mailman id 743312; Tue, 18 Jun 2024 20:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJfrD-0003Nf-Pg for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 20:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJfrD-0002I5-Oy for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 20:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJfrD-0008A3-N4 for xen-changelog@lists.xenproject.org; Tue, 18 Jun 2024 20: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5h8u70a9EP1rSkdnwIhn0nN4S33bSIH7ptTZbSxRM2M=; b=rYsNnMMqhT0QjZkyguDFWSqEkm 1rW3yh97c0VRk/18EUsOBrYSyfaXjpN7aTxb/7WB6BRBfUoKuFI4Y5OR6gRMUXD4lDyaHnTtPLVf1 TMv1cM5Wl4J/MH+gAoLulYNKjVzjuKSzlDwXA4faIEfDnQNjShV+zm45C4/nK6FeZs8U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: add more clean MISRA guidelines Message-Id: Date: Tue, 18 Jun 2024 20:55:11 +0000 commit 77b1ed1d02d082c457924a695e8dde7076285271 Author: Nicola Vetrini AuthorDate: Fri Jun 7 22:13:18 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 17 18:14:54 2024 -0700 automation/eclair_analysis: add more clean MISRA guidelines Rules 20.12 and 14.4 are now clean on ARM and x86, so they are added to the list of clean guidelines. Some guidelines listed in the additional clean section for ARM are also clean on x86, so they can be removed from there. No functional change. Signed-off-by: Nicola Vetrini [stefano: remove 20.9 from commit message] Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index a354ff322e..b829655ca0 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -60,6 +60,7 @@ MC3R1.R11.7|| MC3R1.R11.9|| MC3R1.R12.5|| MC3R1.R14.1|| +MC3R1.R14.4|| MC3R1.R16.7|| MC3R1.R17.1|| MC3R1.R17.3|| @@ -73,6 +74,7 @@ MC3R1.R20.4|| MC3R1.R20.6|| MC3R1.R20.9|| MC3R1.R20.11|| +MC3R1.R20.12|| MC3R1.R20.13|| MC3R1.R20.14|| MC3R1.R21.3|| @@ -105,7 +107,7 @@ if(string_equal(target,"x86_64"), ) if(string_equal(target,"arm64"), - service_selector({"additional_clean_guidelines","MC3R1.R14.4||MC3R1.R16.6||MC3R1.R20.12||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.2||MC3R1.R7.3||MC3R1.R8.6||MC3R1.R9.3"}) + service_selector({"additional_clean_guidelines","MC3R1.R16.6||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.3"}) ) -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 Wed Jun 19 00:44:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 00:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743354.1150237 (Exim 4.92) (envelope-from ) id 1sJjQj-0004hA-6N; Wed, 19 Jun 2024 00:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743354.1150237; Wed, 19 Jun 2024 00: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 1sJjQj-0004h2-3m; Wed, 19 Jun 2024 00:44:05 +0000 Received: by outflank-mailman (input) for mailman id 743354; Wed, 19 Jun 2024 00:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJjQi-0004gw-EF for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJjQi-0006vs-5r for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJjQi-00052f-3I for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lgX4xDiIq9GgWtBm19X2eE2HoScyiyYgnaf5yhQBaxM=; b=FKXT6mih89F4uwFVYxp6i3hazO h7obc4TvQ1MzHHweUh73crXkyrkAcNSockds8C5pSjXB34m4xciykwgTKs0BQ9u8QqevY951uWYyU KpLfOdJS+mQh3SOYf/1Y+aAd8RLR6b6XGpqhk6s5dNuh0ueO4ZbulZQHjR9aqPmm6hk4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains Message-Id: Date: Wed, 19 Jun 2024 00:44:04 +0000 commit cb1ddafdc57305a44e23f781decfdd31dea31189 Author: Henry Wang AuthorDate: Tue Jun 18 17:27:51 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 18 17:27:51 2024 -0700 xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains Currently, users are allowed to map static shared memory in a non-direct-mapped way for direct-mapped domains. This can lead to clashing of guest memory spaces. Also, the current extended region finding logic only removes the host physical addresses of the static shared memory areas for direct-mapped domains, which may be inconsistent with the guest memory map if users map the static shared memory in a non-direct-mapped way. This will lead to incorrect extended region calculation results. To make things easier, add restriction that static shared memory should also be direct-mapped for direct-mapped domains. Check the host physical address to be matched with guest physical address when parsing the device tree. Document this restriction in the doc. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Acked-by: Michal Orzel --- docs/misc/arm/device-tree/booting.txt | 3 +++ xen/arch/arm/static-shmem.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index aa0e614864..3a04f5c57f 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -607,6 +607,9 @@ communication. shared memory region in host physical address space, a size, and a guest physical address, as the target address of the mapping. e.g. xen,shared-mem = < [host physical address] [guest address] [size] >; + Note that if a domain is direct-mapped, i.e. the Dom0 and the Dom0less + DomUs with `direct-map` device tree property, the static shared memory + should also be direct-mapped (host physical address == guest address). It shall also meet the following criteria: 1) If the SHM ID matches with an existing region, the address range of the diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index dbb017c7d7..c434b96e62 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -324,6 +324,12 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, printk("%pd: static shared memory bank not found: '%s'", d, shm_id); return -ENOENT; } + if ( is_domain_direct_mapped(d) && (pbase != gbase) ) + { + printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", + d, pbase, gbase); + return -EINVAL; + } pbase = boot_shm_bank->start; psize = boot_shm_bank->size; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 00:44:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 00:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743355.1150241 (Exim 4.92) (envelope-from ) id 1sJjQt-0004ix-7m; Wed, 19 Jun 2024 00:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743355.1150241; Wed, 19 Jun 2024 00: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 1sJjQt-0004iq-59; Wed, 19 Jun 2024 00:44:15 +0000 Received: by outflank-mailman (input) for mailman id 743355; Wed, 19 Jun 2024 00:44:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJjQs-0004ii-CR for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJjQs-0006xX-9x for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJjQs-00053N-83 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vbJ1wT/Kjjcf2l4cnUMxw4cEPDo50cj9BHaJuiYmhyI=; b=TBzRR1lWHN2ZvwTAraKbL4kGvz noc+rOutsM07M/icr1y5R98NadXgNnxQrYSqipmNuO0PCcAt0Edz1b49yCBvvt2N5rP0E+msME5Pm 2txHHWMSo4K5H8/rKOFsgmJX/NgtiFG3IYqkJ6qwcNE1pa3juaQdGbzwVb5f/Kvvc1GU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor Message-Id: Date: Wed, 19 Jun 2024 00:44:14 +0000 commit 6f9d90ea943b5e0c5d11a71090c49bbfd79e97ea Author: Henry Wang AuthorDate: Fri May 24 15:55:20 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 18 17:32:41 2024 -0700 xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor There are use cases (for example using the PV driver) in Dom0less setup that require Dom0less DomUs start immediately with Dom0, but initialize XenStore later after Dom0's successful boot and call to the init-dom0less application. An error message can seen from the init-dom0less application on 1:1 direct-mapped domains: ``` Allocating magic pages memory.c:238:d0v0 mfn 0x39000 doesn't belong to d1 Error on alloc magic pages ``` The "magic page" is a terminology used in the toolstack as reserved pages for the VM to have access to virtual platform capabilities. Currently the magic pages for Dom0less DomUs are populated by the init-dom0less app through populate_physmap(), and populate_physmap() automatically assumes gfn == mfn for 1:1 direct mapped domains. This cannot be true for the magic pages that are allocated later from the init-dom0less application executed in Dom0. For domain using statically allocated memory but not 1:1 direct-mapped, similar error "failed to retrieve a reserved page" can be seen as the reserved memory list is empty at that time. Since for init-dom0less, the magic page region is only for XenStore. To solve above issue, this commit allocates the XenStore page for Dom0less DomUs at the domain construction time. The PFN will be noted and communicated to the init-dom0less application executed from Dom0. To keep the XenStore late init protocol, set the connection status to XENSTORE_RECONNECT. Currently the GUEST_MAGIC_BASE in the init-dom0less application is hardcoded, which will lead to failures for 1:1 direct-mapped Dom0less DomUs. Since the guest magic region allocation from init-dom0less is for XenStore, and the XenStore page is now allocated from the hypervisor, instead of hardcoding the guest magic pages region, use xc_hvm_param_get() to get the XenStore page PFN. Rename alloc_xs_page() to get_xs_page() to reflect the changes. With this change, some existing code is not needed anymore, including: (1) The definition of the XenStore page offset. (2) Call to xc_domain_setmaxmem() and xc_clear_domain_page() as we don't need to set the max mem and clear the page anymore. (3) Foreign mapping of the XenStore page, setting of XenStore interface status and HVM_PARAM_STORE_PFN from init-dom0less, as they are set by the hypervisor. Take the opportunity to do some coding style improvements when possible. Reported-by: Alec Kwapis Suggested-by: Daniel P. Smith Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/helpers/init-dom0less.c | 58 +++++++++++-------------------------------- xen/arch/arm/dom0less-build.c | 58 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 45 deletions(-) diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c index fee93459c4..325527f040 100644 --- a/tools/helpers/init-dom0less.c +++ b/tools/helpers/init-dom0less.c @@ -16,30 +16,18 @@ #include "init-dom-json.h" -#define XENSTORE_PFN_OFFSET 1 #define STR_MAX_LENGTH 128 -static int alloc_xs_page(struct xc_interface_core *xch, - libxl_dominfo *info, - uint64_t *xenstore_pfn) +static int get_xs_page(struct xc_interface_core *xch, libxl_dominfo *info, + uint64_t *xenstore_pfn) { int rc; - const xen_pfn_t base = GUEST_MAGIC_BASE >> XC_PAGE_SHIFT; - xen_pfn_t p2m = (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET; - rc = xc_domain_setmaxmem(xch, info->domid, - info->max_memkb + (XC_PAGE_SIZE/1024)); - if (rc < 0) - return rc; - - rc = xc_domain_populate_physmap_exact(xch, info->domid, 1, 0, 0, &p2m); - if (rc < 0) - return rc; - - *xenstore_pfn = base + XENSTORE_PFN_OFFSET; - rc = xc_clear_domain_page(xch, info->domid, *xenstore_pfn); - if (rc < 0) - return rc; + rc = xc_hvm_param_get(xch, info->domid, HVM_PARAM_STORE_PFN, xenstore_pfn); + if (rc < 0) { + fprintf(stderr,"Failed to get HVM_PARAM_STORE_PFN\n"); + return 1; + } return 0; } @@ -100,6 +88,7 @@ static bool do_xs_write_vm(struct xs_handle *xsh, xs_transaction_t t, */ static int create_xenstore(struct xs_handle *xsh, libxl_dominfo *info, libxl_uuid uuid, + uint64_t xenstore_pfn, evtchn_port_t xenstore_port) { domid_t domid; @@ -145,8 +134,7 @@ static int create_xenstore(struct xs_handle *xsh, rc = snprintf(target_memkb_str, STR_MAX_LENGTH, "%"PRIu64, info->current_memkb); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; - rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%lld", - (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET); + rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%"PRIu64, xenstore_pfn); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; rc = snprintf(xenstore_port_str, STR_MAX_LENGTH, "%u", xenstore_port); @@ -230,7 +218,6 @@ static int init_domain(struct xs_handle *xsh, libxl_uuid uuid; uint64_t xenstore_evtchn, xenstore_pfn; int rc; - struct xenstore_domain_interface *intf; printf("Init dom0less domain: %u\n", info->domid); @@ -245,20 +232,11 @@ static int init_domain(struct xs_handle *xsh, if (!xenstore_evtchn) return 0; - /* Alloc xenstore page */ - if (alloc_xs_page(xch, info, &xenstore_pfn) != 0) { - printf("Error on alloc magic pages\n"); - return 1; - } - - intf = xenforeignmemory_map(xfh, info->domid, PROT_READ | PROT_WRITE, 1, - &xenstore_pfn, NULL); - if (!intf) { - printf("Error mapping xenstore page\n"); + /* Get xenstore page */ + if (get_xs_page(xch, info, &xenstore_pfn) != 0) { + fprintf(stderr,"Error on getting xenstore page\n"); return 1; } - intf->connection = XENSTORE_RECONNECT; - xenforeignmemory_unmap(xfh, intf, 1); rc = xc_dom_gnttab_seed(xch, info->domid, true, (xen_pfn_t)-1, xenstore_pfn, 0, 0); @@ -272,19 +250,11 @@ static int init_domain(struct xs_handle *xsh, if (rc) err(1, "gen_stub_json_config"); - /* Now everything is ready: set HVM_PARAM_STORE_PFN */ - rc = xc_hvm_param_set(xch, info->domid, HVM_PARAM_STORE_PFN, - xenstore_pfn); - if (rc < 0) - return rc; - - rc = create_xenstore(xsh, info, uuid, xenstore_evtchn); + rc = create_xenstore(xsh, info, uuid, xenstore_pfn, xenstore_evtchn); if (rc) err(1, "writing to xenstore"); - rc = xs_introduce_domain(xsh, info->domid, - (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET, - xenstore_evtchn); + rc = xs_introduce_domain(xsh, info->domid, xenstore_pfn, xenstore_evtchn); if (!rc) err(1, "xs_introduce_domain"); return 0; diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index f919d3acf9..ef2ba85ff4 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include +#include #include #include #include @@ -10,6 +11,8 @@ #include #include +#include + #include #include #include @@ -739,6 +742,56 @@ static int __init alloc_xenstore_evtchn(struct domain *d) return 0; } +#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) ) + { + free_domheap_page(xenstore_pg); + 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; +} + static int __init construct_domU(struct domain *d, const struct dt_device_node *node) { @@ -839,7 +892,10 @@ static int __init construct_domU(struct domain *d, rc = alloc_xenstore_evtchn(d); if ( rc < 0 ) return rc; - d->arch.hvm.params[HVM_PARAM_STORE_PFN] = ~0ULL; + + rc = alloc_xenstore_page(d); + if ( rc < 0 ) + return rc; } return rc; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 00:44:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 00:44:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743356.1150245 (Exim 4.92) (envelope-from ) id 1sJjR3-0004lr-9e; Wed, 19 Jun 2024 00:44:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743356.1150245; Wed, 19 Jun 2024 00:44: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 1sJjR3-0004lj-6q; Wed, 19 Jun 2024 00:44:25 +0000 Received: by outflank-mailman (input) for mailman id 743356; Wed, 19 Jun 2024 00:44:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJjR2-0004lZ-Du for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00:44:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJjR2-0006xf-D3 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00:44:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJjR2-00053q-C7 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 00:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fwGBz/qzLFqoRVISvepsbH2QTdM/IKKuir5gwLjTbZg=; b=DBlT9cRc+Z5tPtOPD3O5qZdkku YEk7cHagnoM0RnB/DMExEmvVuK4E0UOcNcVEfjeeycZdrA2UZk6Uu+z8bw1eStGkRfYyoz+qkuYFa zYikijzdUE/2jNXYqUM9TaYGcCECVss5J5uxzO5Eod40rXTwgNt/0i6yoy7SCBcXZazY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/features/dom0less: Update the late XenStore init protocol Message-Id: Date: Wed, 19 Jun 2024 00:44:24 +0000 commit 53c5c99e8744495395c1274595d6ca55947d1d6a Author: Henry Wang AuthorDate: Fri May 24 15:55:22 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 18 17:33:25 2024 -0700 docs/features/dom0less: Update the late XenStore init protocol With the new allocation strategy of Dom0less DomUs XenStore page, update the doc of the late XenStore init protocol accordingly. Signed-off-by: Henry Wang Reviewed-by: Michal Orzel --- docs/features/dom0less.pandoc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/features/dom0less.pandoc b/docs/features/dom0less.pandoc index 725afa0558..8b178edee0 100644 --- a/docs/features/dom0less.pandoc +++ b/docs/features/dom0less.pandoc @@ -110,9 +110,10 @@ hotplug PV drivers to dom0less guests. E.g. xl network-attach domU. The implementation works as follows: - Xen allocates the xenstore event channel for each dom0less domU that has the "xen,enhanced" property, and sets HVM_PARAM_STORE_EVTCHN -- Xen does *not* allocate the xenstore page and sets HVM_PARAM_STORE_PFN - to ~0ULL (invalid) -- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to invalid +- Xen allocates the xenstore page and sets HVM_PARAM_STORE_PFN as well + as the connection status to XENSTORE_RECONNECT. +- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to + ~0ULL (invalid) or the connection status is *not* XENSTORE_CONNECTED. - Old kernels will continue without xenstore support (Note: some old buggy kernels might crash because they don't check the validity of HVM_PARAM_STORE_PFN before using it! Disable "xen,enhanced" in @@ -121,13 +122,14 @@ The implementation works as follows: channel (HVM_PARAM_STORE_EVTCHN) before continuing with the initialization - Once dom0 is booted, init-dom0less is executed: - - it allocates the xenstore shared page and sets HVM_PARAM_STORE_PFN + - it gets the xenstore shared page from HVM_PARAM_STORE_PFN - it calls xs_introduce_domain - Xenstored notices the new domain, initializes interfaces as usual, and sends an event channel notification to the domain using the xenstore event channel (HVM_PARAM_STORE_EVTCHN) - The Linux domU kernel receives the event channel notification, checks - HVM_PARAM_STORE_PFN again and continue with the initialization + HVM_PARAM_STORE_PFN and the connection status again and continue with + the initialization Limitations -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 05:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 05:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743411.1150299 (Exim 4.92) (envelope-from ) id 1sJoHe-000700-Pk; Wed, 19 Jun 2024 05:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743411.1150299; Wed, 19 Jun 2024 05:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHe-0006zs-N8; Wed, 19 Jun 2024 05:55:02 +0000 Received: by outflank-mailman (input) for mailman id 743411; Wed, 19 Jun 2024 05:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHd-0006zm-Sf for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHd-0003nS-Lf for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJoHd-0005HG-Ka for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R/n3FqfE2HBb5CrvpE+kjIh5QK9TlYqEdy9rWQGj+NM=; b=YohOo2LVkFECdOSQBHrwoZoLDl +oKmiGUtpZ2fXVeFAMOuVg3G/ZWM3f25f/t2PTZV4I0VqyfDORyuWfoOKwJWf8sqcGL6fhUqU0ucg A+NHmUj5Vn8SZN/ACZoixIiIGa11FaHfUV09KuquVuBYmuNFRa+t3rcjbZmivBVcNgao=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/Intel: unlock CPUID earlier for the BSP Message-Id: Date: Wed, 19 Jun 2024 05:55:01 +0000 commit fa4d026737a47cd1d66ffb797a29150b4453aa9f Author: Jan Beulich AuthorDate: Tue Jun 18 15:12:44 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 18 15:12:44 2024 +0200 x86/Intel: unlock CPUID earlier for the BSP Intel CPUs have a MSR bit to limit CPUID enumeration to leaf two. If this bit is set by the BIOS then CPUID evaluation does not work when data from any leaf greater than two is needed; early_cpu_init() in particular wants to collect leaf 7 data. Cure this by unlocking CPUID right before evaluating anything which depends on the maximum CPUID leaf being greater than two. Inspired by (and description cloned from) Linux commit 0c2f6d04619e ("x86/topology/intel: Unlock CPUID before evaluating anything"). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu/common.c | 3 ++- xen/arch/x86/cpu/cpu.h | 2 ++ xen/arch/x86/cpu/intel.c | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 28d7f34c4d..ff4cd22897 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -336,7 +336,8 @@ void __init early_cpu_init(bool verbose) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_INTEL: intel_unlock_cpuid_leaves(c); + actual_cpu = intel_cpu_dev; break; case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index e3d06278b3..8be65e975a 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -24,3 +24,5 @@ void amd_init_lfence(struct cpuinfo_x86 *c); void amd_init_ssbd(const struct cpuinfo_x86 *c); void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); + +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index ce7a77a867..af56e57bd8 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -303,10 +303,24 @@ static void __init noinline intel_init_levelling(void) ctxt_switch_masking = intel_ctxt_switch_masking; } -static void cf_check early_init_intel(struct cpuinfo_x86 *c) +/* Unmask CPUID levels if masked. */ +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) { - u64 misc_enable, disable; + uint64_t misc_enable, disable; + + rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + + disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; + if (disable) { + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); + bootsym(trampoline_misc_enable_off) |= disable; + c->cpuid_level = cpuid_eax(0); + printk(KERN_INFO "revised cpuid level: %u\n", c->cpuid_level); + } +} +static void cf_check early_init_intel(struct cpuinfo_x86 *c) +{ /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; @@ -315,16 +329,7 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c) bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE) printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); - /* Unmask CPUID levels and NX if masked: */ - rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - - disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; - if (disable) { - wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); - bootsym(trampoline_misc_enable_off) |= disable; - printk(KERN_INFO "revised cpuid level: %d\n", - cpuid_eax(0)); - } + intel_unlock_cpuid_leaves(c); /* CPUID workaround for Intel 0F33/0F34 CPU */ if (boot_cpu_data.x86 == 0xF && boot_cpu_data.x86_model == 3 && -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 05:55:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 05:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743412.1150303 (Exim 4.92) (envelope-from ) id 1sJoHo-00071d-RK; Wed, 19 Jun 2024 05:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743412.1150303; Wed, 19 Jun 2024 05:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHo-00071W-Oc; Wed, 19 Jun 2024 05:55:12 +0000 Received: by outflank-mailman (input) for mailman id 743412; Wed, 19 Jun 2024 05:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHn-00071Q-Qf for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHn-0003nc-Ps for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJoHn-0005Hn-O1 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mCufgqt7ze7R6VZclKJ3h9ZRBKKyi9kbPMuiNcdlNEs=; b=I1NRjJ2BsdthSzBBa09hErmgFp qh6LeYd14vYCUU0TXqL9qy5sLmMC4rtUT361x23y3dc7deEDD1+pTx/EPOkgInb7VqL/2dlhKs+Mr 2PmQzpNRcQqARvhGTb7OSPLxg7Bb4L90PUQ3YzjBpG8TyVijPNJnqgIpEqFglQaCDQJY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Message-Id: Date: Wed, 19 Jun 2024 05:55:11 +0000 commit 817d1cd627be668c358d038f0fadbf7d24d417d3 Author: Roger Pau Monné AuthorDate: Tue Jun 18 15:14:49 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 18 15:14:49 2024 +0200 x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Given the current logic it's possible for ->arch.old_cpu_mask to get out of sync: if a CPU set in old_cpu_mask is offlined and then onlined again without old_cpu_mask having been updated the data in the mask will no longer be accurate, as when brought back online the CPU will no longer have old_vector configured to handle the old interrupt source. If there's an interrupt movement in progress, and the to be offlined CPU (which is the call context) is in the old_cpu_mask, clear it and update the mask, so it doesn't contain stale data. Note that when the system is going down fixup_irqs() will be called by smp_send_stop() from CPU 0 with a mask with only CPU 0 on it, effectively asking to move all interrupts to the current caller (CPU 0) which is the only CPU to remain online. In that case we don't care to migrate interrupts that are in the process of being moved, as it's likely we won't be able to move all interrupts to CPU 0 due to vector shortage anyway. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 263e502bc0..d305aed317 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2526,7 +2526,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { bool break_affinity = false, set_affinity = true; - unsigned int vector; + unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); if ( irq == 2 ) @@ -2569,6 +2569,33 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } + if ( desc->arch.move_in_progress && + /* + * Only attempt to adjust the mask if the current CPU is going + * offline, otherwise the whole system is going down and leaving + * stale data in the masks is fine. + */ + !cpu_online(cpu) && + cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) + { + /* + * This CPU is going offline, remove it from ->arch.old_cpu_mask + * and possibly release the old vector if the old mask becomes + * empty. + * + * Note cleaning ->arch.old_cpu_mask is required if the CPU is + * brought offline and then online again, as when re-onlined the + * per-cpu vector table will no longer have ->arch.old_vector + * setup, and hence ->arch.old_cpu_mask would be stale. + */ + cpumask_clear_cpu(cpu, desc->arch.old_cpu_mask); + if ( cpumask_empty(desc->arch.old_cpu_mask) ) + { + desc->arch.move_in_progress = 0; + release_old_vec(desc); + } + } + /* * Avoid shuffling the interrupt around as long as current target CPUs * are a subset of the input mask. What fixup_irqs() cares about is -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 05:55:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 05:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743413.1150307 (Exim 4.92) (envelope-from ) id 1sJoHy-000754-UI; Wed, 19 Jun 2024 05:55:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743413.1150307; Wed, 19 Jun 2024 05:55: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 1sJoHy-00074w-Rd; Wed, 19 Jun 2024 05:55:22 +0000 Received: by outflank-mailman (input) for mailman id 743413; Wed, 19 Jun 2024 05:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHx-00074k-V8 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoHx-0003ns-TZ for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJoHx-0005IE-Rz for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kjeZDKfWTOWW0vMYvpA2iug/mG6s7I7yI8Bachf+wKk=; b=PEXIbAaarUl4jxdGyQIwkwMFZC NJRiRmwUsGJkQQaNrEup1TMUjb5IUQnFZjNKvpHULwpqHvhOmLtTZbKaMcew4sSOZLKuxV8vH/mfk UXOXI8/3QFggFojE1+BribebgM2mwMDcJO/ERn+WsDLYK/OutMelsORtlabVoumYFt8Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/irq: handle moving interrupts in _assign_irq_vector() Message-Id: Date: Wed, 19 Jun 2024 05:55:21 +0000 commit 369558924a642bbb0cb731e9a3375958867cb17b Author: Roger Pau Monné AuthorDate: Tue Jun 18 15:15:10 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 18 15:15:10 2024 +0200 x86/irq: handle moving interrupts in _assign_irq_vector() Currently there's logic in fixup_irqs() that attempts to prevent _assign_irq_vector() from failing, as fixup_irqs() is required to evacuate all interrupts from the CPUs not present in the input mask. The current logic in fixup_irqs() is incomplete, as it doesn't deal with interrupts that have move_cleanup_count > 0 and a non-empty ->arch.old_cpu_mask field. Instead of attempting to fixup the interrupt descriptor in fixup_irqs() so that _assign_irq_vector() cannot fail, introduce logic in _assign_irq_vector() to deal with interrupts that have either move_{in_progress,cleanup_count} set and no remaining online CPUs in ->arch.cpu_mask. If _assign_irq_vector() is requested to move an interrupt in the state described above, first attempt to see if ->arch.old_cpu_mask contains any valid CPUs that could be used as fallback, and if that's the case do move the interrupt back to the previous destination. Note this is easier because the vector hasn't been released yet, so there's no need to allocate and setup a new vector on the destination. Due to the logic in fixup_irqs() that clears offline CPUs from ->arch.old_cpu_mask (and releases the old vector if the mask becomes empty) it shouldn't be possible to get into _assign_irq_vector() with ->arch.move_{in_progress,cleanup_count} set but no online CPUs in ->arch.old_cpu_mask. However if ->arch.move_{in_progress,cleanup_count} is set and the interrupt has also changed affinity, it's possible the members of ->arch.old_cpu_mask are no longer part of the affinity set, move the interrupt to a different CPU part of the provided mask and keep the current ->arch.old_{cpu_mask,vector} for the pending interrupt movement to be completed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 97 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index d305aed317..d7f15c38af 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -544,7 +544,58 @@ static int _assign_irq_vector(struct irq_desc *desc, const cpumask_t *mask) } if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) - return -EAGAIN; + { + /* + * If the current destination is online refuse to shuffle. Retry after + * the in-progress movement has finished. + */ + if ( cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) + return -EAGAIN; + + /* + * Due to the logic in fixup_irqs() that clears offlined CPUs from + * ->arch.old_cpu_mask it shouldn't be possible to get here with + * ->arch.move_{in_progress,cleanup_count} set and no online CPUs in + * ->arch.old_cpu_mask. + */ + ASSERT(valid_irq_vector(desc->arch.old_vector)); + ASSERT(cpumask_intersects(desc->arch.old_cpu_mask, &cpu_online_map)); + + if ( cpumask_intersects(desc->arch.old_cpu_mask, mask) ) + { + /* + * Fallback to the old destination if moving is in progress and the + * current destination is to be offlined. This is only possible if + * the CPUs in old_cpu_mask intersect with the affinity mask passed + * in the 'mask' parameter. + */ + desc->arch.vector = desc->arch.old_vector; + cpumask_and(desc->arch.cpu_mask, desc->arch.old_cpu_mask, mask); + + /* Undo any possibly done cleanup. */ + for_each_cpu(cpu, desc->arch.cpu_mask) + per_cpu(vector_irq, cpu)[desc->arch.vector] = irq; + + /* Cancel the pending move and release the current vector. */ + desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; + cpumask_clear(desc->arch.old_cpu_mask); + desc->arch.move_in_progress = 0; + desc->arch.move_cleanup_count = 0; + if ( desc->arch.used_vectors ) + { + ASSERT(test_bit(old_vector, desc->arch.used_vectors)); + clear_bit(old_vector, desc->arch.used_vectors); + } + + return 0; + } + + /* + * There's an interrupt movement in progress but the destination(s) in + * ->arch.old_cpu_mask are not suitable given the 'mask' parameter, go + * through the full logic to find a new vector in a suitable CPU. + */ + } err = -ENOSPC; @@ -600,7 +651,22 @@ next: current_vector = vector; current_offset = offset; - if ( valid_irq_vector(old_vector) ) + if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) + { + ASSERT(!cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map)); + /* + * Special case when evacuating an interrupt from a CPU to be + * offlined and the interrupt was already in the process of being + * moved. Leave ->arch.old_{vector,cpu_mask} as-is and just + * replace ->arch.{cpu_mask,vector} with the new destination. + * Cleanup will be done normally for the old fields, just release + * the current vector here. + */ + if ( desc->arch.used_vectors && + !test_and_clear_bit(old_vector, desc->arch.used_vectors) ) + ASSERT_UNREACHABLE(); + } + else if ( valid_irq_vector(old_vector) ) { cpumask_and(desc->arch.old_cpu_mask, desc->arch.cpu_mask, &cpu_online_map); @@ -2607,33 +2673,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) continue; } - /* - * In order for the affinity adjustment below to be successful, we - * need _assign_irq_vector() to succeed. This in particular means - * clearing desc->arch.move_in_progress if this would otherwise - * prevent the function from succeeding. Since there's no way for the - * flag to get cleared anymore when there's no possible destination - * left (the only possibility then would be the IRQs enabled window - * after this loop), there's then also no race with us doing it here. - * - * Therefore the logic here and there need to remain in sync. - */ - if ( desc->arch.move_in_progress && - !cpumask_intersects(mask, desc->arch.cpu_mask) ) - { - unsigned int cpu; - - cpumask_and(affinity, desc->arch.old_cpu_mask, &cpu_online_map); - - spin_lock(&vector_lock); - for_each_cpu(cpu, affinity) - per_cpu(vector_irq, cpu)[desc->arch.old_vector] = ~irq; - spin_unlock(&vector_lock); - - release_old_vec(desc); - desc->arch.move_in_progress = 0; - } - if ( !cpumask_intersects(mask, desc->affinity) ) { break_affinity = true; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 05:55:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 05:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743416.1150311 (Exim 4.92) (envelope-from ) id 1sJoI8-000788-Vf; Wed, 19 Jun 2024 05:55:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743416.1150311; Wed, 19 Jun 2024 05:55: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 1sJoI8-000781-T9; Wed, 19 Jun 2024 05:55:32 +0000 Received: by outflank-mailman (input) for mailman id 743416; Wed, 19 Jun 2024 05:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoI8-00077p-1g for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJoI8-0003o1-11 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJoI7-0005Iq-Vd for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 05:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Vbb2ExiZV/2l4GxwwD/ih8xu19YU5omkDSUSbAwr1bI=; b=BypPEg/d/17ommlTqHUL6hZlNC RrLCA5200bAS5lwbX/PTJE7fghk/qIVYLuxMAzOleWjhChFteA6eM9w5eyw3gZtHU9TzIacitfgzk 8p/kQ+zbAxOgCYWM5bqBWKkDSbrsOggtvhXj/v7Pc1/Ge9jJZS5Zh6QMta+XAssB93z0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ubsan: Fix UB in type_descriptor declaration Message-Id: Date: Wed, 19 Jun 2024 05:55:31 +0000 commit bd59af99700f075d06a6d47a16f777c9519928e0 Author: Andrew Cooper AuthorDate: Mon Jun 17 18:40:32 2024 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 18 14:55:04 2024 +0100 xen/ubsan: Fix UB in type_descriptor declaration struct type_descriptor is arranged with a NUL terminated string following the kind/info fields. The only reason this doesn't trip UBSAN detection itself (on more modern compilers at least) is because struct type_descriptor is only referenced in suppressed regions. Switch the declaration to be a real flexible member. No functional change. Fixes: 00fcf4dd8eb4 ("xen/ubsan: Import ubsan implementation from Linux 4.13") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/common/ubsan/ubsan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/ubsan/ubsan.h b/xen/common/ubsan/ubsan.h index a3159040fe..3db42e75b1 100644 --- a/xen/common/ubsan/ubsan.h +++ b/xen/common/ubsan/ubsan.h @@ -10,7 +10,7 @@ enum { struct type_descriptor { u16 type_kind; u16 type_info; - char type_name[1]; + char type_name[]; }; struct source_location { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 11:44:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 11:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743673.1150608 (Exim 4.92) (envelope-from ) id 1sJtjQ-0002Fg-V4; Wed, 19 Jun 2024 11:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743673.1150608; Wed, 19 Jun 2024 11: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 1sJtjQ-0002FY-SW; Wed, 19 Jun 2024 11:44:04 +0000 Received: by outflank-mailman (input) for mailman id 743673; Wed, 19 Jun 2024 11:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJtjQ-0002FS-3A for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJtjP-0001xs-LU for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJtjP-00027X-Jh for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iMGIpXMa1qMJzXgwiwQRFoMhlTP7p5o01tfRNfgxHqI=; b=7GkWnX1zhz/b01HwVV1iDo814k 3hkT4pPxdqFBKeLTIU0/TOK78Y4DGwOgvDbpgffrHF7xy0UQrN7/OEpz439uSF9VQAM8ufsQfDo5G NhhQJAzI7vgbtWQusPeZJc/9B7fZ5rO3gftC0GMx7o99yRVgHlJXiaX1eV7QLaKAzyGE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: static-shmem: fix "gbase/pbase used uninitialized" build failure Message-Id: Date: Wed, 19 Jun 2024 11:44:03 +0000 commit 988f1c7e1f40f85f5654784e5f702ed54904ca9d Author: Michal Orzel AuthorDate: Wed Jun 19 08:46:52 2024 +0200 Commit: Julien Grall CommitDate: Wed Jun 19 12:32:27 2024 +0100 xen/arm: static-shmem: fix "gbase/pbase used uninitialized" build failure Building Xen with CONFIG_STATIC_SHM=y results in a build failure: arch/arm/static-shmem.c: In function 'process_shm': arch/arm/static-shmem.c:327:41: error: 'gbase' may be used uninitialized [-Werror=maybe-uninitialized] 327 | if ( is_domain_direct_mapped(d) && (pbase != gbase) ) arch/arm/static-shmem.c:305:17: note: 'gbase' was declared here 305 | paddr_t gbase, pbase, psize; This is because the commit cb1ddafdc573 adds a check referencing gbase/pbase variables which were not yet assigned a value. Fix it. Fixes: cb1ddafdc573 ("xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains") Signed-off-by: Michal Orzel Release-Acked-by: Oleksii Kurochko Reviewed-by: Bertrand Marquis --- xen/arch/arm/static-shmem.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index c434b96e62..cd48d2896b 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -324,12 +324,6 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, printk("%pd: static shared memory bank not found: '%s'", d, shm_id); return -ENOENT; } - if ( is_domain_direct_mapped(d) && (pbase != gbase) ) - { - printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", - d, pbase, gbase); - return -EINVAL; - } pbase = boot_shm_bank->start; psize = boot_shm_bank->size; @@ -353,6 +347,13 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, /* guest phys address is after host phys address */ gbase = dt_read_paddr(cells + addr_cells, addr_cells); + if ( is_domain_direct_mapped(d) && (pbase != gbase) ) + { + printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", + d, pbase, gbase); + return -EINVAL; + } + for ( i = 0; i < PFN_DOWN(psize); i++ ) if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 11:55:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 11:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743709.1150661 (Exim 4.92) (envelope-from ) id 1sJtu4-0006au-RQ; Wed, 19 Jun 2024 11:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743709.1150661; Wed, 19 Jun 2024 11: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 1sJtu4-0006an-Oy; Wed, 19 Jun 2024 11:55:04 +0000 Received: by outflank-mailman (input) for mailman id 743709; Wed, 19 Jun 2024 11:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJtu3-0006ad-HQ for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJtu3-0002BF-9n for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJtu3-0002gZ-8j for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MI4Hq+NuqWihaOI8VkXhp1vuNUhXNGVoGrHNIlZ1kGU=; b=4ejw2BZA76qCmpS40K3sIwiUbO NIkCHQJJWDOFlHkx6VgorqnIvNr0f1Ww/IFEpcRUKhTuxF1ZtiY3+WPqji5DEGN+t8utx7dJNIpZ/ AfMbZqNgEhRQQAQoMg2IdglTzNYt8qnuY1qxLEp4mY5JVe58iKSwDGpywSFouWqym51M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert "docs/features/dom0less: Update the late XenStore init protocol" Message-Id: Date: Wed, 19 Jun 2024 11:55:03 +0000 commit 443c488a0b3676b5c001069d14890cd8d0ec2c1d Author: Julien Grall AuthorDate: Wed Jun 19 12:47:28 2024 +0100 Commit: Julien Grall CommitDate: Wed Jun 19 12:48:44 2024 +0100 Revert "docs/features/dom0less: Update the late XenStore init protocol" Michal reported that the gitlab CI is failing because of this series [1]. This reverts commit 53c5c99e8744495395c1274595d6ca55947d1d6a. [1] https://gitlab.com/xen-project/xen/-/pipelines/1338067978 Signed-off-by: Julien Grall --- docs/features/dom0less.pandoc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/features/dom0less.pandoc b/docs/features/dom0less.pandoc index 8b178edee0..725afa0558 100644 --- a/docs/features/dom0less.pandoc +++ b/docs/features/dom0less.pandoc @@ -110,10 +110,9 @@ hotplug PV drivers to dom0less guests. E.g. xl network-attach domU. The implementation works as follows: - Xen allocates the xenstore event channel for each dom0less domU that has the "xen,enhanced" property, and sets HVM_PARAM_STORE_EVTCHN -- Xen allocates the xenstore page and sets HVM_PARAM_STORE_PFN as well - as the connection status to XENSTORE_RECONNECT. -- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to - ~0ULL (invalid) or the connection status is *not* XENSTORE_CONNECTED. +- Xen does *not* allocate the xenstore page and sets HVM_PARAM_STORE_PFN + to ~0ULL (invalid) +- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to invalid - Old kernels will continue without xenstore support (Note: some old buggy kernels might crash because they don't check the validity of HVM_PARAM_STORE_PFN before using it! Disable "xen,enhanced" in @@ -122,14 +121,13 @@ The implementation works as follows: channel (HVM_PARAM_STORE_EVTCHN) before continuing with the initialization - Once dom0 is booted, init-dom0less is executed: - - it gets the xenstore shared page from HVM_PARAM_STORE_PFN + - it allocates the xenstore shared page and sets HVM_PARAM_STORE_PFN - it calls xs_introduce_domain - Xenstored notices the new domain, initializes interfaces as usual, and sends an event channel notification to the domain using the xenstore event channel (HVM_PARAM_STORE_EVTCHN) - The Linux domU kernel receives the event channel notification, checks - HVM_PARAM_STORE_PFN and the connection status again and continue with - the initialization + HVM_PARAM_STORE_PFN again and continue with the initialization Limitations -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 11:55:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 11:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743710.1150666 (Exim 4.92) (envelope-from ) id 1sJtuE-0006ct-Sz; Wed, 19 Jun 2024 11:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743710.1150666; Wed, 19 Jun 2024 11: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 1sJtuE-0006cl-QT; Wed, 19 Jun 2024 11:55:14 +0000 Received: by outflank-mailman (input) for mailman id 743710; Wed, 19 Jun 2024 11:55:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJtuD-0006cZ-EL for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11:55:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJtuD-0002BN-DY for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJtuD-0002h6-Bv for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jMHRxyqb/Y3TLrojc3hNKhAmyXDQ2WWCtGNeDoHn304=; b=P4ReMPzT+oVHpEklOTlOLSkI6d tquOxJbJO8Nh17vz8yh7g8faKBF+LXUyHbp0En7qtXIEOd/ZbDcOQGzqFExFgs5VMxXIMYtza8U6M s4fVLICqRodTK38CWVa6y37VWjNymnYU6Z2yjjdpY47JGs7UiQ6NxLl9kGRfYNd7aQIQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert "xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor" Message-Id: Date: Wed, 19 Jun 2024 11:55:13 +0000 commit efa6e9f15ba943d154e8d7b29384581915b2aacd Author: Julien Grall AuthorDate: Wed Jun 19 12:48:09 2024 +0100 Commit: Julien Grall CommitDate: Wed Jun 19 12:48:47 2024 +0100 Revert "xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor" Michal reported that the gitlab CI is failing because of this series [1]. This reverts commit 6f9d90ea943b5e0c5d11a71090c49bbfd79e97ea. Signed-off-by: Julien Grall --- tools/helpers/init-dom0less.c | 58 ++++++++++++++++++++++++++++++++----------- xen/arch/arm/dom0less-build.c | 58 +------------------------------------------ 2 files changed, 45 insertions(+), 71 deletions(-) diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c index 325527f040..fee93459c4 100644 --- a/tools/helpers/init-dom0less.c +++ b/tools/helpers/init-dom0less.c @@ -16,18 +16,30 @@ #include "init-dom-json.h" +#define XENSTORE_PFN_OFFSET 1 #define STR_MAX_LENGTH 128 -static int get_xs_page(struct xc_interface_core *xch, libxl_dominfo *info, - uint64_t *xenstore_pfn) +static int alloc_xs_page(struct xc_interface_core *xch, + libxl_dominfo *info, + uint64_t *xenstore_pfn) { int rc; + const xen_pfn_t base = GUEST_MAGIC_BASE >> XC_PAGE_SHIFT; + xen_pfn_t p2m = (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET; - rc = xc_hvm_param_get(xch, info->domid, HVM_PARAM_STORE_PFN, xenstore_pfn); - if (rc < 0) { - fprintf(stderr,"Failed to get HVM_PARAM_STORE_PFN\n"); - return 1; - } + rc = xc_domain_setmaxmem(xch, info->domid, + info->max_memkb + (XC_PAGE_SIZE/1024)); + if (rc < 0) + return rc; + + rc = xc_domain_populate_physmap_exact(xch, info->domid, 1, 0, 0, &p2m); + if (rc < 0) + return rc; + + *xenstore_pfn = base + XENSTORE_PFN_OFFSET; + rc = xc_clear_domain_page(xch, info->domid, *xenstore_pfn); + if (rc < 0) + return rc; return 0; } @@ -88,7 +100,6 @@ static bool do_xs_write_vm(struct xs_handle *xsh, xs_transaction_t t, */ static int create_xenstore(struct xs_handle *xsh, libxl_dominfo *info, libxl_uuid uuid, - uint64_t xenstore_pfn, evtchn_port_t xenstore_port) { domid_t domid; @@ -134,7 +145,8 @@ static int create_xenstore(struct xs_handle *xsh, rc = snprintf(target_memkb_str, STR_MAX_LENGTH, "%"PRIu64, info->current_memkb); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; - rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%"PRIu64, xenstore_pfn); + rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%lld", + (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; rc = snprintf(xenstore_port_str, STR_MAX_LENGTH, "%u", xenstore_port); @@ -218,6 +230,7 @@ static int init_domain(struct xs_handle *xsh, libxl_uuid uuid; uint64_t xenstore_evtchn, xenstore_pfn; int rc; + struct xenstore_domain_interface *intf; printf("Init dom0less domain: %u\n", info->domid); @@ -232,11 +245,20 @@ static int init_domain(struct xs_handle *xsh, if (!xenstore_evtchn) return 0; - /* Get xenstore page */ - if (get_xs_page(xch, info, &xenstore_pfn) != 0) { - fprintf(stderr,"Error on getting xenstore page\n"); + /* Alloc xenstore page */ + if (alloc_xs_page(xch, info, &xenstore_pfn) != 0) { + printf("Error on alloc magic pages\n"); + return 1; + } + + intf = xenforeignmemory_map(xfh, info->domid, PROT_READ | PROT_WRITE, 1, + &xenstore_pfn, NULL); + if (!intf) { + printf("Error mapping xenstore page\n"); return 1; } + intf->connection = XENSTORE_RECONNECT; + xenforeignmemory_unmap(xfh, intf, 1); rc = xc_dom_gnttab_seed(xch, info->domid, true, (xen_pfn_t)-1, xenstore_pfn, 0, 0); @@ -250,11 +272,19 @@ static int init_domain(struct xs_handle *xsh, if (rc) err(1, "gen_stub_json_config"); - rc = create_xenstore(xsh, info, uuid, xenstore_pfn, xenstore_evtchn); + /* Now everything is ready: set HVM_PARAM_STORE_PFN */ + rc = xc_hvm_param_set(xch, info->domid, HVM_PARAM_STORE_PFN, + xenstore_pfn); + if (rc < 0) + return rc; + + rc = create_xenstore(xsh, info, uuid, xenstore_evtchn); if (rc) err(1, "writing to xenstore"); - rc = xs_introduce_domain(xsh, info->domid, xenstore_pfn, xenstore_evtchn); + rc = xs_introduce_domain(xsh, info->domid, + (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET, + xenstore_evtchn); if (!rc) err(1, "xs_introduce_domain"); return 0; diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index ef2ba85ff4..f919d3acf9 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include #include #include #include @@ -11,8 +10,6 @@ #include #include -#include - #include #include #include @@ -742,56 +739,6 @@ static int __init alloc_xenstore_evtchn(struct domain *d) return 0; } -#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) ) - { - free_domheap_page(xenstore_pg); - 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; -} - static int __init construct_domU(struct domain *d, const struct dt_device_node *node) { @@ -892,10 +839,7 @@ static int __init construct_domU(struct domain *d, rc = alloc_xenstore_evtchn(d); if ( rc < 0 ) return rc; - - rc = alloc_xenstore_page(d); - if ( rc < 0 ) - return rc; + d->arch.hvm.params[HVM_PARAM_STORE_PFN] = ~0ULL; } return rc; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:11:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743764.1150730 (Exim 4.92) (envelope-from ) id 1sJu9Y-0005MG-LO; Wed, 19 Jun 2024 12:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743764.1150730; Wed, 19 Jun 2024 12: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 1sJu9Y-0005M8-Ig; Wed, 19 Jun 2024 12:11:04 +0000 Received: by outflank-mailman (input) for mailman id 743764; Wed, 19 Jun 2024 12:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJu9X-0005M2-Sh for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJu9X-0002aD-NY for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJu9X-00044V-MB for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vynMsQIE6ZWVhTZ/da2MfEDj/Bd73E6n6cwSEV2foAs=; b=dFnyVZCwEgjfDrCNcBBo0CSn0H chzoDmOaMf/UBFs6vik2VSOtzc6h7OXy2ghaKrkJ7207oSR/8D+TvFBeh2JMXKIAoD1zfRgwWlrJW 4l9rQue07UuZnVvtv0qjH6jIRbYyir+f2UXQ5sdLpQW2uBOj2cP5b2+iWuA7S+HSKppQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/irq: Address MISRA Rule 8.3 violation Message-Id: Date: Wed, 19 Jun 2024 12:11:03 +0000 commit 82f480944718d9e8340a6ac1af41ece7851115bf Author: Andrew Cooper AuthorDate: Tue Jun 18 13:48:35 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 xen/irq: Address MISRA Rule 8.3 violation When centralising irq_ack_none(), different architectures had different names for the parameter. As it's type is struct irq_desc *, it should be named desc. Make this consistent. No functional change. Fixes: 8aeda4a241ab ("arch/irq: Make irq_ack_none() mandatory") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/irq.c | 4 ++-- xen/include/xen/irq.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index c60502444c..6b89f64fd1 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -31,9 +31,9 @@ struct irq_guest unsigned int virq; }; -void irq_ack_none(struct irq_desc *irq) +void irq_ack_none(struct irq_desc *desc) { - printk("unexpected IRQ trap at irq %02x\n", irq->irq); + printk("unexpected IRQ trap at irq %02x\n", desc->irq); } void irq_end_none(struct irq_desc *irq) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index adf33547d2..580ae37e74 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -134,7 +134,7 @@ void cf_check irq_actor_none(struct irq_desc *desc); * irq_ack_none() must be provided by the architecture. * irq_end_none() is optional, and opted into using a define. */ -void cf_check irq_ack_none(struct irq_desc *irq); +void cf_check irq_ack_none(struct irq_desc *desc); /* * Per-cpu interrupted context register state - the inner-most interrupt frame -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743765.1150733 (Exim 4.92) (envelope-from ) id 1sJu9i-0005OL-MW; Wed, 19 Jun 2024 12:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743765.1150733; Wed, 19 Jun 2024 12: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 1sJu9i-0005OD-K4; Wed, 19 Jun 2024 12:11:14 +0000 Received: by outflank-mailman (input) for mailman id 743765; Wed, 19 Jun 2024 12:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJu9h-0005Nz-Ru for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJu9h-0002aY-R4 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJu9h-00045C-Ph for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PjLxUhxP45mvyH+6VcKKOr8e+3wr5ueagTfKXsygDao=; b=IEFcRaHv9YSW/bfq/h8xCbGdYj A90GeECqFDrc1ebgHmhg2l9gO/wK4FuXN+65uOWWfwPeniiTwB518IId51XFQNbNneNMdAzvGcI9K xJ9vaiKR3RQl3Lbe7OqhThMKZJ6UtU9t/W6V5BbpVYNeWLz/tFtM0bjK5a6GZX7jS6SU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arch: Centralise __read_mostly and __ro_after_init Message-Id: Date: Wed, 19 Jun 2024 12:11:13 +0000 commit aba98c8d671bd290e978ec154d0baf042e093a65 Author: Andrew Cooper AuthorDate: Fri Jun 14 13:05:40 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 xen/arch: Centralise __read_mostly and __ro_after_init These living in cache.h is inherited from Linux, but cache.h is not a terribly appropriately location for them to live. __read_mostly is an optimisation related to data placement in order to avoid having shared data in cachelines that are likely to be written to, but it really is just a section of the linked image separating data by usage patterns; it has nothing to do with cache sizes or flushing logic. Worse, __ro_after_init was only in xen/cache.h because __read_mostly was in arch/cache.h, and has literally nothing whatsoever to do with caches. Move the definitions into xen/sections.h, which in particular means that RISC-V doesn't need to repeat the problematic pattern. Take the opportunity to provide a short descriptions of what these are used for. For now, leave TODO comments next to the other identical definitions. It turns out that unpicking cache.h is more complicated than it appears because a number of files use it for transitive dependencies. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- xen/arch/arm/include/asm/cache.h | 1 + xen/arch/ppc/include/asm/cache.h | 1 + xen/arch/x86/include/asm/cache.h | 1 + xen/include/xen/cache.h | 1 + xen/include/xen/sections.h | 21 +++++++++++++++++++++ 5 files changed, 25 insertions(+) diff --git a/xen/arch/arm/include/asm/cache.h b/xen/arch/arm/include/asm/cache.h index 240b6ae0ea..029b2896fb 100644 --- a/xen/arch/arm/include/asm/cache.h +++ b/xen/arch/arm/include/asm/cache.h @@ -6,6 +6,7 @@ #define L1_CACHE_SHIFT (CONFIG_ARM_L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +/* TODO: Phase out the use of this via cache.h */ #define __read_mostly __section(".data.read_mostly") #endif diff --git a/xen/arch/ppc/include/asm/cache.h b/xen/arch/ppc/include/asm/cache.h index 0d7323d789..13c0bf3242 100644 --- a/xen/arch/ppc/include/asm/cache.h +++ b/xen/arch/ppc/include/asm/cache.h @@ -3,6 +3,7 @@ #ifndef _ASM_PPC_CACHE_H #define _ASM_PPC_CACHE_H +/* TODO: Phase out the use of this via cache.h */ #define __read_mostly __section(".data.read_mostly") #endif /* _ASM_PPC_CACHE_H */ diff --git a/xen/arch/x86/include/asm/cache.h b/xen/arch/x86/include/asm/cache.h index e4770efb22..956c05493e 100644 --- a/xen/arch/x86/include/asm/cache.h +++ b/xen/arch/x86/include/asm/cache.h @@ -9,6 +9,7 @@ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +/* TODO: Phase out the use of this via cache.h */ #define __read_mostly __section(".data.read_mostly") #ifndef __ASSEMBLY__ diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index f52a0aedf7..55456823c5 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,6 +15,7 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif +/* TODO: Phase out the use of this via cache.h */ #define __ro_after_init __section(".data.ro_after_init") #endif /* __LINUX_CACHE_H */ diff --git a/xen/include/xen/sections.h b/xen/include/xen/sections.h index b6cb5604c2..f2fac8d7fa 100644 --- a/xen/include/xen/sections.h +++ b/xen/include/xen/sections.h @@ -3,9 +3,30 @@ #ifndef __XEN_SECTIONS_H__ #define __XEN_SECTIONS_H__ +#include + /* SAF-0-safe */ extern char __init_begin[], __init_end[]; +/* + * Some data is expected to be written rarely (if at all). + * + * For performance reasons is it helpful to group such data in the build, to + * avoid the linker placing it adjacent to often-written data. + */ +#define __read_mostly __section(".data.read_mostly") + +/* + * Some data should be chosen during boot and be immutable thereafter. + * + * Variables annotated with __ro_after_init will become read-only after boot + * and suffer a runtime access fault if modified. + * + * For architectures/platforms which haven't implemented support, these + * variables will be treated as regular mutable data. + */ +#define __ro_after_init __section(".data.ro_after_init") + #endif /* !__XEN_SECTIONS_H__ */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:11:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743766.1150738 (Exim 4.92) (envelope-from ) id 1sJu9s-0005Qs-OJ; Wed, 19 Jun 2024 12:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743766.1150738; Wed, 19 Jun 2024 12: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 1sJu9s-0005Qk-LV; Wed, 19 Jun 2024 12:11:24 +0000 Received: by outflank-mailman (input) for mailman id 743766; Wed, 19 Jun 2024 12:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJu9r-0005Qa-V4 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJu9r-0002an-UC for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJu9r-00047K-TG for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YtRlx1uM2O7sKtvUiUnPUGKeMTwzR/HwvHIkid3fLdw=; b=RQdlgsxK1L4bXp6nUjhMR2W0uL RcuY2dwDeXLPdewr5wjNE8K5Lp9ZIQpSwNgpJVawCLzxd4S9KiJK4g7QDqnFH/KYoDIgFwAecyjxs gUPGUVNrLGOA313yYgHjfJp6VWrCLE8YcB6xdW7Cqu9DrGzfE3o3PW01jJmqholqOvhg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/xstate: Fix initialisation of XSS cache Message-Id: Date: Wed, 19 Jun 2024 12:11:23 +0000 commit 9e6dbbe8bf400aacb99009ddffa91d2a0c312b39 Author: Andrew Cooper AuthorDate: Wed May 22 17:23:54 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/xstate: Fix initialisation of XSS cache The clobbering of this_cpu(xcr0) and this_cpu(xss) to architecturally invalid values is to force the subsequent set_xcr0() and set_msr_xss() to reload the hardware register. While XCR0 is reloaded in xstate_init(), MSR_XSS isn't. This causes get_msr_xss() to return the invalid value, and logic of the form: old = get_msr_xss(); set_msr_xss(new); ... set_msr_xss(old); to try and restore said invalid value. The architecturally invalid value must be purged from the cache, meaning the hardware register must be written at least once. This in turn highlights that the invalid value must only be used in the case that the hardware register is available. Fixes: f7f4a523927f ("x86/xstate: reset cached register values on resume") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/xstate.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 99cedb4f5e..7578814796 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -641,13 +641,6 @@ void xstate_init(struct cpuinfo_x86 *c) return; } - /* - * Zap the cached values to make set_xcr0() and set_msr_xss() really - * write it. - */ - this_cpu(xcr0) = 0; - this_cpu(xss) = ~0; - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; BUG_ON(!valid_xcr0(feature_mask)); @@ -657,8 +650,19 @@ void xstate_init(struct cpuinfo_x86 *c) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); + + /* + * Zap the cached values to make set_xcr0() and set_msr_xss() really write + * the hardware register. + */ + this_cpu(xcr0) = 0; if ( !set_xcr0(feature_mask) ) BUG(); + if ( cpu_has_xsaves ) + { + this_cpu(xss) = ~0; + set_msr_xss(0); + } if ( bsp ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:11:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743771.1150742 (Exim 4.92) (envelope-from ) id 1sJuA3-0005TX-Pp; Wed, 19 Jun 2024 12:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743771.1150742; Wed, 19 Jun 2024 12:11: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 1sJuA3-0005TQ-N6; Wed, 19 Jun 2024 12:11:35 +0000 Received: by outflank-mailman (input) for mailman id 743771; Wed, 19 Jun 2024 12:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuA2-0005TF-Eo for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuA2-0002b1-17 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJuA2-00048E-08 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u6Uc+7yvyVIgj6AgMuTQXsIXJfHrgtH+Fdnz+ff+XrY=; b=ihpTtXk/dL9Jh8Js2fpyJx3yzE PjDrXxd5V+nU87HTcJcAr+gb3qAljGhmB63yss5oc2zgQ2sze3zky25FArIcC5ckR3nQwifuucXUO h1jv53S+D39FeUqRYnPUDmw8fY9KUBHvjfPk4MXvris/BfZG6JM1jqRDKEKv4aY3TVeU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/xstate: Cross-check dynamic XSTATE sizes at boot Message-Id: Date: Wed, 19 Jun 2024 12:11:34 +0000 commit d31a111940de5431c8bf465b1d38b89f1130a24b Author: Andrew Cooper AuthorDate: Fri Feb 21 17:56:57 2020 +0000 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/xstate: Cross-check dynamic XSTATE sizes at boot Right now, xstate_ctxt_size() performs a cross-check of size with CPUID in for every call. This is expensive, being used for domain create/migrate, as well as to service certain guest CPUID instructions. Instead, arrange to check the sizes once at boot. See the code comments for details. Right now, it just checks hardware against the algorithm expectations. Later patches will cross-check Xen's XSTATE calculations too. Introduce more X86_XCR0_* and X86_XSS_* constants CPUID bits. This is to maximise coverage in the sanity check, even if we don't expect to use/virtualise some of these features any time soon. Leave HDC and HWP alone for now; we don't have CPUID bits from them stored nicely. Only perform the cross-checks when SELF_TESTS are active. It's only developers or new hardware liable to trip these checks, and Xen at least tracks "maximum value ever seen in xcr0" for the lifetime of the VM, which we don't want to be tickling in the general case. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/x86-defns.h | 25 +++- xen/arch/x86/xstate.c | 170 ++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 + 3 files changed, 197 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index 48d7a3b7af..d7602ab225 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -77,7 +77,7 @@ #define X86_CR4_PKS 0x01000000 /* Protection Key Supervisor */ /* - * XSTATE component flags in XCR0 + * XSTATE component flags in XCR0 | MSR_XSS */ #define X86_XCR0_FP_POS 0 #define X86_XCR0_FP (1ULL << X86_XCR0_FP_POS) @@ -95,11 +95,34 @@ #define X86_XCR0_ZMM (1ULL << X86_XCR0_ZMM_POS) #define X86_XCR0_HI_ZMM_POS 7 #define X86_XCR0_HI_ZMM (1ULL << X86_XCR0_HI_ZMM_POS) +#define X86_XSS_PROC_TRACE (_AC(1, ULL) << 8) #define X86_XCR0_PKRU_POS 9 #define X86_XCR0_PKRU (1ULL << X86_XCR0_PKRU_POS) +#define X86_XSS_PASID (_AC(1, ULL) << 10) +#define X86_XSS_CET_U (_AC(1, ULL) << 11) +#define X86_XSS_CET_S (_AC(1, ULL) << 12) +#define X86_XSS_HDC (_AC(1, ULL) << 13) +#define X86_XSS_UINTR (_AC(1, ULL) << 14) +#define X86_XSS_LBR (_AC(1, ULL) << 15) +#define X86_XSS_HWP (_AC(1, ULL) << 16) +#define X86_XCR0_TILE_CFG (_AC(1, ULL) << 17) +#define X86_XCR0_TILE_DATA (_AC(1, ULL) << 18) #define X86_XCR0_LWP_POS 62 #define X86_XCR0_LWP (1ULL << X86_XCR0_LWP_POS) +#define X86_XCR0_STATES \ + (X86_XCR0_FP | X86_XCR0_SSE | X86_XCR0_YMM | X86_XCR0_BNDREGS | \ + X86_XCR0_BNDCSR | X86_XCR0_OPMASK | X86_XCR0_ZMM | \ + X86_XCR0_HI_ZMM | X86_XCR0_PKRU | X86_XCR0_TILE_CFG | \ + X86_XCR0_TILE_DATA | \ + X86_XCR0_LWP) + +#define X86_XSS_STATES \ + (X86_XSS_PROC_TRACE | X86_XSS_PASID | X86_XSS_CET_U | \ + X86_XSS_CET_S | X86_XSS_HDC | X86_XSS_UINTR | X86_XSS_LBR | \ + X86_XSS_HWP | \ + 0) + /* * Debug status flags in DR6. * diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 7578814796..408d9dd108 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -604,9 +604,176 @@ static bool valid_xcr0(uint64_t xcr0) if ( !(xcr0 & X86_XCR0_BNDREGS) != !(xcr0 & X86_XCR0_BNDCSR) ) return false; + /* TILECFG and TILEDATA must be the same. */ + if ( !(xcr0 & X86_XCR0_TILE_CFG) != !(xcr0 & X86_XCR0_TILE_DATA) ) + return false; + return true; } +struct xcheck_state { + uint64_t states; + uint32_t uncomp_size; + uint32_t comp_size; +}; + +static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) +{ + uint32_t hw_size; + + BUILD_BUG_ON(X86_XCR0_STATES & X86_XSS_STATES); + + BUG_ON(new <= s->states); /* States strictly increase by index. */ + BUG_ON(s->states & new); /* States only accumulate. */ + BUG_ON(!valid_xcr0(s->states | new)); /* Xen thinks it's a good value. */ + BUG_ON(new & ~(X86_XCR0_STATES | X86_XSS_STATES)); /* Known state. */ + BUG_ON((new & X86_XCR0_STATES) && + (new & X86_XSS_STATES)); /* User or supervisor, not both. */ + + s->states |= new; + if ( new & X86_XCR0_STATES ) + { + if ( !set_xcr0(s->states & X86_XCR0_STATES) ) + BUG(); + } + else + set_msr_xss(s->states & X86_XSS_STATES); + + /* + * Check the uncompressed size. First ask hardware. + */ + hw_size = cpuid_count_ebx(0xd, 0); + + if ( new & X86_XSS_STATES ) + { + /* + * Supervisor states don't exist in an uncompressed image, so check + * that the uncompressed size doesn't change. Otherwise... + */ + if ( hw_size != s->uncomp_size ) + panic("XSTATE 0x%016"PRIx64", new sup bits {%63pbl}, uncompressed hw size %#x != prev size %#x\n", + s->states, &new, hw_size, s->uncomp_size); + } + else + { + /* + * ... some user XSTATEs are out-of-order and fill in prior holes. + * The best check we make is that the size never decreases. + */ + if ( hw_size < s->uncomp_size ) + panic("XSTATE 0x%016"PRIx64", new bits {%63pbl}, uncompressed hw size %#x < prev size %#x\n", + s->states, &new, hw_size, s->uncomp_size); + } + + s->uncomp_size = hw_size; + + /* + * Check the compressed size, if available. + */ + hw_size = cpuid_count_ebx(0xd, 1); + + if ( cpu_has_xsavec ) + { + /* + * All components strictly appear in index order, irrespective of + * whether they're user or supervisor. As each component also has + * non-zero size, the accumulated size should strictly increase. + */ + if ( hw_size <= s->comp_size ) + panic("XSTATE 0x%016"PRIx64", new bits {%63pbl}, compressed hw size %#x <= prev size %#x\n", + s->states, &new, hw_size, s->comp_size); + + s->comp_size = hw_size; + } + else if ( hw_size ) /* Compressed size reported, but no XSAVEC ? */ + { + static bool once; + + if ( !once ) + { + WARN(); + once = true; + } + } +} + +/* + * The {un,}compressed XSTATE sizes are reported by dynamic CPUID value, based + * on the current %XCR0 and MSR_XSS values. The exact layout is also feature + * and vendor specific. Cross-check Xen's understanding against real hardware + * on boot. + * + * Testing every combination is prohibitive, so we use a partial approach. + * Starting with nothing active, we add new XSTATEs and check that the CPUID + * dynamic values never decreases. + */ +static void __init noinline xstate_check_sizes(void) +{ + uint64_t old_xcr0 = get_xcr0(); + uint64_t old_xss = get_msr_xss(); + struct xcheck_state s = {}; + + /* + * User and supervisor XSTATEs, increasing by index. + * + * Chronologically, Intel and AMD had identical layouts for AVX (YMM). + * AMD introduced LWP in Fam15h, following immediately on from YMM. Intel + * left an LWP-shaped hole when adding MPX (BND{CSR,REGS}) in Skylake. + * AMD removed LWP in Fam17h, putting PKRU in the same space, breaking + * layout compatibility with Intel and having a knock-on effect on all + * subsequent states. + */ + check_new_xstate(&s, X86_XCR0_SSE | X86_XCR0_FP); + + if ( cpu_has_avx ) + check_new_xstate(&s, X86_XCR0_YMM); + + if ( cpu_has_mpx ) + check_new_xstate(&s, X86_XCR0_BNDCSR | X86_XCR0_BNDREGS); + + if ( cpu_has_avx512f ) + check_new_xstate(&s, X86_XCR0_HI_ZMM | X86_XCR0_ZMM | X86_XCR0_OPMASK); + + /* + * Intel Broadwell has Processor Trace but no XSAVES. There doesn't + * appear to have been a new enumeration when X86_XSS_PROC_TRACE was + * introduced in Skylake. + */ + if ( cpu_has_xsaves && cpu_has_proc_trace ) + check_new_xstate(&s, X86_XSS_PROC_TRACE); + + if ( cpu_has_pku ) + check_new_xstate(&s, X86_XCR0_PKRU); + + if ( cpu_has_xsaves && boot_cpu_has(X86_FEATURE_ENQCMD) ) + check_new_xstate(&s, X86_XSS_PASID); + + if ( cpu_has_xsaves && (boot_cpu_has(X86_FEATURE_CET_SS) || + boot_cpu_has(X86_FEATURE_CET_IBT)) ) + { + check_new_xstate(&s, X86_XSS_CET_U); + check_new_xstate(&s, X86_XSS_CET_S); + } + + if ( cpu_has_xsaves && boot_cpu_has(X86_FEATURE_UINTR) ) + check_new_xstate(&s, X86_XSS_UINTR); + + if ( cpu_has_xsaves && boot_cpu_has(X86_FEATURE_ARCH_LBR) ) + check_new_xstate(&s, X86_XSS_LBR); + + if ( boot_cpu_has(X86_FEATURE_AMX_TILE) ) + check_new_xstate(&s, X86_XCR0_TILE_DATA | X86_XCR0_TILE_CFG); + + if ( boot_cpu_has(X86_FEATURE_LWP) ) + check_new_xstate(&s, X86_XCR0_LWP); + + /* Restore old state now the test is done. */ + if ( !set_xcr0(old_xcr0) ) + BUG(); + if ( cpu_has_xsaves ) + set_msr_xss(old_xss); +} + /* Collect the information of processor's extended state */ void xstate_init(struct cpuinfo_x86 *c) { @@ -683,6 +850,9 @@ void xstate_init(struct cpuinfo_x86 *c) if ( setup_xstate_features(bsp) && bsp ) BUG(); + + if ( IS_ENABLED(CONFIG_SELF_TESTS) && bsp ) + xstate_check_sizes(); } int validate_xstate(const struct domain *d, uint64_t xcr0, uint64_t xcr0_accum, diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 6627453e39..d9eba5e9a7 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -266,6 +266,7 @@ XEN_CPUFEATURE(IBPB_RET, 8*32+30) /*A IBPB clears RSB/RAS too. */ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ XEN_CPUFEATURE(FSRM, 9*32+ 4) /*A Fast Short REP MOVS */ +XEN_CPUFEATURE(UINTR, 9*32+ 5) /* User-mode Interrupts */ XEN_CPUFEATURE(AVX512_VP2INTERSECT, 9*32+8) /*a VP2INTERSECT{D,Q} insns */ XEN_CPUFEATURE(SRBDS_CTRL, 9*32+ 9) /* MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. */ XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*!A| VERW clears microarchitectural buffers */ @@ -274,8 +275,10 @@ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*A SERIALIZE insn */ XEN_CPUFEATURE(HYBRID, 9*32+15) /* Heterogeneous platform */ XEN_CPUFEATURE(TSXLDTRK, 9*32+16) /*a TSX load tracking suspend/resume insns */ +XEN_CPUFEATURE(ARCH_LBR, 9*32+19) /* Architectural Last Branch Record */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(AVX512_FP16, 9*32+23) /*A AVX512 FP16 instructions */ +XEN_CPUFEATURE(AMX_TILE, 9*32+24) /* AMX Tile architecture */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ XEN_CPUFEATURE(L1D_FLUSH, 9*32+28) /*S MSR_FLUSH_CMD and L1D flush. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:11:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:11:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743773.1150746 (Exim 4.92) (envelope-from ) id 1sJuAC-0005W3-RF; Wed, 19 Jun 2024 12:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743773.1150746; Wed, 19 Jun 2024 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 1sJuAC-0005Vv-Oe; Wed, 19 Jun 2024 12:11:44 +0000 Received: by outflank-mailman (input) for mailman id 743773; Wed, 19 Jun 2024 12:11:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAC-0005Vp-4o for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAC-0002bB-43 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJuAC-00048j-3L for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W6ujRYn/cbIUnDPsofVTGfnWpyO9FFMwg4O9QBNVr+I=; b=CefB920BafGjPT+Cspwy0r7G2i XqJDXIraT0bzEbl1eycFVvk4eegD+O0QGBhyu8opiqgsVTUl4crUhyk1mGMQqDgf5x6FdSTwmON5L 7r86PIwY3H8BY/jc3wlvO/T2szqu29CUblSHDWJP+bEYzVxpK1sO/S5DnuaFofbn8KhM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Collect the Raw CPU Policy earlier on boot Message-Id: Date: Wed, 19 Jun 2024 12:11:44 +0000 commit a09022a09e1a79b3f9574993993bfad803b32596 Author: Andrew Cooper AuthorDate: Thu May 23 00:55:34 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/boot: Collect the Raw CPU Policy earlier on boot This is a tangle, but it's a small step in the right direction. In the following change, xstate_init() is going to start using the Raw policy. calculate_raw_cpu_policy() is sufficiently separate from the other policies to safely move like this. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu-policy.c | 1 - xen/arch/x86/setup.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index b96f4ee55c..5b66f002df 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -845,7 +845,6 @@ static void __init calculate_hvm_def_policy(void) void __init init_guest_cpu_policies(void) { - calculate_raw_cpu_policy(); calculate_host_policy(); if ( IS_ENABLED(CONFIG_PV) ) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index dd51e68dbe..eee20bb175 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1888,7 +1888,9 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ - identify_cpu(&boot_cpu_data); + calculate_raw_cpu_policy(); /* Needs microcode. No other dependenices. */ + + identify_cpu(&boot_cpu_data); /* Needs microcode and raw policy. */ set_in_cr4(X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:11:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:11:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743775.1150749 (Exim 4.92) (envelope-from ) id 1sJuAM-0005aE-UA; Wed, 19 Jun 2024 12:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743775.1150749; Wed, 19 Jun 2024 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 1sJuAM-0005a6-RW; Wed, 19 Jun 2024 12:11:54 +0000 Received: by outflank-mailman (input) for mailman id 743775; Wed, 19 Jun 2024 12:11:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAM-0005Zu-8K for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAM-0002bP-7R for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJuAM-00049A-6Y for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=L5q3AQlHg8qwF6c7N/ncaAlG5kkqCJk8nIiVREsjZOk=; b=dK8kpqHhigigfbSMR7I9Ry4UIS gKrBA6HPEQYfGwDcEdj5g1K+JvxffF33ZmCGkTTxGWm86g26FKuXBsJgfm1yT6RU+rtDRaTzpEPKF oRCCnoS9xi1ARcsYFt3SNVK/OScsgOd2CPCj5z6YnvmKzSEsn8Fw1fDJEv6Fe8IyS5VU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/xstate: Rework xstate_ctxt_size() as xstate_uncompressed_size() Message-Id: Date: Wed, 19 Jun 2024 12:11:54 +0000 commit df09dfb94de66f7523837c050616a382aa2c7d17 Author: Andrew Cooper AuthorDate: Fri Apr 30 20:17:55 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/xstate: Rework xstate_ctxt_size() as xstate_uncompressed_size() We're soon going to need a compressed helper of the same form. The size of the uncompressed image depends on the single element with the largest offset + size. Sadly this isn't always the element with the largest index. Name the per-xstate-component cpu_policy struture, for legibility of the logic in xstate_uncompressed_size(). Cross-check with hardware during boot, and remove hw_uncompressed_size(). This means that the migration paths don't need to mess with XCR0 just to sanity check the buffer size. It also means we can drop the "fastpath" check against xfeature_mask (there to skip some XCR0 writes); this path is going to be dead logic the moment Xen starts using supervisor states itself. The users of hw_uncompressed_size() in xstate_init() can (and indeed need) to be replaced with CPUID instructions. They run with feature_mask in XCR0, and prior to setup_xstate_features() on the BSP. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/include/asm/xstate.h | 2 +- xen/arch/x86/xstate.c | 79 ++++++++++++++++++++++-------------- xen/include/xen/lib/x86/cpu-policy.h | 2 +- 5 files changed, 52 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 335aedf46d..9190e11faa 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -833,7 +833,7 @@ long arch_do_domctl( uint32_t offset = 0; #define PV_XSAVE_HDR_SIZE (2 * sizeof(uint64_t)) -#define PV_XSAVE_SIZE(xcr0) (PV_XSAVE_HDR_SIZE + xstate_ctxt_size(xcr0)) +#define PV_XSAVE_SIZE(xcr0) (PV_XSAVE_HDR_SIZE + xstate_uncompressed_size(xcr0)) ret = -ESRCH; if ( (evc->vcpu >= d->max_vcpus) || diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8334ab1711..7f4b627b1f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1206,7 +1206,7 @@ HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, NULL, hvm_load_cpu_ctxt, 1, #define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ save_area) + \ - xstate_ctxt_size(xcr0)) + xstate_uncompressed_size(xcr0)) static int cf_check hvm_save_cpu_xsave_states( struct vcpu *v, hvm_domain_context_t *h) diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index c08c267884..f5115199d4 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -107,7 +107,7 @@ void compress_xsave_states(struct vcpu *v, const void *src, unsigned int size); void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(struct cpuinfo_x86 *c); -unsigned int xstate_ctxt_size(u64 xcr0); +unsigned int xstate_uncompressed_size(uint64_t xcr0); static inline uint64_t xgetbv(unsigned int index) { diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 408d9dd108..c8bc40fb5c 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -8,6 +8,8 @@ #include #include #include + +#include #include #include #include @@ -183,7 +185,7 @@ void expand_xsave_states(const struct vcpu *v, void *dest, unsigned int size) /* Check there is state to serialise (i.e. at least an XSAVE_HDR) */ BUG_ON(!v->arch.xcr0_accum); /* Check there is the correct room to decompress into. */ - BUG_ON(size != xstate_ctxt_size(v->arch.xcr0_accum)); + BUG_ON(size != xstate_uncompressed_size(v->arch.xcr0_accum)); if ( !(xstate->xsave_hdr.xcomp_bv & XSTATE_COMPACTION_ENABLED) ) { @@ -245,7 +247,7 @@ void compress_xsave_states(struct vcpu *v, const void *src, unsigned int size) u64 xstate_bv, valid; BUG_ON(!v->arch.xcr0_accum); - BUG_ON(size != xstate_ctxt_size(v->arch.xcr0_accum)); + BUG_ON(size != xstate_uncompressed_size(v->arch.xcr0_accum)); ASSERT(!xsave_area_compressed(src)); xstate_bv = ((const struct xsave_struct *)src)->xsave_hdr.xstate_bv; @@ -553,32 +555,6 @@ void xstate_free_save_area(struct vcpu *v) v->arch.xsave_area = NULL; } -static unsigned int hw_uncompressed_size(uint64_t xcr0) -{ - u64 act_xcr0 = get_xcr0(); - unsigned int size; - bool ok = set_xcr0(xcr0); - - ASSERT(ok); - size = cpuid_count_ebx(XSTATE_CPUID, 0); - ok = set_xcr0(act_xcr0); - ASSERT(ok); - - return size; -} - -/* Fastpath for common xstate size requests, avoiding reloads of xcr0. */ -unsigned int xstate_ctxt_size(u64 xcr0) -{ - if ( xcr0 == xfeature_mask ) - return xsave_cntxt_size; - - if ( xcr0 == 0 ) /* TODO: clean up paths passing 0 in here. */ - return 0; - - return hw_uncompressed_size(xcr0); -} - static bool valid_xcr0(uint64_t xcr0) { /* FP must be unconditionally set. */ @@ -611,6 +587,38 @@ static bool valid_xcr0(uint64_t xcr0) return true; } +unsigned int xstate_uncompressed_size(uint64_t xcr0) +{ + unsigned int size = XSTATE_AREA_MIN_SIZE, i; + + /* Non-XCR0 states don't exist in an uncompressed image. */ + ASSERT((xcr0 & ~X86_XCR0_STATES) == 0); + + if ( xcr0 == 0 ) + return 0; + + if ( xcr0 <= (X86_XCR0_SSE | X86_XCR0_FP) ) + return size; + + /* + * For the non-legacy states, search all activate states and find the + * maximum offset+size. Some states (e.g. LWP, APX_F) are out-of-order + * with respect their index. + */ + xcr0 &= ~(X86_XCR0_SSE | X86_XCR0_FP); + for_each_set_bit ( i, &xcr0, 63 ) + { + const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; + unsigned int s = c->offset + c->size; + + ASSERT(c->offset && c->size); + + size = max(size, s); + } + + return size; +} + struct xcheck_state { uint64_t states; uint32_t uncomp_size; @@ -619,7 +627,7 @@ struct xcheck_state { static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) { - uint32_t hw_size; + uint32_t hw_size, xen_size; BUILD_BUG_ON(X86_XCR0_STATES & X86_XSS_STATES); @@ -667,6 +675,15 @@ static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) s->uncomp_size = hw_size; + /* + * Second, check that Xen's calculation always matches hardware's. + */ + xen_size = xstate_uncompressed_size(s->states & X86_XCR0_STATES); + + if ( xen_size != hw_size ) + panic("XSTATE 0x%016"PRIx64", uncompressed hw size %#x != xen size %#x\n", + s->states, hw_size, xen_size); + /* * Check the compressed size, if available. */ @@ -838,14 +855,14 @@ void xstate_init(struct cpuinfo_x86 *c) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = hw_uncompressed_size(feature_mask); + xsave_cntxt_size = cpuid_count_ebx(0xd, 0); printk("xstate: size: %#x and states: %#"PRIx64"\n", xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != hw_uncompressed_size(feature_mask)); + BUG_ON(xsave_cntxt_size != cpuid_count_ebx(0xd, 0)); } if ( setup_xstate_features(bsp) && bsp ) diff --git a/xen/include/xen/lib/x86/cpu-policy.h b/xen/include/xen/lib/x86/cpu-policy.h index d5e447e9dc..d26012c6da 100644 --- a/xen/include/xen/lib/x86/cpu-policy.h +++ b/xen/include/xen/lib/x86/cpu-policy.h @@ -248,7 +248,7 @@ struct cpu_policy }; /* Per-component common state. Valid for i >= 2. */ - struct { + struct xstate_component { uint32_t size, offset; bool xss:1, align:1; uint32_t _res_d; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:12:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:12:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743777.1150753 (Exim 4.92) (envelope-from ) id 1sJuAW-0005d7-Vf; Wed, 19 Jun 2024 12:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743777.1150753; Wed, 19 Jun 2024 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 1sJuAW-0005cz-T4; Wed, 19 Jun 2024 12:12:04 +0000 Received: by outflank-mailman (input) for mailman id 743777; Wed, 19 Jun 2024 12:12:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAW-0005ct-C6 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAW-0002c5-AX for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJuAW-0004AT-9a for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wiyeit4+HQsND40dulcOovMlIPqlKTsh7UBiQXKwq0c=; b=bquWZdtIWB7wSRagedhyZAtkxH yG+MytLosrEW32XVEHPGZS9ppsEW/ffhkQFeI0FP3mzfBdSYwEr0r4Krq6moqBX4HHkOMOnNqLX+q GPaHYs/UrpOfLpdgqXQX8BvSw5UXEnBBK6a1wGCKdyp97GysBHaI2L3penkQKNj410r4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpu-policy: Simplify recalculate_xstate() Message-Id: Date: Wed, 19 Jun 2024 12:12:04 +0000 commit fdb7e77fea4cb1c98dc51dd891a47f7e94612ad4 Author: Andrew Cooper AuthorDate: Fri Apr 30 20:17:55 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/cpu-policy: Simplify recalculate_xstate() Make use of xstate_uncompressed_size() helper rather than maintaining the running calculation while accumulating feature components. The rest of the CPUID data can come direct from the raw cpu policy. All per-component data form an ABI through the behaviour of the X{SAVE,RSTOR}* instructions. Use for_each_set_bit() rather than opencoding a slightly awkward version of it. Mask the attributes in ecx down based on the visible features. This isn't actually necessary for any components or attributes defined at the time of writing (up to AMX), but is added out of an abundance of caution. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu-policy.c | 55 ++++++++++++++------------------------- xen/arch/x86/include/asm/xstate.h | 1 + 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 5b66f002df..304dc20cfa 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -193,8 +193,7 @@ static void sanitise_featureset(uint32_t *fs) static void recalculate_xstate(struct cpu_policy *p) { uint64_t xstates = XSTATE_FP_SSE; - uint32_t xstate_size = XSTATE_AREA_MIN_SIZE; - unsigned int i, Da1 = p->xstate.Da1; + unsigned int i, ecx_mask = 0, Da1 = p->xstate.Da1; /* * The Da1 leaf is the only piece of information preserved in the common @@ -206,61 +205,47 @@ static void recalculate_xstate(struct cpu_policy *p) return; if ( p->basic.avx ) - { xstates |= X86_XCR0_YMM; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_YMM_POS] + - xstate_sizes[X86_XCR0_YMM_POS]); - } if ( p->feat.mpx ) - { xstates |= X86_XCR0_BNDREGS | X86_XCR0_BNDCSR; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_BNDCSR_POS] + - xstate_sizes[X86_XCR0_BNDCSR_POS]); - } if ( p->feat.avx512f ) - { xstates |= X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_HI_ZMM_POS] + - xstate_sizes[X86_XCR0_HI_ZMM_POS]); - } if ( p->feat.pku ) - { xstates |= X86_XCR0_PKRU; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_PKRU_POS] + - xstate_sizes[X86_XCR0_PKRU_POS]); - } - p->xstate.max_size = xstate_size; + /* Subleaf 0 */ + p->xstate.max_size = + xstate_uncompressed_size(xstates & ~XSTATE_XSAVES_ONLY); p->xstate.xcr0_low = xstates & ~XSTATE_XSAVES_ONLY; p->xstate.xcr0_high = (xstates & ~XSTATE_XSAVES_ONLY) >> 32; + /* Subleaf 1 */ p->xstate.Da1 = Da1; + if ( p->xstate.xsavec ) + ecx_mask |= XSTATE_ALIGN64; + if ( p->xstate.xsaves ) { + ecx_mask |= XSTATE_XSS; p->xstate.xss_low = xstates & XSTATE_XSAVES_ONLY; p->xstate.xss_high = (xstates & XSTATE_XSAVES_ONLY) >> 32; } - else - xstates &= ~XSTATE_XSAVES_ONLY; - for ( i = 2; i < min(63UL, ARRAY_SIZE(p->xstate.comp)); ++i ) + /* Subleafs 2+ */ + xstates &= ~XSTATE_FP_SSE; + BUILD_BUG_ON(ARRAY_SIZE(p->xstate.comp) < 63); + for_each_set_bit ( i, &xstates, 63 ) { - uint64_t curr_xstate = 1UL << i; - - if ( !(xstates & curr_xstate) ) - continue; - - p->xstate.comp[i].size = xstate_sizes[i]; - p->xstate.comp[i].offset = xstate_offsets[i]; - p->xstate.comp[i].xss = curr_xstate & XSTATE_XSAVES_ONLY; - p->xstate.comp[i].align = curr_xstate & xstate_align; + /* + * Pass through size (eax) and offset (ebx) directly. Visbility of + * attributes in ecx limited by visible features in Da1. + */ + p->xstate.raw[i].a = raw_cpu_policy.xstate.raw[i].a; + p->xstate.raw[i].b = raw_cpu_policy.xstate.raw[i].b; + p->xstate.raw[i].c = raw_cpu_policy.xstate.raw[i].c & ecx_mask; } } diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index f5115199d4..bfb66dd766 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -40,6 +40,7 @@ extern uint32_t mxcsr_mask; #define XSTATE_XSAVES_ONLY 0 #define XSTATE_COMPACTION_ENABLED (1ULL << 63) +#define XSTATE_XSS (1U << 0) #define XSTATE_ALIGN64 (1U << 1) extern u64 xfeature_mask; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:12:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:12:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743779.1150758 (Exim 4.92) (envelope-from ) id 1sJuAh-0005fv-1B; Wed, 19 Jun 2024 12:12:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743779.1150758; Wed, 19 Jun 2024 12:12: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 1sJuAg-0005fn-UZ; Wed, 19 Jun 2024 12:12:14 +0000 Received: by outflank-mailman (input) for mailman id 743779; Wed, 19 Jun 2024 12:12:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAg-0005ff-EC for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAg-0002cH-DP for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJuAg-0004B9-Ch for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=i+qw36UFiMOEKstLG7Vzlj2rtGJ+dtxNil7ihX5coAk=; b=KbHzuEOTpkDKbVvbJbo7bYr6zc 4luLSSNc+oGzK3qHBC0RZUdrobAnZuekFKOaBcGp7Ieew12T8Ati8wZaHy4XPmBXlFrR97RhVMlDP D7rfyFM9b69Ts6cIspdRGdlR9OOZBNZH0l1XOGn6t9WFgH30TWNImevSvTzpIgiuolqk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuid: Fix handling of XSAVE dynamic leaves Message-Id: Date: Wed, 19 Jun 2024 12:12:14 +0000 commit 71cacfb035f4a78ee10970dc38a3baa04d387451 Author: Andrew Cooper AuthorDate: Fri Apr 30 20:17:55 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/cpuid: Fix handling of XSAVE dynamic leaves First, if XSAVE is available in hardware but not visible to the guest, the dynamic leaves shouldn't be filled in. Second, the comment concerning XSS state is wrong. VT-x doesn't manage host/guest state automatically, but there is provision for "host only" bits to be set, so the implications are still accurate. Introduce xstate_compressed_size() to mirror the uncompressed one. Cross check it at boot. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpuid.c | 24 ++++++++---------------- xen/arch/x86/include/asm/xstate.h | 1 + xen/arch/x86/xstate.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 7a38e03214..a822e80c7e 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -330,23 +330,15 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case XSTATE_CPUID: switch ( subleaf ) { - case 1: - if ( !p->xstate.xsavec && !p->xstate.xsaves ) - break; - - /* - * TODO: Figure out what to do for XSS state. VT-x manages host - * vs guest MSR_XSS automatically, so as soon as we start - * supporting any XSS states, the wrong XSS will be in context. - */ - BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); - fallthrough; case 0: - /* - * Read CPUID[0xD,0/1].EBX from hardware. They vary with enabled - * XSTATE, and appropriate XCR0|XSS are in context. - */ - res->b = cpuid_count_ebx(leaf, subleaf); + if ( p->basic.xsave ) + res->b = xstate_uncompressed_size(v->arch.xcr0); + break; + + case 1: + if ( p->xstate.xsavec ) + res->b = xstate_compressed_size(v->arch.xcr0 | + v->arch.msrs->xss.raw); break; } break; diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index bfb66dd766..da1d89d2f4 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -109,6 +109,7 @@ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(struct cpuinfo_x86 *c); unsigned int xstate_uncompressed_size(uint64_t xcr0); +unsigned int xstate_compressed_size(uint64_t xstates); static inline uint64_t xgetbv(unsigned int index) { diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index c8bc40fb5c..da0f48da81 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -619,6 +619,36 @@ unsigned int xstate_uncompressed_size(uint64_t xcr0) return size; } +unsigned int xstate_compressed_size(uint64_t xstates) +{ + unsigned int i, size = XSTATE_AREA_MIN_SIZE; + + if ( xstates == 0 ) + return 0; + + if ( xstates <= (X86_XCR0_SSE | X86_XCR0_FP) ) + return size; + + /* + * For the compressed size, every non-legacy component matters. Some + * componenets require aligning to 64 first. + */ + xstates &= ~(X86_XCR0_SSE | X86_XCR0_FP); + for_each_set_bit ( i, &xstates, 63 ) + { + const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; + + ASSERT(c->size); + + if ( c->align ) + size = ROUNDUP(size, 64); + + size += c->size; + } + + return size; +} + struct xcheck_state { uint64_t states; uint32_t uncomp_size; @@ -701,6 +731,15 @@ static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) s->states, &new, hw_size, s->comp_size); s->comp_size = hw_size; + + /* + * Again, check that Xen's calculation always matches hardware's. + */ + xen_size = xstate_compressed_size(s->states); + + if ( xen_size != hw_size ) + panic("XSTATE 0x%016"PRIx64", compressed hw size %#x != xen size %#x\n", + s->states, hw_size, xen_size); } else if ( hw_size ) /* Compressed size reported, but no XSAVEC ? */ { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:12:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:12:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743781.1150761 (Exim 4.92) (envelope-from ) id 1sJuAr-0005ib-2W; Wed, 19 Jun 2024 12:12:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743781.1150761; Wed, 19 Jun 2024 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 1sJuAq-0005iT-W4; Wed, 19 Jun 2024 12:12:24 +0000 Received: by outflank-mailman (input) for mailman id 743781; Wed, 19 Jun 2024 12:12:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAq-0005iJ-H7 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuAq-0002cU-GP for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJuAq-0004Be-Fd for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9MnkQL49v5SXe7rFrFmJ4PoYlye7fjaAtVFlyV+O8X4=; b=ml3EkEWi3QSyjL+dt+Qlrtrcc1 WlwzAQqrcaKD54NY7Lb8O7ZdnDpvwwFDBy64vkvNaln/QQ1Ejo9GPfUSxbd77EaznfPZfQSeXX2gB NNcXPtFN36eFmyEUweGzUHthBqEV0IJpbNoC8kg1XI7R0HtsGGbkoWH+YsIClMsRy0C4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/defns: Clean up X86_{XCR0,XSS}_* constants Message-Id: Date: Wed, 19 Jun 2024 12:12:24 +0000 commit 267122a24c499d26278ab2dbdfb46ebcaaf38474 Author: Andrew Cooper AuthorDate: Fri Apr 30 16:14:36 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/defns: Clean up X86_{XCR0,XSS}_* constants With the exception of one case in read_bndcfgu() which can use ilog2(), the *_POS defines are unused. Drop them. X86_XCR0_X87 is the name used by both the SDM and APM, rather than X86_XCR0_FP. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/i387.c | 2 +- xen/arch/x86/include/asm/x86-defns.h | 32 +++++++++++--------------------- xen/arch/x86/include/asm/xstate.h | 4 ++-- xen/arch/x86/xstate.c | 18 +++++++++--------- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 7a4297cc92..fcdee10a6e 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -369,7 +369,7 @@ void vcpu_setup_fpu(struct vcpu *v, struct xsave_struct *xsave_area, { v->arch.xsave_area->xsave_hdr.xstate_bv &= ~XSTATE_FP_SSE; if ( fcw_default != FCW_DEFAULT ) - v->arch.xsave_area->xsave_hdr.xstate_bv |= X86_XCR0_FP; + v->arch.xsave_area->xsave_hdr.xstate_bv |= X86_XCR0_X87; } } diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index d7602ab225..3bcdbaccd3 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -79,25 +79,16 @@ /* * XSTATE component flags in XCR0 | MSR_XSS */ -#define X86_XCR0_FP_POS 0 -#define X86_XCR0_FP (1ULL << X86_XCR0_FP_POS) -#define X86_XCR0_SSE_POS 1 -#define X86_XCR0_SSE (1ULL << X86_XCR0_SSE_POS) -#define X86_XCR0_YMM_POS 2 -#define X86_XCR0_YMM (1ULL << X86_XCR0_YMM_POS) -#define X86_XCR0_BNDREGS_POS 3 -#define X86_XCR0_BNDREGS (1ULL << X86_XCR0_BNDREGS_POS) -#define X86_XCR0_BNDCSR_POS 4 -#define X86_XCR0_BNDCSR (1ULL << X86_XCR0_BNDCSR_POS) -#define X86_XCR0_OPMASK_POS 5 -#define X86_XCR0_OPMASK (1ULL << X86_XCR0_OPMASK_POS) -#define X86_XCR0_ZMM_POS 6 -#define X86_XCR0_ZMM (1ULL << X86_XCR0_ZMM_POS) -#define X86_XCR0_HI_ZMM_POS 7 -#define X86_XCR0_HI_ZMM (1ULL << X86_XCR0_HI_ZMM_POS) +#define X86_XCR0_X87 (_AC(1, ULL) << 0) +#define X86_XCR0_SSE (_AC(1, ULL) << 1) +#define X86_XCR0_YMM (_AC(1, ULL) << 2) +#define X86_XCR0_BNDREGS (_AC(1, ULL) << 3) +#define X86_XCR0_BNDCSR (_AC(1, ULL) << 4) +#define X86_XCR0_OPMASK (_AC(1, ULL) << 5) +#define X86_XCR0_ZMM (_AC(1, ULL) << 6) +#define X86_XCR0_HI_ZMM (_AC(1, ULL) << 7) #define X86_XSS_PROC_TRACE (_AC(1, ULL) << 8) -#define X86_XCR0_PKRU_POS 9 -#define X86_XCR0_PKRU (1ULL << X86_XCR0_PKRU_POS) +#define X86_XCR0_PKRU (_AC(1, ULL) << 9) #define X86_XSS_PASID (_AC(1, ULL) << 10) #define X86_XSS_CET_U (_AC(1, ULL) << 11) #define X86_XSS_CET_S (_AC(1, ULL) << 12) @@ -107,11 +98,10 @@ #define X86_XSS_HWP (_AC(1, ULL) << 16) #define X86_XCR0_TILE_CFG (_AC(1, ULL) << 17) #define X86_XCR0_TILE_DATA (_AC(1, ULL) << 18) -#define X86_XCR0_LWP_POS 62 -#define X86_XCR0_LWP (1ULL << X86_XCR0_LWP_POS) +#define X86_XCR0_LWP (_AC(1, ULL) << 62) #define X86_XCR0_STATES \ - (X86_XCR0_FP | X86_XCR0_SSE | X86_XCR0_YMM | X86_XCR0_BNDREGS | \ + (X86_XCR0_X87 | X86_XCR0_SSE | X86_XCR0_YMM | X86_XCR0_BNDREGS | \ X86_XCR0_BNDCSR | X86_XCR0_OPMASK | X86_XCR0_ZMM | \ X86_XCR0_HI_ZMM | X86_XCR0_PKRU | X86_XCR0_TILE_CFG | \ X86_XCR0_TILE_DATA | \ diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index da1d89d2f4..f4a8e5f814 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -29,8 +29,8 @@ extern uint32_t mxcsr_mask; #define XSAVE_HDR_OFFSET FXSAVE_SIZE #define XSTATE_AREA_MIN_SIZE (FXSAVE_SIZE + XSAVE_HDR_SIZE) -#define XSTATE_FP_SSE (X86_XCR0_FP | X86_XCR0_SSE) -#define XCNTXT_MASK (X86_XCR0_FP | X86_XCR0_SSE | X86_XCR0_YMM | \ +#define XSTATE_FP_SSE (X86_XCR0_X87 | X86_XCR0_SSE) +#define XCNTXT_MASK (X86_XCR0_X87 | X86_XCR0_SSE | X86_XCR0_YMM | \ X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM | \ XSTATE_NONLAZY) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index da0f48da81..68cdd8fcf0 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -313,7 +313,7 @@ void xsave(struct vcpu *v, uint64_t mask) "=m" (*ptr), \ "a" (lmask), "d" (hmask), "D" (ptr)) - if ( fip_width == 8 || !(mask & X86_XCR0_FP) ) + if ( fip_width == 8 || !(mask & X86_XCR0_X87) ) { XSAVE("0x48,"); } @@ -366,7 +366,7 @@ void xsave(struct vcpu *v, uint64_t mask) fip_width = 8; } #undef XSAVE - if ( mask & X86_XCR0_FP ) + if ( mask & X86_XCR0_X87 ) ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET] = fip_width; } @@ -558,7 +558,7 @@ void xstate_free_save_area(struct vcpu *v) static bool valid_xcr0(uint64_t xcr0) { /* FP must be unconditionally set. */ - if ( !(xcr0 & X86_XCR0_FP) ) + if ( !(xcr0 & X86_XCR0_X87) ) return false; /* YMM depends on SSE. */ @@ -597,7 +597,7 @@ unsigned int xstate_uncompressed_size(uint64_t xcr0) if ( xcr0 == 0 ) return 0; - if ( xcr0 <= (X86_XCR0_SSE | X86_XCR0_FP) ) + if ( xcr0 <= (X86_XCR0_SSE | X86_XCR0_X87) ) return size; /* @@ -605,7 +605,7 @@ unsigned int xstate_uncompressed_size(uint64_t xcr0) * maximum offset+size. Some states (e.g. LWP, APX_F) are out-of-order * with respect their index. */ - xcr0 &= ~(X86_XCR0_SSE | X86_XCR0_FP); + xcr0 &= ~(X86_XCR0_SSE | X86_XCR0_X87); for_each_set_bit ( i, &xcr0, 63 ) { const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; @@ -626,14 +626,14 @@ unsigned int xstate_compressed_size(uint64_t xstates) if ( xstates == 0 ) return 0; - if ( xstates <= (X86_XCR0_SSE | X86_XCR0_FP) ) + if ( xstates <= (X86_XCR0_SSE | X86_XCR0_X87) ) return size; /* * For the compressed size, every non-legacy component matters. Some * componenets require aligning to 64 first. */ - xstates &= ~(X86_XCR0_SSE | X86_XCR0_FP); + xstates &= ~(X86_XCR0_SSE | X86_XCR0_X87); for_each_set_bit ( i, &xstates, 63 ) { const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; @@ -779,7 +779,7 @@ static void __init noinline xstate_check_sizes(void) * layout compatibility with Intel and having a knock-on effect on all * subsequent states. */ - check_new_xstate(&s, X86_XCR0_SSE | X86_XCR0_FP); + check_new_xstate(&s, X86_XCR0_SSE | X86_XCR0_X87); if ( cpu_has_avx ) check_new_xstate(&s, X86_XCR0_YMM); @@ -1026,7 +1026,7 @@ uint64_t read_bndcfgu(void) : "=m" (*xstate) : "a" (X86_XCR0_BNDCSR), "d" (0), "D" (xstate) ); - bndcsr = (void *)xstate + xstate_offsets[X86_XCR0_BNDCSR_POS]; + bndcsr = (void *)xstate + xstate_offsets[ilog2(X86_XCR0_BNDCSR)]; } if ( cr0 & X86_CR0_TS ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 12:22:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 12:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743787.1150766 (Exim 4.92) (envelope-from ) id 1sJuKD-0007ay-QA; Wed, 19 Jun 2024 12:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743787.1150766; Wed, 19 Jun 2024 12: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 1sJuKD-0007aq-NR; Wed, 19 Jun 2024 12:22:05 +0000 Received: by outflank-mailman (input) for mailman id 743787; Wed, 19 Jun 2024 12:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuKC-0007ak-24 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sJuKB-0002qD-P7 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sJuKB-0004ks-No for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=k291poaYUNARRoDmodlgnmkxj2BayKaSehtBiE33ZpE=; b=z9+IDasjg8PyGHap0vU2CpYQvn 23Yk8Wp31iv/9fJw/6QFBuiR7OARyn1GIafR95lBata4zaqB5Til703FAjQkFkC1/959p9wQwzVYs YRy8uXNA52bdbM24RUP+aZsdFtLZW98yUPzRGbNIwHRO5LlZCfEZmDTtAiKL1ZPMp/y4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: avoid UB in guest handle arithmetic Message-Id: Date: Wed, 19 Jun 2024 12:22:03 +0000 commit 43d5c5d5f70b3f5419e7ef30399d23adf6ddfa8e Author: Jan Beulich AuthorDate: Wed Jun 19 14:11:07 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 19 14:11:07 2024 +0200 xen: avoid UB in guest handle arithmetic At least XENMEM_memory_exchange can have huge values passed in the nr_extents and nr_exchanged fields. Adding such values to pointers can overflow, resulting in UB. Cast respective pointers to "unsigned long" while at the same time making the necessary multiplication explicit. Remaining arithmetic is, despite there possibly being mathematical overflow, okay as per the C99 spec: "A computation involving unsigned operands can never overflow, because a result that cannot be represented by the resulting unsigned integer type is reduced modulo the number that is one greater than the largest value that can be represented by the resulting type." The overflow that we need to guard against is checked for in array_access_ok(). Note that in / down from array_access_ok() the address value is only ever cast to "unsigned long" anyway, which is why in the invocation from guest_handle_subrange_okay() the value doesn't need casting back to pointer type. In compat grant table code change two guest_handle_add_offset() to avoid passing in negative offsets. Since {,__}clear_guest_offset() need touching anyway, also deal with another (latent) issue there: They were losing the handle type, i.e. the size of the individual objects accessed. Luckily the few users we presently have all pass char or uint8 handles. Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Tested-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/include/asm/guest_access.h | 2 +- xen/common/compat/grant_table.c | 4 ++-- xen/include/xen/guest_access.h | 42 ++++++++++++++++++++------------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/include/asm/guest_access.h b/xen/arch/x86/include/asm/guest_access.h index dbf789fa58..69716c8b41 100644 --- a/xen/arch/x86/include/asm/guest_access.h +++ b/xen/arch/x86/include/asm/guest_access.h @@ -43,7 +43,7 @@ array_access_ok((hnd).p, (nr), sizeof(*(hnd).p))) #define guest_handle_subrange_okay(hnd, first, last) \ (paging_mode_external(current->domain) || \ - array_access_ok((hnd).p + (first), \ + array_access_ok((unsigned long)(hnd).p + (first) * sizeof(*(hnd).p), \ (last)-(first)+1, \ sizeof(*(hnd).p))) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index af98eade17..c495c375eb 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -232,7 +232,7 @@ int compat_grant_table_op( cnt_uop = guest_handle_cast(xfer, void); while ( n-- ) { - guest_handle_add_offset(xfer, -1); + guest_handle_subtract_offset(xfer, 1); if ( __copy_field_to_guest(xfer, nat.xfer + n, status) ) rc = -EFAULT; } @@ -277,7 +277,7 @@ int compat_grant_table_op( cnt_uop = guest_handle_cast(copy, void); while ( n-- ) { - guest_handle_add_offset(copy, -1); + guest_handle_subtract_offset(copy, 1); if ( __copy_field_to_guest(copy, nat.copy + n, status) ) rc = -EFAULT; } diff --git a/xen/include/xen/guest_access.h b/xen/include/xen/guest_access.h index af33ae3ab6..96dbef2e02 100644 --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -15,8 +15,10 @@ #define guest_handle_is_null(hnd) ((hnd).p == NULL) /* Offset the given guest handle into the array it refers to. */ -#define guest_handle_add_offset(hnd, nr) ((hnd).p += (nr)) -#define guest_handle_subtract_offset(hnd, nr) ((hnd).p -= (nr)) +#define guest_handle_add_offset(hnd, nr) ((hnd).p = \ + (typeof((hnd).p))((unsigned long)(hnd).p + (nr) * sizeof(*(hnd).p))) +#define guest_handle_subtract_offset(hnd, nr) ((hnd).p = \ + (typeof((hnd).p))((unsigned long)(hnd).p - (nr) * sizeof(*(hnd).p))) /* * Cast a guest handle (either XEN_GUEST_HANDLE or XEN_GUEST_HANDLE_PARAM) @@ -59,20 +61,22 @@ */ #define copy_to_guest_offset(hnd, off, ptr, nr) ({ \ const typeof(*(ptr)) *_s = (ptr); \ - char (*_d)[sizeof(*_s)] = (void *)(hnd).p; \ + unsigned long d_ = (unsigned long)(hnd).p; \ /* Check that the handle is not for a const type */ \ void *__maybe_unused _t = (hnd).p; \ (void)((hnd).p == _s); \ - raw_copy_to_guest(_d+(off), _s, sizeof(*_s)*(nr)); \ + raw_copy_to_guest((void *)(d_ + (off) * sizeof(*_s)), \ + _s, (nr) * sizeof(*_s)); \ }) /* * Clear an array of objects in guest context via a guest handle, * specifying an offset into the guest array. */ -#define clear_guest_offset(hnd, off, nr) ({ \ - void *_d = (hnd).p; \ - raw_clear_guest(_d+(off), nr); \ +#define clear_guest_offset(hnd, off, nr) ({ \ + unsigned long d_ = (unsigned long)(hnd).p; \ + raw_clear_guest((void *)(d_ + (off) * sizeof(*(hnd).p)), \ + (nr) * sizeof(*(hnd).p)); \ }) /* @@ -80,9 +84,11 @@ * specifying an offset into the guest array. */ #define copy_from_guest_offset(ptr, hnd, off, nr) ({ \ - const typeof(*(ptr)) *_s = (hnd).p; \ + unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ - raw_copy_from_guest(_d, _s+(off), sizeof(*_d)*(nr));\ + raw_copy_from_guest(_d, \ + (const void *)(s_ + (off) * sizeof(*_d)), \ + (nr) * sizeof(*_d)); \ }) /* Copy sub-field of a structure to guest context via a guest handle. */ @@ -117,22 +123,26 @@ #define __copy_to_guest_offset(hnd, off, ptr, nr) ({ \ const typeof(*(ptr)) *_s = (ptr); \ - char (*_d)[sizeof(*_s)] = (void *)(hnd).p; \ + unsigned long d_ = (unsigned long)(hnd).p; \ /* Check that the handle is not for a const type */ \ void *__maybe_unused _t = (hnd).p; \ (void)((hnd).p == _s); \ - __raw_copy_to_guest(_d + (off), _s, sizeof(*_s) * (nr));\ + __raw_copy_to_guest((void *)(d_ + (off) * sizeof(*_s)), \ + _s, (nr) * sizeof(*_s)); \ }) -#define __clear_guest_offset(hnd, off, nr) ({ \ - void *_d = (hnd).p; \ - __raw_clear_guest(_d + (off), nr); \ +#define __clear_guest_offset(hnd, off, nr) ({ \ + unsigned long d_ = (unsigned long)(hnd).p; \ + __raw_clear_guest((void *)(d_ + (off) * sizeof(*(hnd).p)), \ + (nr) * sizeof(*(hnd).p)); \ }) #define __copy_from_guest_offset(ptr, hnd, off, nr) ({ \ - const typeof(*(ptr)) *_s = (hnd).p; \ + unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ - __raw_copy_from_guest(_d, _s + (off), sizeof (*_d) * (nr)); \ + __raw_copy_from_guest(_d, \ + (const void *)(s_ + (off) * sizeof(*_d)), \ + (nr) * sizeof(*_d)); \ }) #define __copy_field_to_guest(hnd, ptr, field) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 19:11:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 19:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.743998.1151006 (Exim 4.92) (envelope-from ) id 1sK0hz-0005me-7y; Wed, 19 Jun 2024 19:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 743998.1151006; Wed, 19 Jun 2024 19: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 1sK0hz-0005mW-5E; Wed, 19 Jun 2024 19:11:03 +0000 Received: by outflank-mailman (input) for mailman id 743998; Wed, 19 Jun 2024 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 1sK0hx-0005mK-S0 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sK0hx-0002mv-PS for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sK0hx-0006ni-NW for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xoC6NuBcYzRA4vFSIN8Ma6i5GJ98sqi0k8GwxfML3VM=; b=LUKksBy1HdwDCj8G4Ne5JBVIRI +BXJzI9IMonxL0ocm5LGnVqVTKODRqHswR/QREs8BAddv65CUqITMweIA9R0e/UeOdcQNSOcNwN58 MkIhe6zli2tI6h3gZWtuhy9QFf5dEzO8u3YD8JsxZc2ClMjMUSt6jJozRdlqCf+E9YK8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains Message-Id: Date: Wed, 19 Jun 2024 19:11:01 +0000 commit cb1ddafdc57305a44e23f781decfdd31dea31189 Author: Henry Wang AuthorDate: Tue Jun 18 17:27:51 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 18 17:27:51 2024 -0700 xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains Currently, users are allowed to map static shared memory in a non-direct-mapped way for direct-mapped domains. This can lead to clashing of guest memory spaces. Also, the current extended region finding logic only removes the host physical addresses of the static shared memory areas for direct-mapped domains, which may be inconsistent with the guest memory map if users map the static shared memory in a non-direct-mapped way. This will lead to incorrect extended region calculation results. To make things easier, add restriction that static shared memory should also be direct-mapped for direct-mapped domains. Check the host physical address to be matched with guest physical address when parsing the device tree. Document this restriction in the doc. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Acked-by: Michal Orzel --- docs/misc/arm/device-tree/booting.txt | 3 +++ xen/arch/arm/static-shmem.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index aa0e614864..3a04f5c57f 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -607,6 +607,9 @@ communication. shared memory region in host physical address space, a size, and a guest physical address, as the target address of the mapping. e.g. xen,shared-mem = < [host physical address] [guest address] [size] >; + Note that if a domain is direct-mapped, i.e. the Dom0 and the Dom0less + DomUs with `direct-map` device tree property, the static shared memory + should also be direct-mapped (host physical address == guest address). It shall also meet the following criteria: 1) If the SHM ID matches with an existing region, the address range of the diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index dbb017c7d7..c434b96e62 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -324,6 +324,12 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, printk("%pd: static shared memory bank not found: '%s'", d, shm_id); return -ENOENT; } + if ( is_domain_direct_mapped(d) && (pbase != gbase) ) + { + printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", + d, pbase, gbase); + return -EINVAL; + } pbase = boot_shm_bank->start; psize = boot_shm_bank->size; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 19:11:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 19:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744001.1151020 (Exim 4.92) (envelope-from ) id 1sK0i8-00065W-Fg; Wed, 19 Jun 2024 19:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744001.1151020; Wed, 19 Jun 2024 19: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 1sK0i8-00065M-Cv; Wed, 19 Jun 2024 19:11:12 +0000 Received: by outflank-mailman (input) for mailman id 744001; Wed, 19 Jun 2024 19:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sK0i7-00064y-TX for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sK0i7-0002na-Sp for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sK0i7-0006oL-Rn for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/QtFTjM6ANC4cjMh8BSIjnV/kjLFU03isHPouyr08FQ=; b=nO/nYdnIzCW+RQIQ3WbEYcDNJG 5ndrgtqn0meyt4uuoNLfSLgCZuNJOVTJOxbViDe3LG3HkaNZeHDeI0W7/aCmPynWwa2QY4dWtddlA izJyvoJAIzTDjH+hsp6rrB4QyC8JpEYMrLGuYytY0Fj+IWJ5wNKO908XH7rt+MIWNX5Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor Message-Id: Date: Wed, 19 Jun 2024 19:11:11 +0000 commit 6f9d90ea943b5e0c5d11a71090c49bbfd79e97ea Author: Henry Wang AuthorDate: Fri May 24 15:55:20 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 18 17:32:41 2024 -0700 xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor There are use cases (for example using the PV driver) in Dom0less setup that require Dom0less DomUs start immediately with Dom0, but initialize XenStore later after Dom0's successful boot and call to the init-dom0less application. An error message can seen from the init-dom0less application on 1:1 direct-mapped domains: ``` Allocating magic pages memory.c:238:d0v0 mfn 0x39000 doesn't belong to d1 Error on alloc magic pages ``` The "magic page" is a terminology used in the toolstack as reserved pages for the VM to have access to virtual platform capabilities. Currently the magic pages for Dom0less DomUs are populated by the init-dom0less app through populate_physmap(), and populate_physmap() automatically assumes gfn == mfn for 1:1 direct mapped domains. This cannot be true for the magic pages that are allocated later from the init-dom0less application executed in Dom0. For domain using statically allocated memory but not 1:1 direct-mapped, similar error "failed to retrieve a reserved page" can be seen as the reserved memory list is empty at that time. Since for init-dom0less, the magic page region is only for XenStore. To solve above issue, this commit allocates the XenStore page for Dom0less DomUs at the domain construction time. The PFN will be noted and communicated to the init-dom0less application executed from Dom0. To keep the XenStore late init protocol, set the connection status to XENSTORE_RECONNECT. Currently the GUEST_MAGIC_BASE in the init-dom0less application is hardcoded, which will lead to failures for 1:1 direct-mapped Dom0less DomUs. Since the guest magic region allocation from init-dom0less is for XenStore, and the XenStore page is now allocated from the hypervisor, instead of hardcoding the guest magic pages region, use xc_hvm_param_get() to get the XenStore page PFN. Rename alloc_xs_page() to get_xs_page() to reflect the changes. With this change, some existing code is not needed anymore, including: (1) The definition of the XenStore page offset. (2) Call to xc_domain_setmaxmem() and xc_clear_domain_page() as we don't need to set the max mem and clear the page anymore. (3) Foreign mapping of the XenStore page, setting of XenStore interface status and HVM_PARAM_STORE_PFN from init-dom0less, as they are set by the hypervisor. Take the opportunity to do some coding style improvements when possible. Reported-by: Alec Kwapis Suggested-by: Daniel P. Smith Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/helpers/init-dom0less.c | 58 +++++++++++-------------------------------- xen/arch/arm/dom0less-build.c | 58 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 45 deletions(-) diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c index fee93459c4..325527f040 100644 --- a/tools/helpers/init-dom0less.c +++ b/tools/helpers/init-dom0less.c @@ -16,30 +16,18 @@ #include "init-dom-json.h" -#define XENSTORE_PFN_OFFSET 1 #define STR_MAX_LENGTH 128 -static int alloc_xs_page(struct xc_interface_core *xch, - libxl_dominfo *info, - uint64_t *xenstore_pfn) +static int get_xs_page(struct xc_interface_core *xch, libxl_dominfo *info, + uint64_t *xenstore_pfn) { int rc; - const xen_pfn_t base = GUEST_MAGIC_BASE >> XC_PAGE_SHIFT; - xen_pfn_t p2m = (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET; - rc = xc_domain_setmaxmem(xch, info->domid, - info->max_memkb + (XC_PAGE_SIZE/1024)); - if (rc < 0) - return rc; - - rc = xc_domain_populate_physmap_exact(xch, info->domid, 1, 0, 0, &p2m); - if (rc < 0) - return rc; - - *xenstore_pfn = base + XENSTORE_PFN_OFFSET; - rc = xc_clear_domain_page(xch, info->domid, *xenstore_pfn); - if (rc < 0) - return rc; + rc = xc_hvm_param_get(xch, info->domid, HVM_PARAM_STORE_PFN, xenstore_pfn); + if (rc < 0) { + fprintf(stderr,"Failed to get HVM_PARAM_STORE_PFN\n"); + return 1; + } return 0; } @@ -100,6 +88,7 @@ static bool do_xs_write_vm(struct xs_handle *xsh, xs_transaction_t t, */ static int create_xenstore(struct xs_handle *xsh, libxl_dominfo *info, libxl_uuid uuid, + uint64_t xenstore_pfn, evtchn_port_t xenstore_port) { domid_t domid; @@ -145,8 +134,7 @@ static int create_xenstore(struct xs_handle *xsh, rc = snprintf(target_memkb_str, STR_MAX_LENGTH, "%"PRIu64, info->current_memkb); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; - rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%lld", - (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET); + rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%"PRIu64, xenstore_pfn); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; rc = snprintf(xenstore_port_str, STR_MAX_LENGTH, "%u", xenstore_port); @@ -230,7 +218,6 @@ static int init_domain(struct xs_handle *xsh, libxl_uuid uuid; uint64_t xenstore_evtchn, xenstore_pfn; int rc; - struct xenstore_domain_interface *intf; printf("Init dom0less domain: %u\n", info->domid); @@ -245,20 +232,11 @@ static int init_domain(struct xs_handle *xsh, if (!xenstore_evtchn) return 0; - /* Alloc xenstore page */ - if (alloc_xs_page(xch, info, &xenstore_pfn) != 0) { - printf("Error on alloc magic pages\n"); - return 1; - } - - intf = xenforeignmemory_map(xfh, info->domid, PROT_READ | PROT_WRITE, 1, - &xenstore_pfn, NULL); - if (!intf) { - printf("Error mapping xenstore page\n"); + /* Get xenstore page */ + if (get_xs_page(xch, info, &xenstore_pfn) != 0) { + fprintf(stderr,"Error on getting xenstore page\n"); return 1; } - intf->connection = XENSTORE_RECONNECT; - xenforeignmemory_unmap(xfh, intf, 1); rc = xc_dom_gnttab_seed(xch, info->domid, true, (xen_pfn_t)-1, xenstore_pfn, 0, 0); @@ -272,19 +250,11 @@ static int init_domain(struct xs_handle *xsh, if (rc) err(1, "gen_stub_json_config"); - /* Now everything is ready: set HVM_PARAM_STORE_PFN */ - rc = xc_hvm_param_set(xch, info->domid, HVM_PARAM_STORE_PFN, - xenstore_pfn); - if (rc < 0) - return rc; - - rc = create_xenstore(xsh, info, uuid, xenstore_evtchn); + rc = create_xenstore(xsh, info, uuid, xenstore_pfn, xenstore_evtchn); if (rc) err(1, "writing to xenstore"); - rc = xs_introduce_domain(xsh, info->domid, - (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET, - xenstore_evtchn); + rc = xs_introduce_domain(xsh, info->domid, xenstore_pfn, xenstore_evtchn); if (!rc) err(1, "xs_introduce_domain"); return 0; diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index f919d3acf9..ef2ba85ff4 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include +#include #include #include #include @@ -10,6 +11,8 @@ #include #include +#include + #include #include #include @@ -739,6 +742,56 @@ static int __init alloc_xenstore_evtchn(struct domain *d) return 0; } +#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) ) + { + free_domheap_page(xenstore_pg); + 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; +} + static int __init construct_domU(struct domain *d, const struct dt_device_node *node) { @@ -839,7 +892,10 @@ static int __init construct_domU(struct domain *d, rc = alloc_xenstore_evtchn(d); if ( rc < 0 ) return rc; - d->arch.hvm.params[HVM_PARAM_STORE_PFN] = ~0ULL; + + rc = alloc_xenstore_page(d); + if ( rc < 0 ) + return rc; } return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 19 19:11:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jun 2024 19:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744002.1151024 (Exim 4.92) (envelope-from ) id 1sK0iI-0006Bu-HB; Wed, 19 Jun 2024 19:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744002.1151024; Wed, 19 Jun 2024 19: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 1sK0iI-0006Bm-EO; Wed, 19 Jun 2024 19:11:22 +0000 Received: by outflank-mailman (input) for mailman id 744002; Wed, 19 Jun 2024 19:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sK0iI-0006Bc-0g for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sK0iH-0002ni-W9 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sK0iH-0006qU-V4 for xen-changelog@lists.xenproject.org; Wed, 19 Jun 2024 19: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=up2cDVK8yufS7gSWXgsSx18/8QEOrg2NEr1lCuQ4xCA=; b=GiYUEeEzFIBMd0w43rUKbIL7fJ t/BFAYuolto+a+hGC6wyxDE08hgBnfvzBc+C6/X8mWbr48aZnlc8EL/z2FRMUN6JL/CbmDHemHjI4 XRXV1dgcoQKDagUvBqr4K2naF41RWuBEgEXHR6Fd454FjeA5BnBoSLdx28AH1PycGRuk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/features/dom0less: Update the late XenStore init protocol Message-Id: Date: Wed, 19 Jun 2024 19:11:21 +0000 commit 53c5c99e8744495395c1274595d6ca55947d1d6a Author: Henry Wang AuthorDate: Fri May 24 15:55:22 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 18 17:33:25 2024 -0700 docs/features/dom0less: Update the late XenStore init protocol With the new allocation strategy of Dom0less DomUs XenStore page, update the doc of the late XenStore init protocol accordingly. Signed-off-by: Henry Wang Reviewed-by: Michal Orzel --- docs/features/dom0less.pandoc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/features/dom0less.pandoc b/docs/features/dom0less.pandoc index 725afa0558..8b178edee0 100644 --- a/docs/features/dom0less.pandoc +++ b/docs/features/dom0less.pandoc @@ -110,9 +110,10 @@ hotplug PV drivers to dom0less guests. E.g. xl network-attach domU. The implementation works as follows: - Xen allocates the xenstore event channel for each dom0less domU that has the "xen,enhanced" property, and sets HVM_PARAM_STORE_EVTCHN -- Xen does *not* allocate the xenstore page and sets HVM_PARAM_STORE_PFN - to ~0ULL (invalid) -- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to invalid +- Xen allocates the xenstore page and sets HVM_PARAM_STORE_PFN as well + as the connection status to XENSTORE_RECONNECT. +- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to + ~0ULL (invalid) or the connection status is *not* XENSTORE_CONNECTED. - Old kernels will continue without xenstore support (Note: some old buggy kernels might crash because they don't check the validity of HVM_PARAM_STORE_PFN before using it! Disable "xen,enhanced" in @@ -121,13 +122,14 @@ The implementation works as follows: channel (HVM_PARAM_STORE_EVTCHN) before continuing with the initialization - Once dom0 is booted, init-dom0less is executed: - - it allocates the xenstore shared page and sets HVM_PARAM_STORE_PFN + - it gets the xenstore shared page from HVM_PARAM_STORE_PFN - it calls xs_introduce_domain - Xenstored notices the new domain, initializes interfaces as usual, and sends an event channel notification to the domain using the xenstore event channel (HVM_PARAM_STORE_EVTCHN) - The Linux domU kernel receives the event channel notification, checks - HVM_PARAM_STORE_PFN again and continue with the initialization + HVM_PARAM_STORE_PFN and the connection status again and continue with + the initialization Limitations -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 20 07:11:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jun 2024 07:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744193.1151194 (Exim 4.92) (envelope-from ) id 1sKBwm-0006Cw-90; Thu, 20 Jun 2024 07:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744193.1151194; Thu, 20 Jun 2024 07: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 1sKBwm-0006Cm-5f; Thu, 20 Jun 2024 07:11:04 +0000 Received: by outflank-mailman (input) for mailman id 744193; Thu, 20 Jun 2024 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 1sKBwk-0006Cg-Ip for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKBwk-0000ek-DN for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKBwk-0007HO-C0 for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DLCkE+v1WVnzzozWfAtmzXmzvGFpYqkhENytcHM9rmk=; b=feACvMg71QmLk4vONuBLqp5gqo 9fAlrLV6XDc4Ls3znbdWlfbrZw4ugfg4QTuIhGflS2tGi2h83nad2Esb4N4y1Z2MMCJixU05+00Io WQIDePtxulu1dWGDiWiP3swr1W5qpnGofUcEz6zBvRdt438oWtkpCNW2iMyhwd8TyX5Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: static-shmem: fix "gbase/pbase used uninitialized" build failure Message-Id: Date: Thu, 20 Jun 2024 07:11:02 +0000 commit 988f1c7e1f40f85f5654784e5f702ed54904ca9d Author: Michal Orzel AuthorDate: Wed Jun 19 08:46:52 2024 +0200 Commit: Julien Grall CommitDate: Wed Jun 19 12:32:27 2024 +0100 xen/arm: static-shmem: fix "gbase/pbase used uninitialized" build failure Building Xen with CONFIG_STATIC_SHM=y results in a build failure: arch/arm/static-shmem.c: In function 'process_shm': arch/arm/static-shmem.c:327:41: error: 'gbase' may be used uninitialized [-Werror=maybe-uninitialized] 327 | if ( is_domain_direct_mapped(d) && (pbase != gbase) ) arch/arm/static-shmem.c:305:17: note: 'gbase' was declared here 305 | paddr_t gbase, pbase, psize; This is because the commit cb1ddafdc573 adds a check referencing gbase/pbase variables which were not yet assigned a value. Fix it. Fixes: cb1ddafdc573 ("xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains") Signed-off-by: Michal Orzel Release-Acked-by: Oleksii Kurochko Reviewed-by: Bertrand Marquis --- xen/arch/arm/static-shmem.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index c434b96e62..cd48d2896b 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -324,12 +324,6 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, printk("%pd: static shared memory bank not found: '%s'", d, shm_id); return -ENOENT; } - if ( is_domain_direct_mapped(d) && (pbase != gbase) ) - { - printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", - d, pbase, gbase); - return -EINVAL; - } pbase = boot_shm_bank->start; psize = boot_shm_bank->size; @@ -353,6 +347,13 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, /* guest phys address is after host phys address */ gbase = dt_read_paddr(cells + addr_cells, addr_cells); + if ( is_domain_direct_mapped(d) && (pbase != gbase) ) + { + printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", + d, pbase, gbase); + return -EINVAL; + } + for ( i = 0; i < PFN_DOWN(psize); i++ ) if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 20 07:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jun 2024 07:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744194.1151195 (Exim 4.92) (envelope-from ) id 1sKBww-0006Ee-9X; Thu, 20 Jun 2024 07:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744194.1151195; Thu, 20 Jun 2024 07: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 1sKBww-0006EX-77; Thu, 20 Jun 2024 07:11:14 +0000 Received: by outflank-mailman (input) for mailman id 744194; Thu, 20 Jun 2024 07:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKBwu-0006EN-Hf for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKBwu-0000f1-Gs for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKBwu-0007IA-FN for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8I+geZA6XSmAkkYVMCeZ7kge1+fQ4Epo2HLTn54O0c4=; b=0i0101FqyCAQBYfZYealwD2XaO /nVFbquL54ZyB5azcoMdU/UkKuk6Iq+geAk/Q+S8yVL45m+oSL7oQWXPvmGdJYjqstZCo/yvJgDOQ 2BhGgX7o5uewjWodQUUJaH49WROsPFBW0Up9yz6F6LNA9mQJmeT1/jZx834iMmgCNhcI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "docs/features/dom0less: Update the late XenStore init protocol" Message-Id: Date: Thu, 20 Jun 2024 07:11:12 +0000 commit 443c488a0b3676b5c001069d14890cd8d0ec2c1d Author: Julien Grall AuthorDate: Wed Jun 19 12:47:28 2024 +0100 Commit: Julien Grall CommitDate: Wed Jun 19 12:48:44 2024 +0100 Revert "docs/features/dom0less: Update the late XenStore init protocol" Michal reported that the gitlab CI is failing because of this series [1]. This reverts commit 53c5c99e8744495395c1274595d6ca55947d1d6a. [1] https://gitlab.com/xen-project/xen/-/pipelines/1338067978 Signed-off-by: Julien Grall --- docs/features/dom0less.pandoc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/features/dom0less.pandoc b/docs/features/dom0less.pandoc index 8b178edee0..725afa0558 100644 --- a/docs/features/dom0less.pandoc +++ b/docs/features/dom0less.pandoc @@ -110,10 +110,9 @@ hotplug PV drivers to dom0less guests. E.g. xl network-attach domU. The implementation works as follows: - Xen allocates the xenstore event channel for each dom0less domU that has the "xen,enhanced" property, and sets HVM_PARAM_STORE_EVTCHN -- Xen allocates the xenstore page and sets HVM_PARAM_STORE_PFN as well - as the connection status to XENSTORE_RECONNECT. -- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to - ~0ULL (invalid) or the connection status is *not* XENSTORE_CONNECTED. +- Xen does *not* allocate the xenstore page and sets HVM_PARAM_STORE_PFN + to ~0ULL (invalid) +- Dom0less domU kernels check that HVM_PARAM_STORE_PFN is set to invalid - Old kernels will continue without xenstore support (Note: some old buggy kernels might crash because they don't check the validity of HVM_PARAM_STORE_PFN before using it! Disable "xen,enhanced" in @@ -122,14 +121,13 @@ The implementation works as follows: channel (HVM_PARAM_STORE_EVTCHN) before continuing with the initialization - Once dom0 is booted, init-dom0less is executed: - - it gets the xenstore shared page from HVM_PARAM_STORE_PFN + - it allocates the xenstore shared page and sets HVM_PARAM_STORE_PFN - it calls xs_introduce_domain - Xenstored notices the new domain, initializes interfaces as usual, and sends an event channel notification to the domain using the xenstore event channel (HVM_PARAM_STORE_EVTCHN) - The Linux domU kernel receives the event channel notification, checks - HVM_PARAM_STORE_PFN and the connection status again and continue with - the initialization + HVM_PARAM_STORE_PFN again and continue with the initialization Limitations -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 20 07:11:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jun 2024 07:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744196.1151200 (Exim 4.92) (envelope-from ) id 1sKBx5-0006HD-B4; Thu, 20 Jun 2024 07:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744196.1151200; Thu, 20 Jun 2024 07: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 1sKBx5-0006H5-8T; Thu, 20 Jun 2024 07:11:23 +0000 Received: by outflank-mailman (input) for mailman id 744196; Thu, 20 Jun 2024 07:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKBx4-0006Gv-La for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKBx4-0000fW-Kq for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKBx4-0007KN-J3 for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vd2ClPZs30azI+qZUsv0+8aR1xko0YQU8EZOLaSrSXk=; b=iYQGvdnU6hMr5hbXDREUO0ZWIf bb1CBm9YhX9lVbkZ4+BzMqUfIHDmT1ODmEcbeD+O7ZJKKnYCi7KxN/PoQ0bRNIxKJkxy/qih0b9x2 uXCyX3GIvdzCsvecVdZ7mzxiwp3OkBHSxYnzZJL8V5kWHMehCAgEj/OxWreF9fr0vSuI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor" Message-Id: Date: Thu, 20 Jun 2024 07:11:22 +0000 commit efa6e9f15ba943d154e8d7b29384581915b2aacd Author: Julien Grall AuthorDate: Wed Jun 19 12:48:09 2024 +0100 Commit: Julien Grall CommitDate: Wed Jun 19 12:48:47 2024 +0100 Revert "xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor" Michal reported that the gitlab CI is failing because of this series [1]. This reverts commit 6f9d90ea943b5e0c5d11a71090c49bbfd79e97ea. Signed-off-by: Julien Grall --- tools/helpers/init-dom0less.c | 58 ++++++++++++++++++++++++++++++++----------- xen/arch/arm/dom0less-build.c | 58 +------------------------------------------ 2 files changed, 45 insertions(+), 71 deletions(-) diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c index 325527f040..fee93459c4 100644 --- a/tools/helpers/init-dom0less.c +++ b/tools/helpers/init-dom0less.c @@ -16,18 +16,30 @@ #include "init-dom-json.h" +#define XENSTORE_PFN_OFFSET 1 #define STR_MAX_LENGTH 128 -static int get_xs_page(struct xc_interface_core *xch, libxl_dominfo *info, - uint64_t *xenstore_pfn) +static int alloc_xs_page(struct xc_interface_core *xch, + libxl_dominfo *info, + uint64_t *xenstore_pfn) { int rc; + const xen_pfn_t base = GUEST_MAGIC_BASE >> XC_PAGE_SHIFT; + xen_pfn_t p2m = (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET; - rc = xc_hvm_param_get(xch, info->domid, HVM_PARAM_STORE_PFN, xenstore_pfn); - if (rc < 0) { - fprintf(stderr,"Failed to get HVM_PARAM_STORE_PFN\n"); - return 1; - } + rc = xc_domain_setmaxmem(xch, info->domid, + info->max_memkb + (XC_PAGE_SIZE/1024)); + if (rc < 0) + return rc; + + rc = xc_domain_populate_physmap_exact(xch, info->domid, 1, 0, 0, &p2m); + if (rc < 0) + return rc; + + *xenstore_pfn = base + XENSTORE_PFN_OFFSET; + rc = xc_clear_domain_page(xch, info->domid, *xenstore_pfn); + if (rc < 0) + return rc; return 0; } @@ -88,7 +100,6 @@ static bool do_xs_write_vm(struct xs_handle *xsh, xs_transaction_t t, */ static int create_xenstore(struct xs_handle *xsh, libxl_dominfo *info, libxl_uuid uuid, - uint64_t xenstore_pfn, evtchn_port_t xenstore_port) { domid_t domid; @@ -134,7 +145,8 @@ static int create_xenstore(struct xs_handle *xsh, rc = snprintf(target_memkb_str, STR_MAX_LENGTH, "%"PRIu64, info->current_memkb); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; - rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%"PRIu64, xenstore_pfn); + rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%lld", + (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET); if (rc < 0 || rc >= STR_MAX_LENGTH) return rc; rc = snprintf(xenstore_port_str, STR_MAX_LENGTH, "%u", xenstore_port); @@ -218,6 +230,7 @@ static int init_domain(struct xs_handle *xsh, libxl_uuid uuid; uint64_t xenstore_evtchn, xenstore_pfn; int rc; + struct xenstore_domain_interface *intf; printf("Init dom0less domain: %u\n", info->domid); @@ -232,11 +245,20 @@ static int init_domain(struct xs_handle *xsh, if (!xenstore_evtchn) return 0; - /* Get xenstore page */ - if (get_xs_page(xch, info, &xenstore_pfn) != 0) { - fprintf(stderr,"Error on getting xenstore page\n"); + /* Alloc xenstore page */ + if (alloc_xs_page(xch, info, &xenstore_pfn) != 0) { + printf("Error on alloc magic pages\n"); + return 1; + } + + intf = xenforeignmemory_map(xfh, info->domid, PROT_READ | PROT_WRITE, 1, + &xenstore_pfn, NULL); + if (!intf) { + printf("Error mapping xenstore page\n"); return 1; } + intf->connection = XENSTORE_RECONNECT; + xenforeignmemory_unmap(xfh, intf, 1); rc = xc_dom_gnttab_seed(xch, info->domid, true, (xen_pfn_t)-1, xenstore_pfn, 0, 0); @@ -250,11 +272,19 @@ static int init_domain(struct xs_handle *xsh, if (rc) err(1, "gen_stub_json_config"); - rc = create_xenstore(xsh, info, uuid, xenstore_pfn, xenstore_evtchn); + /* Now everything is ready: set HVM_PARAM_STORE_PFN */ + rc = xc_hvm_param_set(xch, info->domid, HVM_PARAM_STORE_PFN, + xenstore_pfn); + if (rc < 0) + return rc; + + rc = create_xenstore(xsh, info, uuid, xenstore_evtchn); if (rc) err(1, "writing to xenstore"); - rc = xs_introduce_domain(xsh, info->domid, xenstore_pfn, xenstore_evtchn); + rc = xs_introduce_domain(xsh, info->domid, + (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET, + xenstore_evtchn); if (!rc) err(1, "xs_introduce_domain"); return 0; diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index ef2ba85ff4..f919d3acf9 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include #include #include #include @@ -11,8 +10,6 @@ #include #include -#include - #include #include #include @@ -742,56 +739,6 @@ static int __init alloc_xenstore_evtchn(struct domain *d) return 0; } -#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) ) - { - free_domheap_page(xenstore_pg); - 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; -} - static int __init construct_domU(struct domain *d, const struct dt_device_node *node) { @@ -892,10 +839,7 @@ static int __init construct_domU(struct domain *d, rc = alloc_xenstore_evtchn(d); if ( rc < 0 ) return rc; - - rc = alloc_xenstore_page(d); - if ( rc < 0 ) - return rc; + d->arch.hvm.params[HVM_PARAM_STORE_PFN] = ~0ULL; } return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 20 10:22:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jun 2024 10:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744383.1151413 (Exim 4.92) (envelope-from ) id 1sKEvc-0001Lm-FG; Thu, 20 Jun 2024 10:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744383.1151413; Thu, 20 Jun 2024 10: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 1sKEvc-0001Lf-CW; Thu, 20 Jun 2024 10:22:04 +0000 Received: by outflank-mailman (input) for mailman id 744383; Thu, 20 Jun 2024 10:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEvb-0001LG-Fm for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEvb-0004Vb-9k for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKEvb-0001Ma-8d for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wD5zcO97IZ/4zF/WGM9kr5cRfv5Xk/sspclf4fY8hBA=; b=w1Sr0fQ5Q7bbd396TM1fs0elQM wFkK13JcE6PG+jTHF7OWxIE6/J8awaxB8AYmyOgG5m6GTKtZ/on5irz3qUTOJ4jHr6eNQe2EugTaU fwYyTk8LMO4s8UQAgsHciSOonoEGnLFJjiDn/AitVqw2G+M8Umk+Lc1KsC5w6euzfpO8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] hotplug: Restore block-tap phy compatibility Message-Id: Date: Thu, 20 Jun 2024 10:22:03 +0000 commit f16ac12bd4181177a7d953f88ef301287f587380 Author: Jason Andryuk AuthorDate: Thu Jun 20 12:08:42 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:08:42 2024 +0200 hotplug: Restore block-tap phy compatibility backendtype=phy using the blktap kernel module needs to use write_dev, but tapback can't support that. tapback should perform better, but make the script compatible with the old kernel module again. Fixes: 76a484193d ("hotplug: Update block-tap") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD Release-Acked-by: Oleksii Kurochko --- tools/hotplug/Linux/block-tap | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/hotplug/Linux/block-tap b/tools/hotplug/Linux/block-tap index 126e472786..8661ce77e3 100755 --- a/tools/hotplug/Linux/block-tap +++ b/tools/hotplug/Linux/block-tap @@ -20,9 +20,13 @@ # # Disks should be specified using the following syntax: # +# For use with tapback (vbd3) (preferred): # vdev=xvda,backendtype=tap,format=vhd,target=/srv/target.vhd # -# format is either "aio" (for raw files), or "vhd" +# For use with blkback and the blktap2 kernel module: +# script=block-tap,vdev=xvda,target=: +# +# format/ is either "aio" (for raw files), or "vhd" dir=$(dirname "$0") . "$dir/block-common.sh" @@ -205,12 +209,17 @@ add() xenstore_write "$XENBUS_PATH/pid" "$pid" xenstore_write "$XENBUS_PATH/minor" "$minor" - # dev, as a unix socket, would end up with major:minor 0:0 in - # physical-device if write_dev were used. tapback would be thrown off by - # that incorrect minor, so just skip writing physical-device. - xenstore_write "$XENBUS_PATH/physical-device-path" "$dev" - success + if [ "$XENBUS_TYPE" = "vbd3" ] ; then + # $dev, as a unix socket, has major:minor 0:0. If write_dev writes + # physical-device, tapback would use that incorrect minor 0. So don't + # write physical-device. + xenstore_write "$XENBUS_PATH/physical-device-path" "$dev" + + success + else + write_dev "$dev" + fi release_lock "block" } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 20 10:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jun 2024 10:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744384.1151416 (Exim 4.92) (envelope-from ) id 1sKEvm-0001NQ-Gp; Thu, 20 Jun 2024 10:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744384.1151416; Thu, 20 Jun 2024 10: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 1sKEvm-0001NJ-E4; Thu, 20 Jun 2024 10:22:14 +0000 Received: by outflank-mailman (input) for mailman id 744384; Thu, 20 Jun 2024 10:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEvl-0001N9-Da for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEvl-0004Vm-Cp for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKEvl-0001NE-Bl for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jTVkMi6I/YfeAlZthkDSeiEBCsAu1Bka1eexS1iuYf8=; b=WfBUCp5q3k7tx+b2tjCEvDeTXH IgPP4x+Cqz9C5RUd4iKZARdH1Y1NRDr1J9W9gUO1egkdOUVi2ViQXL/bHsx/6nj968eRurJXHXyR9 wbvSWBExMaNmJE1xULLVoIhWKJylnNRPWBUd+RXggfgaxlftnZrmCbZs7WGOBxnYFCPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libs/light: Fix nic->vlan memory allocation Message-Id: Date: Thu, 20 Jun 2024 10:22:13 +0000 commit 74970165bab8924898f3ad186364bf96310e8e4e Author: Leigh Brown AuthorDate: Thu Jun 20 12:09:02 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:09:02 2024 +0200 tools/libs/light: Fix nic->vlan memory allocation After the following commit: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") xl list -l aborts with a double free error if a domain has at least one vif defined: $ sudo xl list -l free(): double free detected in tcache 2 Aborted Orginally, the vlan field was called vid and was defined as an integer. It was appropriate to call libxl__xs_read_checked() with gc passed as the string data was copied to a different variable. However, the final version uses a string data type and the call should have been changed to use NOGC instead of gc to allow that data to live past the gc controlled lifetime, in line with the other string fields. This patch makes the change to pass NOGC instead of gc and moves the new code to be next to the other string fields (fixing a couple of errant tabs along the way), as recommended by Jason. Fixes: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") Signed-off-by: Leigh Brown Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD Release-acked-by: Oleksii Kurochko --- tools/libs/light/libxl_nic.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_nic.c b/tools/libs/light/libxl_nic.c index d861e3726d..300a96a8b1 100644 --- a/tools/libs/light/libxl_nic.c +++ b/tools/libs/light/libxl_nic.c @@ -318,11 +318,6 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path, nic->mtu = LIBXL_DEVICE_NIC_MTU_DEFAULT; } - rc = libxl__xs_read_checked(gc, XBT_NULL, - GCSPRINTF("%s/vlan", libxl_path), - (const char **)(&nic->vlan)); - if (rc) goto out; - rc = libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/mac", libxl_path), &tmp); if (rc) goto out; @@ -345,6 +340,10 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path, GCSPRINTF("%s/script", libxl_path), (const char **)(&nic->script)); if (rc) goto out; + rc = libxl__xs_read_checked(NOGC, XBT_NULL, + GCSPRINTF("%s/vlan", libxl_path), + (const char **)(&nic->vlan)); + if (rc) goto out; rc = libxl__xs_read_checked(NOGC, XBT_NULL, GCSPRINTF("%s/forwarddev", libxl_path), (const char **)(&nic->coloft_forwarddev)); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 20 10:22:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jun 2024 10:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744385.1151421 (Exim 4.92) (envelope-from ) id 1sKEvw-0001Po-Ii; Thu, 20 Jun 2024 10:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744385.1151421; Thu, 20 Jun 2024 10: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 1sKEvw-0001Pg-Ff; Thu, 20 Jun 2024 10:22:24 +0000 Received: by outflank-mailman (input) for mailman id 744385; Thu, 20 Jun 2024 10:22:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEvv-0001PZ-IK for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEvv-0004WC-HC for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKEvv-0001Oc-F2 for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TY+ZlQtHtH3lhpDWIqirBfauDakBrA8ZkBtzMzbqYdM=; b=6v4qv7NV9t3Bx56aYuuJ1UaC6i iiF4CXhRwNiDB9sk89YdoHIYRUV/soBQFWRpspsc4+2jJwjNM9N9L2eC1NB/K7sWUusOItEVNnUSg DW3c/tPWuiWKnA3S1EtHQURals4b/0iU1SLESIzyuXEuUiOa9aTrNFcopx7wEjvDABUE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/irq: forward pending interrupts to new destination in fixup_irqs() Message-Id: Date: Thu, 20 Jun 2024 10:22:23 +0000 commit e2bb28d621584fce15c907002ddc7c6772644b64 Author: Roger Pau Monné AuthorDate: Thu Jun 20 12:09:32 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:09:32 2024 +0200 x86/irq: forward pending interrupts to new destination in fixup_irqs() fixup_irqs() is used to evacuate interrupts from to be offlined CPUs. Given the CPU is to become offline, the normal migration logic used by Xen where the vector in the previous target(s) is left configured until the interrupt is received on the new destination is not suitable. Instead attempt to do as much as possible in order to prevent loosing interrupts. If fixup_irqs() is called from the CPU to be offlined (as is currently the case for CPU hot unplug) attempt to forward pending vectors when interrupts that target the current CPU are migrated to a different destination. Additionally, for interrupts that have already been moved from the current CPU prior to the call to fixup_irqs() but that haven't been delivered to the new destination (iow: interrupts with move_in_progress set and the current CPU set in ->arch.old_cpu_mask) also check whether the previous vector is pending and forward it to the new destination. This allows us to remove the window with interrupts enabled at the bottom of fixup_irqs(). Such window wasn't safe anyway: references to the CPU to become offline are removed from interrupts masks, but the per-CPU vector_irq[] array is not updated to reflect those changes (as the CPU is going offline anyway). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/apic.h | 5 +++++ xen/arch/x86/irq.c | 46 +++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h index d1cb001fb4..7bd66dc6e1 100644 --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -132,6 +132,11 @@ static inline bool apic_isr_read(uint8_t vector) (vector & 0x1f)) & 1; } +static inline bool apic_irr_read(unsigned int vector) +{ + return apic_read(APIC_IRR + (vector / 32 * 0x10)) & (1U << (vector % 32)); +} + static inline u32 get_apic_id(void) { u32 id = apic_read(APIC_ID); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index d7f15c38af..9a611c79e0 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2591,7 +2591,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { - bool break_affinity = false, set_affinity = true; + bool break_affinity = false, set_affinity = true, check_irr = false; unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); @@ -2644,6 +2644,25 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) { + /* + * This to be offlined CPU was the target of an interrupt that's + * been moved, and the new destination target hasn't yet + * acknowledged any interrupt from it. + * + * We know the interrupt is configured to target the new CPU at + * this point, so we can check IRR for any pending vectors and + * forward them to the new destination. + * + * Note that for the other case of an interrupt movement being in + * progress (move_cleanup_count being non-zero) we know the new + * destination has already acked at least one interrupt from this + * source, and hence there's no need to forward any stale + * interrupts. + */ + if ( apic_irr_read(desc->arch.old_vector) ) + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + /* * This CPU is going offline, remove it from ->arch.old_cpu_mask * and possibly release the old vector if the old mask becomes @@ -2684,6 +2703,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( desc->handler->disable ) desc->handler->disable(desc); + /* + * If the current CPU is going offline and is (one of) the target(s) of + * the interrupt, signal to check whether there are any pending vectors + * to be handled in the local APIC after the interrupt has been moved. + */ + if ( !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.cpu_mask) ) + check_irr = true; + if ( desc->handler->set_affinity ) desc->handler->set_affinity(desc, affinity); else if ( !(warned++) ) @@ -2694,6 +2721,18 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) cpumask_copy(affinity, desc->affinity); + if ( check_irr && apic_irr_read(vector) ) + /* + * Forward pending interrupt to the new destination, this CPU is + * going offline and otherwise the interrupt would be lost. + * + * Do the IRR check as late as possible before releasing the irq + * desc in order for any in-flight interrupts to be delivered to + * the lapic. + */ + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + spin_unlock(&desc->lock); if ( !verbose ) @@ -2705,11 +2744,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) printk("Broke affinity for IRQ%u, new: {%*pbl}\n", irq, CPUMASK_PR(affinity)); } - - /* That doesn't seem sufficient. Give it 1ms. */ - local_irq_enable(); - mdelay(1); - local_irq_disable(); } void fixup_eoi(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 20 10:22:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jun 2024 10:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.744388.1151424 (Exim 4.92) (envelope-from ) id 1sKEw6-0001TI-LY; Thu, 20 Jun 2024 10:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 744388.1151424; Thu, 20 Jun 2024 10: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 1sKEw6-0001TB-J4; Thu, 20 Jun 2024 10:22:34 +0000 Received: by outflank-mailman (input) for mailman id 744388; Thu, 20 Jun 2024 10:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEw5-0001T1-Kv for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKEw5-0004WR-K7 for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKEw5-0001P8-JM for xen-changelog@lists.xenproject.org; Thu, 20 Jun 2024 10:22:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TUA/uxbpxfsCQq/1I7Z057iWEr9IqarBK3c6CpV1b8U=; b=Z8P0Pw5M7CAWfDnwanstROFAKf BZ4B9HYcCKVE3CWVwqD3o9zjwlBid2918ge7FBUkeoCzpIDaEoASlAWXpJO+CZ2Z6fksTzPpJHkCn BVqdp+FOPFQS7ndGhHS7uCSjjEgZLyadMakIQqInixCp1hbjLlUpc3/baWC875jMqSqo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] livepatch: use appropriate type for buffer offset variables Message-Id: Date: Thu, 20 Jun 2024 10:22:33 +0000 commit 62071a1c16c4dbe765491e58e456fd3a19b33298 Author: Jan Beulich AuthorDate: Thu Jun 20 12:10:27 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:10:27 2024 +0200 livepatch: use appropriate type for buffer offset variables As was made noticeable by the last of the commits referenced below, using a fixed-size type for such purposes is not only against ./CODING_STYLE, but can lead to actual issues. Switch to using size_t instead, thus also allowing calculations to be lighter-weight in 32-bit builds. No functional change for 64-bit builds. Link: https://gitlab.com/xen-project/xen/-/jobs/7136417308 Fixes: b145b4a39c13 ("livepatch: Handle arbitrary size names with the list operation") Fixes: 5083e0ff939d ("livepatch: Add metadata runtime retrieval mechanism") Fixes: 43d5c5d5f70b ("xen: avoid UB in guest handle arithmetic") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall Release-Acked-by: Oleksii Kurochko --- xen/common/livepatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index 502e264bc6..d93a556bcd 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -1252,7 +1252,7 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) list->metadata_total_size = 0; if ( list->nr ) { - uint64_t name_offset = 0, metadata_offset = 0; + size_t name_offset = 0, metadata_offset = 0; list_for_each_entry( data, &payload_list, list ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:44:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745067.1152190 (Exim 4.92) (envelope-from ) id 1sKYwE-0004z2-QK; Fri, 21 Jun 2024 07:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745067.1152190; Fri, 21 Jun 2024 07: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 1sKYwE-0004yt-ND; Fri, 21 Jun 2024 07:44:02 +0000 Received: by outflank-mailman (input) for mailman id 745067; Fri, 21 Jun 2024 07:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwE-0004yn-2p for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwD-0003Gr-Qc for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYwD-0002Fq-Oq for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I+nQedoUgRkzcxgSiYVCv1xuIH+N0rbOZ208nAo18rM=; b=zkflFLQjsVbbbVR92SfABmiIEu 6jQkD7MwIvAoOBgwAlDPqrRq+vUare2H5IdwWNA0TCzyh0B0W1d4Du954oEfpOvxZ9pvaChu6KDts zRTHS1txhV1QwDwlZT9XUgx3vxD9mnaSDIbxzKb26qgJEi7beVvW/FH7NZpuHlMeWV5g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/irq: Address MISRA Rule 8.3 violation Message-Id: Date: Fri, 21 Jun 2024 07:44:01 +0000 commit 82f480944718d9e8340a6ac1af41ece7851115bf Author: Andrew Cooper AuthorDate: Tue Jun 18 13:48:35 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 xen/irq: Address MISRA Rule 8.3 violation When centralising irq_ack_none(), different architectures had different names for the parameter. As it's type is struct irq_desc *, it should be named desc. Make this consistent. No functional change. Fixes: 8aeda4a241ab ("arch/irq: Make irq_ack_none() mandatory") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/irq.c | 4 ++-- xen/include/xen/irq.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index c60502444c..6b89f64fd1 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -31,9 +31,9 @@ struct irq_guest unsigned int virq; }; -void irq_ack_none(struct irq_desc *irq) +void irq_ack_none(struct irq_desc *desc) { - printk("unexpected IRQ trap at irq %02x\n", irq->irq); + printk("unexpected IRQ trap at irq %02x\n", desc->irq); } void irq_end_none(struct irq_desc *irq) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index adf33547d2..580ae37e74 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -134,7 +134,7 @@ void cf_check irq_actor_none(struct irq_desc *desc); * irq_ack_none() must be provided by the architecture. * irq_end_none() is optional, and opted into using a define. */ -void cf_check irq_ack_none(struct irq_desc *irq); +void cf_check irq_ack_none(struct irq_desc *desc); /* * Per-cpu interrupted context register state - the inner-most interrupt frame -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:44:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745068.1152193 (Exim 4.92) (envelope-from ) id 1sKYwO-00050c-RS; Fri, 21 Jun 2024 07:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745068.1152193; Fri, 21 Jun 2024 07: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 1sKYwO-00050S-Od; Fri, 21 Jun 2024 07:44:12 +0000 Received: by outflank-mailman (input) for mailman id 745068; Fri, 21 Jun 2024 07:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwN-00050M-VN for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwN-0003IS-Tt for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYwN-0002GV-Sq for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GJN99pqt61A1Ax88OgBqqJ8yYR18VBRUplEtmhR+SCs=; b=nNZlXVEssawV61xoJuxlmAlcOg mrWLbX7qLX5bzjQ3WvH5lrhDPB45rTjE5eLaO+okgLEwwZ+NjKp8ctfUaiIgvrIhyN/G9NeTNJJiQ Hcft2L2DbZ2aR8q9LkwJGax+AOOFLvCaprCMqcwrFeNRTFSaNuasX34y1FVHXdESAxB8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arch: Centralise __read_mostly and __ro_after_init Message-Id: Date: Fri, 21 Jun 2024 07:44:11 +0000 commit aba98c8d671bd290e978ec154d0baf042e093a65 Author: Andrew Cooper AuthorDate: Fri Jun 14 13:05:40 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 xen/arch: Centralise __read_mostly and __ro_after_init These living in cache.h is inherited from Linux, but cache.h is not a terribly appropriately location for them to live. __read_mostly is an optimisation related to data placement in order to avoid having shared data in cachelines that are likely to be written to, but it really is just a section of the linked image separating data by usage patterns; it has nothing to do with cache sizes or flushing logic. Worse, __ro_after_init was only in xen/cache.h because __read_mostly was in arch/cache.h, and has literally nothing whatsoever to do with caches. Move the definitions into xen/sections.h, which in particular means that RISC-V doesn't need to repeat the problematic pattern. Take the opportunity to provide a short descriptions of what these are used for. For now, leave TODO comments next to the other identical definitions. It turns out that unpicking cache.h is more complicated than it appears because a number of files use it for transitive dependencies. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- xen/arch/arm/include/asm/cache.h | 1 + xen/arch/ppc/include/asm/cache.h | 1 + xen/arch/x86/include/asm/cache.h | 1 + xen/include/xen/cache.h | 1 + xen/include/xen/sections.h | 21 +++++++++++++++++++++ 5 files changed, 25 insertions(+) diff --git a/xen/arch/arm/include/asm/cache.h b/xen/arch/arm/include/asm/cache.h index 240b6ae0ea..029b2896fb 100644 --- a/xen/arch/arm/include/asm/cache.h +++ b/xen/arch/arm/include/asm/cache.h @@ -6,6 +6,7 @@ #define L1_CACHE_SHIFT (CONFIG_ARM_L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +/* TODO: Phase out the use of this via cache.h */ #define __read_mostly __section(".data.read_mostly") #endif diff --git a/xen/arch/ppc/include/asm/cache.h b/xen/arch/ppc/include/asm/cache.h index 0d7323d789..13c0bf3242 100644 --- a/xen/arch/ppc/include/asm/cache.h +++ b/xen/arch/ppc/include/asm/cache.h @@ -3,6 +3,7 @@ #ifndef _ASM_PPC_CACHE_H #define _ASM_PPC_CACHE_H +/* TODO: Phase out the use of this via cache.h */ #define __read_mostly __section(".data.read_mostly") #endif /* _ASM_PPC_CACHE_H */ diff --git a/xen/arch/x86/include/asm/cache.h b/xen/arch/x86/include/asm/cache.h index e4770efb22..956c05493e 100644 --- a/xen/arch/x86/include/asm/cache.h +++ b/xen/arch/x86/include/asm/cache.h @@ -9,6 +9,7 @@ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +/* TODO: Phase out the use of this via cache.h */ #define __read_mostly __section(".data.read_mostly") #ifndef __ASSEMBLY__ diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index f52a0aedf7..55456823c5 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,6 +15,7 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif +/* TODO: Phase out the use of this via cache.h */ #define __ro_after_init __section(".data.ro_after_init") #endif /* __LINUX_CACHE_H */ diff --git a/xen/include/xen/sections.h b/xen/include/xen/sections.h index b6cb5604c2..f2fac8d7fa 100644 --- a/xen/include/xen/sections.h +++ b/xen/include/xen/sections.h @@ -3,9 +3,30 @@ #ifndef __XEN_SECTIONS_H__ #define __XEN_SECTIONS_H__ +#include + /* SAF-0-safe */ extern char __init_begin[], __init_end[]; +/* + * Some data is expected to be written rarely (if at all). + * + * For performance reasons is it helpful to group such data in the build, to + * avoid the linker placing it adjacent to often-written data. + */ +#define __read_mostly __section(".data.read_mostly") + +/* + * Some data should be chosen during boot and be immutable thereafter. + * + * Variables annotated with __ro_after_init will become read-only after boot + * and suffer a runtime access fault if modified. + * + * For architectures/platforms which haven't implemented support, these + * variables will be treated as regular mutable data. + */ +#define __ro_after_init __section(".data.ro_after_init") + #endif /* !__XEN_SECTIONS_H__ */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:44:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:44:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745069.1152196 (Exim 4.92) (envelope-from ) id 1sKYwY-00053F-Sh; Fri, 21 Jun 2024 07:44:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745069.1152196; Fri, 21 Jun 2024 07: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 1sKYwY-000537-Q5; Fri, 21 Jun 2024 07:44:22 +0000 Received: by outflank-mailman (input) for mailman id 745069; Fri, 21 Jun 2024 07:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwY-000531-3r for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwY-0003Id-1U for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYwX-0002H0-Vz for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aQmOGfydpjzvpo612u4bX5yCamletHXL3GFmHUCUsT8=; b=TSFJCba3FKna7WE8PmfygD9Fh7 l1nRgkkCLnZ3Hs3398iLSqT8g7xw2H/ciL+n2a3R+oZKTAUjTGwsXBpI3uRSAdWAmvyiCVS+GfL1z SNgmGPXOBuZon8LKRAdfP8l3UG+OM0rMd//m6a80wYC43c0GOWPVgCD8K4XVicejqo+8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/xstate: Fix initialisation of XSS cache Message-Id: Date: Fri, 21 Jun 2024 07:44:21 +0000 commit 9e6dbbe8bf400aacb99009ddffa91d2a0c312b39 Author: Andrew Cooper AuthorDate: Wed May 22 17:23:54 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/xstate: Fix initialisation of XSS cache The clobbering of this_cpu(xcr0) and this_cpu(xss) to architecturally invalid values is to force the subsequent set_xcr0() and set_msr_xss() to reload the hardware register. While XCR0 is reloaded in xstate_init(), MSR_XSS isn't. This causes get_msr_xss() to return the invalid value, and logic of the form: old = get_msr_xss(); set_msr_xss(new); ... set_msr_xss(old); to try and restore said invalid value. The architecturally invalid value must be purged from the cache, meaning the hardware register must be written at least once. This in turn highlights that the invalid value must only be used in the case that the hardware register is available. Fixes: f7f4a523927f ("x86/xstate: reset cached register values on resume") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/xstate.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 99cedb4f5e..7578814796 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -641,13 +641,6 @@ void xstate_init(struct cpuinfo_x86 *c) return; } - /* - * Zap the cached values to make set_xcr0() and set_msr_xss() really - * write it. - */ - this_cpu(xcr0) = 0; - this_cpu(xss) = ~0; - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; BUG_ON(!valid_xcr0(feature_mask)); @@ -657,8 +650,19 @@ void xstate_init(struct cpuinfo_x86 *c) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); + + /* + * Zap the cached values to make set_xcr0() and set_msr_xss() really write + * the hardware register. + */ + this_cpu(xcr0) = 0; if ( !set_xcr0(feature_mask) ) BUG(); + if ( cpu_has_xsaves ) + { + this_cpu(xss) = ~0; + set_msr_xss(0); + } if ( bsp ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:44:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745074.1152200 (Exim 4.92) (envelope-from ) id 1sKYwi-00056m-Va; Fri, 21 Jun 2024 07:44:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745074.1152200; Fri, 21 Jun 2024 07:44: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 1sKYwi-00056d-Sg; Fri, 21 Jun 2024 07:44:32 +0000 Received: by outflank-mailman (input) for mailman id 745074; Fri, 21 Jun 2024 07:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwi-00056R-5A for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYwi-0003J4-4M for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYwi-0002HR-3d for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fmEdETBJAGWX0L7IS8QgxV8MxuzcvdmnO2r7QlMIvts=; b=RD/n+l2J4lfYktdP/uFaPzKDKF 5Y4n5CzpwjjKdI0EaPBOCuAOSy69fmmfGxmR7LxREJ3ALeVnxEKZwFBYjdlRFtZxg8MZIogvMIgAZ h/8GSp3W3rEaECDAZQWsfq5OtDbIqbDBScjOAXQkFNR8n6FqdHOM8Y7TRjJMbQnTQNrE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/xstate: Cross-check dynamic XSTATE sizes at boot Message-Id: Date: Fri, 21 Jun 2024 07:44:32 +0000 commit d31a111940de5431c8bf465b1d38b89f1130a24b Author: Andrew Cooper AuthorDate: Fri Feb 21 17:56:57 2020 +0000 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/xstate: Cross-check dynamic XSTATE sizes at boot Right now, xstate_ctxt_size() performs a cross-check of size with CPUID in for every call. This is expensive, being used for domain create/migrate, as well as to service certain guest CPUID instructions. Instead, arrange to check the sizes once at boot. See the code comments for details. Right now, it just checks hardware against the algorithm expectations. Later patches will cross-check Xen's XSTATE calculations too. Introduce more X86_XCR0_* and X86_XSS_* constants CPUID bits. This is to maximise coverage in the sanity check, even if we don't expect to use/virtualise some of these features any time soon. Leave HDC and HWP alone for now; we don't have CPUID bits from them stored nicely. Only perform the cross-checks when SELF_TESTS are active. It's only developers or new hardware liable to trip these checks, and Xen at least tracks "maximum value ever seen in xcr0" for the lifetime of the VM, which we don't want to be tickling in the general case. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/x86-defns.h | 25 +++- xen/arch/x86/xstate.c | 170 ++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 3 + 3 files changed, 197 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index 48d7a3b7af..d7602ab225 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -77,7 +77,7 @@ #define X86_CR4_PKS 0x01000000 /* Protection Key Supervisor */ /* - * XSTATE component flags in XCR0 + * XSTATE component flags in XCR0 | MSR_XSS */ #define X86_XCR0_FP_POS 0 #define X86_XCR0_FP (1ULL << X86_XCR0_FP_POS) @@ -95,11 +95,34 @@ #define X86_XCR0_ZMM (1ULL << X86_XCR0_ZMM_POS) #define X86_XCR0_HI_ZMM_POS 7 #define X86_XCR0_HI_ZMM (1ULL << X86_XCR0_HI_ZMM_POS) +#define X86_XSS_PROC_TRACE (_AC(1, ULL) << 8) #define X86_XCR0_PKRU_POS 9 #define X86_XCR0_PKRU (1ULL << X86_XCR0_PKRU_POS) +#define X86_XSS_PASID (_AC(1, ULL) << 10) +#define X86_XSS_CET_U (_AC(1, ULL) << 11) +#define X86_XSS_CET_S (_AC(1, ULL) << 12) +#define X86_XSS_HDC (_AC(1, ULL) << 13) +#define X86_XSS_UINTR (_AC(1, ULL) << 14) +#define X86_XSS_LBR (_AC(1, ULL) << 15) +#define X86_XSS_HWP (_AC(1, ULL) << 16) +#define X86_XCR0_TILE_CFG (_AC(1, ULL) << 17) +#define X86_XCR0_TILE_DATA (_AC(1, ULL) << 18) #define X86_XCR0_LWP_POS 62 #define X86_XCR0_LWP (1ULL << X86_XCR0_LWP_POS) +#define X86_XCR0_STATES \ + (X86_XCR0_FP | X86_XCR0_SSE | X86_XCR0_YMM | X86_XCR0_BNDREGS | \ + X86_XCR0_BNDCSR | X86_XCR0_OPMASK | X86_XCR0_ZMM | \ + X86_XCR0_HI_ZMM | X86_XCR0_PKRU | X86_XCR0_TILE_CFG | \ + X86_XCR0_TILE_DATA | \ + X86_XCR0_LWP) + +#define X86_XSS_STATES \ + (X86_XSS_PROC_TRACE | X86_XSS_PASID | X86_XSS_CET_U | \ + X86_XSS_CET_S | X86_XSS_HDC | X86_XSS_UINTR | X86_XSS_LBR | \ + X86_XSS_HWP | \ + 0) + /* * Debug status flags in DR6. * diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 7578814796..408d9dd108 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -604,9 +604,176 @@ static bool valid_xcr0(uint64_t xcr0) if ( !(xcr0 & X86_XCR0_BNDREGS) != !(xcr0 & X86_XCR0_BNDCSR) ) return false; + /* TILECFG and TILEDATA must be the same. */ + if ( !(xcr0 & X86_XCR0_TILE_CFG) != !(xcr0 & X86_XCR0_TILE_DATA) ) + return false; + return true; } +struct xcheck_state { + uint64_t states; + uint32_t uncomp_size; + uint32_t comp_size; +}; + +static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) +{ + uint32_t hw_size; + + BUILD_BUG_ON(X86_XCR0_STATES & X86_XSS_STATES); + + BUG_ON(new <= s->states); /* States strictly increase by index. */ + BUG_ON(s->states & new); /* States only accumulate. */ + BUG_ON(!valid_xcr0(s->states | new)); /* Xen thinks it's a good value. */ + BUG_ON(new & ~(X86_XCR0_STATES | X86_XSS_STATES)); /* Known state. */ + BUG_ON((new & X86_XCR0_STATES) && + (new & X86_XSS_STATES)); /* User or supervisor, not both. */ + + s->states |= new; + if ( new & X86_XCR0_STATES ) + { + if ( !set_xcr0(s->states & X86_XCR0_STATES) ) + BUG(); + } + else + set_msr_xss(s->states & X86_XSS_STATES); + + /* + * Check the uncompressed size. First ask hardware. + */ + hw_size = cpuid_count_ebx(0xd, 0); + + if ( new & X86_XSS_STATES ) + { + /* + * Supervisor states don't exist in an uncompressed image, so check + * that the uncompressed size doesn't change. Otherwise... + */ + if ( hw_size != s->uncomp_size ) + panic("XSTATE 0x%016"PRIx64", new sup bits {%63pbl}, uncompressed hw size %#x != prev size %#x\n", + s->states, &new, hw_size, s->uncomp_size); + } + else + { + /* + * ... some user XSTATEs are out-of-order and fill in prior holes. + * The best check we make is that the size never decreases. + */ + if ( hw_size < s->uncomp_size ) + panic("XSTATE 0x%016"PRIx64", new bits {%63pbl}, uncompressed hw size %#x < prev size %#x\n", + s->states, &new, hw_size, s->uncomp_size); + } + + s->uncomp_size = hw_size; + + /* + * Check the compressed size, if available. + */ + hw_size = cpuid_count_ebx(0xd, 1); + + if ( cpu_has_xsavec ) + { + /* + * All components strictly appear in index order, irrespective of + * whether they're user or supervisor. As each component also has + * non-zero size, the accumulated size should strictly increase. + */ + if ( hw_size <= s->comp_size ) + panic("XSTATE 0x%016"PRIx64", new bits {%63pbl}, compressed hw size %#x <= prev size %#x\n", + s->states, &new, hw_size, s->comp_size); + + s->comp_size = hw_size; + } + else if ( hw_size ) /* Compressed size reported, but no XSAVEC ? */ + { + static bool once; + + if ( !once ) + { + WARN(); + once = true; + } + } +} + +/* + * The {un,}compressed XSTATE sizes are reported by dynamic CPUID value, based + * on the current %XCR0 and MSR_XSS values. The exact layout is also feature + * and vendor specific. Cross-check Xen's understanding against real hardware + * on boot. + * + * Testing every combination is prohibitive, so we use a partial approach. + * Starting with nothing active, we add new XSTATEs and check that the CPUID + * dynamic values never decreases. + */ +static void __init noinline xstate_check_sizes(void) +{ + uint64_t old_xcr0 = get_xcr0(); + uint64_t old_xss = get_msr_xss(); + struct xcheck_state s = {}; + + /* + * User and supervisor XSTATEs, increasing by index. + * + * Chronologically, Intel and AMD had identical layouts for AVX (YMM). + * AMD introduced LWP in Fam15h, following immediately on from YMM. Intel + * left an LWP-shaped hole when adding MPX (BND{CSR,REGS}) in Skylake. + * AMD removed LWP in Fam17h, putting PKRU in the same space, breaking + * layout compatibility with Intel and having a knock-on effect on all + * subsequent states. + */ + check_new_xstate(&s, X86_XCR0_SSE | X86_XCR0_FP); + + if ( cpu_has_avx ) + check_new_xstate(&s, X86_XCR0_YMM); + + if ( cpu_has_mpx ) + check_new_xstate(&s, X86_XCR0_BNDCSR | X86_XCR0_BNDREGS); + + if ( cpu_has_avx512f ) + check_new_xstate(&s, X86_XCR0_HI_ZMM | X86_XCR0_ZMM | X86_XCR0_OPMASK); + + /* + * Intel Broadwell has Processor Trace but no XSAVES. There doesn't + * appear to have been a new enumeration when X86_XSS_PROC_TRACE was + * introduced in Skylake. + */ + if ( cpu_has_xsaves && cpu_has_proc_trace ) + check_new_xstate(&s, X86_XSS_PROC_TRACE); + + if ( cpu_has_pku ) + check_new_xstate(&s, X86_XCR0_PKRU); + + if ( cpu_has_xsaves && boot_cpu_has(X86_FEATURE_ENQCMD) ) + check_new_xstate(&s, X86_XSS_PASID); + + if ( cpu_has_xsaves && (boot_cpu_has(X86_FEATURE_CET_SS) || + boot_cpu_has(X86_FEATURE_CET_IBT)) ) + { + check_new_xstate(&s, X86_XSS_CET_U); + check_new_xstate(&s, X86_XSS_CET_S); + } + + if ( cpu_has_xsaves && boot_cpu_has(X86_FEATURE_UINTR) ) + check_new_xstate(&s, X86_XSS_UINTR); + + if ( cpu_has_xsaves && boot_cpu_has(X86_FEATURE_ARCH_LBR) ) + check_new_xstate(&s, X86_XSS_LBR); + + if ( boot_cpu_has(X86_FEATURE_AMX_TILE) ) + check_new_xstate(&s, X86_XCR0_TILE_DATA | X86_XCR0_TILE_CFG); + + if ( boot_cpu_has(X86_FEATURE_LWP) ) + check_new_xstate(&s, X86_XCR0_LWP); + + /* Restore old state now the test is done. */ + if ( !set_xcr0(old_xcr0) ) + BUG(); + if ( cpu_has_xsaves ) + set_msr_xss(old_xss); +} + /* Collect the information of processor's extended state */ void xstate_init(struct cpuinfo_x86 *c) { @@ -683,6 +850,9 @@ void xstate_init(struct cpuinfo_x86 *c) if ( setup_xstate_features(bsp) && bsp ) BUG(); + + if ( IS_ENABLED(CONFIG_SELF_TESTS) && bsp ) + xstate_check_sizes(); } int validate_xstate(const struct domain *d, uint64_t xcr0, uint64_t xcr0_accum, diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 6627453e39..d9eba5e9a7 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -266,6 +266,7 @@ XEN_CPUFEATURE(IBPB_RET, 8*32+30) /*A IBPB clears RSB/RAS too. */ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ XEN_CPUFEATURE(FSRM, 9*32+ 4) /*A Fast Short REP MOVS */ +XEN_CPUFEATURE(UINTR, 9*32+ 5) /* User-mode Interrupts */ XEN_CPUFEATURE(AVX512_VP2INTERSECT, 9*32+8) /*a VP2INTERSECT{D,Q} insns */ XEN_CPUFEATURE(SRBDS_CTRL, 9*32+ 9) /* MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. */ XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*!A| VERW clears microarchitectural buffers */ @@ -274,8 +275,10 @@ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*A SERIALIZE insn */ XEN_CPUFEATURE(HYBRID, 9*32+15) /* Heterogeneous platform */ XEN_CPUFEATURE(TSXLDTRK, 9*32+16) /*a TSX load tracking suspend/resume insns */ +XEN_CPUFEATURE(ARCH_LBR, 9*32+19) /* Architectural Last Branch Record */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(AVX512_FP16, 9*32+23) /*A AVX512 FP16 instructions */ +XEN_CPUFEATURE(AMX_TILE, 9*32+24) /* AMX Tile architecture */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ XEN_CPUFEATURE(L1D_FLUSH, 9*32+28) /*S MSR_FLUSH_CMD and L1D flush. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:44:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745076.1152205 (Exim 4.92) (envelope-from ) id 1sKYwt-00059a-0h; Fri, 21 Jun 2024 07:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745076.1152205; Fri, 21 Jun 2024 07:44: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 1sKYws-00059S-UK; Fri, 21 Jun 2024 07:44:42 +0000 Received: by outflank-mailman (input) for mailman id 745076; Fri, 21 Jun 2024 07:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYws-00059M-8Y for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYws-0003JP-7q for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYws-0002Hs-6j for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9SXGvAUIJ0RtX1lxI+CenA6Rh9DYaRcW6nePzV1nnOs=; b=uuXIzF0ZoxbuY5ccCn+1zKcBty bhIY4vQuduaNvgVfP4QumDR7wK8eWNS0B5tFIoR2Njm04x9dLmfVaGAleoicq+FolIaOMQ9jeaqRV olzJiV3Zlzhu7a1z7sj+jdCKmPZcooWTWop3EdKJeAb21rqvJvUV2EAIYK3ewFcxe/zA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Collect the Raw CPU Policy earlier on boot Message-Id: Date: Fri, 21 Jun 2024 07:44:42 +0000 commit a09022a09e1a79b3f9574993993bfad803b32596 Author: Andrew Cooper AuthorDate: Thu May 23 00:55:34 2024 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/boot: Collect the Raw CPU Policy earlier on boot This is a tangle, but it's a small step in the right direction. In the following change, xstate_init() is going to start using the Raw policy. calculate_raw_cpu_policy() is sufficiently separate from the other policies to safely move like this. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu-policy.c | 1 - xen/arch/x86/setup.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index b96f4ee55c..5b66f002df 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -845,7 +845,6 @@ static void __init calculate_hvm_def_policy(void) void __init init_guest_cpu_policies(void) { - calculate_raw_cpu_policy(); calculate_host_policy(); if ( IS_ENABLED(CONFIG_PV) ) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index dd51e68dbe..eee20bb175 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1888,7 +1888,9 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ - identify_cpu(&boot_cpu_data); + calculate_raw_cpu_policy(); /* Needs microcode. No other dependenices. */ + + identify_cpu(&boot_cpu_data); /* Needs microcode and raw policy. */ set_in_cr4(X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:44:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745077.1152210 (Exim 4.92) (envelope-from ) id 1sKYx4-0005D4-4u; Fri, 21 Jun 2024 07:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745077.1152210; Fri, 21 Jun 2024 07:44:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYx4-0005Cx-0w; Fri, 21 Jun 2024 07:44:54 +0000 Received: by outflank-mailman (input) for mailman id 745077; Fri, 21 Jun 2024 07:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYx2-0005Ch-Bt for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYx2-0003Ja-BA for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYx2-0002IP-AF for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wDLjjc/y65xUsN+bSrxGeRmm8+Gsi7a8t384/00IZ6g=; b=ulKDwBfnxzmq7iUbZ7ur6YtQun oLN8bjhwjFU7ojueZV7jJPPyWogAIRf6XsBZv1FnGBV67q0NrYSeLqTalATf+8gnFXeZ1H/m+Rou2 s6uVhwKqjiKCrbijhZA4Vs9PL2J5D9Kwt99VUYXwB5sACY29tyOoxbIgARLScNebHNF4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/xstate: Rework xstate_ctxt_size() as xstate_uncompressed_size() Message-Id: Date: Fri, 21 Jun 2024 07:44:52 +0000 commit df09dfb94de66f7523837c050616a382aa2c7d17 Author: Andrew Cooper AuthorDate: Fri Apr 30 20:17:55 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/xstate: Rework xstate_ctxt_size() as xstate_uncompressed_size() We're soon going to need a compressed helper of the same form. The size of the uncompressed image depends on the single element with the largest offset + size. Sadly this isn't always the element with the largest index. Name the per-xstate-component cpu_policy struture, for legibility of the logic in xstate_uncompressed_size(). Cross-check with hardware during boot, and remove hw_uncompressed_size(). This means that the migration paths don't need to mess with XCR0 just to sanity check the buffer size. It also means we can drop the "fastpath" check against xfeature_mask (there to skip some XCR0 writes); this path is going to be dead logic the moment Xen starts using supervisor states itself. The users of hw_uncompressed_size() in xstate_init() can (and indeed need) to be replaced with CPUID instructions. They run with feature_mask in XCR0, and prior to setup_xstate_features() on the BSP. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/include/asm/xstate.h | 2 +- xen/arch/x86/xstate.c | 79 ++++++++++++++++++++++-------------- xen/include/xen/lib/x86/cpu-policy.h | 2 +- 5 files changed, 52 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 335aedf46d..9190e11faa 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -833,7 +833,7 @@ long arch_do_domctl( uint32_t offset = 0; #define PV_XSAVE_HDR_SIZE (2 * sizeof(uint64_t)) -#define PV_XSAVE_SIZE(xcr0) (PV_XSAVE_HDR_SIZE + xstate_ctxt_size(xcr0)) +#define PV_XSAVE_SIZE(xcr0) (PV_XSAVE_HDR_SIZE + xstate_uncompressed_size(xcr0)) ret = -ESRCH; if ( (evc->vcpu >= d->max_vcpus) || diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8334ab1711..7f4b627b1f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1206,7 +1206,7 @@ HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, NULL, hvm_load_cpu_ctxt, 1, #define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ save_area) + \ - xstate_ctxt_size(xcr0)) + xstate_uncompressed_size(xcr0)) static int cf_check hvm_save_cpu_xsave_states( struct vcpu *v, hvm_domain_context_t *h) diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index c08c267884..f5115199d4 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -107,7 +107,7 @@ void compress_xsave_states(struct vcpu *v, const void *src, unsigned int size); void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(struct cpuinfo_x86 *c); -unsigned int xstate_ctxt_size(u64 xcr0); +unsigned int xstate_uncompressed_size(uint64_t xcr0); static inline uint64_t xgetbv(unsigned int index) { diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 408d9dd108..c8bc40fb5c 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -8,6 +8,8 @@ #include #include #include + +#include #include #include #include @@ -183,7 +185,7 @@ void expand_xsave_states(const struct vcpu *v, void *dest, unsigned int size) /* Check there is state to serialise (i.e. at least an XSAVE_HDR) */ BUG_ON(!v->arch.xcr0_accum); /* Check there is the correct room to decompress into. */ - BUG_ON(size != xstate_ctxt_size(v->arch.xcr0_accum)); + BUG_ON(size != xstate_uncompressed_size(v->arch.xcr0_accum)); if ( !(xstate->xsave_hdr.xcomp_bv & XSTATE_COMPACTION_ENABLED) ) { @@ -245,7 +247,7 @@ void compress_xsave_states(struct vcpu *v, const void *src, unsigned int size) u64 xstate_bv, valid; BUG_ON(!v->arch.xcr0_accum); - BUG_ON(size != xstate_ctxt_size(v->arch.xcr0_accum)); + BUG_ON(size != xstate_uncompressed_size(v->arch.xcr0_accum)); ASSERT(!xsave_area_compressed(src)); xstate_bv = ((const struct xsave_struct *)src)->xsave_hdr.xstate_bv; @@ -553,32 +555,6 @@ void xstate_free_save_area(struct vcpu *v) v->arch.xsave_area = NULL; } -static unsigned int hw_uncompressed_size(uint64_t xcr0) -{ - u64 act_xcr0 = get_xcr0(); - unsigned int size; - bool ok = set_xcr0(xcr0); - - ASSERT(ok); - size = cpuid_count_ebx(XSTATE_CPUID, 0); - ok = set_xcr0(act_xcr0); - ASSERT(ok); - - return size; -} - -/* Fastpath for common xstate size requests, avoiding reloads of xcr0. */ -unsigned int xstate_ctxt_size(u64 xcr0) -{ - if ( xcr0 == xfeature_mask ) - return xsave_cntxt_size; - - if ( xcr0 == 0 ) /* TODO: clean up paths passing 0 in here. */ - return 0; - - return hw_uncompressed_size(xcr0); -} - static bool valid_xcr0(uint64_t xcr0) { /* FP must be unconditionally set. */ @@ -611,6 +587,38 @@ static bool valid_xcr0(uint64_t xcr0) return true; } +unsigned int xstate_uncompressed_size(uint64_t xcr0) +{ + unsigned int size = XSTATE_AREA_MIN_SIZE, i; + + /* Non-XCR0 states don't exist in an uncompressed image. */ + ASSERT((xcr0 & ~X86_XCR0_STATES) == 0); + + if ( xcr0 == 0 ) + return 0; + + if ( xcr0 <= (X86_XCR0_SSE | X86_XCR0_FP) ) + return size; + + /* + * For the non-legacy states, search all activate states and find the + * maximum offset+size. Some states (e.g. LWP, APX_F) are out-of-order + * with respect their index. + */ + xcr0 &= ~(X86_XCR0_SSE | X86_XCR0_FP); + for_each_set_bit ( i, &xcr0, 63 ) + { + const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; + unsigned int s = c->offset + c->size; + + ASSERT(c->offset && c->size); + + size = max(size, s); + } + + return size; +} + struct xcheck_state { uint64_t states; uint32_t uncomp_size; @@ -619,7 +627,7 @@ struct xcheck_state { static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) { - uint32_t hw_size; + uint32_t hw_size, xen_size; BUILD_BUG_ON(X86_XCR0_STATES & X86_XSS_STATES); @@ -667,6 +675,15 @@ static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) s->uncomp_size = hw_size; + /* + * Second, check that Xen's calculation always matches hardware's. + */ + xen_size = xstate_uncompressed_size(s->states & X86_XCR0_STATES); + + if ( xen_size != hw_size ) + panic("XSTATE 0x%016"PRIx64", uncompressed hw size %#x != xen size %#x\n", + s->states, hw_size, xen_size); + /* * Check the compressed size, if available. */ @@ -838,14 +855,14 @@ void xstate_init(struct cpuinfo_x86 *c) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = hw_uncompressed_size(feature_mask); + xsave_cntxt_size = cpuid_count_ebx(0xd, 0); printk("xstate: size: %#x and states: %#"PRIx64"\n", xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != hw_uncompressed_size(feature_mask)); + BUG_ON(xsave_cntxt_size != cpuid_count_ebx(0xd, 0)); } if ( setup_xstate_features(bsp) && bsp ) diff --git a/xen/include/xen/lib/x86/cpu-policy.h b/xen/include/xen/lib/x86/cpu-policy.h index d5e447e9dc..d26012c6da 100644 --- a/xen/include/xen/lib/x86/cpu-policy.h +++ b/xen/include/xen/lib/x86/cpu-policy.h @@ -248,7 +248,7 @@ struct cpu_policy }; /* Per-component common state. Valid for i >= 2. */ - struct { + struct xstate_component { uint32_t size, offset; bool xss:1, align:1; uint32_t _res_d; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:45:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745078.1152214 (Exim 4.92) (envelope-from ) id 1sKYxE-0005Fv-6M; Fri, 21 Jun 2024 07:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745078.1152214; Fri, 21 Jun 2024 07:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxE-0005Fm-2d; Fri, 21 Jun 2024 07:45:04 +0000 Received: by outflank-mailman (input) for mailman id 745078; Fri, 21 Jun 2024 07:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxC-0005Fe-FF for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxC-0003K8-EU for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYxC-0002J7-DX for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8Tv4CB0XmiZ/LIiYfIvxUBScG0H3V7ttXYqMcPb/L/8=; b=wEJdYB1YJVuoz5Jel7OYiI/Cyo w0ACN4lW9bO48Ji5CpjtlfdfcdF3Ho70gJ+Uz3JS5OxAjmncEXQJqTQ4O+NvrtNFZ5FsKOaJWAzk4 Ga6EWfqDEXeQHoySy2eadbfyTxNBWSmKCriqGduOiMXObQW9Ncq6LTUWfNAEHxkhAoS8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Simplify recalculate_xstate() Message-Id: Date: Fri, 21 Jun 2024 07:45:02 +0000 commit fdb7e77fea4cb1c98dc51dd891a47f7e94612ad4 Author: Andrew Cooper AuthorDate: Fri Apr 30 20:17:55 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/cpu-policy: Simplify recalculate_xstate() Make use of xstate_uncompressed_size() helper rather than maintaining the running calculation while accumulating feature components. The rest of the CPUID data can come direct from the raw cpu policy. All per-component data form an ABI through the behaviour of the X{SAVE,RSTOR}* instructions. Use for_each_set_bit() rather than opencoding a slightly awkward version of it. Mask the attributes in ecx down based on the visible features. This isn't actually necessary for any components or attributes defined at the time of writing (up to AMX), but is added out of an abundance of caution. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu-policy.c | 55 ++++++++++++++------------------------- xen/arch/x86/include/asm/xstate.h | 1 + 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 5b66f002df..304dc20cfa 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -193,8 +193,7 @@ static void sanitise_featureset(uint32_t *fs) static void recalculate_xstate(struct cpu_policy *p) { uint64_t xstates = XSTATE_FP_SSE; - uint32_t xstate_size = XSTATE_AREA_MIN_SIZE; - unsigned int i, Da1 = p->xstate.Da1; + unsigned int i, ecx_mask = 0, Da1 = p->xstate.Da1; /* * The Da1 leaf is the only piece of information preserved in the common @@ -206,61 +205,47 @@ static void recalculate_xstate(struct cpu_policy *p) return; if ( p->basic.avx ) - { xstates |= X86_XCR0_YMM; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_YMM_POS] + - xstate_sizes[X86_XCR0_YMM_POS]); - } if ( p->feat.mpx ) - { xstates |= X86_XCR0_BNDREGS | X86_XCR0_BNDCSR; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_BNDCSR_POS] + - xstate_sizes[X86_XCR0_BNDCSR_POS]); - } if ( p->feat.avx512f ) - { xstates |= X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_HI_ZMM_POS] + - xstate_sizes[X86_XCR0_HI_ZMM_POS]); - } if ( p->feat.pku ) - { xstates |= X86_XCR0_PKRU; - xstate_size = max(xstate_size, - xstate_offsets[X86_XCR0_PKRU_POS] + - xstate_sizes[X86_XCR0_PKRU_POS]); - } - p->xstate.max_size = xstate_size; + /* Subleaf 0 */ + p->xstate.max_size = + xstate_uncompressed_size(xstates & ~XSTATE_XSAVES_ONLY); p->xstate.xcr0_low = xstates & ~XSTATE_XSAVES_ONLY; p->xstate.xcr0_high = (xstates & ~XSTATE_XSAVES_ONLY) >> 32; + /* Subleaf 1 */ p->xstate.Da1 = Da1; + if ( p->xstate.xsavec ) + ecx_mask |= XSTATE_ALIGN64; + if ( p->xstate.xsaves ) { + ecx_mask |= XSTATE_XSS; p->xstate.xss_low = xstates & XSTATE_XSAVES_ONLY; p->xstate.xss_high = (xstates & XSTATE_XSAVES_ONLY) >> 32; } - else - xstates &= ~XSTATE_XSAVES_ONLY; - for ( i = 2; i < min(63UL, ARRAY_SIZE(p->xstate.comp)); ++i ) + /* Subleafs 2+ */ + xstates &= ~XSTATE_FP_SSE; + BUILD_BUG_ON(ARRAY_SIZE(p->xstate.comp) < 63); + for_each_set_bit ( i, &xstates, 63 ) { - uint64_t curr_xstate = 1UL << i; - - if ( !(xstates & curr_xstate) ) - continue; - - p->xstate.comp[i].size = xstate_sizes[i]; - p->xstate.comp[i].offset = xstate_offsets[i]; - p->xstate.comp[i].xss = curr_xstate & XSTATE_XSAVES_ONLY; - p->xstate.comp[i].align = curr_xstate & xstate_align; + /* + * Pass through size (eax) and offset (ebx) directly. Visbility of + * attributes in ecx limited by visible features in Da1. + */ + p->xstate.raw[i].a = raw_cpu_policy.xstate.raw[i].a; + p->xstate.raw[i].b = raw_cpu_policy.xstate.raw[i].b; + p->xstate.raw[i].c = raw_cpu_policy.xstate.raw[i].c & ecx_mask; } } diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index f5115199d4..bfb66dd766 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -40,6 +40,7 @@ extern uint32_t mxcsr_mask; #define XSTATE_XSAVES_ONLY 0 #define XSTATE_COMPACTION_ENABLED (1ULL << 63) +#define XSTATE_XSS (1U << 0) #define XSTATE_ALIGN64 (1U << 1) extern u64 xfeature_mask; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:45:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745079.1152217 (Exim 4.92) (envelope-from ) id 1sKYxO-0005IM-7B; Fri, 21 Jun 2024 07:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745079.1152217; Fri, 21 Jun 2024 07:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxO-0005IF-46; Fri, 21 Jun 2024 07:45:14 +0000 Received: by outflank-mailman (input) for mailman id 745079; Fri, 21 Jun 2024 07:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxM-0005I5-J6 for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxM-0003KF-Hb for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYxM-0002JY-Gk for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8CdsmiSogSO1q+wm7/TBwSrP90dPnWTaP8wMnICGiYY=; b=WSl7z7ViVvM2V/zOFrF2EMccka wj6JwrAlnGx3fYAKW5ygm/u2kIOIgdpigw8gnhCviMki8bWFg6dEzkO+Jpsj3nYYsqx3a3mKqpU+z 3nb0tnVE4Q7p/oOBQ+WXzRZqAC6kipvpzPOE5oZc0OW4QF2iARbkWmrULpbpfDcCM+j4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuid: Fix handling of XSAVE dynamic leaves Message-Id: Date: Fri, 21 Jun 2024 07:45:12 +0000 commit 71cacfb035f4a78ee10970dc38a3baa04d387451 Author: Andrew Cooper AuthorDate: Fri Apr 30 20:17:55 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/cpuid: Fix handling of XSAVE dynamic leaves First, if XSAVE is available in hardware but not visible to the guest, the dynamic leaves shouldn't be filled in. Second, the comment concerning XSS state is wrong. VT-x doesn't manage host/guest state automatically, but there is provision for "host only" bits to be set, so the implications are still accurate. Introduce xstate_compressed_size() to mirror the uncompressed one. Cross check it at boot. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpuid.c | 24 ++++++++---------------- xen/arch/x86/include/asm/xstate.h | 1 + xen/arch/x86/xstate.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 7a38e03214..a822e80c7e 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -330,23 +330,15 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case XSTATE_CPUID: switch ( subleaf ) { - case 1: - if ( !p->xstate.xsavec && !p->xstate.xsaves ) - break; - - /* - * TODO: Figure out what to do for XSS state. VT-x manages host - * vs guest MSR_XSS automatically, so as soon as we start - * supporting any XSS states, the wrong XSS will be in context. - */ - BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); - fallthrough; case 0: - /* - * Read CPUID[0xD,0/1].EBX from hardware. They vary with enabled - * XSTATE, and appropriate XCR0|XSS are in context. - */ - res->b = cpuid_count_ebx(leaf, subleaf); + if ( p->basic.xsave ) + res->b = xstate_uncompressed_size(v->arch.xcr0); + break; + + case 1: + if ( p->xstate.xsavec ) + res->b = xstate_compressed_size(v->arch.xcr0 | + v->arch.msrs->xss.raw); break; } break; diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index bfb66dd766..da1d89d2f4 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -109,6 +109,7 @@ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(struct cpuinfo_x86 *c); unsigned int xstate_uncompressed_size(uint64_t xcr0); +unsigned int xstate_compressed_size(uint64_t xstates); static inline uint64_t xgetbv(unsigned int index) { diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index c8bc40fb5c..da0f48da81 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -619,6 +619,36 @@ unsigned int xstate_uncompressed_size(uint64_t xcr0) return size; } +unsigned int xstate_compressed_size(uint64_t xstates) +{ + unsigned int i, size = XSTATE_AREA_MIN_SIZE; + + if ( xstates == 0 ) + return 0; + + if ( xstates <= (X86_XCR0_SSE | X86_XCR0_FP) ) + return size; + + /* + * For the compressed size, every non-legacy component matters. Some + * componenets require aligning to 64 first. + */ + xstates &= ~(X86_XCR0_SSE | X86_XCR0_FP); + for_each_set_bit ( i, &xstates, 63 ) + { + const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; + + ASSERT(c->size); + + if ( c->align ) + size = ROUNDUP(size, 64); + + size += c->size; + } + + return size; +} + struct xcheck_state { uint64_t states; uint32_t uncomp_size; @@ -701,6 +731,15 @@ static void __init check_new_xstate(struct xcheck_state *s, uint64_t new) s->states, &new, hw_size, s->comp_size); s->comp_size = hw_size; + + /* + * Again, check that Xen's calculation always matches hardware's. + */ + xen_size = xstate_compressed_size(s->states); + + if ( xen_size != hw_size ) + panic("XSTATE 0x%016"PRIx64", compressed hw size %#x != xen size %#x\n", + s->states, hw_size, xen_size); } else if ( hw_size ) /* Compressed size reported, but no XSAVEC ? */ { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:45:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745080.1152220 (Exim 4.92) (envelope-from ) id 1sKYxY-0005LD-8I; Fri, 21 Jun 2024 07:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745080.1152220; Fri, 21 Jun 2024 07: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 1sKYxY-0005L5-5d; Fri, 21 Jun 2024 07:45:24 +0000 Received: by outflank-mailman (input) for mailman id 745080; Fri, 21 Jun 2024 07:45:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxW-0005Kt-LI for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxW-0003KM-Ka for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYxW-0002K1-Ji for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9PHGZmt2/iI+xdVundB2EUYFqz8TzsRCxxJOwZ3dyXM=; b=EiKlb6BuavuJ+gdcMoitYn+vqn XybVcH0/sNp6lNm9uDK27ZLiw9lTmxCJLoqbtsWjmoiHYjMNj+G4qaK0955GVIFE0l39t2bYnzBgH O3HY7f92Dm0PBs8Q9F1gZ+XZCsNHHIjfBOx0X41u7/XPPxStKr4vxh7+LX9jh6ZO/wKA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/defns: Clean up X86_{XCR0,XSS}_* constants Message-Id: Date: Fri, 21 Jun 2024 07:45:22 +0000 commit 267122a24c499d26278ab2dbdfb46ebcaaf38474 Author: Andrew Cooper AuthorDate: Fri Apr 30 16:14:36 2021 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 19 13:00:06 2024 +0100 x86/defns: Clean up X86_{XCR0,XSS}_* constants With the exception of one case in read_bndcfgu() which can use ilog2(), the *_POS defines are unused. Drop them. X86_XCR0_X87 is the name used by both the SDM and APM, rather than X86_XCR0_FP. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/i387.c | 2 +- xen/arch/x86/include/asm/x86-defns.h | 32 +++++++++++--------------------- xen/arch/x86/include/asm/xstate.h | 4 ++-- xen/arch/x86/xstate.c | 18 +++++++++--------- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 7a4297cc92..fcdee10a6e 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -369,7 +369,7 @@ void vcpu_setup_fpu(struct vcpu *v, struct xsave_struct *xsave_area, { v->arch.xsave_area->xsave_hdr.xstate_bv &= ~XSTATE_FP_SSE; if ( fcw_default != FCW_DEFAULT ) - v->arch.xsave_area->xsave_hdr.xstate_bv |= X86_XCR0_FP; + v->arch.xsave_area->xsave_hdr.xstate_bv |= X86_XCR0_X87; } } diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index d7602ab225..3bcdbaccd3 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -79,25 +79,16 @@ /* * XSTATE component flags in XCR0 | MSR_XSS */ -#define X86_XCR0_FP_POS 0 -#define X86_XCR0_FP (1ULL << X86_XCR0_FP_POS) -#define X86_XCR0_SSE_POS 1 -#define X86_XCR0_SSE (1ULL << X86_XCR0_SSE_POS) -#define X86_XCR0_YMM_POS 2 -#define X86_XCR0_YMM (1ULL << X86_XCR0_YMM_POS) -#define X86_XCR0_BNDREGS_POS 3 -#define X86_XCR0_BNDREGS (1ULL << X86_XCR0_BNDREGS_POS) -#define X86_XCR0_BNDCSR_POS 4 -#define X86_XCR0_BNDCSR (1ULL << X86_XCR0_BNDCSR_POS) -#define X86_XCR0_OPMASK_POS 5 -#define X86_XCR0_OPMASK (1ULL << X86_XCR0_OPMASK_POS) -#define X86_XCR0_ZMM_POS 6 -#define X86_XCR0_ZMM (1ULL << X86_XCR0_ZMM_POS) -#define X86_XCR0_HI_ZMM_POS 7 -#define X86_XCR0_HI_ZMM (1ULL << X86_XCR0_HI_ZMM_POS) +#define X86_XCR0_X87 (_AC(1, ULL) << 0) +#define X86_XCR0_SSE (_AC(1, ULL) << 1) +#define X86_XCR0_YMM (_AC(1, ULL) << 2) +#define X86_XCR0_BNDREGS (_AC(1, ULL) << 3) +#define X86_XCR0_BNDCSR (_AC(1, ULL) << 4) +#define X86_XCR0_OPMASK (_AC(1, ULL) << 5) +#define X86_XCR0_ZMM (_AC(1, ULL) << 6) +#define X86_XCR0_HI_ZMM (_AC(1, ULL) << 7) #define X86_XSS_PROC_TRACE (_AC(1, ULL) << 8) -#define X86_XCR0_PKRU_POS 9 -#define X86_XCR0_PKRU (1ULL << X86_XCR0_PKRU_POS) +#define X86_XCR0_PKRU (_AC(1, ULL) << 9) #define X86_XSS_PASID (_AC(1, ULL) << 10) #define X86_XSS_CET_U (_AC(1, ULL) << 11) #define X86_XSS_CET_S (_AC(1, ULL) << 12) @@ -107,11 +98,10 @@ #define X86_XSS_HWP (_AC(1, ULL) << 16) #define X86_XCR0_TILE_CFG (_AC(1, ULL) << 17) #define X86_XCR0_TILE_DATA (_AC(1, ULL) << 18) -#define X86_XCR0_LWP_POS 62 -#define X86_XCR0_LWP (1ULL << X86_XCR0_LWP_POS) +#define X86_XCR0_LWP (_AC(1, ULL) << 62) #define X86_XCR0_STATES \ - (X86_XCR0_FP | X86_XCR0_SSE | X86_XCR0_YMM | X86_XCR0_BNDREGS | \ + (X86_XCR0_X87 | X86_XCR0_SSE | X86_XCR0_YMM | X86_XCR0_BNDREGS | \ X86_XCR0_BNDCSR | X86_XCR0_OPMASK | X86_XCR0_ZMM | \ X86_XCR0_HI_ZMM | X86_XCR0_PKRU | X86_XCR0_TILE_CFG | \ X86_XCR0_TILE_DATA | \ diff --git a/xen/arch/x86/include/asm/xstate.h b/xen/arch/x86/include/asm/xstate.h index da1d89d2f4..f4a8e5f814 100644 --- a/xen/arch/x86/include/asm/xstate.h +++ b/xen/arch/x86/include/asm/xstate.h @@ -29,8 +29,8 @@ extern uint32_t mxcsr_mask; #define XSAVE_HDR_OFFSET FXSAVE_SIZE #define XSTATE_AREA_MIN_SIZE (FXSAVE_SIZE + XSAVE_HDR_SIZE) -#define XSTATE_FP_SSE (X86_XCR0_FP | X86_XCR0_SSE) -#define XCNTXT_MASK (X86_XCR0_FP | X86_XCR0_SSE | X86_XCR0_YMM | \ +#define XSTATE_FP_SSE (X86_XCR0_X87 | X86_XCR0_SSE) +#define XCNTXT_MASK (X86_XCR0_X87 | X86_XCR0_SSE | X86_XCR0_YMM | \ X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM | \ XSTATE_NONLAZY) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index da0f48da81..68cdd8fcf0 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -313,7 +313,7 @@ void xsave(struct vcpu *v, uint64_t mask) "=m" (*ptr), \ "a" (lmask), "d" (hmask), "D" (ptr)) - if ( fip_width == 8 || !(mask & X86_XCR0_FP) ) + if ( fip_width == 8 || !(mask & X86_XCR0_X87) ) { XSAVE("0x48,"); } @@ -366,7 +366,7 @@ void xsave(struct vcpu *v, uint64_t mask) fip_width = 8; } #undef XSAVE - if ( mask & X86_XCR0_FP ) + if ( mask & X86_XCR0_X87 ) ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET] = fip_width; } @@ -558,7 +558,7 @@ void xstate_free_save_area(struct vcpu *v) static bool valid_xcr0(uint64_t xcr0) { /* FP must be unconditionally set. */ - if ( !(xcr0 & X86_XCR0_FP) ) + if ( !(xcr0 & X86_XCR0_X87) ) return false; /* YMM depends on SSE. */ @@ -597,7 +597,7 @@ unsigned int xstate_uncompressed_size(uint64_t xcr0) if ( xcr0 == 0 ) return 0; - if ( xcr0 <= (X86_XCR0_SSE | X86_XCR0_FP) ) + if ( xcr0 <= (X86_XCR0_SSE | X86_XCR0_X87) ) return size; /* @@ -605,7 +605,7 @@ unsigned int xstate_uncompressed_size(uint64_t xcr0) * maximum offset+size. Some states (e.g. LWP, APX_F) are out-of-order * with respect their index. */ - xcr0 &= ~(X86_XCR0_SSE | X86_XCR0_FP); + xcr0 &= ~(X86_XCR0_SSE | X86_XCR0_X87); for_each_set_bit ( i, &xcr0, 63 ) { const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; @@ -626,14 +626,14 @@ unsigned int xstate_compressed_size(uint64_t xstates) if ( xstates == 0 ) return 0; - if ( xstates <= (X86_XCR0_SSE | X86_XCR0_FP) ) + if ( xstates <= (X86_XCR0_SSE | X86_XCR0_X87) ) return size; /* * For the compressed size, every non-legacy component matters. Some * componenets require aligning to 64 first. */ - xstates &= ~(X86_XCR0_SSE | X86_XCR0_FP); + xstates &= ~(X86_XCR0_SSE | X86_XCR0_X87); for_each_set_bit ( i, &xstates, 63 ) { const struct xstate_component *c = &raw_cpu_policy.xstate.comp[i]; @@ -779,7 +779,7 @@ static void __init noinline xstate_check_sizes(void) * layout compatibility with Intel and having a knock-on effect on all * subsequent states. */ - check_new_xstate(&s, X86_XCR0_SSE | X86_XCR0_FP); + check_new_xstate(&s, X86_XCR0_SSE | X86_XCR0_X87); if ( cpu_has_avx ) check_new_xstate(&s, X86_XCR0_YMM); @@ -1026,7 +1026,7 @@ uint64_t read_bndcfgu(void) : "=m" (*xstate) : "a" (X86_XCR0_BNDCSR), "d" (0), "D" (xstate) ); - bndcsr = (void *)xstate + xstate_offsets[X86_XCR0_BNDCSR_POS]; + bndcsr = (void *)xstate + xstate_offsets[ilog2(X86_XCR0_BNDCSR)]; } if ( cr0 & X86_CR0_TS ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:45:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745081.1152225 (Exim 4.92) (envelope-from ) id 1sKYxi-0005OK-Az; Fri, 21 Jun 2024 07:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745081.1152225; Fri, 21 Jun 2024 07:45: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 1sKYxi-0005OC-8O; Fri, 21 Jun 2024 07:45:34 +0000 Received: by outflank-mailman (input) for mailman id 745081; Fri, 21 Jun 2024 07:45:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxg-0005O0-RC for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxg-0003Kn-PF for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYxg-0002Kk-Mk for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=slVd3jbKRaYJ2qM5isPjRESfi3nzTvSNqUXsgTKGjV8=; b=S2v9gTLB8s1JeME30bOvIXAD6X uK//RHphjLtxSryNecgcs2+5FNc6dejjFrVy04pCU1VhqdJJAnlOsoDAGD+UUMXnIYjPy7NmSZySm l0Ix4fYX+5ZUTPx4Cdmi/Y7fxF/2ehvozM1QPpfhSW2grh1g9ZUZpKvjHPcLBf4+AbNs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: avoid UB in guest handle arithmetic Message-Id: Date: Fri, 21 Jun 2024 07:45:32 +0000 commit 43d5c5d5f70b3f5419e7ef30399d23adf6ddfa8e Author: Jan Beulich AuthorDate: Wed Jun 19 14:11:07 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 19 14:11:07 2024 +0200 xen: avoid UB in guest handle arithmetic At least XENMEM_memory_exchange can have huge values passed in the nr_extents and nr_exchanged fields. Adding such values to pointers can overflow, resulting in UB. Cast respective pointers to "unsigned long" while at the same time making the necessary multiplication explicit. Remaining arithmetic is, despite there possibly being mathematical overflow, okay as per the C99 spec: "A computation involving unsigned operands can never overflow, because a result that cannot be represented by the resulting unsigned integer type is reduced modulo the number that is one greater than the largest value that can be represented by the resulting type." The overflow that we need to guard against is checked for in array_access_ok(). Note that in / down from array_access_ok() the address value is only ever cast to "unsigned long" anyway, which is why in the invocation from guest_handle_subrange_okay() the value doesn't need casting back to pointer type. In compat grant table code change two guest_handle_add_offset() to avoid passing in negative offsets. Since {,__}clear_guest_offset() need touching anyway, also deal with another (latent) issue there: They were losing the handle type, i.e. the size of the individual objects accessed. Luckily the few users we presently have all pass char or uint8 handles. Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Tested-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/include/asm/guest_access.h | 2 +- xen/common/compat/grant_table.c | 4 ++-- xen/include/xen/guest_access.h | 42 ++++++++++++++++++++------------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/include/asm/guest_access.h b/xen/arch/x86/include/asm/guest_access.h index dbf789fa58..69716c8b41 100644 --- a/xen/arch/x86/include/asm/guest_access.h +++ b/xen/arch/x86/include/asm/guest_access.h @@ -43,7 +43,7 @@ array_access_ok((hnd).p, (nr), sizeof(*(hnd).p))) #define guest_handle_subrange_okay(hnd, first, last) \ (paging_mode_external(current->domain) || \ - array_access_ok((hnd).p + (first), \ + array_access_ok((unsigned long)(hnd).p + (first) * sizeof(*(hnd).p), \ (last)-(first)+1, \ sizeof(*(hnd).p))) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index af98eade17..c495c375eb 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -232,7 +232,7 @@ int compat_grant_table_op( cnt_uop = guest_handle_cast(xfer, void); while ( n-- ) { - guest_handle_add_offset(xfer, -1); + guest_handle_subtract_offset(xfer, 1); if ( __copy_field_to_guest(xfer, nat.xfer + n, status) ) rc = -EFAULT; } @@ -277,7 +277,7 @@ int compat_grant_table_op( cnt_uop = guest_handle_cast(copy, void); while ( n-- ) { - guest_handle_add_offset(copy, -1); + guest_handle_subtract_offset(copy, 1); if ( __copy_field_to_guest(copy, nat.copy + n, status) ) rc = -EFAULT; } diff --git a/xen/include/xen/guest_access.h b/xen/include/xen/guest_access.h index af33ae3ab6..96dbef2e02 100644 --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -15,8 +15,10 @@ #define guest_handle_is_null(hnd) ((hnd).p == NULL) /* Offset the given guest handle into the array it refers to. */ -#define guest_handle_add_offset(hnd, nr) ((hnd).p += (nr)) -#define guest_handle_subtract_offset(hnd, nr) ((hnd).p -= (nr)) +#define guest_handle_add_offset(hnd, nr) ((hnd).p = \ + (typeof((hnd).p))((unsigned long)(hnd).p + (nr) * sizeof(*(hnd).p))) +#define guest_handle_subtract_offset(hnd, nr) ((hnd).p = \ + (typeof((hnd).p))((unsigned long)(hnd).p - (nr) * sizeof(*(hnd).p))) /* * Cast a guest handle (either XEN_GUEST_HANDLE or XEN_GUEST_HANDLE_PARAM) @@ -59,20 +61,22 @@ */ #define copy_to_guest_offset(hnd, off, ptr, nr) ({ \ const typeof(*(ptr)) *_s = (ptr); \ - char (*_d)[sizeof(*_s)] = (void *)(hnd).p; \ + unsigned long d_ = (unsigned long)(hnd).p; \ /* Check that the handle is not for a const type */ \ void *__maybe_unused _t = (hnd).p; \ (void)((hnd).p == _s); \ - raw_copy_to_guest(_d+(off), _s, sizeof(*_s)*(nr)); \ + raw_copy_to_guest((void *)(d_ + (off) * sizeof(*_s)), \ + _s, (nr) * sizeof(*_s)); \ }) /* * Clear an array of objects in guest context via a guest handle, * specifying an offset into the guest array. */ -#define clear_guest_offset(hnd, off, nr) ({ \ - void *_d = (hnd).p; \ - raw_clear_guest(_d+(off), nr); \ +#define clear_guest_offset(hnd, off, nr) ({ \ + unsigned long d_ = (unsigned long)(hnd).p; \ + raw_clear_guest((void *)(d_ + (off) * sizeof(*(hnd).p)), \ + (nr) * sizeof(*(hnd).p)); \ }) /* @@ -80,9 +84,11 @@ * specifying an offset into the guest array. */ #define copy_from_guest_offset(ptr, hnd, off, nr) ({ \ - const typeof(*(ptr)) *_s = (hnd).p; \ + unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ - raw_copy_from_guest(_d, _s+(off), sizeof(*_d)*(nr));\ + raw_copy_from_guest(_d, \ + (const void *)(s_ + (off) * sizeof(*_d)), \ + (nr) * sizeof(*_d)); \ }) /* Copy sub-field of a structure to guest context via a guest handle. */ @@ -117,22 +123,26 @@ #define __copy_to_guest_offset(hnd, off, ptr, nr) ({ \ const typeof(*(ptr)) *_s = (ptr); \ - char (*_d)[sizeof(*_s)] = (void *)(hnd).p; \ + unsigned long d_ = (unsigned long)(hnd).p; \ /* Check that the handle is not for a const type */ \ void *__maybe_unused _t = (hnd).p; \ (void)((hnd).p == _s); \ - __raw_copy_to_guest(_d + (off), _s, sizeof(*_s) * (nr));\ + __raw_copy_to_guest((void *)(d_ + (off) * sizeof(*_s)), \ + _s, (nr) * sizeof(*_s)); \ }) -#define __clear_guest_offset(hnd, off, nr) ({ \ - void *_d = (hnd).p; \ - __raw_clear_guest(_d + (off), nr); \ +#define __clear_guest_offset(hnd, off, nr) ({ \ + unsigned long d_ = (unsigned long)(hnd).p; \ + __raw_clear_guest((void *)(d_ + (off) * sizeof(*(hnd).p)), \ + (nr) * sizeof(*(hnd).p)); \ }) #define __copy_from_guest_offset(ptr, hnd, off, nr) ({ \ - const typeof(*(ptr)) *_s = (hnd).p; \ + unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ - __raw_copy_from_guest(_d, _s + (off), sizeof (*_d) * (nr)); \ + __raw_copy_from_guest(_d, \ + (const void *)(s_ + (off) * sizeof(*_d)), \ + (nr) * sizeof(*_d)); \ }) #define __copy_field_to_guest(hnd, ptr, field) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:45:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745082.1152228 (Exim 4.92) (envelope-from ) id 1sKYxs-0005R0-CW; Fri, 21 Jun 2024 07:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745082.1152228; Fri, 21 Jun 2024 07:45: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 1sKYxs-0005Qt-9m; Fri, 21 Jun 2024 07:45:44 +0000 Received: by outflank-mailman (input) for mailman id 745082; Fri, 21 Jun 2024 07:45:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxq-0005Qb-Sn for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYxq-0003Kw-S6 for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYxq-0002LK-RP for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1YFHl/BRclLGj1YmdSdwR3h/rDOj9Zfr9iHJghGI5QY=; b=f+Au46f9rxIbPml6a7eGGk7WU4 eZxySXAc5lsmtQV6Ki/qwsOWHQHQgL5FBGxnol+JmM9m+sYscbLvHqidKU/8ozOdjqdNu/rfhtuxi C9ZKe7aznsTETym8X7xuX1esDpJSbCOMuomTQUBZK1TbysHKSDqNM3VLK4hi4RjTciUo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] hotplug: Restore block-tap phy compatibility Message-Id: Date: Fri, 21 Jun 2024 07:45:42 +0000 commit f16ac12bd4181177a7d953f88ef301287f587380 Author: Jason Andryuk AuthorDate: Thu Jun 20 12:08:42 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:08:42 2024 +0200 hotplug: Restore block-tap phy compatibility backendtype=phy using the blktap kernel module needs to use write_dev, but tapback can't support that. tapback should perform better, but make the script compatible with the old kernel module again. Fixes: 76a484193d ("hotplug: Update block-tap") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD Release-Acked-by: Oleksii Kurochko --- tools/hotplug/Linux/block-tap | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/hotplug/Linux/block-tap b/tools/hotplug/Linux/block-tap index 126e472786..8661ce77e3 100755 --- a/tools/hotplug/Linux/block-tap +++ b/tools/hotplug/Linux/block-tap @@ -20,9 +20,13 @@ # # Disks should be specified using the following syntax: # +# For use with tapback (vbd3) (preferred): # vdev=xvda,backendtype=tap,format=vhd,target=/srv/target.vhd # -# format is either "aio" (for raw files), or "vhd" +# For use with blkback and the blktap2 kernel module: +# script=block-tap,vdev=xvda,target=: +# +# format/ is either "aio" (for raw files), or "vhd" dir=$(dirname "$0") . "$dir/block-common.sh" @@ -205,12 +209,17 @@ add() xenstore_write "$XENBUS_PATH/pid" "$pid" xenstore_write "$XENBUS_PATH/minor" "$minor" - # dev, as a unix socket, would end up with major:minor 0:0 in - # physical-device if write_dev were used. tapback would be thrown off by - # that incorrect minor, so just skip writing physical-device. - xenstore_write "$XENBUS_PATH/physical-device-path" "$dev" - success + if [ "$XENBUS_TYPE" = "vbd3" ] ; then + # $dev, as a unix socket, has major:minor 0:0. If write_dev writes + # physical-device, tapback would use that incorrect minor 0. So don't + # write physical-device. + xenstore_write "$XENBUS_PATH/physical-device-path" "$dev" + + success + else + write_dev "$dev" + fi release_lock "block" } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:45:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745083.1152233 (Exim 4.92) (envelope-from ) id 1sKYy2-0005Tp-Eh; Fri, 21 Jun 2024 07:45:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745083.1152233; Fri, 21 Jun 2024 07:45: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 1sKYy2-0005Tf-BK; Fri, 21 Jun 2024 07:45:54 +0000 Received: by outflank-mailman (input) for mailman id 745083; Fri, 21 Jun 2024 07:45:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYy0-0005TM-Vi for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYy0-0003L8-V0 for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYy0-0002Ln-UA for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:45: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6+Ua9zXsMu0MQdbVB5c8fDiVNA5GW+yyKQotlT0EDvY=; b=mlXHk87lZYEgffPgRwNcIfMxIr 4WjB/zpJvxisoohMSsWd3fYbVZE6JveQEafQZ9bFD9qxu9EYsJ+MFIxQ6z7I4J94s5RL+VT0//C3I HHmL/DjJknjSH9ADlDRR6KL2VIcxKUSX8CXpc1XkiZcPJna8U0Z4id+PFjR5fgw44GN0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/light: Fix nic->vlan memory allocation Message-Id: Date: Fri, 21 Jun 2024 07:45:52 +0000 commit 74970165bab8924898f3ad186364bf96310e8e4e Author: Leigh Brown AuthorDate: Thu Jun 20 12:09:02 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:09:02 2024 +0200 tools/libs/light: Fix nic->vlan memory allocation After the following commit: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") xl list -l aborts with a double free error if a domain has at least one vif defined: $ sudo xl list -l free(): double free detected in tcache 2 Aborted Orginally, the vlan field was called vid and was defined as an integer. It was appropriate to call libxl__xs_read_checked() with gc passed as the string data was copied to a different variable. However, the final version uses a string data type and the call should have been changed to use NOGC instead of gc to allow that data to live past the gc controlled lifetime, in line with the other string fields. This patch makes the change to pass NOGC instead of gc and moves the new code to be next to the other string fields (fixing a couple of errant tabs along the way), as recommended by Jason. Fixes: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") Signed-off-by: Leigh Brown Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD Release-acked-by: Oleksii Kurochko --- tools/libs/light/libxl_nic.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_nic.c b/tools/libs/light/libxl_nic.c index d861e3726d..300a96a8b1 100644 --- a/tools/libs/light/libxl_nic.c +++ b/tools/libs/light/libxl_nic.c @@ -318,11 +318,6 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path, nic->mtu = LIBXL_DEVICE_NIC_MTU_DEFAULT; } - rc = libxl__xs_read_checked(gc, XBT_NULL, - GCSPRINTF("%s/vlan", libxl_path), - (const char **)(&nic->vlan)); - if (rc) goto out; - rc = libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/mac", libxl_path), &tmp); if (rc) goto out; @@ -345,6 +340,10 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path, GCSPRINTF("%s/script", libxl_path), (const char **)(&nic->script)); if (rc) goto out; + rc = libxl__xs_read_checked(NOGC, XBT_NULL, + GCSPRINTF("%s/vlan", libxl_path), + (const char **)(&nic->vlan)); + if (rc) goto out; rc = libxl__xs_read_checked(NOGC, XBT_NULL, GCSPRINTF("%s/forwarddev", libxl_path), (const char **)(&nic->coloft_forwarddev)); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:46:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:46:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745084.1152236 (Exim 4.92) (envelope-from ) id 1sKYyC-0005WL-FP; Fri, 21 Jun 2024 07:46:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745084.1152236; Fri, 21 Jun 2024 07:46: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 1sKYyC-0005WE-Cs; Fri, 21 Jun 2024 07:46:04 +0000 Received: by outflank-mailman (input) for mailman id 745084; Fri, 21 Jun 2024 07:46:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYyB-0005Vw-2Z for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:46:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYyB-0003LS-1w for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:46:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYyB-0002N7-13 for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:46: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RAFsU008oJ8oZuPRK91yREdENXBqcshhA1teNeq/q+I=; b=ce57y0vhkeEs1l1lq0LWXR995m FuG86s8vYRza6ZCwsrrfoaqN7zFWwD+Yg0gAJ3Un5AbOlexBSaFgB+rQUIse+bAB6riMEjLid1E1b 7eSnLVIDt0WBkcc/bs1xQq7MWjXiOdfHcIo13/Usk7/3N40ATZYTax6kH/9626dTDgF4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/irq: forward pending interrupts to new destination in fixup_irqs() Message-Id: Date: Fri, 21 Jun 2024 07:46:03 +0000 commit e2bb28d621584fce15c907002ddc7c6772644b64 Author: Roger Pau Monné AuthorDate: Thu Jun 20 12:09:32 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:09:32 2024 +0200 x86/irq: forward pending interrupts to new destination in fixup_irqs() fixup_irqs() is used to evacuate interrupts from to be offlined CPUs. Given the CPU is to become offline, the normal migration logic used by Xen where the vector in the previous target(s) is left configured until the interrupt is received on the new destination is not suitable. Instead attempt to do as much as possible in order to prevent loosing interrupts. If fixup_irqs() is called from the CPU to be offlined (as is currently the case for CPU hot unplug) attempt to forward pending vectors when interrupts that target the current CPU are migrated to a different destination. Additionally, for interrupts that have already been moved from the current CPU prior to the call to fixup_irqs() but that haven't been delivered to the new destination (iow: interrupts with move_in_progress set and the current CPU set in ->arch.old_cpu_mask) also check whether the previous vector is pending and forward it to the new destination. This allows us to remove the window with interrupts enabled at the bottom of fixup_irqs(). Such window wasn't safe anyway: references to the CPU to become offline are removed from interrupts masks, but the per-CPU vector_irq[] array is not updated to reflect those changes (as the CPU is going offline anyway). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/apic.h | 5 +++++ xen/arch/x86/irq.c | 46 +++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h index d1cb001fb4..7bd66dc6e1 100644 --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -132,6 +132,11 @@ static inline bool apic_isr_read(uint8_t vector) (vector & 0x1f)) & 1; } +static inline bool apic_irr_read(unsigned int vector) +{ + return apic_read(APIC_IRR + (vector / 32 * 0x10)) & (1U << (vector % 32)); +} + static inline u32 get_apic_id(void) { u32 id = apic_read(APIC_ID); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index d7f15c38af..9a611c79e0 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2591,7 +2591,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { - bool break_affinity = false, set_affinity = true; + bool break_affinity = false, set_affinity = true, check_irr = false; unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); @@ -2644,6 +2644,25 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) { + /* + * This to be offlined CPU was the target of an interrupt that's + * been moved, and the new destination target hasn't yet + * acknowledged any interrupt from it. + * + * We know the interrupt is configured to target the new CPU at + * this point, so we can check IRR for any pending vectors and + * forward them to the new destination. + * + * Note that for the other case of an interrupt movement being in + * progress (move_cleanup_count being non-zero) we know the new + * destination has already acked at least one interrupt from this + * source, and hence there's no need to forward any stale + * interrupts. + */ + if ( apic_irr_read(desc->arch.old_vector) ) + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + /* * This CPU is going offline, remove it from ->arch.old_cpu_mask * and possibly release the old vector if the old mask becomes @@ -2684,6 +2703,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( desc->handler->disable ) desc->handler->disable(desc); + /* + * If the current CPU is going offline and is (one of) the target(s) of + * the interrupt, signal to check whether there are any pending vectors + * to be handled in the local APIC after the interrupt has been moved. + */ + if ( !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.cpu_mask) ) + check_irr = true; + if ( desc->handler->set_affinity ) desc->handler->set_affinity(desc, affinity); else if ( !(warned++) ) @@ -2694,6 +2721,18 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) cpumask_copy(affinity, desc->affinity); + if ( check_irr && apic_irr_read(vector) ) + /* + * Forward pending interrupt to the new destination, this CPU is + * going offline and otherwise the interrupt would be lost. + * + * Do the IRR check as late as possible before releasing the irq + * desc in order for any in-flight interrupts to be delivered to + * the lapic. + */ + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + spin_unlock(&desc->lock); if ( !verbose ) @@ -2705,11 +2744,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) printk("Broke affinity for IRQ%u, new: {%*pbl}\n", irq, CPUMASK_PR(affinity)); } - - /* That doesn't seem sufficient. Give it 1ms. */ - local_irq_enable(); - mdelay(1); - local_irq_disable(); } void fixup_eoi(void) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 07:46:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 07:46:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745085.1152242 (Exim 4.92) (envelope-from ) id 1sKYyM-0005Yy-It; Fri, 21 Jun 2024 07:46:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745085.1152242; Fri, 21 Jun 2024 07:46: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 1sKYyM-0005Yq-ET; Fri, 21 Jun 2024 07:46:14 +0000 Received: by outflank-mailman (input) for mailman id 745085; Fri, 21 Jun 2024 07:46:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYyL-0005Yc-5a for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:46:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKYyL-0003Li-4s for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:46:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKYyL-0002Na-44 for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 07:46: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KZAKpabvifZd6+JhD22WX35i2YuSdJxcbx4GQ5ZzU5E=; b=Yei/EDi3+IeBsIiUwNkYTbVWLx ZuUKHscCcQUP7Jrsrzah5dCTe7xSMEADn0mGV2qEa8W0060JHPu3jDyS1G1m5XkzZjIOyczV2SN77 wbemt7eq3o4OBMKdXkuag+kWOMrWrpE7wfZ+nl79Nz3/5bgVEwezeBrbojTHGRP/hk2w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] livepatch: use appropriate type for buffer offset variables Message-Id: Date: Fri, 21 Jun 2024 07:46:13 +0000 commit 62071a1c16c4dbe765491e58e456fd3a19b33298 Author: Jan Beulich AuthorDate: Thu Jun 20 12:10:27 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 20 12:10:27 2024 +0200 livepatch: use appropriate type for buffer offset variables As was made noticeable by the last of the commits referenced below, using a fixed-size type for such purposes is not only against ./CODING_STYLE, but can lead to actual issues. Switch to using size_t instead, thus also allowing calculations to be lighter-weight in 32-bit builds. No functional change for 64-bit builds. Link: https://gitlab.com/xen-project/xen/-/jobs/7136417308 Fixes: b145b4a39c13 ("livepatch: Handle arbitrary size names with the list operation") Fixes: 5083e0ff939d ("livepatch: Add metadata runtime retrieval mechanism") Fixes: 43d5c5d5f70b ("xen: avoid UB in guest handle arithmetic") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall Release-Acked-by: Oleksii Kurochko --- xen/common/livepatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index 502e264bc6..d93a556bcd 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -1252,7 +1252,7 @@ static int livepatch_list(struct xen_sysctl_livepatch_list *list) list->metadata_total_size = 0; if ( list->nr ) { - uint64_t name_offset = 0, metadata_offset = 0; + size_t name_offset = 0, metadata_offset = 0; list_for_each_entry( data, &payload_list, list ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 14:11:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 14:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745298.1152426 (Exim 4.92) (envelope-from ) id 1sKeym-0001ND-A8; Fri, 21 Jun 2024 14:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745298.1152426; Fri, 21 Jun 2024 14: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 1sKeym-0001N5-7Q; Fri, 21 Jun 2024 14:11:04 +0000 Received: by outflank-mailman (input) for mailman id 745298; Fri, 21 Jun 2024 14:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKeyl-0001Mz-OV for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 14:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKeyl-0002pp-HN for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 14:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKeyl-0000RK-FY for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 14: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3856Rq9z9JlC9rq7QMFmjD5xJ18zL82LGofmQ+a66lA=; b=y7QaIWJI84E1wcv2Fo0QThaYf2 kJ9AqlT9r46E2OYl1DG11zf0U33EAlLGcR9cy8J6YoSVvZdRfvof/Jjw+GofEOa5KJmiBFFc4MY7P iaexW2t8PhYPu5sn3sq1NcXMRWnAkomEcmX/OfVuVdd/8/vcoU1e6u9oTzBPOQ1YB4Pc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ioapic: Fix signed shifts in io_apic.c Message-Id: Date: Fri, 21 Jun 2024 14:11:03 +0000 commit c5746b021e573184fb92b601a0e93a295485054e Author: Matthew Barnes AuthorDate: Thu Jun 20 16:36:46 2024 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 21 15:09:26 2024 +0100 x86/ioapic: Fix signed shifts in io_apic.c There exists bitshifts in the IOAPIC code where signed integers are shifted to the left by up to 31 bits, which is undefined behaviour. This patch fixes this by changing the integers from signed to unsigned. Signed-off-by: Matthew Barnes Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/io_apic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index b48a642465..d73108558e 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1692,7 +1692,8 @@ static void cf_check mask_and_ack_level_ioapic_irq(struct irq_desc *desc) !io_apic_level_ack_pending(desc->irq)) move_masked_irq(desc); - if ( !(v & (1 << (i & 0x1f))) ) { + if ( !(v & (1U << (i & 0x1f))) ) + { spin_lock(&ioapic_lock); __edge_IO_APIC_irq(desc->irq); __level_IO_APIC_irq(desc->irq); @@ -1756,7 +1757,8 @@ static void cf_check end_level_ioapic_irq_new(struct irq_desc *desc, u8 vector) !io_apic_level_ack_pending(desc->irq) ) move_native_irq(desc); - if (!(v & (1 << (i & 0x1f)))) { + if ( !(v & (1U << (i & 0x1f))) ) + { spin_lock(&ioapic_lock); __mask_IO_APIC_irq(desc->irq); __edge_IO_APIC_irq(desc->irq); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 21 14:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jun 2024 14:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745299.1152430 (Exim 4.92) (envelope-from ) id 1sKeyw-0001P3-Bs; Fri, 21 Jun 2024 14:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745299.1152430; Fri, 21 Jun 2024 14: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 1sKeyw-0001Ot-8u; Fri, 21 Jun 2024 14:11:14 +0000 Received: by outflank-mailman (input) for mailman id 745299; Fri, 21 Jun 2024 14:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKeyv-0001On-M6 for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 14:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKeyv-0002q3-LK for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 14:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKeyv-0000S1-JT for xen-changelog@lists.xenproject.org; Fri, 21 Jun 2024 14: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2eRNxnR0qYRODrRcUoPRanMbRBr/hFWmfT0H5KBTPI8=; b=uwRCj5PGP3hJtuLMQaokfKWeeb 3EUvpATJGjdF0b7NBRNf8UzWknbqN/S9dB2ZyhU6FF52kMmwCiUG91o0S2y1VPnG6cOJHwY/eNubp AeYZRso2QYSAblOvLpBTyJBPOt0qZ0AhTj1Ea52cKU+XQFigX0MUbGKEUST0xpkDMS90=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libelf: avoid UB in elf_xen_feature_{get,set}() Message-Id: Date: Fri, 21 Jun 2024 14:11:13 +0000 commit 9e7c26ad8532c3efda174dee5ab8bdbeef1e4f6d Author: Jan Beulich AuthorDate: Thu Jun 20 17:34:56 2024 +0200 Commit: Andrew Cooper CommitDate: Fri Jun 21 15:09:26 2024 +0100 libelf: avoid UB in elf_xen_feature_{get,set}() When the left shift amount is up to 31, the shifted quantity wants to be of unsigned int (or wider) type. While there also adjust types: get doesn't alter the array and returns a boolean, while both don't really accept negative "nr". Drop a stray blank each as well. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/include/xen/libelf.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index a0675a4dc3..a99d33c251 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -445,13 +445,13 @@ struct elf_dom_parms { uint64_t virt_kend; }; -static inline void elf_xen_feature_set(int nr, uint32_t * addr) +static inline void elf_xen_feature_set(unsigned int nr, uint32_t *addr) { - addr[nr >> 5] |= 1 << (nr & 31); + addr[nr >> 5] |= 1U << (nr & 31); } -static inline int elf_xen_feature_get(int nr, uint32_t * addr) +static inline bool elf_xen_feature_get(unsigned int nr, const uint32_t *addr) { - return !!(addr[nr >> 5] & (1 << (nr & 31))); + return addr[nr >> 5] & (1U << (nr & 31)); } elf_errorstatus elf_xen_parse_features(const char *features, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 22 05:44:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Jun 2024 05:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745762.1152881 (Exim 4.92) (envelope-from ) id 1sKtXe-0006Kk-FL; Sat, 22 Jun 2024 05:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745762.1152881; Sat, 22 Jun 2024 05: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 1sKtXe-0006Kd-Cp; Sat, 22 Jun 2024 05:44:02 +0000 Received: by outflank-mailman (input) for mailman id 745762; Sat, 22 Jun 2024 05:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKtXd-0006KX-Jc for xen-changelog@lists.xenproject.org; Sat, 22 Jun 2024 05:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKtXd-0003Z5-Ig for xen-changelog@lists.xenproject.org; Sat, 22 Jun 2024 05:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKtXd-00060U-Gg for xen-changelog@lists.xenproject.org; Sat, 22 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=w1eFDJsVJPy8qORTRyuzigw9SjhP368ZDCskM/3jW8Y=; b=sADlxhHVd3miPMn/nbX8N3OQt2 eGdgBq77hXOzl7XDLLoyYYAp5q5Ay0MDGpBVGQc4CDqEvEFx9Rnjr1+1utzDa+ypifzcnZlwkf/td ay8+bNM7h1g2o3IXmQjK9UHT3BpZRcBCiadvgiPLIn8zIlPb/MyCWpdjbjmY6i8IfOOA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ioapic: Fix signed shifts in io_apic.c Message-Id: Date: Sat, 22 Jun 2024 05:44:01 +0000 commit c5746b021e573184fb92b601a0e93a295485054e Author: Matthew Barnes AuthorDate: Thu Jun 20 16:36:46 2024 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 21 15:09:26 2024 +0100 x86/ioapic: Fix signed shifts in io_apic.c There exists bitshifts in the IOAPIC code where signed integers are shifted to the left by up to 31 bits, which is undefined behaviour. This patch fixes this by changing the integers from signed to unsigned. Signed-off-by: Matthew Barnes Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/io_apic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index b48a642465..d73108558e 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1692,7 +1692,8 @@ static void cf_check mask_and_ack_level_ioapic_irq(struct irq_desc *desc) !io_apic_level_ack_pending(desc->irq)) move_masked_irq(desc); - if ( !(v & (1 << (i & 0x1f))) ) { + if ( !(v & (1U << (i & 0x1f))) ) + { spin_lock(&ioapic_lock); __edge_IO_APIC_irq(desc->irq); __level_IO_APIC_irq(desc->irq); @@ -1756,7 +1757,8 @@ static void cf_check end_level_ioapic_irq_new(struct irq_desc *desc, u8 vector) !io_apic_level_ack_pending(desc->irq) ) move_native_irq(desc); - if (!(v & (1 << (i & 0x1f)))) { + if ( !(v & (1U << (i & 0x1f))) ) + { spin_lock(&ioapic_lock); __mask_IO_APIC_irq(desc->irq); __edge_IO_APIC_irq(desc->irq); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 22 05:44:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Jun 2024 05:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.745763.1152886 (Exim 4.92) (envelope-from ) id 1sKtXo-0006Mj-Hg; Sat, 22 Jun 2024 05:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745763.1152886; Sat, 22 Jun 2024 05: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 1sKtXo-0006Mc-EP; Sat, 22 Jun 2024 05:44:12 +0000 Received: by outflank-mailman (input) for mailman id 745763; Sat, 22 Jun 2024 05:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKtXn-0006MQ-Mc for xen-changelog@lists.xenproject.org; Sat, 22 Jun 2024 05:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKtXn-0003ak-Ll for xen-changelog@lists.xenproject.org; Sat, 22 Jun 2024 05:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sKtXn-00061D-Kk for xen-changelog@lists.xenproject.org; Sat, 22 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MGk4/VSfk8a/JZNwoQaEAt0/sRjk5YAMuod2aYfgNtQ=; b=Dodgt508DFI5Ja7shpS3tJ7hhF h4d7xmNRRlgZFhjtDE7EmCmCrVA5iRi1C6jgGqkwTyaV7AB9kr0fMkcoQh3CN0ZbLZSK/e2Iznga4 uqUhX8HnyhQ+rttKNLszD88XhopeX4ldTeCAKfNGugl/Rft4Vnpiu2nMJCP5CctIIKks=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libelf: avoid UB in elf_xen_feature_{get,set}() Message-Id: Date: Sat, 22 Jun 2024 05:44:11 +0000 commit 9e7c26ad8532c3efda174dee5ab8bdbeef1e4f6d Author: Jan Beulich AuthorDate: Thu Jun 20 17:34:56 2024 +0200 Commit: Andrew Cooper CommitDate: Fri Jun 21 15:09:26 2024 +0100 libelf: avoid UB in elf_xen_feature_{get,set}() When the left shift amount is up to 31, the shifted quantity wants to be of unsigned int (or wider) type. While there also adjust types: get doesn't alter the array and returns a boolean, while both don't really accept negative "nr". Drop a stray blank each as well. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/include/xen/libelf.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index a0675a4dc3..a99d33c251 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -445,13 +445,13 @@ struct elf_dom_parms { uint64_t virt_kend; }; -static inline void elf_xen_feature_set(int nr, uint32_t * addr) +static inline void elf_xen_feature_set(unsigned int nr, uint32_t *addr) { - addr[nr >> 5] |= 1 << (nr & 31); + addr[nr >> 5] |= 1U << (nr & 31); } -static inline int elf_xen_feature_get(int nr, uint32_t * addr) +static inline bool elf_xen_feature_get(unsigned int nr, const uint32_t *addr) { - return !!(addr[nr >> 5] & (1 << (nr & 31))); + return addr[nr >> 5] & (1U << (nr & 31)); } elf_errorstatus elf_xen_parse_features(const char *features, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:33:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746772.1153931 (Exim 4.92) (envelope-from ) id 1sLlgm-00037r-FT; Mon, 24 Jun 2024 15:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746772.1153931; Mon, 24 Jun 2024 15: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 1sLlgm-00037j-Ck; Mon, 24 Jun 2024 15:33:04 +0000 Received: by outflank-mailman (input) for mailman id 746772; Mon, 24 Jun 2024 15:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlgl-00037b-MN for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlgl-0004Gb-JK for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlgl-0007LX-IE for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YkXURDjJpk+8hIBTuwAzooUxT1kt5KwRcjqZ1OizNu4=; b=hqbfJRTvBBPkoKCKE9IPD+BaHb BPO5X2i2cbQ+3zucJgVIeGzxZEwREZEIradr+/BuGb5lvpre1uaFwz0mP0kghgjDJiXLqHH7XXRf/ Qze5xwxW54Co7mtgD1l7dwVe1i1Zp6mlvP1TXxxhoQXHkITIW1mVbMCarKioVoMLWwtM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: Open xldevd.log with O_CLOEXEC Message-Id: Date: Mon, 24 Jun 2024 15:33:03 +0000 commit ba52b3b624e4a1a976908552364eba924ca45430 Author: Andrew Cooper AuthorDate: Tue May 7 12:05:58 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 tools/xl: Open xldevd.log with O_CLOEXEC `xl devd` has been observed leaking /var/log/xldevd.log into children. Note this is specifically safe; dup2() leaves O_CLOEXEC disabled on newfd, so after setting up stdout/stderr, it's only the logfile fd which will close on exec(). Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Reviewed-by: Demi Marie Obenour Acked-by: Anthony PERARD Release-Acked-by: Oleksii Kurochko --- tools/xl/xl_utils.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/xl/xl_utils.c b/tools/xl/xl_utils.c index 17489d1829..b0d23b2cdb 100644 --- a/tools/xl/xl_utils.c +++ b/tools/xl/xl_utils.c @@ -27,6 +27,10 @@ #include "xl.h" #include "xl_utils.h" +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + void dolog(const char *file, int line, const char *func, const char *fmt, ...) { va_list ap; @@ -270,7 +274,7 @@ int do_daemonize(const char *name, const char *pidfile) exit(-1); } - CHK_SYSCALL(logfile = open(fullname, O_WRONLY|O_CREAT|O_APPEND, 0644)); + CHK_SYSCALL(logfile = open(fullname, O_WRONLY | O_CREAT | O_APPEND | O_CLOEXEC, 0644)); free(fullname); assert(logfile >= 3); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:33:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746773.1153935 (Exim 4.92) (envelope-from ) id 1sLlgw-0003Aa-Gs; Mon, 24 Jun 2024 15:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746773.1153935; Mon, 24 Jun 2024 15:33: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 1sLlgw-0003AS-E8; Mon, 24 Jun 2024 15:33:14 +0000 Received: by outflank-mailman (input) for mailman id 746773; Mon, 24 Jun 2024 15:33:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlgv-0003AI-Ns for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlgv-0004Gl-N6 for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlgv-0007MA-Ld for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RNfxASbr7rdYA5AiZjxuiu86K1ZRDGsV5MtrrWqzBUM=; b=fq9ccMH5zYMSq3N7EXR53u+0Co ohbj9ulX2PA40YrJqaMgiJL5yQ8tRKDX5Dco5xm4UpFZlKpqHTlRXQ1GQwEQLFn7X78uRpQXtdVUy pr87lKGU9Cl9Mtkx+Wg71fvcE5lfNvESa6ZNCH9cSKxyJbSNlaOu2x/JJa0MdJFjCSMA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: Rework trace_shadow_gen() into sh_trace_va() Message-Id: Date: Mon, 24 Jun 2024 15:33:13 +0000 commit 2e9f8a734e3dd2b6abccea325dd5e854a3670dec Author: Andrew Cooper AuthorDate: Wed May 22 13:51:43 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Rework trace_shadow_gen() into sh_trace_va() The ((GUEST_PAGING_LEVELS - 2) << 8) expression in the event field is common to all shadow trace events, so introduce sh_trace() as a very thin wrapper around trace(). Then, rename trace_shadow_gen() to sh_trace_va() to better describe what it is doing, and to be more consistent with later cleanup. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index bcd02b2d00..1775952d7e 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1974,13 +1974,17 @@ typedef u32 guest_va_t; typedef u32 guest_pa_t; #endif -static inline void trace_shadow_gen(u32 event, guest_va_t va) +/* Shadow trace event with GUEST_PAGING_LEVELS folded into the event field. */ +static void sh_trace(uint32_t event, unsigned int extra, const void *extra_data) +{ + trace(event | ((GUEST_PAGING_LEVELS - 2) << 8), extra, extra_data); +} + +/* Shadow trace event with the guest's linear address. */ +static void sh_trace_va(uint32_t event, guest_va_t va) { if ( tb_init_done ) - { - event |= (GUEST_PAGING_LEVELS-2)<<8; - trace(event, sizeof(va), &va); - } + sh_trace(event, sizeof(va), &va); } static inline void trace_shadow_fixup(guest_l1e_t gl1e, @@ -2239,7 +2243,7 @@ static int cf_check sh_page_fault( sh_reset_early_unshadow(v); perfc_incr(shadow_fault_fast_gnp); SHADOW_PRINTK("fast path not-present\n"); - trace_shadow_gen(TRC_SHADOW_FAST_PROPAGATE, va); + sh_trace_va(TRC_SHADOW_FAST_PROPAGATE, va); return 0; } #ifdef CONFIG_HVM @@ -2250,7 +2254,7 @@ static int cf_check sh_page_fault( perfc_incr(shadow_fault_fast_mmio); SHADOW_PRINTK("fast path mmio %#"PRIpaddr"\n", gpa); sh_reset_early_unshadow(v); - trace_shadow_gen(TRC_SHADOW_FAST_MMIO, va); + sh_trace_va(TRC_SHADOW_FAST_MMIO, va); return handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0; #else @@ -2265,7 +2269,7 @@ static int cf_check sh_page_fault( * Retry and let the hardware give us the right fault next time. */ perfc_incr(shadow_fault_fast_fail); SHADOW_PRINTK("fast path false alarm!\n"); - trace_shadow_gen(TRC_SHADOW_FALSE_FAST_PATH, va); + sh_trace_va(TRC_SHADOW_FALSE_FAST_PATH, va); return EXCRET_fault_fixed; } } @@ -2481,7 +2485,7 @@ static int cf_check sh_page_fault( #endif paging_unlock(d); put_gfn(d, gfn_x(gfn)); - trace_shadow_gen(TRC_SHADOW_DOMF_DYING, va); + sh_trace_va(TRC_SHADOW_DOMF_DYING, va); return 0; } @@ -2569,7 +2573,7 @@ static int cf_check sh_page_fault( put_gfn(d, gfn_x(gfn)); perfc_incr(shadow_fault_mmio); - trace_shadow_gen(TRC_SHADOW_MMIO, va); + sh_trace_va(TRC_SHADOW_MMIO, va); return handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:33:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746775.1153939 (Exim 4.92) (envelope-from ) id 1sLlh6-0003EJ-Hy; Mon, 24 Jun 2024 15:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746775.1153939; Mon, 24 Jun 2024 15: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 1sLlh6-0003E9-FV; Mon, 24 Jun 2024 15:33:24 +0000 Received: by outflank-mailman (input) for mailman id 746775; Mon, 24 Jun 2024 15:33:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlh5-0003Dy-RW for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlh5-0004H5-Qh for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlh5-0007Mu-PJ for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nSjPmmqYwbnq+UC3VaJMe+mJ79Rs1aD6V0uAzcwJ1ww=; b=GilDJsKg5ilVuUY4+vNSfwzeWW V7CeWKWnjnn4ZzqTGfQIp1IwL61v+TVtuhRIW2A969u/VuFUIHKMAepwypkGffniXUmsVfDDXOw2C 4JEQK91HLuwdC9yvJwRaq3MsQC7fApmZ3MORaQRsJW/J1tGKGk9jmkQAYjuXHxZ363lQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: Introduce sh_trace_gl1e_va() Message-Id: Date: Mon, 24 Jun 2024 15:33:23 +0000 commit 578066d82b2b96e949ff46e6c142a33231b1ae2d Author: Andrew Cooper AuthorDate: Wed May 22 13:58:22 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Introduce sh_trace_gl1e_va() trace_shadow_fixup() and trace_not_shadow_fault() both write out identical trace records. Reimplement them in terms of a common sh_trace_gl1e_va(). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 57 ++++++++++++------------------------------ 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 1775952d7e..75250c6f0f 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1987,51 +1987,26 @@ static void sh_trace_va(uint32_t event, guest_va_t va) sh_trace(event, sizeof(va), &va); } -static inline void trace_shadow_fixup(guest_l1e_t gl1e, - guest_va_t va) +/* Shadow trace event with a gl1e, linear address and flags. */ +static void sh_trace_gl1e_va(uint32_t event, guest_l1e_t gl1e, guest_va_t va) { if ( tb_init_done ) { struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ - guest_l1e_t gl1e; - guest_va_t va; - u32 flags; - } d; - u32 event; - - event = TRC_SHADOW_FIXUP | ((GUEST_PAGING_LEVELS-2)<<8); - - d.gl1e = gl1e; - d.va = va; - d.flags = this_cpu(trace_shadow_path_flags); - - trace(event, sizeof(d), &d); - } -} - -static inline void trace_not_shadow_fault(guest_l1e_t gl1e, - guest_va_t va) -{ - if ( tb_init_done ) - { - struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ + /* + * For GUEST_PAGING_LEVELS=3 (PAE paging), guest_l1e is 64 while + * guest_va is 32. Put it first to avoid padding. + */ guest_l1e_t gl1e; guest_va_t va; - u32 flags; - } d; - u32 event; - - event = TRC_SHADOW_NOT_SHADOW | ((GUEST_PAGING_LEVELS-2)<<8); - - d.gl1e = gl1e; - d.va = va; - d.flags = this_cpu(trace_shadow_path_flags); - - trace(event, sizeof(d), &d); + uint32_t flags; + } d = { + .gl1e = gl1e, + .va = va, + .flags = this_cpu(trace_shadow_path_flags), + }; + + sh_trace(event, sizeof(d), &d); } } @@ -2603,7 +2578,7 @@ static int cf_check sh_page_fault( d->arch.paging.log_dirty.fault_count++; sh_reset_early_unshadow(v); - trace_shadow_fixup(gw.l1e, va); + sh_trace_gl1e_va(TRC_SHADOW_FIXUP, gw.l1e, va); done: __maybe_unused; sh_audit_gw(v, &gw); SHADOW_PRINTK("fixed\n"); @@ -2857,7 +2832,7 @@ static int cf_check sh_page_fault( put_gfn(d, gfn_x(gfn)); propagate: - trace_not_shadow_fault(gw.l1e, va); + sh_trace_gl1e_va(TRC_SHADOW_NOT_SHADOW, gw.l1e, va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:33:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746776.1153943 (Exim 4.92) (envelope-from ) id 1sLlhG-0003Gz-Jn; Mon, 24 Jun 2024 15:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746776.1153943; Mon, 24 Jun 2024 15:33: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 1sLlhG-0003Gr-Gt; Mon, 24 Jun 2024 15:33:34 +0000 Received: by outflank-mailman (input) for mailman id 746776; Mon, 24 Jun 2024 15:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhF-0003Gj-V4 for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhF-0004HS-UN for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlhF-0007NP-Sy for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KhQrsaDcpQ3A4xZO2ku1XjsuJmnmQSKx7xA5wVqiCI4=; b=fVxvh0lFKRoZpi6t41Je1UgTaN C8ULW/LevctvyY1dT6hM0ETMi/s297YpfyD8241jZ6QwPLG2DHcTk/CZSuE28OWJFhB151nAW6z1f BCt0Y4/2NiS5AT2Lb8RUw/xBxVhLsjuiIZBOr/24Hraz63XCNZVCkR1+D2icfUdzoLnk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: Rework trace_shadow_emulate_other() as sh_trace_gfn_va() Message-Id: Date: Mon, 24 Jun 2024 15:33:33 +0000 commit 8765783434e903fa8be628de25f9941b0204502d Author: Andrew Cooper AuthorDate: Wed May 22 14:05:13 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Rework trace_shadow_emulate_other() as sh_trace_gfn_va() sh_trace_gfn_va() is very similar to sh_trace_gl1e_va(), and a rather shorter name than trace_shadow_emulate_other(). It's only referenced in CONFIG_HVM=y builds, so give it a __maybe_unused to placate randconfig builds. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 75250c6f0f..a1caae9127 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2010,29 +2010,31 @@ static void sh_trace_gl1e_va(uint32_t event, guest_l1e_t gl1e, guest_va_t va) } } -static inline void trace_shadow_emulate_other(u32 event, - guest_va_t va, - gfn_t gfn) +/* Shadow trace event with a gfn, linear address and flags. */ +static void __maybe_unused sh_trace_gfn_va(uint32_t event, gfn_t gfn, + guest_va_t va) { if ( tb_init_done ) { struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ + /* + * For GUEST_PAGING_LEVELS=3 (PAE paging), gfn is 64 while + * guest_va is 32. Put it first to avoid padding. + */ #if GUEST_PAGING_LEVELS == 2 - u32 gfn; + uint32_t gfn; #else - u64 gfn; + uint64_t gfn; #endif guest_va_t va; - } d; - - event |= ((GUEST_PAGING_LEVELS-2)<<8); - - d.gfn=gfn_x(gfn); - d.va = va; + uint32_t flags; + } d = { + .gfn = gfn_x(gfn), + .va = va, + .flags = this_cpu(trace_shadow_path_flags), + }; - trace(event, sizeof(d), &d); + sh_trace(event, sizeof(d), &d); } } @@ -2603,8 +2605,7 @@ static int cf_check sh_page_fault( mfn_x(gmfn)); perfc_incr(shadow_fault_emulate_failed); shadow_remove_all_shadows(d, gmfn); - trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_USER, - va, gfn); + sh_trace_gfn_va(TRC_SHADOW_EMULATE_UNSHADOW_USER, gfn, va); goto done; } @@ -2683,8 +2684,7 @@ static int cf_check sh_page_fault( } #endif shadow_remove_all_shadows(d, gmfn); - trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_EVTINJ, - va, gfn); + sh_trace_gfn_va(TRC_SHADOW_EMULATE_UNSHADOW_EVTINJ, gfn, va); return EXCRET_fault_fixed; } @@ -2739,8 +2739,7 @@ static int cf_check sh_page_fault( * though, this is a hint that this page should not be shadowed. */ shadow_remove_all_shadows(d, gmfn); - trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_UNHANDLED, - va, gfn); + sh_trace_gfn_va(TRC_SHADOW_EMULATE_UNSHADOW_UNHANDLED, gfn, va); goto emulate_done; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:33:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:33:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746777.1153947 (Exim 4.92) (envelope-from ) id 1sLlhR-0003Jy-LA; Mon, 24 Jun 2024 15:33:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746777.1153947; Mon, 24 Jun 2024 15:33: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 1sLlhR-0003Jq-IN; Mon, 24 Jun 2024 15:33:45 +0000 Received: by outflank-mailman (input) for mailman id 746777; Mon, 24 Jun 2024 15:33:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhQ-0003JY-1p for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhQ-0004HZ-18 for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlhQ-0007O3-0G for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bVRni0Z/61SpHKzdnPA3RZmDG+rNcvgTusqc1Y5hHNM=; b=ZKxsqMVC6A+1i98nxuBqKmTgI3 98bYcUWQ6rXRlVkmTG/CAY/555+1aBkmjrUnplRilXuvaNCl8bSq7ErdRIuQV3RPRo/UdDWT1g6dh dMoKcelP3i1cPgeUTHyiLif9aZk2MEk+YpA4EuvUgbV69h4+MlD59w3HkTUSh+aAc69k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: Don't leave trace record field uninitialized Message-Id: Date: Mon, 24 Jun 2024 15:33:44 +0000 commit 6a17e1199332c24b41bacccdc91dbeaf22653588 Author: Jan Beulich AuthorDate: Wed May 22 12:17:30 2024 +0200 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Don't leave trace record field uninitialized The emulation_count field is set only conditionally right now. Convert all field setting to an initializer, thus guaranteeing that field to be set to 0 (default initialized) when GUEST_PAGING_LEVELS != 3. Rework trace_shadow_emulate() to be consistent with the other trace helpers. Coverity-ID: 1598430 Fixes: 9a86ac1aa3d2 ("xentrace 5/7: Additional tracing for the shadow code") Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index a1caae9127..8e0046ae69 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2064,30 +2064,29 @@ static void cf_check trace_emulate_write_val( #endif } -static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) +static inline void sh_trace_emulate(guest_l1e_t gl1e, unsigned long va) { if ( tb_init_done ) { struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ + /* + * For GUEST_PAGING_LEVELS=3 (PAE paging), guest_l1e is 64 while + * guest_va is 32. Put it first to avoid padding. + */ guest_l1e_t gl1e, write_val; guest_va_t va; uint32_t flags:29, emulation_count:3; - } d; - u32 event; - - event = TRC_SHADOW_EMULATE | ((GUEST_PAGING_LEVELS-2)<<8); - - d.gl1e = gl1e; - d.write_val.l1 = this_cpu(trace_emulate_write_val); - d.va = va; + } d = { + .gl1e = gl1e, + .write_val.l1 = this_cpu(trace_emulate_write_val), + .va = va, #if GUEST_PAGING_LEVELS == 3 - d.emulation_count = this_cpu(trace_extra_emulation_count); + .emulation_count = this_cpu(trace_extra_emulation_count), #endif - d.flags = this_cpu(trace_shadow_path_flags); + .flags = this_cpu(trace_shadow_path_flags), + }; - trace(event, sizeof(d), &d); + sh_trace(TRC_SHADOW_EMULATE, sizeof(d), &d); } } #endif /* CONFIG_HVM */ @@ -2816,7 +2815,7 @@ static int cf_check sh_page_fault( } #endif /* PAE guest */ - trace_shadow_emulate(gw.l1e, va); + sh_trace_emulate(gw.l1e, va); emulate_done: SHADOW_PRINTK("emulated\n"); return EXCRET_fault_fixed; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:33:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:33:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746778.1153951 (Exim 4.92) (envelope-from ) id 1sLlhb-0003Mj-N7; Mon, 24 Jun 2024 15:33:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746778.1153951; Mon, 24 Jun 2024 15:33: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 1sLlhb-0003Mb-Jn; Mon, 24 Jun 2024 15:33:55 +0000 Received: by outflank-mailman (input) for mailman id 746778; Mon, 24 Jun 2024 15:33:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlha-0003MP-4s for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlha-0004Hj-47 for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlha-0007Oe-3E for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:33: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EXFBiyOCvTGVNKyhtk8KvOVTyu6Ux+EPHpVQ2Z6sXSE=; b=eBCoEZiLfSwHtRYLayrg+dFoXG lWpsPD9b6RjLpr7dDn0Q2UeOhsXy3IGajQj02VMNzt98FytHxFPfAeqzcpKitWzzEJgH4757jBZKS Z7u5M0/xLTNOlExFrygRbIPQSUaXede9TXr8RpacK/C+p4RcJJwwkHMEZ7TkQcyJCmoY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/xlat: Sort out whitespace Message-Id: Date: Mon, 24 Jun 2024 15:33:54 +0000 commit 90c1520d4eff8e6480035f523041fe62c5065833 Author: Andrew Cooper AuthorDate: Tue Feb 20 19:27:33 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/xlat: Sort out whitespace * Fix tabs/spaces mismatch for certain rows * Insert lines between header files to improve legibility Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- xen/include/xlat.lst | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 9c41948514..e811342bb0 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -20,19 +20,24 @@ # First column indicator: # ! - needs translation # ? - needs checking + ? dom0_vga_console_info xen.h ? xenctl_bitmap xen.h ? mmu_update xen.h ! mmuext_op xen.h ! start_info xen.h ? vcpu_time_info xen.h + ? pmu_amd_ctxt arch-x86/pmu.h ? pmu_arch arch-x86/pmu.h ? pmu_cntr_pair arch-x86/pmu.h ? pmu_intel_ctxt arch-x86/pmu.h ? pmu_regs arch-x86/pmu.h + ! cpu_user_regs arch-x86/xen-@arch@.h + ! trap_info arch-x86/xen.h + ? cpu_offline_action arch-x86/xen-mca.h ? mc arch-x86/xen-mca.h ? mcinfo_bank arch-x86/xen-mca.h @@ -50,6 +55,7 @@ ? mc_notifydomain arch-x86/xen-mca.h ! mc_physcpuinfo arch-x86/xen-mca.h ? page_offline_action arch-x86/xen-mca.h + ? argo_addr argo.h ! argo_iov argo.h ? argo_register_ring argo.h @@ -59,6 +65,7 @@ ? argo_ring_message_header argo.h ? argo_send_addr argo.h ? argo_unregister_ring argo.h + ? evtchn_alloc_unbound event_channel.h ? evtchn_bind_interdomain event_channel.h ? evtchn_bind_ipi event_channel.h @@ -74,6 +81,7 @@ ? evtchn_set_priority event_channel.h ? evtchn_status event_channel.h ? evtchn_unmask event_channel.h + ? gnttab_cache_flush grant_table.h ! gnttab_copy grant_table.h ? gnttab_dump_table grant_table.h @@ -86,9 +94,10 @@ ? gnttab_get_version grant_table.h ! gnttab_get_status_frames grant_table.h ? grant_entry_v1 grant_table.h -? grant_entry_header grant_table.h +? grant_entry_header grant_table.h ? grant_entry_v2 grant_table.h ? gnttab_swap_grant_ref grant_table.h + ! dm_op_buf hvm/dm_op.h ? dm_op_create_ioreq_server hvm/dm_op.h ? dm_op_destroy_ioreq_server hvm/dm_op.h @@ -108,15 +117,20 @@ ? dm_op_set_pci_intx_level hvm/dm_op.h ? dm_op_set_pci_link_route hvm/dm_op.h ? dm_op_track_dirty_vram hvm/dm_op.h + ! hvm_altp2m_set_mem_access_multi hvm/hvm_op.h + ? vcpu_hvm_context hvm/hvm_vcpu.h ? vcpu_hvm_x86_32 hvm/hvm_vcpu.h ? vcpu_hvm_x86_64 hvm/hvm_vcpu.h + ? hypfs_direntry hypfs.h ? hypfs_dirlistentry hypfs.h + ? kexec_exec kexec.h ! kexec_image kexec.h ! kexec_range kexec.h + ! add_to_physmap memory.h ! add_to_physmap_batch memory.h ! foreign_memory_map memory.h @@ -130,6 +144,7 @@ ! reserved_device_memory_map memory.h ? vmemrange memory.h ! vnuma_topology_info memory.h + ? physdev_eoi physdev.h ? physdev_get_free_pirq physdev.h ? physdev_irq physdev.h @@ -143,6 +158,7 @@ ? physdev_restore_msi physdev.h ? physdev_set_iopl physdev.h ? physdev_setup_gsi physdev.h + ! pct_register platform.h ! power_register platform.h ? processor_csd platform.h @@ -158,23 +174,30 @@ ? xenpf_pcpu_version platform.h ? xenpf_resource_entry platform.h ? xenpf_ucode_revision platform.h + ? pmu_data pmu.h ? pmu_params pmu.h + ! sched_poll sched.h ? sched_pin_override sched.h ? sched_remote_shutdown sched.h ? sched_shutdown sched.h + ? t_buf trace.h + ? vcpu_get_physid vcpu.h ? vcpu_register_vcpu_info vcpu.h ! vcpu_runstate_info vcpu.h ? vcpu_set_periodic_timer vcpu.h ! vcpu_set_singleshot_timer vcpu.h -? build_id version.h -? compile_info version.h -? feature_info version.h + +? build_id version.h +? compile_info version.h +? feature_info version.h + ? xenoprof_init xenoprof.h ? xenoprof_passive xenoprof.h + ? flask_access xsm/flask_op.h ? flask_cache_stats xsm/flask_op.h ? flask_hash_stats xsm/flask_op.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:34:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:34:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746779.1153954 (Exim 4.92) (envelope-from ) id 1sLlhl-0003Pa-QC; Mon, 24 Jun 2024 15:34:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746779.1153954; Mon, 24 Jun 2024 15: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 1sLlhl-0003PT-Ni; Mon, 24 Jun 2024 15:34:05 +0000 Received: by outflank-mailman (input) for mailman id 746779; Mon, 24 Jun 2024 15:34:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhk-0003PL-7x for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhk-0004I6-7B for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlhk-0007Po-6I for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VOXzLgUVtv/y7PZbNKzEGZ9jibQTG8dElcMITTwSg5s=; b=ttTXnIWX1EfjEcg++B7twuyMEZ P55LJOG7kP6mRpnhtzqmlhyw2Oio7zS6kTyEhj0+qg5saXO1nNXRTqfcPe7B58uEtjNFBAdp1kPqI c/93QrRW3Y0dr/QSHOlFonVJ0Y1NQgfIfhJ7ZzdfG7jFtYHmkGHA8772s7N8e7K0LMx8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/xlat: Sort structs per file Message-Id: Date: Mon, 24 Jun 2024 15:34:04 +0000 commit ebed411e7afa240fea803ac97a0ced73fffef8dc Author: Andrew Cooper AuthorDate: Tue Feb 20 19:34:06 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/xlat: Sort structs per file ... with a C local to avoid ambiguities over _ and - as separators. Also adjust arch-x86/xen.h which is out-of-order relative to the other arch-x86/ files. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- xen/include/xlat.lst | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index e811342bb0..0630530703 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -22,11 +22,11 @@ # ? - needs checking ? dom0_vga_console_info xen.h -? xenctl_bitmap xen.h ? mmu_update xen.h ! mmuext_op xen.h ! start_info xen.h ? vcpu_time_info xen.h +? xenctl_bitmap xen.h ? pmu_amd_ctxt arch-x86/pmu.h ? pmu_arch arch-x86/pmu.h @@ -36,17 +36,8 @@ ! cpu_user_regs arch-x86/xen-@arch@.h -! trap_info arch-x86/xen.h - ? cpu_offline_action arch-x86/xen-mca.h ? mc arch-x86/xen-mca.h -? mcinfo_bank arch-x86/xen-mca.h -? mcinfo_common arch-x86/xen-mca.h -? mcinfo_extended arch-x86/xen-mca.h -? mcinfo_global arch-x86/xen-mca.h -? mcinfo_logical_cpu arch-x86/xen-mca.h -? mcinfo_msr arch-x86/xen-mca.h -? mcinfo_recovery arch-x86/xen-mca.h ! mc_fetch arch-x86/xen-mca.h ? mc_info arch-x86/xen-mca.h ? mc_inject_v2 arch-x86/xen-mca.h @@ -54,8 +45,17 @@ ? mc_msrinject arch-x86/xen-mca.h ? mc_notifydomain arch-x86/xen-mca.h ! mc_physcpuinfo arch-x86/xen-mca.h +? mcinfo_bank arch-x86/xen-mca.h +? mcinfo_common arch-x86/xen-mca.h +? mcinfo_extended arch-x86/xen-mca.h +? mcinfo_global arch-x86/xen-mca.h +? mcinfo_logical_cpu arch-x86/xen-mca.h +? mcinfo_msr arch-x86/xen-mca.h +? mcinfo_recovery arch-x86/xen-mca.h ? page_offline_action arch-x86/xen-mca.h +! trap_info arch-x86/xen.h + ? argo_addr argo.h ! argo_iov argo.h ? argo_register_ring argo.h @@ -85,18 +85,18 @@ ? gnttab_cache_flush grant_table.h ! gnttab_copy grant_table.h ? gnttab_dump_table grant_table.h +! gnttab_get_status_frames grant_table.h +? gnttab_get_version grant_table.h ? gnttab_map_grant_ref grant_table.h +? gnttab_set_version grant_table.h ! gnttab_setup_table grant_table.h +? gnttab_swap_grant_ref grant_table.h ! gnttab_transfer grant_table.h -? gnttab_unmap_grant_ref grant_table.h ? gnttab_unmap_and_replace grant_table.h -? gnttab_set_version grant_table.h -? gnttab_get_version grant_table.h -! gnttab_get_status_frames grant_table.h -? grant_entry_v1 grant_table.h +? gnttab_unmap_grant_ref grant_table.h ? grant_entry_header grant_table.h +? grant_entry_v1 grant_table.h ? grant_entry_v2 grant_table.h -? gnttab_swap_grant_ref grant_table.h ! dm_op_buf hvm/dm_op.h ? dm_op_create_ioreq_server hvm/dm_op.h @@ -134,11 +134,11 @@ ! add_to_physmap memory.h ! add_to_physmap_batch memory.h ! foreign_memory_map memory.h +! mem_access_op memory.h +! mem_acquire_resource memory.h ! memory_exchange memory.h ! memory_map memory.h ! memory_reservation memory.h -! mem_access_op memory.h -! mem_acquire_resource memory.h ! pod_target memory.h ! remove_from_physmap memory.h ! reserved_device_memory_map memory.h @@ -154,10 +154,10 @@ ? physdev_pci_device physdev.h ? physdev_pci_device_add physdev.h ? physdev_pci_mmcfg_reserved physdev.h -? physdev_unmap_pirq physdev.h ? physdev_restore_msi physdev.h ? physdev_set_iopl physdev.h ? physdev_setup_gsi physdev.h +? physdev_unmap_pirq physdev.h ! pct_register platform.h ! power_register platform.h @@ -169,17 +169,17 @@ ? processor_px platform.h ! psd_package platform.h ? xenpf_enter_acpi_sleep platform.h -! xenpf_symdata platform.h -? xenpf_pcpuinfo platform.h ? xenpf_pcpu_version platform.h +? xenpf_pcpuinfo platform.h ? xenpf_resource_entry platform.h +! xenpf_symdata platform.h ? xenpf_ucode_revision platform.h ? pmu_data pmu.h ? pmu_params pmu.h -! sched_poll sched.h ? sched_pin_override sched.h +! sched_poll sched.h ? sched_remote_shutdown sched.h ? sched_shutdown sched.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:34:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:34:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746780.1153958 (Exim 4.92) (envelope-from ) id 1sLlhv-0003SF-Rf; Mon, 24 Jun 2024 15:34:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746780.1153958; Mon, 24 Jun 2024 15: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 1sLlhv-0003S8-PF; Mon, 24 Jun 2024 15:34:15 +0000 Received: by outflank-mailman (input) for mailman id 746780; Mon, 24 Jun 2024 15:34:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhu-0003Ry-Bg for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLlhu-0004Jk-Aw for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLlhu-0007Qf-9K for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qQjv2Yy4b6ww2QpEAGCMUvBDVv8QnozokxjfoHHcMDo=; b=dqDGZqn5R9E9KFwb94oW24lB+J wxQSY9jEErgk0twku6I3sEi3wyjiFdP43YkPQicQ3LiGBG9fZ3xpf00LZRkwGSnZAJC6qy+YIbrnA 3McNNX6ImFdni2f01Wur4eriop5VsiT2LgoOWYEhjyXlrM8V051BTgVxF3QakgHNEmN0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gnttab: Perform compat/native gnttab_query_size check Message-Id: Date: Mon, 24 Jun 2024 15:34:14 +0000 commit 8c3bb4d8ce3f9e69ee173b8787a8cbbf1a852d06 Author: Andrew Cooper AuthorDate: Tue Feb 20 19:58:08 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/gnttab: Perform compat/native gnttab_query_size check This subop appears to have been missed from the compat checks. Fixes: 5ce8fafa947c ("Dynamic grant-table sizing") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/common/compat/grant_table.c | 9 +++++++++ xen/include/xlat.lst | 1 + 2 files changed, 10 insertions(+) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index c495c375eb..dd40c48b11 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -30,6 +30,11 @@ CHECK_gnttab_unmap_grant_ref; CHECK_gnttab_unmap_and_replace; #undef xen_gnttab_unmap_and_replace +#define xen_gnttab_query_size gnttab_query_size +CHECK_gnttab_query_size; +#undef xen_gnttab_query_size +DEFINE_XEN_GUEST_HANDLE(gnttab_query_size_compat_t); + DEFINE_XEN_GUEST_HANDLE(gnttab_setup_table_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_copy_compat_t); @@ -106,6 +111,10 @@ int compat_grant_table_op( CASE(copy); #endif +#ifndef CHECK_query_size + CASE(query_size); +#endif + #ifndef CHECK_gnttab_dump_table CASE(dump_table); #endif diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 0630530703..2046b36c04 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -88,6 +88,7 @@ ! gnttab_get_status_frames grant_table.h ? gnttab_get_version grant_table.h ? gnttab_map_grant_ref grant_table.h +? gnttab_query_size grant_table.h ? gnttab_set_version grant_table.h ! gnttab_setup_table grant_table.h ? gnttab_swap_grant_ref grant_table.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 15:34:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 15:34:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746781.1153963 (Exim 4.92) (envelope-from ) id 1sLli5-0003VL-TV; Mon, 24 Jun 2024 15:34:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746781.1153963; Mon, 24 Jun 2024 15: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 1sLli5-0003VD-Qj; Mon, 24 Jun 2024 15:34:25 +0000 Received: by outflank-mailman (input) for mailman id 746781; Mon, 24 Jun 2024 15:34:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLli4-0003Uy-Ed for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLli4-0004Ju-Dr for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLli4-0007RO-D3 for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 15:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9+YH24ToovFdndq9aeg+CdBCozUfOcwSQOE/2ivQjhI=; b=vjlRN3amDW0p93QfbSIbFPu8Vb TcdDQSeqhV5nix+vugkAmohP6wP8cjz/s6D21SIFjUhGvDW/aNJUkDPbMFmLj5TwVoqnOJ3MZj2Gg l0pAJu2YGOPI+zY9Dp9bCjDqOBZoA5k9+cFWpaqs6l//xgX3HCg9TURG4KRZqaWZWHJg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: Drop legacy __ro_after_init definition Message-Id: Date: Mon, 24 Jun 2024 15:34:24 +0000 commit 908407bf2b29a38d6879fc8c57dad14473ef67f8 Author: Andrew Cooper AuthorDate: Fri Jun 21 20:29:07 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/riscv: Drop legacy __ro_after_init definition Hide the legacy __ro_after_init definition in xen/cache.h for RISC-V, to avoid its use creeping in. Only mm.c needs adjusting as a consequence No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Release-Acked-by: Oleksii Kurochko --- xen/arch/riscv/mm.c | 2 +- xen/include/xen/cache.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index 053f043a3d..3ebaf6da01 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include #include #include #include #include #include +#include #include #include diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index 55456823c5..82a3ba38e3 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,7 +15,9 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif +#if defined(CONFIG_ARM) || defined(CONFIG_X86) || defined(CONFIG_PPC64) /* TODO: Phase out the use of this via cache.h */ #define __ro_after_init __section(".data.ro_after_init") +#endif #endif /* __LINUX_CACHE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 24 17:00:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Jun 2024 17:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.746858.1154076 (Exim 4.92) (envelope-from ) id 1sLn30-0000GO-5X; Mon, 24 Jun 2024 17:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 746858.1154076; Mon, 24 Jun 2024 17:00: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 1sLn30-0000G2-2p; Mon, 24 Jun 2024 17:00:06 +0000 Received: by outflank-mailman (input) for mailman id 746858; Mon, 24 Jun 2024 17:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLn2y-0008Lc-4E for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 17:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLn2y-0006N9-3T for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 17:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLn2y-0000YT-1n for xen-changelog@lists.xenproject.org; Mon, 24 Jun 2024 17:00: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tjtz1GzJ6DR7FKQEI3WsknEIhQ2mAV/P7alU3De4woQ=; b=c3oes6DaRBjSHHfqLF1DkETXbQ z8EQM9JVV5TECJoP1qgLg9QIrqF4eZn4jB2BxtqPF68ldftgjOCVMJlsunFINtqjK2B3a3qmULVjH pJ6Xe8lRailIOmEyv5sJfcP2xeby0e3ZUV82z8NtMKGz6W0f3M23hPDWLGH414guSFhw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: static-shmem: request host address to be specified for 1:1 domains Message-Id: Date: Mon, 24 Jun 2024 17:00:04 +0000 commit c56f1ef577831ec70645ca5874d54f2e698c6761 Author: Michal Orzel AuthorDate: Fri Jun 21 11:22:05 2024 +0200 Commit: Julien Grall CommitDate: Mon Jun 24 17:55:06 2024 +0100 xen/arm: static-shmem: request host address to be specified for 1:1 domains As a follow up to commit cb1ddafdc573 ("xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains") add a check to request that both host and guest physical address must be supplied for direct mapped domains. Otherwise return an error to prevent unwanted behavior. Signed-off-by: Michal Orzel Fixes: 988f1c7e1f40 ("xen/arm: static-shmem: fix "gbase/pbase used uninitialized" build failure") Reviewed-by: Julien Grall Release-Acked-By: Oleksii Kurochko --- xen/arch/arm/static-shmem.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index cd48d2896b..aa80756c3c 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -378,6 +378,13 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct membank *alloc_bank = find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); + if ( is_domain_direct_mapped(d) ) + { + printk("%pd: host and guest physical address must be supplied for direct-mapped domains\n", + d); + return -EINVAL; + } + /* guest phys address is right at the beginning */ gbase = dt_read_paddr(cells, addr_cells); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 00:44:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 00:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747019.1154271 (Exim 4.92) (envelope-from ) id 1sLuI1-0006cH-1H; Tue, 25 Jun 2024 00:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747019.1154271; Tue, 25 Jun 2024 00: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 1sLuI0-0006c9-Uo; Tue, 25 Jun 2024 00:44:04 +0000 Received: by outflank-mailman (input) for mailman id 747019; Tue, 25 Jun 2024 00:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuI0-0006c3-5R for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuHz-0006Tk-Tn for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLuHz-0003JA-S2 for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ox0LvdPRU0UsoFKu8REEai2CPexazGrp2vzSe8F5yyg=; b=Oy93pAXYOojBAc2OYyOCkhAKz+ bfCJE327xHZg+TPp0HKvCgvBC0yMevfXmor/c9I3fHNuciZA9+xNP+g0LjLQMzcYvTiE+tJXZA6Q6 XHpGnHDhkjrnDEWaIPXAtFvTZoSYgfjQ4889EIWBkLU38Exd86v5kockSsyU3LTvFAn8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: add deviation for MISRA C Rule 17.7 Message-Id: Date: Tue, 25 Jun 2024 00:44:03 +0000 commit 912412f97a293f5e1deece134d78c52b1b0b8856 Author: Federico Serafini AuthorDate: Fri Jun 14 11:15:38 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:39:09 2024 -0700 automation/eclair: add deviation for MISRA C Rule 17.7 Update ECLAIR configuration to deviate some cases where not using the return value of a function is not dangerous. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 4 ++++ docs/misra/deviations.rst | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index e2653f77eb..89345a9d08 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -413,6 +413,10 @@ explicit comment indicating the fallthrough intention is present." -config=MC3R1.R17.1,macros+={hide , "^va_(arg|start|copy|end)$"} -doc_end +-doc_begin="Not using the return value of a function does not endanger safety if it coincides with an actual argument." +-config=MC3R1.R17.7,calls+={safe, "any()", "decl(name(__builtin_memcpy||__builtin_memmove||__builtin_memset||cpumask_check))"} +-doc_end + # # Series 18. # diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 36959aa44a..679d8c885f 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -364,6 +364,15 @@ Deviations related to MISRA C:2012 Rules: by `stdarg.h`. - Tagged as `deliberate` for ECLAIR. + * - R17.7 + - Not using the return value of a function does not endanger safety if it + coincides with an actual argument. + - Tagged as `safe` for ECLAIR. Such functions are: + - __builtin_memcpy() + - __builtin_memmove() + - __builtin_memset() + - cpumask_check() + * - R20.4 - The override of the keyword \"inline\" in xen/compiler.h is present so that section contents checks pass when the compiler chooses not to -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 00:44:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 00:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747020.1154275 (Exim 4.92) (envelope-from ) id 1sLuIB-0006eC-3F; Tue, 25 Jun 2024 00:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747020.1154275; Tue, 25 Jun 2024 00: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 1sLuIB-0006e2-00; Tue, 25 Jun 2024 00:44:15 +0000 Received: by outflank-mailman (input) for mailman id 747020; Tue, 25 Jun 2024 00:44:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIA-0006ds-1V for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIA-0006VR-0i for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLuI9-0003Js-W1 for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MLjufc700JyOgDdULGyZoxXGNjJnU07QICt5bakssyU=; b=TQEj3jO/7+/AsBpPTX/aXwmuQ3 SRjl74o0gmDCnOQsff7y09HHpr2vI8RazvNJ+Bj8hJ8sQh2C0mPV1i7hLyKy9ZtdGNlumYFxBkE9o w+Ah+koHrGEKgkKf1Cy8Zt80uOtV/kCaU89V0S2YWsAyR2w7dHdiGFse9ttCqVrRlIfQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: add deviations of MISRA C Rule 5.5 Message-Id: Date: Tue, 25 Jun 2024 00:44:13 +0000 commit 5add709cc6595af95e181091dbbf6e00aae836e3 Author: Federico Serafini AuthorDate: Thu Jun 20 14:50:34 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:40:05 2024 -0700 automation/eclair: add deviations of MISRA C Rule 5.5 MISRA C Rule 5.5 states that "Identifiers shall be distinct from macro names". Update ECLAIR configuration to deviate: - macros expanding to their own name; - clashes between macros and non-callable entities; - clashes related to the selection of specific implementations of string handling functions. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 16 ++++++++++++++++ docs/misra/deviations.rst | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 89345a9d08..ae2eaf50f7 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -90,6 +90,22 @@ conform to the directive." -config=MC3R1.R5.3,reports+={safe, "any_area(any_loc(any_exp(macro(^read_debugreg$))&&any_exp(macro(^write_debugreg$))))"} -doc_end +-doc_begin="Macros expanding to their own identifier (e.g., \"#define x x\") are deliberate." +-config=MC3R1.R5.5,reports+={deliberate, "all_area(macro(same_id_body())||!macro(!same_id_body()))"} +-doc_end + +-doc_begin="There is no clash between function like macros and not callable objects." +-config=MC3R1.R5.5,reports+={deliberate, "all_area(macro(function_like())||decl(any()))&&all_area(macro(any())||!decl(kind(function))&&!decl(__function_pointer_decls))"} +-doc_end + +-doc_begin="Clashes between function names and macros are deliberate for string handling functions since some architectures may want to use their own arch-specific implementation." +-config=MC3R1.R5.5,reports+={deliberate, "all_area(all_loc(file(^xen/arch/x86/string\\.c|xen/include/xen/string\\.h|xen/lib/.*$)))"} +-doc_end + +-doc_begin="In libelf, clashes between macros and function names are deliberate and needed to prevent the use of undecorated versions of memcpy, memset and memmove." +-config=MC3R1.R5.5,reports+={deliberate, "any_area(decl(kind(function))||any_loc(macro(name(memcpy||memset||memmove))))&&any_area(any_loc(file(^xen/common/libelf/libelf-private\\.h$)))"} +-doc_end + -doc_begin="The type \"ret_t\" is deliberately defined multiple times, depending on the guest." -config=MC3R1.R5.6,reports+={deliberate,"any_area(any_loc(text(^.*ret_t.*$)))"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 679d8c885f..16fc345756 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -98,6 +98,27 @@ Deviations related to MISRA C:2012 Rules: - __emulate_2op and __emulate_2op_nobyte - read_debugreg and write_debugreg + * - R5.5 + - Macros expanding to their own name are allowed. + - Tagged as `deliberate` for ECLAIR. + + * - R5.5 + - Clashes between names of function-like macros and identifiers of + non-callable entities are allowed. + - Tagged as `deliberate` for ECLAIR. + + * - R5.5 + - Clashes between function names and macros are deliberate for string + handling functions since some architectures may want to use their own + arch-specific implementation. + - Tagged as `deliberate` for ECLAIR. + + * - R5.5 + - In libelf, clashes between macros and function names are deliberate and + needed to prevent the use of undecorated versions of memcpy, memset and + memmove. + - Tagged as `deliberate` for ECLAIR. + * - R5.6 - The type ret_t is deliberately defined multiple times depending on the type of guest to service. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 00:44:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 00:44:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747021.1154279 (Exim 4.92) (envelope-from ) id 1sLuIL-0006h3-4H; Tue, 25 Jun 2024 00:44:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747021.1154279; Tue, 25 Jun 2024 00:44: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 1sLuIL-0006gu-1R; Tue, 25 Jun 2024 00:44:25 +0000 Received: by outflank-mailman (input) for mailman id 747021; Tue, 25 Jun 2024 00:44:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIK-0006gk-4z for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIK-0006VZ-47 for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLuIK-0003Kg-2p for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rY85kMBMX8QxelE+dN20cys4+5ffrGjWEYSiTn12wuo=; b=etNxauF2f10RCga9QeVNrkhW1H 560qPYhdcj3FxkLG8mgYWO3jSrh6aj5MkZZoRmn5DTKnxomNHp/UeyWn+bzeBuESv6BsN3p7cgbXY TYOEM3BRCkmo5M5QcSwRNhIZ69moUouKBhBDGEnuYRFEFvfmvIijoGaDfG5qd847P2Xs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: add more guidelines to the monitored set Message-Id: Date: Tue, 25 Jun 2024 00:44:24 +0000 commit c2f4ea4dc9eba454dc2e761bfd39ccb72870d268 Author: Federico Serafini AuthorDate: Fri Jun 21 17:32:41 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:41:12 2024 -0700 automation/eclair: add more guidelines to the monitored set Add more accepted guidelines to the monitored set to check them at each commit. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/monitored.ecl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 4daecb0c83..9ffaebbdc3 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -18,10 +18,13 @@ -enable=MC3R1.R12.5 -enable=MC3R1.R1.3 -enable=MC3R1.R13.6 +-enable=MC3R1.R13.1 -enable=MC3R1.R1.4 -enable=MC3R1.R14.1 -enable=MC3R1.R14.4 -enable=MC3R1.R16.2 +-enable=MC3R1.R16.3 +-enable=MC3R1.R16.4 -enable=MC3R1.R16.6 -enable=MC3R1.R16.7 -enable=MC3R1.R17.1 @@ -34,6 +37,7 @@ -enable=MC3R1.R20.13 -enable=MC3R1.R20.14 -enable=MC3R1.R20.4 +-enable=MC3R1.R20.7 -enable=MC3R1.R20.9 -enable=MC3R1.R2.1 -enable=MC3R1.R21.10 @@ -58,6 +62,7 @@ -enable=MC3R1.R5.2 -enable=MC3R1.R5.3 -enable=MC3R1.R5.4 +-enable=MC3R1.R5.5 -enable=MC3R1.R5.6 -enable=MC3R1.R6.1 -enable=MC3R1.R6.2 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 00:44:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 00:44:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747022.1154283 (Exim 4.92) (envelope-from ) id 1sLuIV-0006kW-6m; Tue, 25 Jun 2024 00:44:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747022.1154283; Tue, 25 Jun 2024 00:44: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 1sLuIV-0006kP-4D; Tue, 25 Jun 2024 00:44:35 +0000 Received: by outflank-mailman (input) for mailman id 747022; Tue, 25 Jun 2024 00:44:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIU-0006kD-8M for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIU-0006W2-7W for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLuIU-0003LK-6D for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2ptG4o74CkglSdXgwWiqXJB1k8z5mBOYCnebN8kSKVc=; b=1HqRlg6hQd8247r3FTeFj9Qmzi Grca7jFc9oJzB1okP9nsZmCRueHueABIbWSD6vq6qhGCUrlPdVNM3YqL7VcOZVnTKRwcoj+YuRB2N uOlVpLCJZqMgpg4wtk0OGhtZblcq1gSnORLOF6eklnM0EtJgSC5vUQkmi39XoYDxy78I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] common/unlzo: address violation of MISRA C Rule 7.3 Message-Id: Date: Tue, 25 Jun 2024 00:44:34 +0000 commit 6e07f41b27c3267e4528327ebc44dd03ac869ae3 Author: Alessandro Zucchelli AuthorDate: Fri Jun 21 15:40:47 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:41:58 2024 -0700 common/unlzo: address violation of MISRA C Rule 7.3 This addresses violations of MISRA C:2012 Rule 7.3 which states as following: the lowercase character `l' shall not be used in a literal suffix. The file common/unlzo.c defines the non-compliant constant LZO_BLOCK_SIZE with having a lowercase 'l'. It is now defined as '256*1024L'. No functional change. Signed-off-by: Alessandro Zucchelli Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- xen/common/unlzo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c index bdcefa95b3..acb8dff600 100644 --- a/xen/common/unlzo.c +++ b/xen/common/unlzo.c @@ -52,7 +52,7 @@ static inline u32 get_unaligned_be32(const void *p) static const unsigned char lzop_magic[] = { 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a }; -#define LZO_BLOCK_SIZE (256*1024l) +#define LZO_BLOCK_SIZE (256*1024L) #define HEADER_HAS_FILTER 0x00000800L #define HEADER_SIZE_MIN (9 + 7 + 4 + 8 + 1 + 4) #define HEADER_SIZE_MAX (9 + 7 + 1 + 8 + 8 + 4 + 1 + 255 + 4) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 00:44:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 00:44:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747024.1154291 (Exim 4.92) (envelope-from ) id 1sLuIf-0006po-FX; Tue, 25 Jun 2024 00:44:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747024.1154291; Tue, 25 Jun 2024 00:44: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 1sLuIf-0006pB-Ch; Tue, 25 Jun 2024 00:44:45 +0000 Received: by outflank-mailman (input) for mailman id 747024; Tue, 25 Jun 2024 00:44:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIe-0006mo-BG for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLuIe-0006W9-AY for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sLuIe-0003Lq-9b for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 00:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AKni4gkGUo1MQRLwWNUckdxFeiDhn+I4/OZSWy46Lpw=; b=gL5ZwJa/o08U1Uakwe4wQBkGdm P/Prc+6B6GRxkD6noKVJbuX6WhyuAdTr72yB33BMj+pIBcT5CpcNLH2MidVxA54jFk97rUCR3e+B2 jolvnW2NbznH3sWn50n0NiBp66XtOfMSZAFwsuVTirAakpj1z201PeAAAR3EllUJLgJg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pagewalk: Address MISRA R8.3 violation in guest_walk_tables() Message-Id: Date: Tue, 25 Jun 2024 00:44:44 +0000 commit b14dae96c07ef27cc7f8107ddaa16989e9ab024b Author: Andrew Cooper AuthorDate: Fri Jun 21 21:57:59 2024 +0100 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:42:51 2024 -0700 x86/pagewalk: Address MISRA R8.3 violation in guest_walk_tables() Commit 4c5d78a10dc8 ("x86/pagewalk: Re-implement the pagetable walker") intentionally renamed guest_walk_tables()'s 'pfec' parameter to 'walk' because it's not a PageFault Error Code, despite the name of some of the constants passed in. Sadly the constants-cleanup I've been meaning to do since then still hasn't come to pass. Update the declaration to match, to placate MISRA. Fixes: 4c5d78a10dc8 ("x86/pagewalk: Re-implement the pagetable walker") Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/guest_pt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/guest_pt.h b/xen/arch/x86/include/asm/guest_pt.h index bc312343cd..7b0c9b005c 100644 --- a/xen/arch/x86/include/asm/guest_pt.h +++ b/xen/arch/x86/include/asm/guest_pt.h @@ -422,7 +422,7 @@ static inline unsigned int guest_walk_to_page_order(const walk_t *gw) bool guest_walk_tables(const struct vcpu *v, struct p2m_domain *p2m, - unsigned long va, walk_t *gw, uint32_t pfec, + unsigned long va, walk_t *gw, uint32_t walk, gfn_t top_gfn, mfn_t top_mfn, void *top_map); /* Pretty-print the contents of a guest-walk */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 07:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 07:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747371.1154762 (Exim 4.92) (envelope-from ) id 1sM115-00070u-4N; Tue, 25 Jun 2024 07:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747371.1154762; Tue, 25 Jun 2024 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 1sM115-00070m-1n; Tue, 25 Jun 2024 07:55:03 +0000 Received: by outflank-mailman (input) for mailman id 747371; Tue, 25 Jun 2024 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 1sM114-00070e-7b for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 07:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sM113-00070s-ST for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 07:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sM113-0005X0-QJ for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UtEOCu4pQZp4jtS0oiKhqrifMVQY5Vie0PoTjFl2LYs=; b=6TMuglIKp2qNQqw7dY5ApB3vGs sh7JAF0J7s5wZFWk3Fzc8x3XwWcy9HNrzvlwrtFwIQBVbFnYzvXc3Wv+q/SrONQcI2r4/ju9Y12Jg ku15eMawUHW9pPJ+RrgRzTIpLuMEHps8TgRzSeKgPcCgzDqg0jkWLnr9ZPo0nCxJAGdY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mman: correct m{,un}lock() definitions Message-Id: Date: Tue, 25 Jun 2024 07:55:01 +0000 commit 8b038c7411ae7e823eaf6d15d5efbe037a07197a Author: Charles Arnold AuthorDate: Tue Jun 25 09:50:11 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 25 09:50:11 2024 +0200 mman: correct m{,un}lock() definitions gcc14 no longer (silently) accepts functions with no return type specified. Signed-off-by: Charles Arnold Signed-off-by: Jan Beulich Reviewed-by: Samuel Thibault --- include/posix/sys/mman.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/posix/sys/mman.h b/include/posix/sys/mman.h index 4d34979..69bba45 100644 --- a/include/posix/sys/mman.h +++ b/include/posix/sys/mman.h @@ -16,7 +16,7 @@ void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) asm("mmap64"); int munmap(void *start, size_t length); -static inline mlock(const void *addr, size_t len) { return 0; } -static inline munlock(const void *addr, size_t len) { return 0; } +static inline int mlock(const void *addr, size_t len) { return 0; } +static inline int munlock(const void *addr, size_t len) { return 0; } #endif /* _POSIX_SYS_MMAN_H */ -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 09:44:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 09:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747521.1154946 (Exim 4.92) (envelope-from ) id 1sM2ib-0002CD-II; Tue, 25 Jun 2024 09:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747521.1154946; Tue, 25 Jun 2024 09: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 1sM2ib-0002C5-FP; Tue, 25 Jun 2024 09:44:05 +0000 Received: by outflank-mailman (input) for mailman id 747521; Tue, 25 Jun 2024 09:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sM2iZ-0002Bz-UR for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sM2iZ-00018x-JE for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sM2iZ-0005xq-IE for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zJxztJ/ipSgdse3lZEmiAvGIGyuHO8eFhqsXzZd0OdM=; b=erRL6in9kSK0MGXZEnN+8BpcFq ppE1/hnDCD5KPirf06FWnhjyve3Sv7enr6F3xTaFpUOFcWyGOAeNCB/AfiX4bZymACm+XT9u7lUDj nrswzUzVTBeacl+hjZ8EUwBGWHlRJqTBJpZI9fI8oxoB3lYpPqiwfmBt2wQ1gi2itJZk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: Update my email address again Message-Id: Date: Tue, 25 Jun 2024 09:44:03 +0000 commit 93db2f64f3663192d9b83d89a35d596cad73fb08 Author: Anthony PERARD AuthorDate: Tue Jun 25 11:36:15 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 25 11:36:15 2024 +0200 MAINTAINERS: Update my email address again Signed-off-by: Anthony PERARD Acked-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8e2b30a345..9d66b898ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -208,7 +208,7 @@ Maintainers List (try to look for most precise areas first) 9PFSD M: Juergen Gross -M: Anthony PERARD +M: Anthony PERARD S: Supported F: tools/9pfsd/ @@ -383,7 +383,7 @@ F: xen/arch/x86/machine_kexec.c F: xen/arch/x86/x86_64/kexec_reloc.S LIBS -M: Anthony PERARD +M: Anthony PERARD R: Juergen Gross S: Supported F: tools/include/libxenvchan.h @@ -429,7 +429,7 @@ S: Supported F: tools/ocaml/ OVMF UPSTREAM -M: Anthony PERARD +M: Anthony PERARD S: Supported T: git https://xenbits.xenproject.org/git-http/ovmf.git @@ -462,7 +462,7 @@ T: git https://xenbits.xenproject.org/git-http/qemu-xen-traditional.git QEMU UPSTREAM M: Stefano Stabellini -M: Anthony Perard +M: Anthony Perard S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen.git @@ -515,7 +515,7 @@ F: xen/arch/arm/include/asm/tee F: xen/arch/arm/tee/ TOOLSTACK -M: Anthony PERARD +M: Anthony PERARD S: Supported F: autogen.sh F: config/*.in -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 09:44:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 09:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747522.1154950 (Exim 4.92) (envelope-from ) id 1sM2il-0002Dw-Jc; Tue, 25 Jun 2024 09:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747522.1154950; Tue, 25 Jun 2024 09: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 1sM2il-0002Dp-Go; Tue, 25 Jun 2024 09:44:15 +0000 Received: by outflank-mailman (input) for mailman id 747522; Tue, 25 Jun 2024 09:44:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sM2ij-0002Df-OH for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sM2ij-0001Ad-NP for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sM2ij-0006Dn-LI for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Cm0L1YKkc7BxqjBvH365Zkp52usDuQ+AaTG7jYWKz6o=; b=e2PuOzpph83i0JtWCQn3LMEdsa eiq4mxLEqK3eGBB9/P8Zlo5oDNGA7uiNRzXBJooGlRUMoOYnOBNsQ9s1uwKJCXL3PcFNGF8xX/Gt1 tWyCoACYjD08rGp4ognFMRA7ac0904yekI70oSEBNK0z++FpHkLIumRDk9mg4wcmD6nc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: re-add type checking to {,__}copy_from_guest_offset() Message-Id: Date: Tue, 25 Jun 2024 09:44:13 +0000 commit 735865f88486814dd6ae255f13a7f70cd3b01d4f Author: Jan Beulich AuthorDate: Tue Jun 25 11:36:59 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 25 11:36:59 2024 +0200 xen: re-add type checking to {,__}copy_from_guest_offset() When re-working them to avoid UB on guest address calculations, I failed to add explicit type checks in exchange for the implicit ones that until then had happened in assignments that were there anyway. Fixes: 43d5c5d5f70b ("xen: avoid UB in guest handle arithmetic") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- xen/include/xen/guest_access.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/include/xen/guest_access.h b/xen/include/xen/guest_access.h index 96dbef2e02..a2146749e3 100644 --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -86,6 +86,7 @@ #define copy_from_guest_offset(ptr, hnd, off, nr) ({ \ unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ + (void)((hnd).p == _d); \ raw_copy_from_guest(_d, \ (const void *)(s_ + (off) * sizeof(*_d)), \ (nr) * sizeof(*_d)); \ @@ -140,6 +141,7 @@ #define __copy_from_guest_offset(ptr, hnd, off, nr) ({ \ unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ + (void)((hnd).p == _d); \ __raw_copy_from_guest(_d, \ (const void *)(s_ + (off) * sizeof(*_d)), \ (nr) * sizeof(*_d)); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 09:44:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 09:44:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.747523.1154954 (Exim 4.92) (envelope-from ) id 1sM2iv-0002H1-LT; Tue, 25 Jun 2024 09:44:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 747523.1154954; Tue, 25 Jun 2024 09:44: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 1sM2iv-0002Gt-IK; Tue, 25 Jun 2024 09:44:25 +0000 Received: by outflank-mailman (input) for mailman id 747523; Tue, 25 Jun 2024 09:44:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sM2it-0002GU-TI for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sM2it-0001Ax-Qy for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sM2it-0006EO-PP for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 09:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9NSrlBu4tlM5TQFTuzHEBTbARo4qaPROnEJhXpADMd0=; b=Hwbk5xAJaIyeJj2wwR8YskbwN+ 5aqDYMI7p5SDVFCuAbheq6JiOu9iOUmCaHFGqHmiyHHgpHVIOTaWcDBns4EaPHmK6W42rTqib2s4q DO/1ikygeU3GdTb+X4zVZ4psiWIa2epZexEER9kjBXKz5Ar2+JJI/yNn1+f7xcqrzc9s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] gnttab: fix compat query-size handling Message-Id: Date: Tue, 25 Jun 2024 09:44:23 +0000 commit 11ea49a3fda5f0cbd8546ee8bdc5e9c55736c828 Author: Jan Beulich AuthorDate: Tue Jun 25 11:37:44 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 25 11:37:44 2024 +0200 gnttab: fix compat query-size handling The odd DEFINE_XEN_GUEST_HANDLE(), inconsistent with all other similar constructs, should have caught my attention. Turns out it was needed for the build to succeed merely because the corresponding #ifndef had a typo. That typo in turn broke compat mode guests, by having query-size requests of theirs wire into the domain_crash() at the bottom of the switch(). Fixes: 8c3bb4d8ce3f ("xen/gnttab: Perform compat/native gnttab_query_size check") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/common/compat/grant_table.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index dd40c48b11..5ad0debf96 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -33,7 +33,6 @@ CHECK_gnttab_unmap_and_replace; #define xen_gnttab_query_size gnttab_query_size CHECK_gnttab_query_size; #undef xen_gnttab_query_size -DEFINE_XEN_GUEST_HANDLE(gnttab_query_size_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_setup_table_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_compat_t); @@ -111,7 +110,7 @@ int compat_grant_table_op( CASE(copy); #endif -#ifndef CHECK_query_size +#ifndef CHECK_gnttab_query_size CASE(query_size); #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 22:33:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 22:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748131.1155708 (Exim 4.92) (envelope-from ) id 1sMEin-0002RB-Js; Tue, 25 Jun 2024 22:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748131.1155708; Tue, 25 Jun 2024 22: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 1sMEin-0002R3-H4; Tue, 25 Jun 2024 22:33:05 +0000 Received: by outflank-mailman (input) for mailman id 748131; Tue, 25 Jun 2024 22:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMEil-0002Qx-UP for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 22:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMEil-0007QZ-QW for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 22:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMEil-0002Ko-OQ for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CMyM2eJDSlYal96aVr7YqO3mHXgbmcXwt8v4G5xIKeU=; b=AO6rxA1bf8BTAng3GucnfzeNr7 CWVXmCJSXBnuRNbWEbpkkoBVFTIZABBW+0cjIf5KhL+aDm1dBlFLaBLRoes3iyG2BgN3q5L4L8vFX sW6ftSkTM32hdelGGA18UwFZ7mjy0ldvjHh5MagZkXEbliI1lCSQqOq+iKPl613Jcx88=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: configure Rule 13.6 and custom service B.UNEVALEFF Message-Id: Date: Tue, 25 Jun 2024 22:33:03 +0000 commit 0ac3b175e74167815995df463181663461f8d9f1 Author: Federico Serafini AuthorDate: Mon Jun 24 11:18:32 2024 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 25 13:41:05 2024 -0700 automation/eclair: configure Rule 13.6 and custom service B.UNEVALEFF Rule 13.6 states that "The operand of the `sizeof' operator shall not contain any expression which has potential side effects". Define service B.UNEVALEFF as an extension of Rule 13.6 to check for unevalued side effects also for typeof and alignof operators. Update ECLAIR configuration to deviate uses of BUILD_BUG_ON and alternative_v?call[0-9] for both Rule 13.6 and B.UNEVALEFF. Add service B.UNEVALEFF to the accepted.ecl guidelines to check "violations" in the weekly analysis. Signed-off-by: Federico Serafini Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl | 10 ++++++++++ automation/eclair_analysis/ECLAIR/accepted_guidelines.sh | 2 ++ automation/eclair_analysis/ECLAIR/analysis.ecl | 1 + automation/eclair_analysis/ECLAIR/deviations.ecl | 10 ++++++++++ docs/misra/deviations.rst | 10 ++++++++++ 5 files changed, 33 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl b/automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl new file mode 100644 index 0000000000..92d8db8986 --- /dev/null +++ b/automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl @@ -0,0 +1,10 @@ +-clone_service=MC3R1.R13.6,B.UNEVALEFF + +-config=B.UNEVALEFF,summary="The operand of the `alignof' and `typeof' operators shall not contain any expression which has potential side effects" +-config=B.UNEVALEFF,stmt_child_matcher= +{"stmt(node(utrait_expr)&&operator(alignof))", expr, 0, "stmt(any())", {}}, +{"stmt(node(utrait_type)&&operator(alignof))", type, 0, "stmt(any())", {}}, +{"stmt(node(utrait_expr)&&operator(preferred_alignof))", expr, 0, "stmt(any())", {}}, +{"stmt(node(utrait_type)&&operator(preferred_alignof))", type, 0, "stmt(any())", {}}, +{"type(node(typeof_expr))", expr, 0, "stmt(any())", {}}, +{"type(node(typeof_type))", type, 0, "stmt(any())", {}} diff --git a/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh b/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh index b308bd4cda..368135122c 100755 --- a/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh +++ b/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh @@ -11,3 +11,5 @@ accepted_rst=$1 grep -Eo "\`(Dir|Rule) [0-9]+\.[0-9]+" ${accepted_rst} \ | sed -e 's/`Rule /MC3R1.R/' -e 's/`Dir /MC3R1.D/' -e 's/.*/-enable=&/' > ${script_dir}/accepted.ecl + +echo "-enable=B.UNEVALEFF" >> ${script_dir}/accepted.ecl diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 9134e59617..df0b551812 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -52,6 +52,7 @@ their Standard Library equivalents." -eval_file=adopted.ecl -eval_file=out_of_scope.ecl +-eval_file=B.UNEVALEFF.ecl -eval_file=deviations.ecl -eval_file=call_properties.ecl -eval_file=tagging.ecl diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index ae2eaf50f7..8f13dabeb1 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -344,6 +344,16 @@ of the short-circuit evaluation strategy of such logical operators." -config=MC3R1.R13.5,reports+={disapplied,"any()"} -doc_end +-doc_begin="Macros alternative_v?call[0-9] use sizeof and typeof to check that the argument types match the corresponding parameter ones." +-config=MC3R1.R13.6,reports+={deliberate,"any_area(any_loc(any_exp(macro(^alternative_vcall[0-9]$))&&file(^xen/arch/x86/include/asm/alternative\\.h*$)))"} +-config=B.UNEVALEFF,reports+={deliberate,"any_area(any_loc(any_exp(macro(^alternative_v?call[0-9]$))&&file(^xen/arch/x86/include/asm/alterantive\\.h*$)))"} +-doc_end + +-doc_begin="Anything, no matter how complicated, inside the BUILD_BUG_ON macro is subject to a compile-time evaluation without relevant side effects." +-config=MC3R1.R13.6,reports+={safe,"any_area(any_loc(any_exp(macro(name(BUILD_BUG_ON)))))"} +-config=B.UNEVALEFF,reports+={safe,"any_area(any_loc(any_exp(macro(name(BUILD_BUG_ON)))))"} +-doc_end + # # Series 14 # diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 16fc345756..c6a2affc6a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -300,6 +300,16 @@ Deviations related to MISRA C:2012 Rules: the short-circuit evaluation strategy for logical operators. - Project-wide deviation; tagged as `disapplied` for ECLAIR. + * - R13.6 + - On x86, macros alternative_v?call[0-9] use sizeof and typeof to check + that the argument types match the corresponding parameter ones. + - Tagged as `deliberate` for ECLAIR. + + * - R13.6 + - Anything, no matter how complicated, inside the BUILD_BUG_ON macro is + subject to a compile-time evaluation without relevant side effects." + - Tagged as `safe` for ECLAIR. + * - R14.2 - The severe restrictions imposed by this rule on the use of 'for' statements are not counterbalanced by the presumed facilitation of the -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 25 22:33:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jun 2024 22:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748132.1155712 (Exim 4.92) (envelope-from ) id 1sMEix-0002St-LS; Tue, 25 Jun 2024 22:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748132.1155712; Tue, 25 Jun 2024 22: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 1sMEix-0002Sl-If; Tue, 25 Jun 2024 22:33:15 +0000 Received: by outflank-mailman (input) for mailman id 748132; Tue, 25 Jun 2024 22:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMEiv-0002SW-W2 for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 22:33:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMEiv-0007Qd-VB for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 22:33:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMEiv-0002La-Si for xen-changelog@lists.xenproject.org; Tue, 25 Jun 2024 22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QTBjiavbFt7wzIthbQrGdypISWK6vZ5JyLVksSY9YgQ=; b=woZHG23jDbMnuUDHnBpg5aT/3m 5W/d/u2G/CxfzYDpu5yWFs2RsNpkyTluI1vQTrbTJtt/LGkoZ2KS/gTzx/danQQEGIwshBIH+G45g 5Tho7t+ZoXhu4Sg/Qs7MveqsRQvuZ4GMRmlPdMGJm9Udnr9kFxt/HCOYKU/z7s62qm5g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: deviate and|or|xor|not for MISRA C Rule 21.2 Message-Id: Date: Tue, 25 Jun 2024 22:33:13 +0000 commit 853f707cd9e2eb9410dbfbadbd5a01ac0252ef83 Author: Alessandro Zucchelli AuthorDate: Tue Jun 25 13:41:27 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 25 13:41:27 2024 -0700 automation/eclair_analysis: deviate and|or|xor|not for MISRA C Rule 21.2 Rule 21.2 reports identifiers reserved for the C and POSIX standard libraries: or, and, not and xor are reserved identifiers because they constitute alternate spellings for the corresponding operators (they are defined as macros by iso646.h); however Xen doesn't use standard library headers, so there is no risk of overlap. This addresses violations arising from x86_emulate/x86_emulate.c, where label statements named as or, and and xor appear. No functional change. Signed-off-by: Alessandro Zucchelli Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 8f13dabeb1..dcff4f4013 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -523,6 +523,12 @@ in the expansion." # Series 21. # +-doc_begin="or, and and xor are reserved identifiers because they constitute alternate +spellings for the corresponding operators (they are defined as macros by iso646.h). +However, Xen doesn't use standard library headers, so there is no risk of overlap." +-config=MC3R1.R21.2,reports+={safe, "any_area(stmt(ref(kind(label)&&^(or|and|xor|not)$)))"} +-doc_end + -doc_begin="Xen does not use the functions provided by the Standard Library, but implements a set of functions that share the same names as their Standard Library equivalent. The implementation of these functions is available in source form, so the undefined, unspecified -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:22:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748333.1155967 (Exim 4.92) (envelope-from ) id 1sML6a-0004Ky-0g; Wed, 26 Jun 2024 05:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748333.1155967; Wed, 26 Jun 2024 05: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 1sML6Z-0004Kq-TY; Wed, 26 Jun 2024 05:22:03 +0000 Received: by outflank-mailman (input) for mailman id 748333; Wed, 26 Jun 2024 05:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML6Y-0004Kk-Gl for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML6Y-0006J6-Ao for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML6Y-0005QN-9s for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PiIIf73z+Pwt91X4VcZiYxBUNOCZxFOOU8SNqNtYnRU=; b=6Jza1mxA+v/wgVmB5jWJxcgvkv p9YuDTR/6d5pUWa3GO+x6sXmO6dAyN2w7xh0JU3tQWt3RYHAghvELiYXVlpqEYT8ix9+7BJLRdG4x e8Fh7pqK9CPHvjxP/cnNBV/een3DBmpE/9MoVV4alI8aieLAWR/kvxWhUMfywJunxmfs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: Open xldevd.log with O_CLOEXEC Message-Id: Date: Wed, 26 Jun 2024 05:22:02 +0000 commit ba52b3b624e4a1a976908552364eba924ca45430 Author: Andrew Cooper AuthorDate: Tue May 7 12:05:58 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 tools/xl: Open xldevd.log with O_CLOEXEC `xl devd` has been observed leaking /var/log/xldevd.log into children. Note this is specifically safe; dup2() leaves O_CLOEXEC disabled on newfd, so after setting up stdout/stderr, it's only the logfile fd which will close on exec(). Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Reviewed-by: Demi Marie Obenour Acked-by: Anthony PERARD Release-Acked-by: Oleksii Kurochko --- tools/xl/xl_utils.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/xl/xl_utils.c b/tools/xl/xl_utils.c index 17489d1829..b0d23b2cdb 100644 --- a/tools/xl/xl_utils.c +++ b/tools/xl/xl_utils.c @@ -27,6 +27,10 @@ #include "xl.h" #include "xl_utils.h" +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + void dolog(const char *file, int line, const char *func, const char *fmt, ...) { va_list ap; @@ -270,7 +274,7 @@ int do_daemonize(const char *name, const char *pidfile) exit(-1); } - CHK_SYSCALL(logfile = open(fullname, O_WRONLY|O_CREAT|O_APPEND, 0644)); + CHK_SYSCALL(logfile = open(fullname, O_WRONLY | O_CREAT | O_APPEND | O_CLOEXEC, 0644)); free(fullname); assert(logfile >= 3); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748334.1155970 (Exim 4.92) (envelope-from ) id 1sML6k-0004Mu-1b; Wed, 26 Jun 2024 05:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748334.1155970; Wed, 26 Jun 2024 05: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 1sML6j-0004Mm-V0; Wed, 26 Jun 2024 05:22:13 +0000 Received: by outflank-mailman (input) for mailman id 748334; Wed, 26 Jun 2024 05:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML6i-0004Ma-Eq for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML6i-0006JI-E7 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML6i-0005Qu-DC for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nlJsolftaWAXO8IMJ2a5nAeyzqyWpQ3q7Z9U8iMNpWk=; b=0zyEzorVGYsgIramF5iZBs2pLR hIJETCNQth2v95DMwrZaVjiySgOYJVruzU90ZriF38r+YGVZEQt67FUM0A8qb4/GwXTcwkkE9yF10 yTxetv5ID6wcbTVE4xyngDhFWy+3jijSbLupZFvL8jTpo1i3V22RjkG8ZlHG7ZE2Toyk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: Rework trace_shadow_gen() into sh_trace_va() Message-Id: Date: Wed, 26 Jun 2024 05:22:12 +0000 commit 2e9f8a734e3dd2b6abccea325dd5e854a3670dec Author: Andrew Cooper AuthorDate: Wed May 22 13:51:43 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Rework trace_shadow_gen() into sh_trace_va() The ((GUEST_PAGING_LEVELS - 2) << 8) expression in the event field is common to all shadow trace events, so introduce sh_trace() as a very thin wrapper around trace(). Then, rename trace_shadow_gen() to sh_trace_va() to better describe what it is doing, and to be more consistent with later cleanup. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index bcd02b2d00..1775952d7e 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1974,13 +1974,17 @@ typedef u32 guest_va_t; typedef u32 guest_pa_t; #endif -static inline void trace_shadow_gen(u32 event, guest_va_t va) +/* Shadow trace event with GUEST_PAGING_LEVELS folded into the event field. */ +static void sh_trace(uint32_t event, unsigned int extra, const void *extra_data) +{ + trace(event | ((GUEST_PAGING_LEVELS - 2) << 8), extra, extra_data); +} + +/* Shadow trace event with the guest's linear address. */ +static void sh_trace_va(uint32_t event, guest_va_t va) { if ( tb_init_done ) - { - event |= (GUEST_PAGING_LEVELS-2)<<8; - trace(event, sizeof(va), &va); - } + sh_trace(event, sizeof(va), &va); } static inline void trace_shadow_fixup(guest_l1e_t gl1e, @@ -2239,7 +2243,7 @@ static int cf_check sh_page_fault( sh_reset_early_unshadow(v); perfc_incr(shadow_fault_fast_gnp); SHADOW_PRINTK("fast path not-present\n"); - trace_shadow_gen(TRC_SHADOW_FAST_PROPAGATE, va); + sh_trace_va(TRC_SHADOW_FAST_PROPAGATE, va); return 0; } #ifdef CONFIG_HVM @@ -2250,7 +2254,7 @@ static int cf_check sh_page_fault( perfc_incr(shadow_fault_fast_mmio); SHADOW_PRINTK("fast path mmio %#"PRIpaddr"\n", gpa); sh_reset_early_unshadow(v); - trace_shadow_gen(TRC_SHADOW_FAST_MMIO, va); + sh_trace_va(TRC_SHADOW_FAST_MMIO, va); return handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0; #else @@ -2265,7 +2269,7 @@ static int cf_check sh_page_fault( * Retry and let the hardware give us the right fault next time. */ perfc_incr(shadow_fault_fast_fail); SHADOW_PRINTK("fast path false alarm!\n"); - trace_shadow_gen(TRC_SHADOW_FALSE_FAST_PATH, va); + sh_trace_va(TRC_SHADOW_FALSE_FAST_PATH, va); return EXCRET_fault_fixed; } } @@ -2481,7 +2485,7 @@ static int cf_check sh_page_fault( #endif paging_unlock(d); put_gfn(d, gfn_x(gfn)); - trace_shadow_gen(TRC_SHADOW_DOMF_DYING, va); + sh_trace_va(TRC_SHADOW_DOMF_DYING, va); return 0; } @@ -2569,7 +2573,7 @@ static int cf_check sh_page_fault( put_gfn(d, gfn_x(gfn)); perfc_incr(shadow_fault_mmio); - trace_shadow_gen(TRC_SHADOW_MMIO, va); + sh_trace_va(TRC_SHADOW_MMIO, va); return handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:22:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748336.1155976 (Exim 4.92) (envelope-from ) id 1sML6u-0004QL-3Z; Wed, 26 Jun 2024 05:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748336.1155976; Wed, 26 Jun 2024 05: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 1sML6u-0004QD-0q; Wed, 26 Jun 2024 05:22:24 +0000 Received: by outflank-mailman (input) for mailman id 748336; Wed, 26 Jun 2024 05:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML6s-0004PI-I1 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML6s-0006JZ-HG for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML6s-0005RW-GQ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xH3tC6sJ7aCU0gqoCnLOgfxPChO0P1Er4h1rdgFgGjY=; b=Pjy/I53tAqzL8xLfbvwz4Uoca9 PYkRblApBZmiQNkOdnEPYKBw1IuxzWYL9vXY5zlccUDrve8J81DAzzF+j/OYbm8kykNw4yXzITsVn ielPGslByclXTm6CE3g+Qfd3Es6Zuw60BqWg4O3fxyWEHr8ACUt1k+ISjo+TaNGbAEwE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: Introduce sh_trace_gl1e_va() Message-Id: Date: Wed, 26 Jun 2024 05:22:22 +0000 commit 578066d82b2b96e949ff46e6c142a33231b1ae2d Author: Andrew Cooper AuthorDate: Wed May 22 13:58:22 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Introduce sh_trace_gl1e_va() trace_shadow_fixup() and trace_not_shadow_fault() both write out identical trace records. Reimplement them in terms of a common sh_trace_gl1e_va(). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 57 ++++++++++++------------------------------ 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 1775952d7e..75250c6f0f 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1987,51 +1987,26 @@ static void sh_trace_va(uint32_t event, guest_va_t va) sh_trace(event, sizeof(va), &va); } -static inline void trace_shadow_fixup(guest_l1e_t gl1e, - guest_va_t va) +/* Shadow trace event with a gl1e, linear address and flags. */ +static void sh_trace_gl1e_va(uint32_t event, guest_l1e_t gl1e, guest_va_t va) { if ( tb_init_done ) { struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ - guest_l1e_t gl1e; - guest_va_t va; - u32 flags; - } d; - u32 event; - - event = TRC_SHADOW_FIXUP | ((GUEST_PAGING_LEVELS-2)<<8); - - d.gl1e = gl1e; - d.va = va; - d.flags = this_cpu(trace_shadow_path_flags); - - trace(event, sizeof(d), &d); - } -} - -static inline void trace_not_shadow_fault(guest_l1e_t gl1e, - guest_va_t va) -{ - if ( tb_init_done ) - { - struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ + /* + * For GUEST_PAGING_LEVELS=3 (PAE paging), guest_l1e is 64 while + * guest_va is 32. Put it first to avoid padding. + */ guest_l1e_t gl1e; guest_va_t va; - u32 flags; - } d; - u32 event; - - event = TRC_SHADOW_NOT_SHADOW | ((GUEST_PAGING_LEVELS-2)<<8); - - d.gl1e = gl1e; - d.va = va; - d.flags = this_cpu(trace_shadow_path_flags); - - trace(event, sizeof(d), &d); + uint32_t flags; + } d = { + .gl1e = gl1e, + .va = va, + .flags = this_cpu(trace_shadow_path_flags), + }; + + sh_trace(event, sizeof(d), &d); } } @@ -2603,7 +2578,7 @@ static int cf_check sh_page_fault( d->arch.paging.log_dirty.fault_count++; sh_reset_early_unshadow(v); - trace_shadow_fixup(gw.l1e, va); + sh_trace_gl1e_va(TRC_SHADOW_FIXUP, gw.l1e, va); done: __maybe_unused; sh_audit_gw(v, &gw); SHADOW_PRINTK("fixed\n"); @@ -2857,7 +2832,7 @@ static int cf_check sh_page_fault( put_gfn(d, gfn_x(gfn)); propagate: - trace_not_shadow_fault(gw.l1e, va); + sh_trace_gl1e_va(TRC_SHADOW_NOT_SHADOW, gw.l1e, va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:22:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748337.1155981 (Exim 4.92) (envelope-from ) id 1sML74-0004TJ-5B; Wed, 26 Jun 2024 05:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748337.1155981; Wed, 26 Jun 2024 05: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 1sML74-0004TB-2H; Wed, 26 Jun 2024 05:22:34 +0000 Received: by outflank-mailman (input) for mailman id 748337; Wed, 26 Jun 2024 05:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML72-0004Sl-Lm for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML72-0006Jp-Kz for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML72-0005SL-Jo for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e9KL0ZRPATyEXLjz4rNcXSFqZa/s/OOMxvR8VRiCGdw=; b=z4ELIX/zXaXMf8TEdotvguV+yM JYXjJQ7ZcnWGOTxNg8CGKaaldXAoWOcT3xsFv3QYSAjeJtxaxFNMgqB0zT/7vpN3LNWw1Y8qq7udU 3lJfhTkcxd6TjH/YCOYTDtXiLHBvp91E+yVXj11BrJpvqRj9Waw75mN2l7+e8cXiUSac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: Rework trace_shadow_emulate_other() as sh_trace_gfn_va() Message-Id: Date: Wed, 26 Jun 2024 05:22:32 +0000 commit 8765783434e903fa8be628de25f9941b0204502d Author: Andrew Cooper AuthorDate: Wed May 22 14:05:13 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Rework trace_shadow_emulate_other() as sh_trace_gfn_va() sh_trace_gfn_va() is very similar to sh_trace_gl1e_va(), and a rather shorter name than trace_shadow_emulate_other(). It's only referenced in CONFIG_HVM=y builds, so give it a __maybe_unused to placate randconfig builds. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 75250c6f0f..a1caae9127 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2010,29 +2010,31 @@ static void sh_trace_gl1e_va(uint32_t event, guest_l1e_t gl1e, guest_va_t va) } } -static inline void trace_shadow_emulate_other(u32 event, - guest_va_t va, - gfn_t gfn) +/* Shadow trace event with a gfn, linear address and flags. */ +static void __maybe_unused sh_trace_gfn_va(uint32_t event, gfn_t gfn, + guest_va_t va) { if ( tb_init_done ) { struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ + /* + * For GUEST_PAGING_LEVELS=3 (PAE paging), gfn is 64 while + * guest_va is 32. Put it first to avoid padding. + */ #if GUEST_PAGING_LEVELS == 2 - u32 gfn; + uint32_t gfn; #else - u64 gfn; + uint64_t gfn; #endif guest_va_t va; - } d; - - event |= ((GUEST_PAGING_LEVELS-2)<<8); - - d.gfn=gfn_x(gfn); - d.va = va; + uint32_t flags; + } d = { + .gfn = gfn_x(gfn), + .va = va, + .flags = this_cpu(trace_shadow_path_flags), + }; - trace(event, sizeof(d), &d); + sh_trace(event, sizeof(d), &d); } } @@ -2603,8 +2605,7 @@ static int cf_check sh_page_fault( mfn_x(gmfn)); perfc_incr(shadow_fault_emulate_failed); shadow_remove_all_shadows(d, gmfn); - trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_USER, - va, gfn); + sh_trace_gfn_va(TRC_SHADOW_EMULATE_UNSHADOW_USER, gfn, va); goto done; } @@ -2683,8 +2684,7 @@ static int cf_check sh_page_fault( } #endif shadow_remove_all_shadows(d, gmfn); - trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_EVTINJ, - va, gfn); + sh_trace_gfn_va(TRC_SHADOW_EMULATE_UNSHADOW_EVTINJ, gfn, va); return EXCRET_fault_fixed; } @@ -2739,8 +2739,7 @@ static int cf_check sh_page_fault( * though, this is a hint that this page should not be shadowed. */ shadow_remove_all_shadows(d, gmfn); - trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_UNHANDLED, - va, gfn); + sh_trace_gfn_va(TRC_SHADOW_EMULATE_UNSHADOW_UNHANDLED, gfn, va); goto emulate_done; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:22:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748338.1155985 (Exim 4.92) (envelope-from ) id 1sML7E-0004Yp-7Z; Wed, 26 Jun 2024 05:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748338.1155985; Wed, 26 Jun 2024 05: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 1sML7E-0004Yh-4v; Wed, 26 Jun 2024 05:22:44 +0000 Received: by outflank-mailman (input) for mailman id 748338; Wed, 26 Jun 2024 05:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7C-0004YI-Pc for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7C-0006Jy-O5 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML7C-0005T1-NJ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T6NzDyznCI3mYk2oM/led9bfLfjRsjhwehL1vxXHIC4=; b=XbGtagBxVFj4Y/bw0uxyoJrQHr 0LlxS+u2hmzgp8PQa3jrqYGFqmkpe3YNB/hY7Uq+Q//sAWdo5Myw+JJItZbQIZr2obUaTbBcM+9wp nBazGDwwo0eXHV/+1Xp3ONWe2jVeM16JQwua9/WhFC08KfN/f+xtBjd8M/ByJ/SbzLm0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: Don't leave trace record field uninitialized Message-Id: Date: Wed, 26 Jun 2024 05:22:42 +0000 commit 6a17e1199332c24b41bacccdc91dbeaf22653588 Author: Jan Beulich AuthorDate: Wed May 22 12:17:30 2024 +0200 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 x86/shadow: Don't leave trace record field uninitialized The emulation_count field is set only conditionally right now. Convert all field setting to an initializer, thus guaranteeing that field to be set to 0 (default initialized) when GUEST_PAGING_LEVELS != 3. Rework trace_shadow_emulate() to be consistent with the other trace helpers. Coverity-ID: 1598430 Fixes: 9a86ac1aa3d2 ("xentrace 5/7: Additional tracing for the shadow code") Signed-off-by: Jan Beulich Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/mm/shadow/multi.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index a1caae9127..8e0046ae69 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2064,30 +2064,29 @@ static void cf_check trace_emulate_write_val( #endif } -static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) +static inline void sh_trace_emulate(guest_l1e_t gl1e, unsigned long va) { if ( tb_init_done ) { struct __packed { - /* for PAE, guest_l1e may be 64 while guest_va may be 32; - so put it first for alignment sake. */ + /* + * For GUEST_PAGING_LEVELS=3 (PAE paging), guest_l1e is 64 while + * guest_va is 32. Put it first to avoid padding. + */ guest_l1e_t gl1e, write_val; guest_va_t va; uint32_t flags:29, emulation_count:3; - } d; - u32 event; - - event = TRC_SHADOW_EMULATE | ((GUEST_PAGING_LEVELS-2)<<8); - - d.gl1e = gl1e; - d.write_val.l1 = this_cpu(trace_emulate_write_val); - d.va = va; + } d = { + .gl1e = gl1e, + .write_val.l1 = this_cpu(trace_emulate_write_val), + .va = va, #if GUEST_PAGING_LEVELS == 3 - d.emulation_count = this_cpu(trace_extra_emulation_count); + .emulation_count = this_cpu(trace_extra_emulation_count), #endif - d.flags = this_cpu(trace_shadow_path_flags); + .flags = this_cpu(trace_shadow_path_flags), + }; - trace(event, sizeof(d), &d); + sh_trace(TRC_SHADOW_EMULATE, sizeof(d), &d); } } #endif /* CONFIG_HVM */ @@ -2816,7 +2815,7 @@ static int cf_check sh_page_fault( } #endif /* PAE guest */ - trace_shadow_emulate(gw.l1e, va); + sh_trace_emulate(gw.l1e, va); emulate_done: SHADOW_PRINTK("emulated\n"); return EXCRET_fault_fixed; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:22:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748339.1155989 (Exim 4.92) (envelope-from ) id 1sML7O-0004bM-9N; Wed, 26 Jun 2024 05:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748339.1155989; Wed, 26 Jun 2024 05: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 1sML7O-0004bF-6R; Wed, 26 Jun 2024 05:22:54 +0000 Received: by outflank-mailman (input) for mailman id 748339; Wed, 26 Jun 2024 05:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7M-0004b3-Rn for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7M-0006K7-R3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML7M-0005Tc-QE for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2xM13+GT6Og3UsGzjryLZynxpPCSpnDNCe7b8dgaTs0=; b=rHh688D+2JD5APqjgDh0jt1Bdd /zb0LGI+ScK2MKQkC3Mw075qZnHREF9LkyaOAUhVIHSYISqghYYi4R+3h/rr0vF80T9yRV8y0Vwzq hgicH2RVnz5phxAL9IOdQeAzjxRoyxyFJYtYIxGYhiYshS0lc5inFzmbDJpRTAnRV+aA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/xlat: Sort out whitespace Message-Id: Date: Wed, 26 Jun 2024 05:22:52 +0000 commit 90c1520d4eff8e6480035f523041fe62c5065833 Author: Andrew Cooper AuthorDate: Tue Feb 20 19:27:33 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/xlat: Sort out whitespace * Fix tabs/spaces mismatch for certain rows * Insert lines between header files to improve legibility Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- xen/include/xlat.lst | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 9c41948514..e811342bb0 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -20,19 +20,24 @@ # First column indicator: # ! - needs translation # ? - needs checking + ? dom0_vga_console_info xen.h ? xenctl_bitmap xen.h ? mmu_update xen.h ! mmuext_op xen.h ! start_info xen.h ? vcpu_time_info xen.h + ? pmu_amd_ctxt arch-x86/pmu.h ? pmu_arch arch-x86/pmu.h ? pmu_cntr_pair arch-x86/pmu.h ? pmu_intel_ctxt arch-x86/pmu.h ? pmu_regs arch-x86/pmu.h + ! cpu_user_regs arch-x86/xen-@arch@.h + ! trap_info arch-x86/xen.h + ? cpu_offline_action arch-x86/xen-mca.h ? mc arch-x86/xen-mca.h ? mcinfo_bank arch-x86/xen-mca.h @@ -50,6 +55,7 @@ ? mc_notifydomain arch-x86/xen-mca.h ! mc_physcpuinfo arch-x86/xen-mca.h ? page_offline_action arch-x86/xen-mca.h + ? argo_addr argo.h ! argo_iov argo.h ? argo_register_ring argo.h @@ -59,6 +65,7 @@ ? argo_ring_message_header argo.h ? argo_send_addr argo.h ? argo_unregister_ring argo.h + ? evtchn_alloc_unbound event_channel.h ? evtchn_bind_interdomain event_channel.h ? evtchn_bind_ipi event_channel.h @@ -74,6 +81,7 @@ ? evtchn_set_priority event_channel.h ? evtchn_status event_channel.h ? evtchn_unmask event_channel.h + ? gnttab_cache_flush grant_table.h ! gnttab_copy grant_table.h ? gnttab_dump_table grant_table.h @@ -86,9 +94,10 @@ ? gnttab_get_version grant_table.h ! gnttab_get_status_frames grant_table.h ? grant_entry_v1 grant_table.h -? grant_entry_header grant_table.h +? grant_entry_header grant_table.h ? grant_entry_v2 grant_table.h ? gnttab_swap_grant_ref grant_table.h + ! dm_op_buf hvm/dm_op.h ? dm_op_create_ioreq_server hvm/dm_op.h ? dm_op_destroy_ioreq_server hvm/dm_op.h @@ -108,15 +117,20 @@ ? dm_op_set_pci_intx_level hvm/dm_op.h ? dm_op_set_pci_link_route hvm/dm_op.h ? dm_op_track_dirty_vram hvm/dm_op.h + ! hvm_altp2m_set_mem_access_multi hvm/hvm_op.h + ? vcpu_hvm_context hvm/hvm_vcpu.h ? vcpu_hvm_x86_32 hvm/hvm_vcpu.h ? vcpu_hvm_x86_64 hvm/hvm_vcpu.h + ? hypfs_direntry hypfs.h ? hypfs_dirlistentry hypfs.h + ? kexec_exec kexec.h ! kexec_image kexec.h ! kexec_range kexec.h + ! add_to_physmap memory.h ! add_to_physmap_batch memory.h ! foreign_memory_map memory.h @@ -130,6 +144,7 @@ ! reserved_device_memory_map memory.h ? vmemrange memory.h ! vnuma_topology_info memory.h + ? physdev_eoi physdev.h ? physdev_get_free_pirq physdev.h ? physdev_irq physdev.h @@ -143,6 +158,7 @@ ? physdev_restore_msi physdev.h ? physdev_set_iopl physdev.h ? physdev_setup_gsi physdev.h + ! pct_register platform.h ! power_register platform.h ? processor_csd platform.h @@ -158,23 +174,30 @@ ? xenpf_pcpu_version platform.h ? xenpf_resource_entry platform.h ? xenpf_ucode_revision platform.h + ? pmu_data pmu.h ? pmu_params pmu.h + ! sched_poll sched.h ? sched_pin_override sched.h ? sched_remote_shutdown sched.h ? sched_shutdown sched.h + ? t_buf trace.h + ? vcpu_get_physid vcpu.h ? vcpu_register_vcpu_info vcpu.h ! vcpu_runstate_info vcpu.h ? vcpu_set_periodic_timer vcpu.h ! vcpu_set_singleshot_timer vcpu.h -? build_id version.h -? compile_info version.h -? feature_info version.h + +? build_id version.h +? compile_info version.h +? feature_info version.h + ? xenoprof_init xenoprof.h ? xenoprof_passive xenoprof.h + ? flask_access xsm/flask_op.h ? flask_cache_stats xsm/flask_op.h ? flask_hash_stats xsm/flask_op.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:23:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748340.1155992 (Exim 4.92) (envelope-from ) id 1sML7Y-0004e5-An; Wed, 26 Jun 2024 05:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748340.1155992; Wed, 26 Jun 2024 05: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 1sML7Y-0004dx-85; Wed, 26 Jun 2024 05:23:04 +0000 Received: by outflank-mailman (input) for mailman id 748340; Wed, 26 Jun 2024 05:23:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7W-0004dk-V1 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7W-0006Kp-Tx for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML7W-0005UO-TE for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rWvxt9drC863Z/rwWUKnLBmF9J9uf3H7GlWBCTkAAXg=; b=rn1SVpaV9P/BNsrS155CqxQLUE fcNVcZbNzRUoYVy8brSwISkWq00LFj6NOxwg/HndvxbBLY6IgkO1b3nFMgivLMRqaWwNLmpHRbryE iTm2S5SVH0BPq6KCFA2oTEnFdiEUxKRIJfQSXxZJF5WREXE2W7LHzPEzX/zQKfYaStJc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/xlat: Sort structs per file Message-Id: Date: Wed, 26 Jun 2024 05:23:02 +0000 commit ebed411e7afa240fea803ac97a0ced73fffef8dc Author: Andrew Cooper AuthorDate: Tue Feb 20 19:34:06 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/xlat: Sort structs per file ... with a C local to avoid ambiguities over _ and - as separators. Also adjust arch-x86/xen.h which is out-of-order relative to the other arch-x86/ files. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- xen/include/xlat.lst | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index e811342bb0..0630530703 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -22,11 +22,11 @@ # ? - needs checking ? dom0_vga_console_info xen.h -? xenctl_bitmap xen.h ? mmu_update xen.h ! mmuext_op xen.h ! start_info xen.h ? vcpu_time_info xen.h +? xenctl_bitmap xen.h ? pmu_amd_ctxt arch-x86/pmu.h ? pmu_arch arch-x86/pmu.h @@ -36,17 +36,8 @@ ! cpu_user_regs arch-x86/xen-@arch@.h -! trap_info arch-x86/xen.h - ? cpu_offline_action arch-x86/xen-mca.h ? mc arch-x86/xen-mca.h -? mcinfo_bank arch-x86/xen-mca.h -? mcinfo_common arch-x86/xen-mca.h -? mcinfo_extended arch-x86/xen-mca.h -? mcinfo_global arch-x86/xen-mca.h -? mcinfo_logical_cpu arch-x86/xen-mca.h -? mcinfo_msr arch-x86/xen-mca.h -? mcinfo_recovery arch-x86/xen-mca.h ! mc_fetch arch-x86/xen-mca.h ? mc_info arch-x86/xen-mca.h ? mc_inject_v2 arch-x86/xen-mca.h @@ -54,8 +45,17 @@ ? mc_msrinject arch-x86/xen-mca.h ? mc_notifydomain arch-x86/xen-mca.h ! mc_physcpuinfo arch-x86/xen-mca.h +? mcinfo_bank arch-x86/xen-mca.h +? mcinfo_common arch-x86/xen-mca.h +? mcinfo_extended arch-x86/xen-mca.h +? mcinfo_global arch-x86/xen-mca.h +? mcinfo_logical_cpu arch-x86/xen-mca.h +? mcinfo_msr arch-x86/xen-mca.h +? mcinfo_recovery arch-x86/xen-mca.h ? page_offline_action arch-x86/xen-mca.h +! trap_info arch-x86/xen.h + ? argo_addr argo.h ! argo_iov argo.h ? argo_register_ring argo.h @@ -85,18 +85,18 @@ ? gnttab_cache_flush grant_table.h ! gnttab_copy grant_table.h ? gnttab_dump_table grant_table.h +! gnttab_get_status_frames grant_table.h +? gnttab_get_version grant_table.h ? gnttab_map_grant_ref grant_table.h +? gnttab_set_version grant_table.h ! gnttab_setup_table grant_table.h +? gnttab_swap_grant_ref grant_table.h ! gnttab_transfer grant_table.h -? gnttab_unmap_grant_ref grant_table.h ? gnttab_unmap_and_replace grant_table.h -? gnttab_set_version grant_table.h -? gnttab_get_version grant_table.h -! gnttab_get_status_frames grant_table.h -? grant_entry_v1 grant_table.h +? gnttab_unmap_grant_ref grant_table.h ? grant_entry_header grant_table.h +? grant_entry_v1 grant_table.h ? grant_entry_v2 grant_table.h -? gnttab_swap_grant_ref grant_table.h ! dm_op_buf hvm/dm_op.h ? dm_op_create_ioreq_server hvm/dm_op.h @@ -134,11 +134,11 @@ ! add_to_physmap memory.h ! add_to_physmap_batch memory.h ! foreign_memory_map memory.h +! mem_access_op memory.h +! mem_acquire_resource memory.h ! memory_exchange memory.h ! memory_map memory.h ! memory_reservation memory.h -! mem_access_op memory.h -! mem_acquire_resource memory.h ! pod_target memory.h ! remove_from_physmap memory.h ! reserved_device_memory_map memory.h @@ -154,10 +154,10 @@ ? physdev_pci_device physdev.h ? physdev_pci_device_add physdev.h ? physdev_pci_mmcfg_reserved physdev.h -? physdev_unmap_pirq physdev.h ? physdev_restore_msi physdev.h ? physdev_set_iopl physdev.h ? physdev_setup_gsi physdev.h +? physdev_unmap_pirq physdev.h ! pct_register platform.h ! power_register platform.h @@ -169,17 +169,17 @@ ? processor_px platform.h ! psd_package platform.h ? xenpf_enter_acpi_sleep platform.h -! xenpf_symdata platform.h -? xenpf_pcpuinfo platform.h ? xenpf_pcpu_version platform.h +? xenpf_pcpuinfo platform.h ? xenpf_resource_entry platform.h +! xenpf_symdata platform.h ? xenpf_ucode_revision platform.h ? pmu_data pmu.h ? pmu_params pmu.h -! sched_poll sched.h ? sched_pin_override sched.h +! sched_poll sched.h ? sched_remote_shutdown sched.h ? sched_shutdown sched.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:23:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748341.1155997 (Exim 4.92) (envelope-from ) id 1sML7i-0004gm-CA; Wed, 26 Jun 2024 05:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748341.1155997; Wed, 26 Jun 2024 05: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 1sML7i-0004ge-9Y; Wed, 26 Jun 2024 05:23:14 +0000 Received: by outflank-mailman (input) for mailman id 748341; Wed, 26 Jun 2024 05:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7h-0004gU-1J for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7h-0006Ky-0d for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML7g-0005Uv-WB for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MVwNiV8VRT4R/B9jPKO3ef3ngRseOJkmEc9WiNvelzo=; b=aJOYkIVimdnJdUiGhMhx6OyqRk Rg6+/CnXGdru8vB70+Eejv1TjZngZjIp9E3sWjtu72JxLs38lVVmVDElllo9vIO5BKvtx3eoFbBkY OrP5jAS9xS03HKN/+eQpYPL2+zlJwTonw81cXXS4adc/9Zyzb6yw5x41BmIvCXyQezBo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gnttab: Perform compat/native gnttab_query_size check Message-Id: Date: Wed, 26 Jun 2024 05:23:12 +0000 commit 8c3bb4d8ce3f9e69ee173b8787a8cbbf1a852d06 Author: Andrew Cooper AuthorDate: Tue Feb 20 19:58:08 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/gnttab: Perform compat/native gnttab_query_size check This subop appears to have been missed from the compat checks. Fixes: 5ce8fafa947c ("Dynamic grant-table sizing") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-By: Oleksii Kurochko --- xen/common/compat/grant_table.c | 9 +++++++++ xen/include/xlat.lst | 1 + 2 files changed, 10 insertions(+) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index c495c375eb..dd40c48b11 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -30,6 +30,11 @@ CHECK_gnttab_unmap_grant_ref; CHECK_gnttab_unmap_and_replace; #undef xen_gnttab_unmap_and_replace +#define xen_gnttab_query_size gnttab_query_size +CHECK_gnttab_query_size; +#undef xen_gnttab_query_size +DEFINE_XEN_GUEST_HANDLE(gnttab_query_size_compat_t); + DEFINE_XEN_GUEST_HANDLE(gnttab_setup_table_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_copy_compat_t); @@ -106,6 +111,10 @@ int compat_grant_table_op( CASE(copy); #endif +#ifndef CHECK_query_size + CASE(query_size); +#endif + #ifndef CHECK_gnttab_dump_table CASE(dump_table); #endif diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 0630530703..2046b36c04 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -88,6 +88,7 @@ ! gnttab_get_status_frames grant_table.h ? gnttab_get_version grant_table.h ? gnttab_map_grant_ref grant_table.h +? gnttab_query_size grant_table.h ? gnttab_set_version grant_table.h ! gnttab_setup_table grant_table.h ? gnttab_swap_grant_ref grant_table.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:23:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748342.1156001 (Exim 4.92) (envelope-from ) id 1sML7s-0004jL-DV; Wed, 26 Jun 2024 05:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748342.1156001; Wed, 26 Jun 2024 05: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 1sML7s-0004jD-B0; Wed, 26 Jun 2024 05:23:24 +0000 Received: by outflank-mailman (input) for mailman id 748342; Wed, 26 Jun 2024 05:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7r-0004j3-4M for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML7r-0006L7-3f for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML7r-0005VS-2t for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hqk/zqOmURGzNVMvE2+8kI1eF7NVDpEi11ZF60v1SxQ=; b=sMxgq5sTQwnKyDKlzWmD7wRTSb DRodO+kpFHoXZYu/Mw3CINIIgmnSMtxhcR1OUeAjnW5GVNJlbtdEAiPxg6HkcaXcm2D6zz2+OpwO+ GJqEug5HQHMbkH55wP8+qgZqZkOxjDLgEEZTFwm4mXkcHJtB0BaXAVL8SfLcRfc1hh4Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: Drop legacy __ro_after_init definition Message-Id: Date: Wed, 26 Jun 2024 05:23:23 +0000 commit 908407bf2b29a38d6879fc8c57dad14473ef67f8 Author: Andrew Cooper AuthorDate: Fri Jun 21 20:29:07 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 24 16:22:59 2024 +0100 xen/riscv: Drop legacy __ro_after_init definition Hide the legacy __ro_after_init definition in xen/cache.h for RISC-V, to avoid its use creeping in. Only mm.c needs adjusting as a consequence No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Release-Acked-by: Oleksii Kurochko --- xen/arch/riscv/mm.c | 2 +- xen/include/xen/cache.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index 053f043a3d..3ebaf6da01 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include #include #include #include #include #include +#include #include #include diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index 55456823c5..82a3ba38e3 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,7 +15,9 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif +#if defined(CONFIG_ARM) || defined(CONFIG_X86) || defined(CONFIG_PPC64) /* TODO: Phase out the use of this via cache.h */ #define __ro_after_init __section(".data.ro_after_init") +#endif #endif /* __LINUX_CACHE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:23:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748343.1156004 (Exim 4.92) (envelope-from ) id 1sML82-0004mG-F5; Wed, 26 Jun 2024 05:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748343.1156004; Wed, 26 Jun 2024 05: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 1sML82-0004m9-CW; Wed, 26 Jun 2024 05:23:34 +0000 Received: by outflank-mailman (input) for mailman id 748343; Wed, 26 Jun 2024 05:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML81-0004li-8A for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML81-0006LJ-7Q for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML81-0005WE-5t for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cQBx2lagbCJj1Yh/37s8zbEzPkDuPxXSvPghJq7hUTU=; b=hXMmqSRE94D8xFAqwgpBdOO7wu yBi/rJRc+aYPfw+r4sDN3VIcH9AWJeK+IdgwZSYjpUSNgOGq75Qu4lkfBEb8jZ8oCi2qfLyU9VaKF xSfLA6+pZfvcNcgQIFh1Mfi+URAW9M/sxSnaTiO/+RnZN32abL1wMSqR+l2KV/HGpXlg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: static-shmem: request host address to be specified for 1:1 domains Message-Id: Date: Wed, 26 Jun 2024 05:23:33 +0000 commit c56f1ef577831ec70645ca5874d54f2e698c6761 Author: Michal Orzel AuthorDate: Fri Jun 21 11:22:05 2024 +0200 Commit: Julien Grall CommitDate: Mon Jun 24 17:55:06 2024 +0100 xen/arm: static-shmem: request host address to be specified for 1:1 domains As a follow up to commit cb1ddafdc573 ("xen/arm/static-shmem: Static-shmem should be direct-mapped for direct-mapped domains") add a check to request that both host and guest physical address must be supplied for direct mapped domains. Otherwise return an error to prevent unwanted behavior. Signed-off-by: Michal Orzel Fixes: 988f1c7e1f40 ("xen/arm: static-shmem: fix "gbase/pbase used uninitialized" build failure") Reviewed-by: Julien Grall Release-Acked-By: Oleksii Kurochko --- xen/arch/arm/static-shmem.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index cd48d2896b..aa80756c3c 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -378,6 +378,13 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct membank *alloc_bank = find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); + if ( is_domain_direct_mapped(d) ) + { + printk("%pd: host and guest physical address must be supplied for direct-mapped domains\n", + d); + return -EINVAL; + } + /* guest phys address is right at the beginning */ gbase = dt_read_paddr(cells, addr_cells); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:23:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:23:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748344.1156009 (Exim 4.92) (envelope-from ) id 1sML8D-0004ox-Gt; Wed, 26 Jun 2024 05:23:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748344.1156009; Wed, 26 Jun 2024 05:23: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 1sML8D-0004op-E0; Wed, 26 Jun 2024 05:23:45 +0000 Received: by outflank-mailman (input) for mailman id 748344; Wed, 26 Jun 2024 05:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8B-0004od-B9 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8B-0006LU-AO for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML8B-0005Ww-9j for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xU6D2qYrltk98tzT5BUvZf+bZMInhPjtyevswgretqk=; b=yHH0vrBlrOhpQyR7g1ktHX7nst Oo56QW+Mhg4aZlSEsd6ZcukeWrPKgkOkt+MKlvH1/geWOf8NnZTW65ibAOD0rHsUbanpy4ZQeF4HV wjH5OUuCe6ntTfZHKEOkchWl6ojathvrdwwlKKLZ1HrJcrNmVNG+ufyaj2+WkJKxwulo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: add deviation for MISRA C Rule 17.7 Message-Id: Date: Wed, 26 Jun 2024 05:23:43 +0000 commit 912412f97a293f5e1deece134d78c52b1b0b8856 Author: Federico Serafini AuthorDate: Fri Jun 14 11:15:38 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:39:09 2024 -0700 automation/eclair: add deviation for MISRA C Rule 17.7 Update ECLAIR configuration to deviate some cases where not using the return value of a function is not dangerous. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 4 ++++ docs/misra/deviations.rst | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index e2653f77eb..89345a9d08 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -413,6 +413,10 @@ explicit comment indicating the fallthrough intention is present." -config=MC3R1.R17.1,macros+={hide , "^va_(arg|start|copy|end)$"} -doc_end +-doc_begin="Not using the return value of a function does not endanger safety if it coincides with an actual argument." +-config=MC3R1.R17.7,calls+={safe, "any()", "decl(name(__builtin_memcpy||__builtin_memmove||__builtin_memset||cpumask_check))"} +-doc_end + # # Series 18. # diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 36959aa44a..679d8c885f 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -364,6 +364,15 @@ Deviations related to MISRA C:2012 Rules: by `stdarg.h`. - Tagged as `deliberate` for ECLAIR. + * - R17.7 + - Not using the return value of a function does not endanger safety if it + coincides with an actual argument. + - Tagged as `safe` for ECLAIR. Such functions are: + - __builtin_memcpy() + - __builtin_memmove() + - __builtin_memset() + - cpumask_check() + * - R20.4 - The override of the keyword \"inline\" in xen/compiler.h is present so that section contents checks pass when the compiler chooses not to -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:23:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748345.1156013 (Exim 4.92) (envelope-from ) id 1sML8M-0004rq-Jz; Wed, 26 Jun 2024 05:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748345.1156013; Wed, 26 Jun 2024 05: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 1sML8M-0004ri-HS; Wed, 26 Jun 2024 05:23:54 +0000 Received: by outflank-mailman (input) for mailman id 748345; Wed, 26 Jun 2024 05:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8L-0004rY-Dy for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8L-0006Lx-DH for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML8L-0005Y1-Cf for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Dnqbk5VdgrpvK331o4gPfJ/Hi5DixaTBdv2mqR0L6FA=; b=GEs8nyaG6CbW35Ij+gPV3Dys24 e+CbaBHOBdbC6wXlOHIj7S/E1a7nZ3Gj00GcN+erXTip1Nw+VtoHnAlvloYX5++DpRKFrKissYBhI 213FsfDJXZaWMK7bcxC2e12SpfaBb1nCP/+KM9wrEQp37rtiJt1BJX81hS3JRZEhxMMA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: add deviations of MISRA C Rule 5.5 Message-Id: Date: Wed, 26 Jun 2024 05:23:53 +0000 commit 5add709cc6595af95e181091dbbf6e00aae836e3 Author: Federico Serafini AuthorDate: Thu Jun 20 14:50:34 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:40:05 2024 -0700 automation/eclair: add deviations of MISRA C Rule 5.5 MISRA C Rule 5.5 states that "Identifiers shall be distinct from macro names". Update ECLAIR configuration to deviate: - macros expanding to their own name; - clashes between macros and non-callable entities; - clashes related to the selection of specific implementations of string handling functions. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 16 ++++++++++++++++ docs/misra/deviations.rst | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 89345a9d08..ae2eaf50f7 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -90,6 +90,22 @@ conform to the directive." -config=MC3R1.R5.3,reports+={safe, "any_area(any_loc(any_exp(macro(^read_debugreg$))&&any_exp(macro(^write_debugreg$))))"} -doc_end +-doc_begin="Macros expanding to their own identifier (e.g., \"#define x x\") are deliberate." +-config=MC3R1.R5.5,reports+={deliberate, "all_area(macro(same_id_body())||!macro(!same_id_body()))"} +-doc_end + +-doc_begin="There is no clash between function like macros and not callable objects." +-config=MC3R1.R5.5,reports+={deliberate, "all_area(macro(function_like())||decl(any()))&&all_area(macro(any())||!decl(kind(function))&&!decl(__function_pointer_decls))"} +-doc_end + +-doc_begin="Clashes between function names and macros are deliberate for string handling functions since some architectures may want to use their own arch-specific implementation." +-config=MC3R1.R5.5,reports+={deliberate, "all_area(all_loc(file(^xen/arch/x86/string\\.c|xen/include/xen/string\\.h|xen/lib/.*$)))"} +-doc_end + +-doc_begin="In libelf, clashes between macros and function names are deliberate and needed to prevent the use of undecorated versions of memcpy, memset and memmove." +-config=MC3R1.R5.5,reports+={deliberate, "any_area(decl(kind(function))||any_loc(macro(name(memcpy||memset||memmove))))&&any_area(any_loc(file(^xen/common/libelf/libelf-private\\.h$)))"} +-doc_end + -doc_begin="The type \"ret_t\" is deliberately defined multiple times, depending on the guest." -config=MC3R1.R5.6,reports+={deliberate,"any_area(any_loc(text(^.*ret_t.*$)))"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 679d8c885f..16fc345756 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -98,6 +98,27 @@ Deviations related to MISRA C:2012 Rules: - __emulate_2op and __emulate_2op_nobyte - read_debugreg and write_debugreg + * - R5.5 + - Macros expanding to their own name are allowed. + - Tagged as `deliberate` for ECLAIR. + + * - R5.5 + - Clashes between names of function-like macros and identifiers of + non-callable entities are allowed. + - Tagged as `deliberate` for ECLAIR. + + * - R5.5 + - Clashes between function names and macros are deliberate for string + handling functions since some architectures may want to use their own + arch-specific implementation. + - Tagged as `deliberate` for ECLAIR. + + * - R5.5 + - In libelf, clashes between macros and function names are deliberate and + needed to prevent the use of undecorated versions of memcpy, memset and + memmove. + - Tagged as `deliberate` for ECLAIR. + * - R5.6 - The type ret_t is deliberately defined multiple times depending on the type of guest to service. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:24:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:24:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748346.1156017 (Exim 4.92) (envelope-from ) id 1sML8W-0004uQ-LP; Wed, 26 Jun 2024 05:24:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748346.1156017; Wed, 26 Jun 2024 05:24: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 1sML8W-0004uJ-It; Wed, 26 Jun 2024 05:24:04 +0000 Received: by outflank-mailman (input) for mailman id 748346; Wed, 26 Jun 2024 05:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8V-0004uB-Gy for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8V-0006MJ-GF for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML8V-0005ZI-FR for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RDV5EcKqv8w8RhhAcVY+tkCfK0VzdIDWOFxxLUNuZy0=; b=z1mIvK/EMM+lAoBj7olleXRFkH 5lkmd/JwWishC83J0aXsypgJOJimp5tcE5hpmPbTe3xUORrNKPHFl6H9KZ85av6EuqHJ7aPgelNg5 SjapExVeYMKoFbOOhTvxINyhn4aH/LMwt/3IryP/QWXVbDX5JAix2VPFKLRsMgk1NQ1g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: add more guidelines to the monitored set Message-Id: Date: Wed, 26 Jun 2024 05:24:03 +0000 commit c2f4ea4dc9eba454dc2e761bfd39ccb72870d268 Author: Federico Serafini AuthorDate: Fri Jun 21 17:32:41 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:41:12 2024 -0700 automation/eclair: add more guidelines to the monitored set Add more accepted guidelines to the monitored set to check them at each commit. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/monitored.ecl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 4daecb0c83..9ffaebbdc3 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -18,10 +18,13 @@ -enable=MC3R1.R12.5 -enable=MC3R1.R1.3 -enable=MC3R1.R13.6 +-enable=MC3R1.R13.1 -enable=MC3R1.R1.4 -enable=MC3R1.R14.1 -enable=MC3R1.R14.4 -enable=MC3R1.R16.2 +-enable=MC3R1.R16.3 +-enable=MC3R1.R16.4 -enable=MC3R1.R16.6 -enable=MC3R1.R16.7 -enable=MC3R1.R17.1 @@ -34,6 +37,7 @@ -enable=MC3R1.R20.13 -enable=MC3R1.R20.14 -enable=MC3R1.R20.4 +-enable=MC3R1.R20.7 -enable=MC3R1.R20.9 -enable=MC3R1.R2.1 -enable=MC3R1.R21.10 @@ -58,6 +62,7 @@ -enable=MC3R1.R5.2 -enable=MC3R1.R5.3 -enable=MC3R1.R5.4 +-enable=MC3R1.R5.5 -enable=MC3R1.R5.6 -enable=MC3R1.R6.1 -enable=MC3R1.R6.2 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:24:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:24:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748347.1156020 (Exim 4.92) (envelope-from ) id 1sML8g-0004wz-Mr; Wed, 26 Jun 2024 05:24:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748347.1156020; Wed, 26 Jun 2024 05:24: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 1sML8g-0004ws-KM; Wed, 26 Jun 2024 05:24:14 +0000 Received: by outflank-mailman (input) for mailman id 748347; Wed, 26 Jun 2024 05:24:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8f-0004wb-Jn for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8f-0006Nz-Iz for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML8f-0005Zq-IO for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=32br1hFdIGWvt2c7Kde89qn0OtGfdKb6EzH3BoYvDSQ=; b=HeId1ggkWZBRU2e5zOhy+v9jDB xfJZv2oL6KahfO5JDFU7Sm0AxuKi5g+cwglrgROjbi0x3nPg0EO9dlaUPhY0aewGElM13mkeX9fvA YIqG0duA/pKk9U1sfaiARjRu1mJw4cMBxZ+YN5xFEYCbcRsA+qQ57ODqlJNAJ48jW9sU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common/unlzo: address violation of MISRA C Rule 7.3 Message-Id: Date: Wed, 26 Jun 2024 05:24:13 +0000 commit 6e07f41b27c3267e4528327ebc44dd03ac869ae3 Author: Alessandro Zucchelli AuthorDate: Fri Jun 21 15:40:47 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:41:58 2024 -0700 common/unlzo: address violation of MISRA C Rule 7.3 This addresses violations of MISRA C:2012 Rule 7.3 which states as following: the lowercase character `l' shall not be used in a literal suffix. The file common/unlzo.c defines the non-compliant constant LZO_BLOCK_SIZE with having a lowercase 'l'. It is now defined as '256*1024L'. No functional change. Signed-off-by: Alessandro Zucchelli Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- xen/common/unlzo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c index bdcefa95b3..acb8dff600 100644 --- a/xen/common/unlzo.c +++ b/xen/common/unlzo.c @@ -52,7 +52,7 @@ static inline u32 get_unaligned_be32(const void *p) static const unsigned char lzop_magic[] = { 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a }; -#define LZO_BLOCK_SIZE (256*1024l) +#define LZO_BLOCK_SIZE (256*1024L) #define HEADER_HAS_FILTER 0x00000800L #define HEADER_SIZE_MIN (9 + 7 + 4 + 8 + 1 + 4) #define HEADER_SIZE_MAX (9 + 7 + 1 + 8 + 8 + 4 + 1 + 255 + 4) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:24:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:24:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748348.1156025 (Exim 4.92) (envelope-from ) id 1sML8q-00050J-Oe; Wed, 26 Jun 2024 05:24:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748348.1156025; Wed, 26 Jun 2024 05:24: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 1sML8q-00050B-Ls; Wed, 26 Jun 2024 05:24:24 +0000 Received: by outflank-mailman (input) for mailman id 748348; Wed, 26 Jun 2024 05:24:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8p-000503-ND for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8p-0006O8-MX for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML8p-0005aY-L9 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Vqf8sDtUXGYQEZDw7l33wr9pWygi5bAaPnyiuu5Ptsw=; b=DSvB92dMTgvV/w/sFA2sk96U9q Kf3cFpmo6lANA1tOj4q0Yiq4b5i5FYJBBbAg/iLyuLXJEmBocIFWWTr4wrkasxnXx29AneC/v0RAp VYcjVtZbXeLbuRsOI0yeFfTvB0akvfpj0w/U+tEcSUkTGU54eulwoustl1bsGPDxWEOM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pagewalk: Address MISRA R8.3 violation in guest_walk_tables() Message-Id: Date: Wed, 26 Jun 2024 05:24:23 +0000 commit b14dae96c07ef27cc7f8107ddaa16989e9ab024b Author: Andrew Cooper AuthorDate: Fri Jun 21 21:57:59 2024 +0100 Commit: Stefano Stabellini CommitDate: Mon Jun 24 16:42:51 2024 -0700 x86/pagewalk: Address MISRA R8.3 violation in guest_walk_tables() Commit 4c5d78a10dc8 ("x86/pagewalk: Re-implement the pagetable walker") intentionally renamed guest_walk_tables()'s 'pfec' parameter to 'walk' because it's not a PageFault Error Code, despite the name of some of the constants passed in. Sadly the constants-cleanup I've been meaning to do since then still hasn't come to pass. Update the declaration to match, to placate MISRA. Fixes: 4c5d78a10dc8 ("x86/pagewalk: Re-implement the pagetable walker") Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/guest_pt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/guest_pt.h b/xen/arch/x86/include/asm/guest_pt.h index bc312343cd..7b0c9b005c 100644 --- a/xen/arch/x86/include/asm/guest_pt.h +++ b/xen/arch/x86/include/asm/guest_pt.h @@ -422,7 +422,7 @@ static inline unsigned int guest_walk_to_page_order(const walk_t *gw) bool guest_walk_tables(const struct vcpu *v, struct p2m_domain *p2m, - unsigned long va, walk_t *gw, uint32_t pfec, + unsigned long va, walk_t *gw, uint32_t walk, gfn_t top_gfn, mfn_t top_mfn, void *top_map); /* Pretty-print the contents of a guest-walk */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:24:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:24:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748349.1156029 (Exim 4.92) (envelope-from ) id 1sML90-00053B-Q2; Wed, 26 Jun 2024 05:24:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748349.1156029; Wed, 26 Jun 2024 05:24: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 1sML90-000534-NH; Wed, 26 Jun 2024 05:24:34 +0000 Received: by outflank-mailman (input) for mailman id 748349; Wed, 26 Jun 2024 05:24:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8z-00052g-QF for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML8z-0006OK-PN for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML8z-0005b6-Og for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kocVEy0nhsreevvcxjt+qsRgqncRUTbYSGFwyOQhTgw=; b=RNEBuiGQChaxuVpdVu1RK7l6iK qWNrjEIK27+7uR3QNRyHnsMOsm9EI49/Ac7ZPgwD3CFwT/plFRmeWrR92Rc8MOUmrSzlEoy4pD6qn hFB5LnVD+ul5gL92KHs23Q1rtMLbpbsxtWdhRh5DdVF8aoVQ4+4E3po1W1lmEn5UUERw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: Update my email address again Message-Id: Date: Wed, 26 Jun 2024 05:24:33 +0000 commit 93db2f64f3663192d9b83d89a35d596cad73fb08 Author: Anthony PERARD AuthorDate: Tue Jun 25 11:36:15 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 25 11:36:15 2024 +0200 MAINTAINERS: Update my email address again Signed-off-by: Anthony PERARD Acked-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8e2b30a345..9d66b898ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -208,7 +208,7 @@ Maintainers List (try to look for most precise areas first) 9PFSD M: Juergen Gross -M: Anthony PERARD +M: Anthony PERARD S: Supported F: tools/9pfsd/ @@ -383,7 +383,7 @@ F: xen/arch/x86/machine_kexec.c F: xen/arch/x86/x86_64/kexec_reloc.S LIBS -M: Anthony PERARD +M: Anthony PERARD R: Juergen Gross S: Supported F: tools/include/libxenvchan.h @@ -429,7 +429,7 @@ S: Supported F: tools/ocaml/ OVMF UPSTREAM -M: Anthony PERARD +M: Anthony PERARD S: Supported T: git https://xenbits.xenproject.org/git-http/ovmf.git @@ -462,7 +462,7 @@ T: git https://xenbits.xenproject.org/git-http/qemu-xen-traditional.git QEMU UPSTREAM M: Stefano Stabellini -M: Anthony Perard +M: Anthony Perard S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen.git @@ -515,7 +515,7 @@ F: xen/arch/arm/include/asm/tee F: xen/arch/arm/tee/ TOOLSTACK -M: Anthony PERARD +M: Anthony PERARD S: Supported F: autogen.sh F: config/*.in -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:24:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:24:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748350.1156032 (Exim 4.92) (envelope-from ) id 1sML9A-00055r-RP; Wed, 26 Jun 2024 05:24:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748350.1156032; Wed, 26 Jun 2024 05:24: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 1sML9A-00055j-Oo; Wed, 26 Jun 2024 05:24:44 +0000 Received: by outflank-mailman (input) for mailman id 748350; Wed, 26 Jun 2024 05:24:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML99-00055V-Sw for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML99-0006OV-S9 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML99-0005bY-RT for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MGcT4mTNXFvKaMendbkb1jtkHultZUGXNNu3Fu6SsCk=; b=xlxLlqoS5Hd4cHQO0p0NJUjsRo Mh5nhPSrJtIkemkSg1bM93mOAA+sT7lwo2iJYMFgFXfjfPWigg56GXm3MpSvTYMtgjEcIZdQMwORE zV8eIlkFIQ/4qv0uoSTM9qsB+NGvZm60BBN/NbDn5amFWHnsDUqDhAWCPQ8h/xXW18SI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: re-add type checking to {,__}copy_from_guest_offset() Message-Id: Date: Wed, 26 Jun 2024 05:24:43 +0000 commit 735865f88486814dd6ae255f13a7f70cd3b01d4f Author: Jan Beulich AuthorDate: Tue Jun 25 11:36:59 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 25 11:36:59 2024 +0200 xen: re-add type checking to {,__}copy_from_guest_offset() When re-working them to avoid UB on guest address calculations, I failed to add explicit type checks in exchange for the implicit ones that until then had happened in assignments that were there anyway. Fixes: 43d5c5d5f70b ("xen: avoid UB in guest handle arithmetic") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- xen/include/xen/guest_access.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/include/xen/guest_access.h b/xen/include/xen/guest_access.h index 96dbef2e02..a2146749e3 100644 --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -86,6 +86,7 @@ #define copy_from_guest_offset(ptr, hnd, off, nr) ({ \ unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ + (void)((hnd).p == _d); \ raw_copy_from_guest(_d, \ (const void *)(s_ + (off) * sizeof(*_d)), \ (nr) * sizeof(*_d)); \ @@ -140,6 +141,7 @@ #define __copy_from_guest_offset(ptr, hnd, off, nr) ({ \ unsigned long s_ = (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d = (ptr); \ + (void)((hnd).p == _d); \ __raw_copy_from_guest(_d, \ (const void *)(s_ + (off) * sizeof(*_d)), \ (nr) * sizeof(*_d)); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 05:24:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 05:24:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748351.1156037 (Exim 4.92) (envelope-from ) id 1sML9K-00058U-Sz; Wed, 26 Jun 2024 05:24:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748351.1156037; Wed, 26 Jun 2024 05:24: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 1sML9K-00058M-QN; Wed, 26 Jun 2024 05:24:54 +0000 Received: by outflank-mailman (input) for mailman id 748351; Wed, 26 Jun 2024 05:24:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML9J-00058C-Vv for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sML9J-0006P0-VD for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sML9J-0005cY-UL for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 05:24: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dmumxAS76QHdX5+fKjfEYyjmgzGctwTCfRWfNcRv3No=; b=FOyTvzfgU0cDQD5ZRmqVrEHobS YJ9gJ55/ESOvx55CNye8FX2xEnqVm7yf1ufaOwC6WTPnpi2LH8nopwP+4Vyxy4Bhq2dxp3DolCqqF uhAFv4QIjtQl7lJvKK3MexNE/3zwHHLovSbEMvrCGlggaJ8QFGXBj/jIBBwPEyfgPsmw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] gnttab: fix compat query-size handling Message-Id: Date: Wed, 26 Jun 2024 05:24:53 +0000 commit 11ea49a3fda5f0cbd8546ee8bdc5e9c55736c828 Author: Jan Beulich AuthorDate: Tue Jun 25 11:37:44 2024 +0200 Commit: Jan Beulich CommitDate: Tue Jun 25 11:37:44 2024 +0200 gnttab: fix compat query-size handling The odd DEFINE_XEN_GUEST_HANDLE(), inconsistent with all other similar constructs, should have caught my attention. Turns out it was needed for the build to succeed merely because the corresponding #ifndef had a typo. That typo in turn broke compat mode guests, by having query-size requests of theirs wire into the domain_crash() at the bottom of the switch(). Fixes: 8c3bb4d8ce3f ("xen/gnttab: Perform compat/native gnttab_query_size check") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko --- xen/common/compat/grant_table.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index dd40c48b11..5ad0debf96 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -33,7 +33,6 @@ CHECK_gnttab_unmap_and_replace; #define xen_gnttab_query_size gnttab_query_size CHECK_gnttab_query_size; #undef xen_gnttab_query_size -DEFINE_XEN_GUEST_HANDLE(gnttab_query_size_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_setup_table_compat_t); DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_compat_t); @@ -111,7 +110,7 @@ int compat_grant_table_op( CASE(copy); #endif -#ifndef CHECK_query_size +#ifndef CHECK_gnttab_query_size CASE(query_size); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 10:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 10:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748753.1156566 (Exim 4.92) (envelope-from ) id 1sMQIr-0007MP-Ij; Wed, 26 Jun 2024 10:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748753.1156566; Wed, 26 Jun 2024 10: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 1sMQIr-0007MH-Fw; Wed, 26 Jun 2024 10:55:05 +0000 Received: by outflank-mailman (input) for mailman id 748753; Wed, 26 Jun 2024 10:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMQIq-0007MB-2l for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 10:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMQIp-0004md-LB for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 10:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMQIp-0005mY-Jm for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 10: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DsVXRaXQLv0RqCIK6XPAoi8oFY9dzn2p4sJ3R0kPGcA=; b=Z0Lw/kwiM0uTk93sB5fEbQ2goz kRVlH4cbP0OAQGdCJFlHwwNJuQXCi4MDeq6UvAcJvbUGocQOqUzCrJx4Td0eGGBIRqqIsd/Ms25cC t9nIXouf74K9CUGc2lezeKcEheDeI3SzDNyGwd9MGaS9KCBjs4LPZ37l5oe6Eq/rsCFs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Config.mk: update MiniOS commit Message-Id: Date: Wed, 26 Jun 2024 10:55:03 +0000 commit 4712e3b3769e6c03e0aaaa8179395f0fb7b141cc Author: Jan Beulich AuthorDate: Wed Jun 26 12:49:08 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 12:49:08 2024 +0200 Config.mk: update MiniOS commit Pull in the gcc14 build fix there. Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Release-Acked-by: Oleksii Kurochko --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index a962f095ca..1a3938b6c4 100644 --- a/Config.mk +++ b/Config.mk @@ -224,7 +224,7 @@ QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git QEMU_UPSTREAM_REVISION ?= master MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git -MINIOS_UPSTREAM_REVISION ?= b6a5b4d72b88e5c4faed01f5a44505de022860fc +MINIOS_UPSTREAM_REVISION ?= 8b038c7411ae7e823eaf6d15d5efbe037a07197a SEABIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/seabios.git SEABIOS_UPSTREAM_REVISION ?= rel-1.16.3 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:55:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748767.1156580 (Exim 4.92) (envelope-from ) id 1sMREw-0000Rc-0G; Wed, 26 Jun 2024 11:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748767.1156580; Wed, 26 Jun 2024 11: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 1sMREv-0000RV-Tn; Wed, 26 Jun 2024 11:55:05 +0000 Received: by outflank-mailman (input) for mailman id 748767; Wed, 26 Jun 2024 11:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMREu-0000RP-2n for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMREt-0005xP-NV for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMREt-0002HG-Ka for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=P6NS/EwibB/adk3UTIAPjBK1g8QLIWvqVJD1OEk8Tvc=; b=oclkLBoUwPYLMvO6umycycw0Wv Z2SePhB6jevdvOI4fRj3/SWTafG77Xk5D0AGcFRyHiupBvDkaz+2vCTPg986svl9Ypn4r2l5vPFNZ ELbxdMoNvDOuhbqKwQaSCYriPEwvUcrlTgMQnn7ERjLcdj1XcGGFuJWoXidtaothJCh4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/ucode: Further fixes to identify "ucode already up to date" Message-Id: Date: Wed, 26 Jun 2024 11:55:03 +0000 commit cd873f00bedca2f1afeaf13a78f70e719c5b1398 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:36:13 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:36:13 2024 +0200 x86/ucode: Further fixes to identify "ucode already up to date" When the revision in hardware is newer than anything Xen has to hand, 'microcode_cache' isn't set up. Then, `xen-ucode` initiates the update because it doesn't know whether the revisions across the system are symmetric or not. This involves the patch getting all the way into the apply_microcode() hooks before being found to be too old. This is all a giant mess and needs an overhaul, but in the short term simply adjust the apply_microcode() to return -EEXIST. Also, unconditionally print the preexisting microcode revision on boot. It's relevant information which is otherwise unavailable if Xen doesn't find new microcode to use. Fixes: 648db37a155a ("x86/ucode: Distinguish "ucode already up to date"") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 977d98e67c2e929c62aa1f495fc4c6341c45abb5 master date: 2024-05-16 13:59:11 +0100 --- xen/arch/x86/cpu/microcode/amd.c | 7 +++++-- xen/arch/x86/cpu/microcode/core.c | 2 ++ xen/arch/x86/cpu/microcode/intel.c | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 75fc84e445..d8f7646e88 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -222,12 +222,15 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) uint32_t rev, old_rev = sig->rev; enum microcode_match_result result = microcode_fits(patch); + if ( result == MIS_UCODE ) + return -EINVAL; + /* * Allow application of the same revision to pick up SMT-specific changes * even if the revision of the other SMT thread is already up-to-date. */ - if ( result != NEW_UCODE && result != SAME_UCODE ) - return -EINVAL; + if ( result == OLD_UCODE ) + return -EEXIST; if ( check_final_patch_levels(sig) ) { diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index d5338ad345..8a47f4471f 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -887,6 +887,8 @@ int __init early_microcode_init(unsigned long *module_map, ucode_ops.collect_cpu_info(); + printk(XENLOG_INFO "BSP microcode revision: 0x%08x\n", this_cpu(cpu_sig).rev); + /* * Some hypervisors deliberately report a microcode revision of -1 to * mean that they will not accept microcode updates. diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index 060c529a6e..a2d88e3ac0 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -294,10 +294,13 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) result = microcode_update_match(patch); - if ( result != NEW_UCODE && - !(opt_ucode_allow_same && result == SAME_UCODE) ) + if ( result == MIS_UCODE ) return -EINVAL; + if ( result == OLD_UCODE || + (result == SAME_UCODE && !opt_ucode_allow_same) ) + return -EEXIST; + wbinvd(); wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748768.1156584 (Exim 4.92) (envelope-from ) id 1sMRF5-0000TB-1m; Wed, 26 Jun 2024 11:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748768.1156584; Wed, 26 Jun 2024 11: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 1sMRF4-0000T3-VQ; Wed, 26 Jun 2024 11:55:14 +0000 Received: by outflank-mailman (input) for mailman id 748768; Wed, 26 Jun 2024 11:55:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRF3-0000Sl-SB for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRF3-0005xT-RS for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRF3-0002IW-Pg for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gyaPgsycacW9rThz9wL/P3tj1NbA/MQy7kQALnSaQLA=; b=rep7PnodRqnyHN6LZGzC6zRFLB RkJEzn/ACXDqvH9OqHQ+WQUbkISmAReq35ujWCCkK7n8w/syU0w9jQyIkTkCUlgTxHp6xuKEbr+Zw an+HeFx15Bd0x1wBg3DW+5DicmqAAk5RrFZ+pf4JLpBP5OHuH9ekM6sHsms+i6SnHmj0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/msi: prevent watchdog triggering when dumping MSI state Message-Id: Date: Wed, 26 Jun 2024 11:55:13 +0000 commit 1ffb29d132600e6a7965c2885505615a6fd6c647 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:36:52 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:36:52 2024 +0200 x86/msi: prevent watchdog triggering when dumping MSI state Use the same check that's used in dump_irqs(). Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 594b22ca5be681ec1b42c34f321cc2600d582210 master date: 2024-05-20 14:29:44 +0100 --- xen/arch/x86/msi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index a78367d7cf..3eaeffd1e0 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -1405,6 +1406,9 @@ static void cf_check dump_msi(unsigned char key) unsigned long flags; const char *type = "???"; + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + if ( !irq_desc_initialized(desc) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:55:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748769.1156589 (Exim 4.92) (envelope-from ) id 1sMRFF-0000Vs-3d; Wed, 26 Jun 2024 11:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748769.1156589; Wed, 26 Jun 2024 11:55: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 1sMRFF-0000Vk-0d; Wed, 26 Jun 2024 11:55:25 +0000 Received: by outflank-mailman (input) for mailman id 748769; Wed, 26 Jun 2024 11:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFD-0000VZ-VI for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFD-0005xi-UV for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRFD-0002J6-Tc for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WRJyUVpdXdNbjfwJSNzacGtNCtqFQOLIXBq7h+OLwEg=; b=nGCT8AO8G1DfTQ+/GQ7pNEOeFb xDAhUfpZVY3rDWh5xrZoZ5O5yIC0ya+J6YRyoUOj7lLLh0qRolEnCEc0/sZHmBR6j0vmCPB5/RL5n tdQ0KViDHY32SJqAFlKOZzChKQV+8ToVv7cFUf4xeDJc2/w22fi8liUJ1psyZyH1YrOg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count Message-Id: Date: Wed, 26 Jun 2024 11:55:23 +0000 commit 52e16bf065cb42b79d14ac74d701d1f9d8506430 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:37:20 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:37:20 2024 +0200 x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count When adjusting move_cleanup_count to account for CPUs that are offline also adjust old_cpu_mask, otherwise further calls to fixup_irqs() could subtract those again and create an imbalance in move_cleanup_count. Fixes: 472e0b74c5c4 ('x86/IRQ: deal with move cleanup count state in fixup_irqs()') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e63209d3ba2fd1b2f232babd14c9c679ffa7b09a master date: 2024-06-10 10:33:22 +0200 --- xen/arch/x86/irq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e07006391a..db14df93db 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2576,6 +2576,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) desc->arch.move_cleanup_count -= cpumask_weight(affinity); if ( !desc->arch.move_cleanup_count ) release_old_vec(desc); + else + /* + * Adjust old_cpu_mask to account for the offline CPUs, + * otherwise further calls to fixup_irqs() could subtract those + * again and possibly underflow the counter. + */ + cpumask_andnot(desc->arch.old_cpu_mask, desc->arch.old_cpu_mask, + affinity); } if ( !desc->action || cpumask_subset(desc->affinity, mask) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:55:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748770.1156591 (Exim 4.92) (envelope-from ) id 1sMRFP-0000Yx-4Q; Wed, 26 Jun 2024 11:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748770.1156591; Wed, 26 Jun 2024 11: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 1sMRFP-0000Yq-1z; Wed, 26 Jun 2024 11:55:35 +0000 Received: by outflank-mailman (input) for mailman id 748770; Wed, 26 Jun 2024 11:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFO-0000Yf-3a for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFO-0005xs-2o for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRFO-0002Jt-0N for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HISMAr3Ght57LZEiKsZWlccJX8O9ARjKbW1aUn9ELMY=; b=ws2BvqdAh2zAgLhUuQvNJxIQb/ FQmiIe5qnPo3baq1HPf3WUD7MJIasEue18i46Bb1BSmMDfJ4oq0WZC15KqMzwaILG50rYf3ZucSMB eNj1RDSF1PkYC6/EZXbDamtuydjJfIWSu2XVdqK+Or+aibA/gbhzLCFC8MFyp1LENGmU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] CI: Update FreeBSD to 13.3 Message-Id: Date: Wed, 26 Jun 2024 11:55:34 +0000 commit 80f2d2c2a515a6b9a4ea1b128267c6e1b5085002 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:37:58 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:37:58 2024 +0200 CI: Update FreeBSD to 13.3 Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Stefano Stabellini master commit: 5ea7f2c9d7a1334b3b2bd5f67fab4d447b60613d master date: 2024-06-11 17:00:10 +0100 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 63f3afb104..e961877881 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,7 @@ freebsd_template: &FREEBSD_TEMPLATE task: name: 'FreeBSD 13' freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-3 << : *FREEBSD_TEMPLATE task: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:55:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748771.1156595 (Exim 4.92) (envelope-from ) id 1sMRFa-0000cB-5v; Wed, 26 Jun 2024 11:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748771.1156595; Wed, 26 Jun 2024 11:55: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 1sMRFa-0000c3-3Q; Wed, 26 Jun 2024 11:55:46 +0000 Received: by outflank-mailman (input) for mailman id 748771; Wed, 26 Jun 2024 11:55:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFY-0000bi-7g for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFY-0005y4-63 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRFY-0002Kk-55 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YPI1lYzM1ck5IU0BATdj/gGzHjnZ0VhJGsXJVxVgyrs=; b=YiCtLnJcqy6ZVVM6HisfblNt/h dEfS+9z9kFMhzA1Wkf4C/WrToiiT0q6YUTtkBXQBsvXl0O+tHQk8ELZ+AArw4OGK8FSy0CdoZfACQ e3GmxzsXfCfir2DsVcZuI/cOTiPM0MCFF1H1YuswQt+HxWAuE8bX9cAt0WenhBHxAaIY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Message-Id: Date: Wed, 26 Jun 2024 11:55:44 +0000 commit 98238d49ecb149a5ac07cb8032817904c404ac2b Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:38:36 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:38:36 2024 +0200 x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Due to the current rwlock logic, if the CPU calling get_cpu_maps() does so from a cpu_hotplug_{begin,done}() region the function will still return success, because a CPU taking the rwlock in read mode after having taken it in write mode is allowed. Such corner case makes using get_cpu_maps() alone not enough to prevent using the shorthand in CPU hotplug regions. Introduce a new helper to detect whether the current caller is between a cpu_hotplug_{begin,done}() region and use it in send_IPI_mask() to restrict shorthand usage. Fixes: 5500d265a2a8 ('x86/smp: use APIC ALLBUT destination shorthand when possible') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 171c52fba5d94e050d704770480dcb983490d0ad master date: 2024-06-12 14:29:31 +0200 --- xen/arch/x86/smp.c | 2 +- xen/common/cpu.c | 5 +++++ xen/include/xen/cpu.h | 10 ++++++++++ xen/include/xen/rwlock.h | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 3a331cbdbc..340fcafb46 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -88,7 +88,7 @@ void send_IPI_mask(const cpumask_t *mask, int vector) * the system have been accounted for. */ if ( system_state > SYS_STATE_smp_boot && - !unaccounted_cpus && !disabled_cpus && + !unaccounted_cpus && !disabled_cpus && !cpu_in_hotplug_context() && /* NB: get_cpu_maps lock requires enabled interrupts. */ local_irq_is_enabled() && (cpus_locked = get_cpu_maps()) && (park_offline_cpus || diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 8709db4d29..6e35b114c0 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -68,6 +68,11 @@ void cpu_hotplug_done(void) write_unlock(&cpu_add_remove_lock); } +bool cpu_in_hotplug_context(void) +{ + return rw_is_write_locked_by_me(&cpu_add_remove_lock); +} + static NOTIFIER_HEAD(cpu_chain); void __init register_cpu_notifier(struct notifier_block *nb) diff --git a/xen/include/xen/cpu.h b/xen/include/xen/cpu.h index e1d4eb5967..6bf5786750 100644 --- a/xen/include/xen/cpu.h +++ b/xen/include/xen/cpu.h @@ -13,6 +13,16 @@ void put_cpu_maps(void); void cpu_hotplug_begin(void); void cpu_hotplug_done(void); +/* + * Returns true when the caller CPU is between a cpu_hotplug_{begin,done}() + * region. + * + * This is required to safely identify hotplug contexts, as get_cpu_maps() + * would otherwise succeed because a caller holding the lock in write mode is + * allowed to acquire the same lock in read mode. + */ +bool cpu_in_hotplug_context(void); + /* Receive notification of CPU hotplug events. */ void register_cpu_notifier(struct notifier_block *nb); diff --git a/xen/include/xen/rwlock.h b/xen/include/xen/rwlock.h index 9e35ee2edf..dc74d1c057 100644 --- a/xen/include/xen/rwlock.h +++ b/xen/include/xen/rwlock.h @@ -309,6 +309,8 @@ static always_inline void write_lock_irq(rwlock_t *l) #define rw_is_locked(l) _rw_is_locked(l) #define rw_is_write_locked(l) _rw_is_write_locked(l) +#define rw_is_write_locked_by_me(l) \ + lock_evaluate_nospec(_is_write_locked_by_me(atomic_read(&(l)->cnts))) typedef struct percpu_rwlock percpu_rwlock_t; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:55:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748772.1156600 (Exim 4.92) (envelope-from ) id 1sMRFk-0000eb-7S; Wed, 26 Jun 2024 11:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748772.1156600; Wed, 26 Jun 2024 11: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 1sMRFk-0000eS-4r; Wed, 26 Jun 2024 11:55:56 +0000 Received: by outflank-mailman (input) for mailman id 748772; Wed, 26 Jun 2024 11:55:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFi-0000eG-A4 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFi-0005yE-9I for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:55:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRFi-0002LY-8M for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zqyTn2ukThAtWJ5UOVwzeqKV8Da3k47Aq8qj8hgTb58=; b=CRUhdhSzQAhn+uuHLuQFXPlaJU uO6itIQhuam0ejt/hqw5F2a9/BZopfwzxSdNi5SfBTxyWIfyt4H/wigixKDxLpqE5hsq30yF1kOMC 0SyQHRG3tfvLyMXr9XMBt8gTtQHq00gzEheVwBtLfrnVsd89XyIr9/cKDeKVvwWX8w98=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/irq: limit interrupt movement done by fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 11:55:54 +0000 commit ce0a0cb0a74a909abf988f242aa228acdd2917fe Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:39:11 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:39:11 2024 +0200 x86/irq: limit interrupt movement done by fixup_irqs() The current check used in fixup_irqs() to decide whether to move around interrupts is based on the affinity mask, but such mask can have all bits set, and hence is unlikely to be a subset of the input mask. For example if an interrupt has an affinity mask of all 1s, any input to fixup_irqs() that's not an all set CPU mask would cause that interrupt to be shuffled around unconditionally. What fixup_irqs() care about is evacuating interrupts from CPUs not set on the input CPU mask, and for that purpose it should check whether the interrupt is assigned to a CPU not present in the input mask. Assume that ->arch.cpu_mask is a subset of the ->affinity mask, and keep the current logic that resets the ->affinity mask if the interrupt has to be shuffled around. Doing the affinity movement based on ->arch.cpu_mask requires removing the special handling to ->arch.cpu_mask done for high priority vectors, otherwise the adjustment done to cpu_mask makes them always skip the CPU interrupt movement. While there also adjust the comment as to the purpose of fixup_irqs(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: c7564d7366d865cc407e3d64bca816d07edee174 master date: 2024-06-12 14:30:40 +0200 --- xen/arch/x86/include/asm/irq.h | 2 +- xen/arch/x86/irq.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index d7fb8ec7e8..71d4a8fc56 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -132,7 +132,7 @@ void free_domain_pirqs(struct domain *d); int map_domain_emuirq_pirq(struct domain *d, int pirq, int emuirq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose); void fixup_eoi(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index db14df93db..566331bec1 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2529,7 +2529,7 @@ static int __init cf_check setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose) { unsigned int irq; @@ -2553,19 +2553,15 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && - vector <= LAST_HIPRIORITY_VECTOR ) + vector <= LAST_HIPRIORITY_VECTOR && + desc->handler == &no_irq_type ) { - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); - /* * This can in particular happen when parking secondary threads * during boot and when the serial console wants to use a PCI IRQ. */ - if ( desc->handler == &no_irq_type ) - { - spin_unlock(&desc->lock); - continue; - } + spin_unlock(&desc->lock); + continue; } if ( desc->arch.move_cleanup_count ) @@ -2586,7 +2582,12 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } - if ( !desc->action || cpumask_subset(desc->affinity, mask) ) + /* + * Avoid shuffling the interrupt around as long as current target CPUs + * are a subset of the input mask. What fixup_irqs() cares about is + * evacuating interrupts from CPUs not in the input mask. + */ + if ( !desc->action || cpumask_subset(desc->arch.cpu_mask, mask) ) { spin_unlock(&desc->lock); continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:56:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748773.1156604 (Exim 4.92) (envelope-from ) id 1sMRFu-0000hD-96; Wed, 26 Jun 2024 11:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748773.1156604; Wed, 26 Jun 2024 11:56: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 1sMRFu-0000h5-6H; Wed, 26 Jun 2024 11:56:06 +0000 Received: by outflank-mailman (input) for mailman id 748773; Wed, 26 Jun 2024 11:56:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFs-0000gv-Cs for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRFs-0005yw-CA for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRFs-0002My-BV for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bApNyvvbQQ1TFML02UR1Rpu044UFi28xroAR6e4IyOA=; b=c3tq+AP4a6eNDg2Cjc56bvwC/k VcFK0zrpqZAHMzB8UtbK5Hbwz815GIxy3RPHLiCBbIzULFp3Hb8RKKzyW5U4B8o28/7r7kMzud+BB r9k8V1sw2Ax95FiX5CW04pjVIMqSy5N63eRY9wC0ile+MQhddUbLS7gnzerS8qgqLyeY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/EPT: correct special page checking in epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 11:56:04 +0000 commit 6e647efaf2b02ce92bcf80bec47c18cca5084f8a Author: Jan Beulich AuthorDate: Wed Jun 26 13:39:44 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:39:44 2024 +0200 x86/EPT: correct special page checking in epte_get_entry_emt() mfn_valid() granularity is (currently) 256Mb. Therefore the start of a 1Gb page passing the test doesn't necessarily mean all parts of such a range would also pass. Yet using the result of mfn_to_page() on an MFN which doesn't pass mfn_valid() checking is liable to result in a crash (the invocation of mfn_to_page() alone is presumably "just" UB in such a case). Fixes: ca24b2ffdbd9 ("x86/hvm: set 'ipat' in EPT for special pages") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 5540b94e8191059eb9cbbe98ac316232a42208f6 master date: 2024-06-13 16:53:34 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 85c4e8e54f..1aa6bbc771 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -518,8 +518,12 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, } for ( special_pgs = i = 0; i < (1ul << order); i++ ) - if ( is_special_page(mfn_to_page(mfn_add(mfn, i))) ) + { + mfn_t cur = mfn_add(mfn, i); + + if ( mfn_valid(cur) && is_special_page(mfn_to_page(cur)) ) special_pgs++; + } if ( special_pgs ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:56:16 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:56:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748774.1156608 (Exim 4.92) (envelope-from ) id 1sMRG4-0000kF-Bf; Wed, 26 Jun 2024 11:56:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748774.1156608; Wed, 26 Jun 2024 11:56: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 1sMRG4-0000k7-8y; Wed, 26 Jun 2024 11:56:16 +0000 Received: by outflank-mailman (input) for mailman id 748774; Wed, 26 Jun 2024 11:56:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRG2-0000jx-G3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRG2-0005zG-FG for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRG2-0002Nt-EO for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HfjmIL7GeXtJPkFKST+DEkVL5UUybyaz7Oa8esamDuQ=; b=l6k1EHZvyMDQSueu5QhCG+G+/h Ug84+kt8ZRYT+GwD/YRbUCOaFQxG3/VRJEI5ZmtP3sRStTPXvmTXeHkUo0X3iiCOyqFcfIK/C898Q FIi2mqFFvpYxTUEoofeU2+yzKxHltcy9Rh+993uOVRqIBxQZbMQya6ea1Ksk3+HmTqbM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/EPT: avoid marking non-present entries for re-configuring Message-Id: Date: Wed, 26 Jun 2024 11:56:14 +0000 commit d31385be5c8e8bc5efb6f8848057bd0c69e8274a Author: Jan Beulich AuthorDate: Wed Jun 26 13:40:11 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:40:11 2024 +0200 x86/EPT: avoid marking non-present entries for re-configuring For non-present entries EMT, like most other fields, is meaningless to hardware. Make the logic in ept_set_entry() setting the field (and iPAT) conditional upon dealing with a present entry, leaving the value at 0 otherwise. This has two effects for epte_get_entry_emt() which we'll want to leverage subsequently: 1) The call moved here now won't be issued with INVALID_MFN anymore (a respective BUG_ON() is being added). 2) Neither of the other two calls could now be issued with a truncated form of INVALID_MFN anymore (as long as there's no bug anywhere marking an entry present when that was populated using INVALID_MFN). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 777c71d31325bc55ba1cc3f317d4155fe519ab0b master date: 2024-06-13 16:54:17 +0200 --- xen/arch/x86/mm/p2m-ept.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 1aa6bbc771..641d61b350 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -649,6 +649,8 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) if ( e.emt != MTRR_NUM_TYPES ) break; + ASSERT(is_epte_present(&e)); + if ( level == 0 ) { for ( gfn -= i, i = 0; i < EPT_PAGETABLE_ENTRIES; ++i ) @@ -914,17 +916,6 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { - bool ipat; - int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, - i * EPT_TABLE_ORDER, &ipat, - p2mt); - - if ( emt >= 0 ) - new_entry.emt = emt; - else /* ept_handle_misconfig() will need to take care of this. */ - new_entry.emt = MTRR_NUM_TYPES; - - new_entry.ipat = ipat; new_entry.sp = !!i; new_entry.sa_p2mt = p2mt; new_entry.access = p2ma; @@ -940,6 +931,22 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, need_modify_vtd_table = 0; ept_p2m_type_to_flags(p2m, &new_entry); + + if ( is_epte_present(&new_entry) ) + { + bool ipat; + int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, + i * EPT_TABLE_ORDER, &ipat, + p2mt); + + BUG_ON(mfn_eq(mfn, INVALID_MFN)); + + if ( emt >= 0 ) + new_entry.emt = emt; + else /* ept_handle_misconfig() will need to take care of this. */ + new_entry.emt = MTRR_NUM_TYPES; + new_entry.ipat = ipat; + } } if ( sve != -1 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:56:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:56:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748775.1156613 (Exim 4.92) (envelope-from ) id 1sMRGE-0000mT-DE; Wed, 26 Jun 2024 11:56:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748775.1156613; Wed, 26 Jun 2024 11:56: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 1sMRGE-0000mL-AO; Wed, 26 Jun 2024 11:56:26 +0000 Received: by outflank-mailman (input) for mailman id 748775; Wed, 26 Jun 2024 11:56:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGC-0000m9-Iw for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGC-0005zP-IC for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRGC-0002QW-HQ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DPi3AknE4TE89pctcAq/YD+UY85ZNqFOddGmRzv+ZuE=; b=0jTXhDQ9w7PvwlO9WFWY1nNRC1 c63Twh0g7khVfiyxMD8VFRVTbBQS2Yg+1aHoCuWMH4GE4xIS5EIQWdU7L4kW8zOyZvaPlb/kXVxqx fJbbzu+3jDseHvxhic53+F/xHHGvd/qU0D8refmIaslUsXhsF72kiL9//LFqGE2+bbus=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 11:56:24 +0000 commit 3b777c2ce4ea8cf67b79a5496e51201145606798 Author: Jan Beulich AuthorDate: Wed Jun 26 13:40:35 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:40:35 2024 +0200 x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() mfn_valid() is RAM-focused; it will often return false for MMIO. Yet access to actual MMIO space should not generally be restricted to UC only; especially video frame buffer accesses are unduly affected by such a restriction. Since, as of 777c71d31325 ("x86/EPT: avoid marking non-present entries for re-configuring"), the function won't be called with INVALID_MFN or, worse, truncated forms thereof anymore, we call fully drop that check. Fixes: 81fd0d3ca4b2 ("x86/hvm: simplify 'mmio_direct' check in epte_get_entry_emt()") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 4fdd8d75566fdad06667a79ec0ce6f43cc466c54 master date: 2024-06-13 16:55:22 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 641d61b350..d325424e97 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -500,12 +500,6 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, return -1; } - if ( !mfn_valid(mfn) ) - { - *ipat = true; - return X86_MT_UC; - } - /* * Conditional must be kept in sync with the code in * {iomem,ioports}_{permit,deny}_access(). -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:56:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:56:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748776.1156616 (Exim 4.92) (envelope-from ) id 1sMRGO-0000oo-Ei; Wed, 26 Jun 2024 11:56:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748776.1156616; Wed, 26 Jun 2024 11:56: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 1sMRGO-0000og-Bl; Wed, 26 Jun 2024 11:56:36 +0000 Received: by outflank-mailman (input) for mailman id 748776; Wed, 26 Jun 2024 11:56:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGM-0000oV-Mc for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGM-0005zW-Lp for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRGM-0002S4-KN for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FgYzbFeFIpdteCmzRMe43hrPGPHWRcrcYUvX0tljET8=; b=yf1i7xuBCYVYnv5Tcu0ftMkhLc hQfmbQG0gg7YpOfmKbwBu7hiwYo8naqUrl90Od34JVX4diiZtvWkETF6OSSWzG/rAfq0y07zbaILM OvAaRdgc8BfBxrJDJuenUVgeCCsXrLqlPJ465azRpHt51HQZ9HpX/OrNQ3C5jLvuRINA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/Intel: unlock CPUID earlier for the BSP Message-Id: Date: Wed, 26 Jun 2024 11:56:34 +0000 commit c4b284912695a5802433512b913e968eda01544f Author: Jan Beulich AuthorDate: Wed Jun 26 13:41:05 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:41:05 2024 +0200 x86/Intel: unlock CPUID earlier for the BSP Intel CPUs have a MSR bit to limit CPUID enumeration to leaf two. If this bit is set by the BIOS then CPUID evaluation does not work when data from any leaf greater than two is needed; early_cpu_init() in particular wants to collect leaf 7 data. Cure this by unlocking CPUID right before evaluating anything which depends on the maximum CPUID leaf being greater than two. Inspired by (and description cloned from) Linux commit 0c2f6d04619e ("x86/topology/intel: Unlock CPUID before evaluating anything"). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: fa4d026737a47cd1d66ffb797a29150b4453aa9f master date: 2024-06-18 15:12:44 +0200 --- xen/arch/x86/cpu/common.c | 3 ++- xen/arch/x86/cpu/cpu.h | 2 ++ xen/arch/x86/cpu/intel.c | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 26eed2ade1..edec0a2546 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -336,7 +336,8 @@ void __init early_cpu_init(bool verbose) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_INTEL: intel_unlock_cpuid_leaves(c); + actual_cpu = intel_cpu_dev; break; case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index e3d06278b3..8be65e975a 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -24,3 +24,5 @@ void amd_init_lfence(struct cpuinfo_x86 *c); void amd_init_ssbd(const struct cpuinfo_x86 *c); void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); + +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index deb7b70464..0dc7c27601 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -303,10 +303,24 @@ static void __init noinline intel_init_levelling(void) ctxt_switch_masking = intel_ctxt_switch_masking; } -static void cf_check early_init_intel(struct cpuinfo_x86 *c) +/* Unmask CPUID levels if masked. */ +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) { - u64 misc_enable, disable; + uint64_t misc_enable, disable; + + rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + + disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; + if (disable) { + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); + bootsym(trampoline_misc_enable_off) |= disable; + c->cpuid_level = cpuid_eax(0); + printk(KERN_INFO "revised cpuid level: %u\n", c->cpuid_level); + } +} +static void cf_check early_init_intel(struct cpuinfo_x86 *c) +{ /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; @@ -315,16 +329,7 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c) bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE) printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); - /* Unmask CPUID levels and NX if masked: */ - rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - - disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; - if (disable) { - wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); - bootsym(trampoline_misc_enable_off) |= disable; - printk(KERN_INFO "revised cpuid level: %d\n", - cpuid_eax(0)); - } + intel_unlock_cpuid_leaves(c); /* CPUID workaround for Intel 0F33/0F34 CPU */ if (boot_cpu_data.x86 == 0xF && boot_cpu_data.x86_model == 3 && -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:56:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:56:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748777.1156619 (Exim 4.92) (envelope-from ) id 1sMRGY-0000rq-Fm; Wed, 26 Jun 2024 11:56:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748777.1156619; Wed, 26 Jun 2024 11:56: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 1sMRGY-0000ri-DE; Wed, 26 Jun 2024 11:56:46 +0000 Received: by outflank-mailman (input) for mailman id 748777; Wed, 26 Jun 2024 11:56:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGW-0000rR-Pb for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGW-0005zj-Op for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRGW-0002TC-Nz for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=g0phOnTRKMoCRznuVOFjCoaILhk6Mc62Y4FxopvhPS0=; b=bdREBtOMIAAm9CuR62b06ixczI q4c2dfy9AGkvTrIzza5vrLJBtKUZCt5ku0WmIx/DaxJssC9VJdo4vjk/994sNJ38axT7Gk57PwPVR /yD8sYI1IO02moN3tYykdJsDF5Mb314el0gft3rjVhX22xkZ/GKUm4z7pTp5oRMryAZo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 11:56:44 +0000 commit 39a6170c15bf369a2b26c855ea7621387ed4070b Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:41:35 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:41:35 2024 +0200 x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Given the current logic it's possible for ->arch.old_cpu_mask to get out of sync: if a CPU set in old_cpu_mask is offlined and then onlined again without old_cpu_mask having been updated the data in the mask will no longer be accurate, as when brought back online the CPU will no longer have old_vector configured to handle the old interrupt source. If there's an interrupt movement in progress, and the to be offlined CPU (which is the call context) is in the old_cpu_mask, clear it and update the mask, so it doesn't contain stale data. Note that when the system is going down fixup_irqs() will be called by smp_send_stop() from CPU 0 with a mask with only CPU 0 on it, effectively asking to move all interrupts to the current caller (CPU 0) which is the only CPU to remain online. In that case we don't care to migrate interrupts that are in the process of being moved, as it's likely we won't be able to move all interrupts to CPU 0 due to vector shortage anyway. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 817d1cd627be668c358d038f0fadbf7d24d417d3 master date: 2024-06-18 15:14:49 +0200 --- xen/arch/x86/irq.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 566331bec1..f877327975 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2539,7 +2539,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { bool break_affinity = false, set_affinity = true; - unsigned int vector; + unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); if ( irq == 2 ) @@ -2582,6 +2582,33 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } + if ( desc->arch.move_in_progress && + /* + * Only attempt to adjust the mask if the current CPU is going + * offline, otherwise the whole system is going down and leaving + * stale data in the masks is fine. + */ + !cpu_online(cpu) && + cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) + { + /* + * This CPU is going offline, remove it from ->arch.old_cpu_mask + * and possibly release the old vector if the old mask becomes + * empty. + * + * Note cleaning ->arch.old_cpu_mask is required if the CPU is + * brought offline and then online again, as when re-onlined the + * per-cpu vector table will no longer have ->arch.old_vector + * setup, and hence ->arch.old_cpu_mask would be stale. + */ + cpumask_clear_cpu(cpu, desc->arch.old_cpu_mask); + if ( cpumask_empty(desc->arch.old_cpu_mask) ) + { + desc->arch.move_in_progress = 0; + release_old_vec(desc); + } + } + /* * Avoid shuffling the interrupt around as long as current target CPUs * are a subset of the input mask. What fixup_irqs() cares about is -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:56:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:56:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748778.1156623 (Exim 4.92) (envelope-from ) id 1sMRGi-0000vH-HW; Wed, 26 Jun 2024 11:56:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748778.1156623; Wed, 26 Jun 2024 11:56: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 1sMRGi-0000v9-Ei; Wed, 26 Jun 2024 11:56:56 +0000 Received: by outflank-mailman (input) for mailman id 748778; Wed, 26 Jun 2024 11:56:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGg-0000uz-Sk for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGg-0005zv-Rw for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRGg-0002U3-R9 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VKk8XcVmnMTgRdT9JB0NWPqtjZZL7dwvDsYToGjcGig=; b=IWkWOj8//TGB31ttdQpY8pRtiC gwxX2X1hzFjadkdHW/+2uU7CzomNu9sNe/WyxMERsYzZq1hfs5fG+iXHg8jaqdr851D6ui25vuWe5 TMly/R0LCvi/jDcZQ9viIRaKlcDR95LS3nJefVmUzQSo5+sp5Jj6rIHAPsMkp0a24Vms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/irq: handle moving interrupts in _assign_irq_vector() Message-Id: Date: Wed, 26 Jun 2024 11:56:54 +0000 commit 3a8f4ec75d8ed8da6370deac95c341cbada96802 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:42:05 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:42:05 2024 +0200 x86/irq: handle moving interrupts in _assign_irq_vector() Currently there's logic in fixup_irqs() that attempts to prevent _assign_irq_vector() from failing, as fixup_irqs() is required to evacuate all interrupts from the CPUs not present in the input mask. The current logic in fixup_irqs() is incomplete, as it doesn't deal with interrupts that have move_cleanup_count > 0 and a non-empty ->arch.old_cpu_mask field. Instead of attempting to fixup the interrupt descriptor in fixup_irqs() so that _assign_irq_vector() cannot fail, introduce logic in _assign_irq_vector() to deal with interrupts that have either move_{in_progress,cleanup_count} set and no remaining online CPUs in ->arch.cpu_mask. If _assign_irq_vector() is requested to move an interrupt in the state described above, first attempt to see if ->arch.old_cpu_mask contains any valid CPUs that could be used as fallback, and if that's the case do move the interrupt back to the previous destination. Note this is easier because the vector hasn't been released yet, so there's no need to allocate and setup a new vector on the destination. Due to the logic in fixup_irqs() that clears offline CPUs from ->arch.old_cpu_mask (and releases the old vector if the mask becomes empty) it shouldn't be possible to get into _assign_irq_vector() with ->arch.move_{in_progress,cleanup_count} set but no online CPUs in ->arch.old_cpu_mask. However if ->arch.move_{in_progress,cleanup_count} is set and the interrupt has also changed affinity, it's possible the members of ->arch.old_cpu_mask are no longer part of the affinity set, move the interrupt to a different CPU part of the provided mask and keep the current ->arch.old_{cpu_mask,vector} for the pending interrupt movement to be completed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 369558924a642bbb0cb731e9a3375958867cb17b master date: 2024-06-18 15:15:10 +0200 --- xen/arch/x86/irq.c | 97 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f877327975..13ef61a5b7 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -553,7 +553,58 @@ static int _assign_irq_vector(struct irq_desc *desc, const cpumask_t *mask) } if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) - return -EAGAIN; + { + /* + * If the current destination is online refuse to shuffle. Retry after + * the in-progress movement has finished. + */ + if ( cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) + return -EAGAIN; + + /* + * Due to the logic in fixup_irqs() that clears offlined CPUs from + * ->arch.old_cpu_mask it shouldn't be possible to get here with + * ->arch.move_{in_progress,cleanup_count} set and no online CPUs in + * ->arch.old_cpu_mask. + */ + ASSERT(valid_irq_vector(desc->arch.old_vector)); + ASSERT(cpumask_intersects(desc->arch.old_cpu_mask, &cpu_online_map)); + + if ( cpumask_intersects(desc->arch.old_cpu_mask, mask) ) + { + /* + * Fallback to the old destination if moving is in progress and the + * current destination is to be offlined. This is only possible if + * the CPUs in old_cpu_mask intersect with the affinity mask passed + * in the 'mask' parameter. + */ + desc->arch.vector = desc->arch.old_vector; + cpumask_and(desc->arch.cpu_mask, desc->arch.old_cpu_mask, mask); + + /* Undo any possibly done cleanup. */ + for_each_cpu(cpu, desc->arch.cpu_mask) + per_cpu(vector_irq, cpu)[desc->arch.vector] = irq; + + /* Cancel the pending move and release the current vector. */ + desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; + cpumask_clear(desc->arch.old_cpu_mask); + desc->arch.move_in_progress = 0; + desc->arch.move_cleanup_count = 0; + if ( desc->arch.used_vectors ) + { + ASSERT(test_bit(old_vector, desc->arch.used_vectors)); + clear_bit(old_vector, desc->arch.used_vectors); + } + + return 0; + } + + /* + * There's an interrupt movement in progress but the destination(s) in + * ->arch.old_cpu_mask are not suitable given the 'mask' parameter, go + * through the full logic to find a new vector in a suitable CPU. + */ + } err = -ENOSPC; @@ -609,7 +660,22 @@ next: current_vector = vector; current_offset = offset; - if ( valid_irq_vector(old_vector) ) + if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) + { + ASSERT(!cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map)); + /* + * Special case when evacuating an interrupt from a CPU to be + * offlined and the interrupt was already in the process of being + * moved. Leave ->arch.old_{vector,cpu_mask} as-is and just + * replace ->arch.{cpu_mask,vector} with the new destination. + * Cleanup will be done normally for the old fields, just release + * the current vector here. + */ + if ( desc->arch.used_vectors && + !test_and_clear_bit(old_vector, desc->arch.used_vectors) ) + ASSERT_UNREACHABLE(); + } + else if ( valid_irq_vector(old_vector) ) { cpumask_and(desc->arch.old_cpu_mask, desc->arch.cpu_mask, &cpu_online_map); @@ -2620,33 +2686,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) continue; } - /* - * In order for the affinity adjustment below to be successful, we - * need _assign_irq_vector() to succeed. This in particular means - * clearing desc->arch.move_in_progress if this would otherwise - * prevent the function from succeeding. Since there's no way for the - * flag to get cleared anymore when there's no possible destination - * left (the only possibility then would be the IRQs enabled window - * after this loop), there's then also no race with us doing it here. - * - * Therefore the logic here and there need to remain in sync. - */ - if ( desc->arch.move_in_progress && - !cpumask_intersects(mask, desc->arch.cpu_mask) ) - { - unsigned int cpu; - - cpumask_and(affinity, desc->arch.old_cpu_mask, &cpu_online_map); - - spin_lock(&vector_lock); - for_each_cpu(cpu, affinity) - per_cpu(vector_irq, cpu)[desc->arch.old_vector] = ~irq; - spin_unlock(&vector_lock); - - release_old_vec(desc); - desc->arch.move_in_progress = 0; - } - if ( !cpumask_intersects(mask, desc->affinity) ) { break_affinity = true; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:57:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:57:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748779.1156628 (Exim 4.92) (envelope-from ) id 1sMRGs-0000yU-KK; Wed, 26 Jun 2024 11:57:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748779.1156628; Wed, 26 Jun 2024 11:57: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 1sMRGs-0000yM-HU; Wed, 26 Jun 2024 11:57:06 +0000 Received: by outflank-mailman (input) for mailman id 748779; Wed, 26 Jun 2024 11:57:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGq-0000y9-VX for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRGq-00060g-Un for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRGq-0002Uj-U5 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lD5oZxXw4sXObKRljTb4L6SYNXNbL90pcluvVm6QY8k=; b=B14dDzu7Cn0+yKu01iCoNvliJM XrVEjre2TtI9uvzBu5xgr/YwBtZeUxEQcCE8O+/QJ2nCTSo8lgQ+vvD5L+TKe9NndsI7TLuF11LHq +ZDgLdniQEK45TfFG6bjUOvVAcY48RihDS1/TsYwpIYnd3d+4z6qNMtgpAW/6nDX1NsY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] xen/ubsan: Fix UB in type_descriptor declaration Message-Id: Date: Wed, 26 Jun 2024 11:57:04 +0000 commit 5397ab9995f7354e7f8122a8a91c810256afa3d1 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:42:30 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:42:30 2024 +0200 xen/ubsan: Fix UB in type_descriptor declaration struct type_descriptor is arranged with a NUL terminated string following the kind/info fields. The only reason this doesn't trip UBSAN detection itself (on more modern compilers at least) is because struct type_descriptor is only referenced in suppressed regions. Switch the declaration to be a real flexible member. No functional change. Fixes: 00fcf4dd8eb4 ("xen/ubsan: Import ubsan implementation from Linux 4.13") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: bd59af99700f075d06a6d47a16f777c9519928e0 master date: 2024-06-18 14:55:04 +0100 --- xen/common/ubsan/ubsan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/ubsan/ubsan.h b/xen/common/ubsan/ubsan.h index a3159040fe..3db42e75b1 100644 --- a/xen/common/ubsan/ubsan.h +++ b/xen/common/ubsan/ubsan.h @@ -10,7 +10,7 @@ enum { struct type_descriptor { u16 type_kind; u16 type_info; - char type_name[1]; + char type_name[]; }; struct source_location { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:57:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:57:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748780.1156633 (Exim 4.92) (envelope-from ) id 1sMRH1-000115-Mq; Wed, 26 Jun 2024 11:57:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748780.1156633; Wed, 26 Jun 2024 11:57: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 1sMRH1-00010x-Iv; Wed, 26 Jun 2024 11:57:15 +0000 Received: by outflank-mailman (input) for mailman id 748780; Wed, 26 Jun 2024 11:57:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRH1-00010q-28 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRH1-00060u-1V for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRH1-0002Va-0d for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FDle1Bgl3LQvWXP8ElIQia9n/ZGKQykteqz+G4zXrvE=; b=kUZjcoH5EUqy/8yDw/4c1eHD4F Dmoxtb5FCoDK/ZkUYdPN5KtqzC+YO5WNnT7EP/9yl42sYhpyzN6U7kTDySHwdc9xgjg9ZwlqHs/Y2 A0/vPE8+/ZVeUNaDpem2vvZkIl6r9JgKGSGgFzfOUpUv97twVnd1i2olYfrTkPdgaBAQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/xstate: Fix initialisation of XSS cache Message-Id: Date: Wed, 26 Jun 2024 11:57:15 +0000 commit 4ee1df89d9c92609e5fff3c9b261ce4b1bb88e42 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:43:19 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:43:19 2024 +0200 x86/xstate: Fix initialisation of XSS cache The clobbering of this_cpu(xcr0) and this_cpu(xss) to architecturally invalid values is to force the subsequent set_xcr0() and set_msr_xss() to reload the hardware register. While XCR0 is reloaded in xstate_init(), MSR_XSS isn't. This causes get_msr_xss() to return the invalid value, and logic of the form: old = get_msr_xss(); set_msr_xss(new); ... set_msr_xss(old); to try and restore said invalid value. The architecturally invalid value must be purged from the cache, meaning the hardware register must be written at least once. This in turn highlights that the invalid value must only be used in the case that the hardware register is available. Fixes: f7f4a523927f ("x86/xstate: reset cached register values on resume") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 9e6dbbe8bf400aacb99009ddffa91d2a0c312b39 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/xstate.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index f442610fc5..ca76f98fe2 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -641,13 +641,6 @@ void xstate_init(struct cpuinfo_x86 *c) return; } - /* - * Zap the cached values to make set_xcr0() and set_msr_xss() really - * write it. - */ - this_cpu(xcr0) = 0; - this_cpu(xss) = ~0; - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; BUG_ON(!valid_xcr0(feature_mask)); @@ -657,8 +650,19 @@ void xstate_init(struct cpuinfo_x86 *c) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); + + /* + * Zap the cached values to make set_xcr0() and set_msr_xss() really write + * the hardware register. + */ + this_cpu(xcr0) = 0; if ( !set_xcr0(feature_mask) ) BUG(); + if ( cpu_has_xsaves ) + { + this_cpu(xss) = ~0; + set_msr_xss(0); + } if ( bsp ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:57:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:57:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748781.1156636 (Exim 4.92) (envelope-from ) id 1sMRHB-00013j-Mz; Wed, 26 Jun 2024 11:57:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748781.1156636; Wed, 26 Jun 2024 11:57: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 1sMRHB-00013c-KM; Wed, 26 Jun 2024 11:57:25 +0000 Received: by outflank-mailman (input) for mailman id 748781; Wed, 26 Jun 2024 11:57:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRHB-00013W-50 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRHB-000611-4N for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRHB-0002WJ-3c for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gBrzo45XLlNobGqO0dvlNbCHUW5/IfQpDqWjyoEvMjs=; b=mYcaY9xDh9HczNSb35fow1rH8K LnAVe4FLLiTtGlOYA/++rvawZxSOrZjipCxEaXNGNAXa8B3nUZuhRCAn7CsloEpSqwn6PiwB8tx4G Gz6JPgDbG8dwTiVGXuhpSgG2G13krt+bYtJoe+cNx8Xyn1hj5UPP2dVKABIwLKYoSbyw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/cpuid: Fix handling of XSAVE dynamic leaves Message-Id: Date: Wed, 26 Jun 2024 11:57:25 +0000 commit 9b43092d54b5f9e9d39d9f20393671e303b19e81 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:43:44 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:43:44 2024 +0200 x86/cpuid: Fix handling of XSAVE dynamic leaves [ This is a minimal backport of commit 71cacfb035f4 ("x86/cpuid: Fix handling of XSAVE dynamic leaves") to fix the bugs without depending on the large rework of XSTATE handling in Xen 4.19 ] First, if XSAVE is available in hardware but not visible to the guest, the dynamic leaves shouldn't be filled in. Second, the comment concerning XSS state is wrong. VT-x doesn't manage host/guest state automatically, but there is provision for "host only" bits to be set, so the implications are still accurate. In Xen 4.18, no XSS states are supported, so it's safe to keep deferring to real hardware. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 71cacfb035f4a78ee10970dc38a3baa04d387451 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/cpuid.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 455a09b2dd..f6fd6cc6b3 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -330,24 +330,20 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case XSTATE_CPUID: switch ( subleaf ) { - case 1: - if ( p->xstate.xsavec || p->xstate.xsaves ) - { - /* - * TODO: Figure out what to do for XSS state. VT-x manages - * host vs guest MSR_XSS automatically, so as soon as we start - * supporting any XSS states, the wrong XSS will be in - * context. - */ - BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); - - /* - * Read CPUID[0xD,0/1].EBX from hardware. They vary with - * enabled XSTATE, and appropraite XCR0|XSS are in context. - */ + /* + * Read CPUID[0xd,0/1].EBX from hardware. They vary with enabled + * XSTATE, and the appropriate XCR0 is in context. + */ case 0: - res->b = cpuid_count_ebx(leaf, subleaf); - } + if ( p->basic.xsave ) + res->b = cpuid_count_ebx(0xd, 0); + break; + + case 1: + /* This only works because Xen doesn't support XSS states yet. */ + BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); + if ( p->xstate.xsavec ) + res->b = cpuid_count_ebx(0xd, 1); break; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 11:57:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 11:57:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748782.1156640 (Exim 4.92) (envelope-from ) id 1sMRHL-0001A9-OR; Wed, 26 Jun 2024 11:57:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748782.1156640; Wed, 26 Jun 2024 11: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 1sMRHL-0001A1-Lr; Wed, 26 Jun 2024 11:57:35 +0000 Received: by outflank-mailman (input) for mailman id 748782; Wed, 26 Jun 2024 11:57:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRHL-00019t-87 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRHL-00061G-7U for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRHL-0002Xd-6i for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 11:57: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8qcocW5O7TGQ7O+Kk+Ica9Ce9FGQOyggTCcI14jsYuU=; b=dpuZV4qn+0fsrWTSKSquoeALcm pqhIj1psR1XtqWStnV+NUGYDLneVCBAy+86NB6OY4CnJDxR1TO/tNuuHCbbxc6M/utfTJ3gaWAu/N dtVsOsSDPmc/s0gGjjqPIQXjFYZEqOQeK9t/YXma75fQEeDaim1JxVbQDckjB07mimZg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/irq: forward pending interrupts to new destination in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 11:57:35 +0000 commit e95d30f9e5eed0c5d9dbf72d4cc3ae373152ab10 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:44:08 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:44:08 2024 +0200 x86/irq: forward pending interrupts to new destination in fixup_irqs() fixup_irqs() is used to evacuate interrupts from to be offlined CPUs. Given the CPU is to become offline, the normal migration logic used by Xen where the vector in the previous target(s) is left configured until the interrupt is received on the new destination is not suitable. Instead attempt to do as much as possible in order to prevent loosing interrupts. If fixup_irqs() is called from the CPU to be offlined (as is currently the case for CPU hot unplug) attempt to forward pending vectors when interrupts that target the current CPU are migrated to a different destination. Additionally, for interrupts that have already been moved from the current CPU prior to the call to fixup_irqs() but that haven't been delivered to the new destination (iow: interrupts with move_in_progress set and the current CPU set in ->arch.old_cpu_mask) also check whether the previous vector is pending and forward it to the new destination. This allows us to remove the window with interrupts enabled at the bottom of fixup_irqs(). Such window wasn't safe anyway: references to the CPU to become offline are removed from interrupts masks, but the per-CPU vector_irq[] array is not updated to reflect those changes (as the CPU is going offline anyway). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e2bb28d621584fce15c907002ddc7c6772644b64 master date: 2024-06-20 12:09:32 +0200 --- xen/arch/x86/include/asm/apic.h | 5 +++++ xen/arch/x86/irq.c | 46 +++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h index 7625c0ecd6..ad8d7cc054 100644 --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -145,6 +145,11 @@ static __inline bool_t apic_isr_read(u8 vector) (vector & 0x1f)) & 1; } +static inline bool apic_irr_read(unsigned int vector) +{ + return apic_read(APIC_IRR + (vector / 32 * 0x10)) & (1U << (vector % 32)); +} + static __inline u32 get_apic_id(void) /* Get the physical APIC id */ { u32 id = apic_read(APIC_ID); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 13ef61a5b7..290f8d26e7 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2604,7 +2604,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { - bool break_affinity = false, set_affinity = true; + bool break_affinity = false, set_affinity = true, check_irr = false; unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); @@ -2657,6 +2657,25 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) { + /* + * This to be offlined CPU was the target of an interrupt that's + * been moved, and the new destination target hasn't yet + * acknowledged any interrupt from it. + * + * We know the interrupt is configured to target the new CPU at + * this point, so we can check IRR for any pending vectors and + * forward them to the new destination. + * + * Note that for the other case of an interrupt movement being in + * progress (move_cleanup_count being non-zero) we know the new + * destination has already acked at least one interrupt from this + * source, and hence there's no need to forward any stale + * interrupts. + */ + if ( apic_irr_read(desc->arch.old_vector) ) + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + /* * This CPU is going offline, remove it from ->arch.old_cpu_mask * and possibly release the old vector if the old mask becomes @@ -2697,6 +2716,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( desc->handler->disable ) desc->handler->disable(desc); + /* + * If the current CPU is going offline and is (one of) the target(s) of + * the interrupt, signal to check whether there are any pending vectors + * to be handled in the local APIC after the interrupt has been moved. + */ + if ( !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.cpu_mask) ) + check_irr = true; + if ( desc->handler->set_affinity ) desc->handler->set_affinity(desc, affinity); else if ( !(warned++) ) @@ -2707,6 +2734,18 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) cpumask_copy(affinity, desc->affinity); + if ( check_irr && apic_irr_read(vector) ) + /* + * Forward pending interrupt to the new destination, this CPU is + * going offline and otherwise the interrupt would be lost. + * + * Do the IRR check as late as possible before releasing the irq + * desc in order for any in-flight interrupts to be delivered to + * the lapic. + */ + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + spin_unlock(&desc->lock); if ( !verbose ) @@ -2718,11 +2757,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) printk("Broke affinity for IRQ%u, new: %*pb\n", irq, CPUMASK_PR(affinity)); } - - /* That doesn't seem sufficient. Give it 1ms. */ - local_irq_enable(); - mdelay(1); - local_irq_disable(); } void fixup_eoi(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748802.1156664 (Exim 4.92) (envelope-from ) id 1sMRf3-0006eK-35; Wed, 26 Jun 2024 12:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748802.1156664; Wed, 26 Jun 2024 12: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 1sMRf3-0006eC-0J; Wed, 26 Jun 2024 12:22:05 +0000 Received: by outflank-mailman (input) for mailman id 748802; Wed, 26 Jun 2024 12:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRf1-0006e6-PW for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRf1-0006UQ-Ea for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRf1-0004qA-DS for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SktDsEanx/pYylxUNBzuMA+i+oakYFYwOpH7w5SaeKo=; b=qTcHKX2fx2Gmyjqe6+gwGPzph5 GpilBD6BcfWVCKxPD2tjp5DPsudhWcVY+5EvCxl6BznwolpyOH9J9NJV+2Nfz/Gcg2CeR70zxvu+P BXhOsG7rx7fNfi6vZwdjQuUB2Mm7RQa2fpJZA8XJnYUDJUPY4lKM7YSoInRZ1s72VcHM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/ucode: Further fixes to identify "ucode already up to date" Message-Id: Date: Wed, 26 Jun 2024 12:22:03 +0000 commit cd8aab43d2b9bbd2cd99f0027dd2d918e0a393d5 Author: Andrew Cooper AuthorDate: Wed Jun 26 14:05:54 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:05:54 2024 +0200 x86/ucode: Further fixes to identify "ucode already up to date" When the revision in hardware is newer than anything Xen has to hand, 'microcode_cache' isn't set up. Then, `xen-ucode` initiates the update because it doesn't know whether the revisions across the system are symmetric or not. This involves the patch getting all the way into the apply_microcode() hooks before being found to be too old. This is all a giant mess and needs an overhaul, but in the short term simply adjust the apply_microcode() to return -EEXIST. Also, unconditionally print the preexisting microcode revision on boot. It's relevant information which is otherwise unavailable if Xen doesn't find new microcode to use. Fixes: 648db37a155a ("x86/ucode: Distinguish "ucode already up to date"") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 977d98e67c2e929c62aa1f495fc4c6341c45abb5 master date: 2024-05-16 13:59:11 +0100 --- xen/arch/x86/cpu/microcode/amd.c | 7 +++++-- xen/arch/x86/cpu/microcode/core.c | 2 ++ xen/arch/x86/cpu/microcode/intel.c | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index c6d13f3fb3..b28171f2d4 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -222,12 +222,15 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) uint32_t rev, old_rev = sig->rev; enum microcode_match_result result = microcode_fits(patch); + if ( result == MIS_UCODE ) + return -EINVAL; + /* * Allow application of the same revision to pick up SMT-specific changes * even if the revision of the other SMT thread is already up-to-date. */ - if ( result != NEW_UCODE && result != SAME_UCODE ) - return -EINVAL; + if ( result == OLD_UCODE ) + return -EEXIST; if ( check_final_patch_levels(sig) ) { diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 667b1baf91..3150395478 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -819,6 +819,8 @@ int __init early_microcode_init(void) alternative_vcall(ucode_ops.collect_cpu_info); + printk(XENLOG_INFO "BSP microcode revision: 0x%08x\n", this_cpu(cpu_sig).rev); + if ( ucode_mod.mod_end || ucode_blob.size ) rc = early_microcode_update_cpu(); diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index cb08f63d2e..91d82f9dde 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -294,10 +294,13 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) result = microcode_update_match(patch); - if ( result != NEW_UCODE && - !(opt_ucode_allow_same && result == SAME_UCODE) ) + if ( result == MIS_UCODE ) return -EINVAL; + if ( result == OLD_UCODE || + (result == SAME_UCODE && !opt_ucode_allow_same) ) + return -EEXIST; + wbinvd(); wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:22:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748803.1156667 (Exim 4.92) (envelope-from ) id 1sMRfD-0006gI-4B; Wed, 26 Jun 2024 12:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748803.1156667; Wed, 26 Jun 2024 12: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 1sMRfD-0006gA-1i; Wed, 26 Jun 2024 12:22:15 +0000 Received: by outflank-mailman (input) for mailman id 748803; Wed, 26 Jun 2024 12:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfB-0006fu-K2 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfB-0006UY-Io for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRfB-0004qh-Gg for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4XYsJEezmpF9GvpOTPyckXCSkqeiolLah2u/Z/JKu2w=; b=ovFfEZ49gG6Vhhl1yoFhzwX1jm CcXC+cMegzt3ixi/9byp87X1pzM1rGzaGmu05Cimamo1kVSvgmOlHkhVnsPwyKII3uFpUYBfB+uwL u/iHQT5W5HKPV46W+TMSDQvIE1AcMG5+SVevKCQ7Zea5XinNHBlLsO0Vpr4bUezgMKFc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/msi: prevent watchdog triggering when dumping MSI state Message-Id: Date: Wed, 26 Jun 2024 12:22:13 +0000 commit 373e02254ce88baae37b89159149c15904fffc13 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:06:35 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:06:35 2024 +0200 x86/msi: prevent watchdog triggering when dumping MSI state Use the same check that's used in dump_irqs(). Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 594b22ca5be681ec1b42c34f321cc2600d582210 master date: 2024-05-20 14:29:44 +0100 --- xen/arch/x86/msi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index d0bf63df1d..3d36fc4204 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -1428,6 +1429,9 @@ static void cf_check dump_msi(unsigned char key) unsigned long flags; const char *type = "???"; + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + if ( !irq_desc_initialized(desc) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:22:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:22:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748804.1156672 (Exim 4.92) (envelope-from ) id 1sMRfN-0006j4-5l; Wed, 26 Jun 2024 12:22:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748804.1156672; Wed, 26 Jun 2024 12: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 1sMRfN-0006iv-3A; Wed, 26 Jun 2024 12:22:25 +0000 Received: by outflank-mailman (input) for mailman id 748804; Wed, 26 Jun 2024 12:22:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfL-0006ik-MX for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfL-0006Ui-Lp for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRfL-0004rM-Kv for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6t3uENzT8x8BrVpGou4RRt4YmHCxnxy4VldYisSgjak=; b=ipAFREPQIde4O+/JidBQz2FPEH mL0LkmiCBYNF0RjDOVeFpaTNX9RrJMxtj1p9DFe+5AUO0Ftty05WCQ1gepnRr3JicMUFB0gjHUz/1 tfVTe9tjHDbEboT/gCN4ULImN9XwG9sfIFtYLowfMJhgQYX3ptDWsif23JzXUIB7qbX4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count Message-Id: Date: Wed, 26 Jun 2024 12:22:23 +0000 commit 9fa0df93babcbb4b0fba9dbc78bbfb1318b85360 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:07:06 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:07:06 2024 +0200 x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count When adjusting move_cleanup_count to account for CPUs that are offline also adjust old_cpu_mask, otherwise further calls to fixup_irqs() could subtract those again and create an imbalance in move_cleanup_count. Fixes: 472e0b74c5c4 ('x86/IRQ: deal with move cleanup count state in fixup_irqs()') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e63209d3ba2fd1b2f232babd14c9c679ffa7b09a master date: 2024-06-10 10:33:22 +0200 --- xen/arch/x86/irq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index abd6f577dd..5e6edc0905 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2576,6 +2576,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) desc->arch.move_cleanup_count -= cpumask_weight(affinity); if ( !desc->arch.move_cleanup_count ) release_old_vec(desc); + else + /* + * Adjust old_cpu_mask to account for the offline CPUs, + * otherwise further calls to fixup_irqs() could subtract those + * again and possibly underflow the counter. + */ + cpumask_andnot(desc->arch.old_cpu_mask, desc->arch.old_cpu_mask, + affinity); } if ( !desc->action || cpumask_subset(desc->affinity, mask) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:22:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:22:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748805.1156676 (Exim 4.92) (envelope-from ) id 1sMRfX-0006ls-7M; Wed, 26 Jun 2024 12:22:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748805.1156676; Wed, 26 Jun 2024 12:22: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 1sMRfX-0006le-4i; Wed, 26 Jun 2024 12:22:35 +0000 Received: by outflank-mailman (input) for mailman id 748805; Wed, 26 Jun 2024 12:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfV-0006lT-PM for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfV-0006Uy-Of for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRfV-0004sE-Np for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mfaAOg8LofXLgx/PWIhu5sXDwDSYFYCgWOCvDjunzog=; b=uPQAEtT2cXYrTTmmee/MR69DF4 PGRkawtsqOCWCWDtu6P8qyr0xawZBBgNZKkSbxz0SVwZXVF47Qm7mYBPTnxcFCsfacjmMDIYhyg7a ECmyuXHebpbESTzk6Beyjck8cmymYveoA5koOUedLGoSEtaX1AgojtmDx7WZGTRs0iiA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] CI: Update FreeBSD to 13.3 Message-Id: Date: Wed, 26 Jun 2024 12:22:33 +0000 commit f15af3ee5bd60893673fe9aae202e90533d3c0dc Author: Andrew Cooper AuthorDate: Wed Jun 26 14:07:53 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:07:53 2024 +0200 CI: Update FreeBSD to 13.3 Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Stefano Stabellini master commit: 5ea7f2c9d7a1334b3b2bd5f67fab4d447b60613d master date: 2024-06-11 17:00:10 +0100 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 63f3afb104..e961877881 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,7 @@ freebsd_template: &FREEBSD_TEMPLATE task: name: 'FreeBSD 13' freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-3 << : *FREEBSD_TEMPLATE task: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:22:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:22:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748806.1156680 (Exim 4.92) (envelope-from ) id 1sMRfh-0006qE-8s; Wed, 26 Jun 2024 12:22:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748806.1156680; Wed, 26 Jun 2024 12:22:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfh-0006q6-65; Wed, 26 Jun 2024 12:22:45 +0000 Received: by outflank-mailman (input) for mailman id 748806; Wed, 26 Jun 2024 12:22:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRff-0006pu-Sj for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRff-0006V5-Rs for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRff-0004sh-Qr for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yJ5TuvDrTbJ4adbvEXAH5OZRuGn0YXsCiDftfvrgDDM=; b=G/Dcgn9AhbVH0YXbUAkvNot7+d 9SAXZznfqBPhv/PZsxF4+OmH2k+KQeSMKwcpZVgDBAjNDyH83kAZ4FW16CXtISzu/8/31ZrP4O6l3 UtDXHomfyvSjtkvdg3y9viQZfNHA2UExwkptNw+c8pNLTEBjr6PfsWdrqHjH12VpHiAk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Message-Id: Date: Wed, 26 Jun 2024 12:22:43 +0000 commit 2165a8d88862c5f4b23577dc079c5ef777d94df2 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:08:40 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:08:40 2024 +0200 x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Due to the current rwlock logic, if the CPU calling get_cpu_maps() does so from a cpu_hotplug_{begin,done}() region the function will still return success, because a CPU taking the rwlock in read mode after having taken it in write mode is allowed. Such corner case makes using get_cpu_maps() alone not enough to prevent using the shorthand in CPU hotplug regions. Introduce a new helper to detect whether the current caller is between a cpu_hotplug_{begin,done}() region and use it in send_IPI_mask() to restrict shorthand usage. Fixes: 5500d265a2a8 ('x86/smp: use APIC ALLBUT destination shorthand when possible') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 171c52fba5d94e050d704770480dcb983490d0ad master date: 2024-06-12 14:29:31 +0200 --- xen/arch/x86/smp.c | 2 +- xen/common/cpu.c | 5 +++++ xen/include/xen/cpu.h | 10 ++++++++++ xen/include/xen/rwlock.h | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index b42603c351..1f27b20286 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -89,7 +89,7 @@ void send_IPI_mask(const cpumask_t *mask, int vector) * the system have been accounted for. */ if ( system_state > SYS_STATE_smp_boot && - !unaccounted_cpus && !disabled_cpus && + !unaccounted_cpus && !disabled_cpus && !cpu_in_hotplug_context() && /* NB: get_cpu_maps lock requires enabled interrupts. */ local_irq_is_enabled() && (cpus_locked = get_cpu_maps()) && (park_offline_cpus || diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 778b6820b7..9a2c088873 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -68,6 +68,11 @@ void cpu_hotplug_done(void) write_unlock(&cpu_add_remove_lock); } +bool cpu_in_hotplug_context(void) +{ + return rw_is_write_locked_by_me(&cpu_add_remove_lock); +} + static NOTIFIER_HEAD(cpu_chain); void __init register_cpu_notifier(struct notifier_block *nb) diff --git a/xen/include/xen/cpu.h b/xen/include/xen/cpu.h index e8eeb217a0..8a1afb1837 100644 --- a/xen/include/xen/cpu.h +++ b/xen/include/xen/cpu.h @@ -13,6 +13,16 @@ void put_cpu_maps(void); void cpu_hotplug_begin(void); void cpu_hotplug_done(void); +/* + * Returns true when the caller CPU is between a cpu_hotplug_{begin,done}() + * region. + * + * This is required to safely identify hotplug contexts, as get_cpu_maps() + * would otherwise succeed because a caller holding the lock in write mode is + * allowed to acquire the same lock in read mode. + */ +bool cpu_in_hotplug_context(void); + /* Receive notification of CPU hotplug events. */ void register_cpu_notifier(struct notifier_block *nb); diff --git a/xen/include/xen/rwlock.h b/xen/include/xen/rwlock.h index abe0804bf7..02369079f9 100644 --- a/xen/include/xen/rwlock.h +++ b/xen/include/xen/rwlock.h @@ -297,6 +297,8 @@ static always_inline void write_lock_irq(rwlock_t *l) #define rw_is_locked(l) _rw_is_locked(l) #define rw_is_write_locked(l) _rw_is_write_locked(l) +#define rw_is_write_locked_by_me(l) \ + lock_evaluate_nospec(_is_write_locked_by_me(atomic_read(&(l)->cnts))) typedef struct percpu_rwlock percpu_rwlock_t; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:22:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:22:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748807.1156684 (Exim 4.92) (envelope-from ) id 1sMRfr-0006sx-AQ; Wed, 26 Jun 2024 12:22:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748807.1156684; Wed, 26 Jun 2024 12:22:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfr-0006sp-7r; Wed, 26 Jun 2024 12:22:55 +0000 Received: by outflank-mailman (input) for mailman id 748807; Wed, 26 Jun 2024 12:22:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfp-0006sX-Vl for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRfp-0006VE-Uz for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:22:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRfp-0004tG-U3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Empm41oetzpyv6K2BYZ4C2IOtcFRrZ4H9j75nn2CdGE=; b=yt1BmDkvNRQsnwhbTv6xrzoDi8 o8uitUU3lb9xg5Cx2do1ftKHvoCO7efUc+H5ivIEXknFitQF5Yhxhy3bRlgvC+He4jdmtnBREEJqC XAcuLh/oGiaM9RTD711ikYZmp9BiE8cgIXNhpOvAgbIgJbCPrv9cAkaOBKRwZHPWKd3w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/irq: limit interrupt movement done by fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 12:22:53 +0000 commit eeefc570559f129223ed8c0e24183cfdb1c39e5b Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:09:15 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:09:15 2024 +0200 x86/irq: limit interrupt movement done by fixup_irqs() The current check used in fixup_irqs() to decide whether to move around interrupts is based on the affinity mask, but such mask can have all bits set, and hence is unlikely to be a subset of the input mask. For example if an interrupt has an affinity mask of all 1s, any input to fixup_irqs() that's not an all set CPU mask would cause that interrupt to be shuffled around unconditionally. What fixup_irqs() care about is evacuating interrupts from CPUs not set on the input CPU mask, and for that purpose it should check whether the interrupt is assigned to a CPU not present in the input mask. Assume that ->arch.cpu_mask is a subset of the ->affinity mask, and keep the current logic that resets the ->affinity mask if the interrupt has to be shuffled around. Doing the affinity movement based on ->arch.cpu_mask requires removing the special handling to ->arch.cpu_mask done for high priority vectors, otherwise the adjustment done to cpu_mask makes them always skip the CPU interrupt movement. While there also adjust the comment as to the purpose of fixup_irqs(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: c7564d7366d865cc407e3d64bca816d07edee174 master date: 2024-06-12 14:30:40 +0200 --- xen/arch/x86/include/asm/irq.h | 2 +- xen/arch/x86/irq.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 26850e5077..207c9fede2 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -136,7 +136,7 @@ void free_domain_pirqs(struct domain *d); int map_domain_emuirq_pirq(struct domain *d, int pirq, int irq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose); void fixup_eoi(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 5e6edc0905..2eac2de0b4 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2529,7 +2529,7 @@ static int __init cf_check setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose) { unsigned int irq; @@ -2553,19 +2553,15 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && - vector <= LAST_HIPRIORITY_VECTOR ) + vector <= LAST_HIPRIORITY_VECTOR && + desc->handler == &no_irq_type ) { - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); - /* * This can in particular happen when parking secondary threads * during boot and when the serial console wants to use a PCI IRQ. */ - if ( desc->handler == &no_irq_type ) - { - spin_unlock(&desc->lock); - continue; - } + spin_unlock(&desc->lock); + continue; } if ( desc->arch.move_cleanup_count ) @@ -2586,7 +2582,12 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } - if ( !desc->action || cpumask_subset(desc->affinity, mask) ) + /* + * Avoid shuffling the interrupt around as long as current target CPUs + * are a subset of the input mask. What fixup_irqs() cares about is + * evacuating interrupts from CPUs not in the input mask. + */ + if ( !desc->action || cpumask_subset(desc->arch.cpu_mask, mask) ) { spin_unlock(&desc->lock); continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:23:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:23:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748808.1156688 (Exim 4.92) (envelope-from ) id 1sMRg1-0006vI-CH; Wed, 26 Jun 2024 12:23:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748808.1156688; Wed, 26 Jun 2024 12:23: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 1sMRg1-0006vB-9N; Wed, 26 Jun 2024 12:23:05 +0000 Received: by outflank-mailman (input) for mailman id 748808; Wed, 26 Jun 2024 12:23:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRg0-0006v3-2q for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRg0-0006Vu-1h for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRg0-0004uo-0q for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZiVydP7YHE3PmZGj2pLoo1GL+GZdw7qc3fUUmGpPxno=; b=WEpeZNxNQSSTenB4XrDxHKSpxc HOOylPelEmYLp9e7ZfxtrCNSk3L9sXC6QWnXnnkq4RMDaO/XjRaqM3fDElqFZtZzCFuG/dfMTXSgf /gRvGw4IllNP99aXOS65AwcpN0OdoTJCTa4yOQLnl9wdSISk3vNUkbbOajtd1a2ZJT74=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/EPT: correct special page checking in epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 12:23:04 +0000 commit a86a0df4c0af15df36a6b4fa397c8cc2e876cbfa Author: Jan Beulich AuthorDate: Wed Jun 26 14:09:50 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:09:50 2024 +0200 x86/EPT: correct special page checking in epte_get_entry_emt() mfn_valid() granularity is (currently) 256Mb. Therefore the start of a 1Gb page passing the test doesn't necessarily mean all parts of such a range would also pass. Yet using the result of mfn_to_page() on an MFN which doesn't pass mfn_valid() checking is liable to result in a crash (the invocation of mfn_to_page() alone is presumably "just" UB in such a case). Fixes: ca24b2ffdbd9 ("x86/hvm: set 'ipat' in EPT for special pages") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 5540b94e8191059eb9cbbe98ac316232a42208f6 master date: 2024-06-13 16:53:34 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index d61d66c20e..54fa13fa7e 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -530,8 +530,12 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, } for ( special_pgs = i = 0; i < (1ul << order); i++ ) - if ( is_special_page(mfn_to_page(mfn_add(mfn, i))) ) + { + mfn_t cur = mfn_add(mfn, i); + + if ( mfn_valid(cur) && is_special_page(mfn_to_page(cur)) ) special_pgs++; + } if ( special_pgs ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:23:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:23:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748809.1156692 (Exim 4.92) (envelope-from ) id 1sMRgB-0006yL-FH; Wed, 26 Jun 2024 12:23:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748809.1156692; Wed, 26 Jun 2024 12:23: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 1sMRgB-0006yD-Cc; Wed, 26 Jun 2024 12:23:15 +0000 Received: by outflank-mailman (input) for mailman id 748809; Wed, 26 Jun 2024 12:23:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgA-0006xz-5Q for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgA-0006W3-4g for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRgA-0004vQ-3r for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uf2HoL0YUUQOzv1BBz2miJ+Q8oEzOuXtpfpmKyL9f68=; b=AcdWUBzq2tqqWyNe+8hdSPbhpO E+esiCaic6IhNNocUz4AzIMc6sSLrhG6uw2lRo6Ik414aw+ILarqOXyjFwhA9aLumdzhL9YzU7SAj L8uNUl4qrMLkRZFGY5WDRh0Z+g/4oJqgfAlc/yPkZTns43ggxjjlQpAkAuUf/DWXgFV0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/EPT: avoid marking non-present entries for re-configuring Message-Id: Date: Wed, 26 Jun 2024 12:23:14 +0000 commit 6f39608e1f2cebb55a2265d426c16f1f4132f63e Author: Jan Beulich AuthorDate: Wed Jun 26 14:10:15 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:10:15 2024 +0200 x86/EPT: avoid marking non-present entries for re-configuring For non-present entries EMT, like most other fields, is meaningless to hardware. Make the logic in ept_set_entry() setting the field (and iPAT) conditional upon dealing with a present entry, leaving the value at 0 otherwise. This has two effects for epte_get_entry_emt() which we'll want to leverage subsequently: 1) The call moved here now won't be issued with INVALID_MFN anymore (a respective BUG_ON() is being added). 2) Neither of the other two calls could now be issued with a truncated form of INVALID_MFN anymore (as long as there's no bug anywhere marking an entry present when that was populated using INVALID_MFN). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 777c71d31325bc55ba1cc3f317d4155fe519ab0b master date: 2024-06-13 16:54:17 +0200 --- xen/arch/x86/mm/p2m-ept.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 54fa13fa7e..b7d7a5b68c 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -662,6 +662,8 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) if ( e.emt != MTRR_NUM_TYPES ) break; + ASSERT(is_epte_present(&e)); + if ( level == 0 ) { for ( gfn -= i, i = 0; i < EPT_PAGETABLE_ENTRIES; ++i ) @@ -927,17 +929,6 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { - bool ipat; - int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, - i * EPT_TABLE_ORDER, &ipat, - p2mt); - - if ( emt >= 0 ) - new_entry.emt = emt; - else /* ept_handle_misconfig() will need to take care of this. */ - new_entry.emt = MTRR_NUM_TYPES; - - new_entry.ipat = ipat; new_entry.sp = !!i; new_entry.sa_p2mt = p2mt; new_entry.access = p2ma; @@ -953,6 +944,22 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, need_modify_vtd_table = 0; ept_p2m_type_to_flags(p2m, &new_entry); + + if ( is_epte_present(&new_entry) ) + { + bool ipat; + int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, + i * EPT_TABLE_ORDER, &ipat, + p2mt); + + BUG_ON(mfn_eq(mfn, INVALID_MFN)); + + if ( emt >= 0 ) + new_entry.emt = emt; + else /* ept_handle_misconfig() will need to take care of this. */ + new_entry.emt = MTRR_NUM_TYPES; + new_entry.ipat = ipat; + } } if ( sve != -1 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:23:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:23:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748810.1156696 (Exim 4.92) (envelope-from ) id 1sMRgL-00071P-Gj; Wed, 26 Jun 2024 12:23:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748810.1156696; Wed, 26 Jun 2024 12:23: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 1sMRgL-00071H-E0; Wed, 26 Jun 2024 12:23:25 +0000 Received: by outflank-mailman (input) for mailman id 748810; Wed, 26 Jun 2024 12:23:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgK-000713-8b for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgK-0006WC-7r for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRgK-0004wO-6u for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=izlvZqTO19QLr5WU+Tsqm/EQZr6gXfxHygThhVXXb4c=; b=6R11AZROJVyJ14rJM7zi0gaLcK Znpo/cDgCi+eS79IbfNN9BUnqNSamxOOuCMvQ12034Jj6rbVzZGEkLt2HCzxalrdcteqqgNl2nTHB yg4QtCR+X59G0UVP6Is2jqaRZ3omcb2/jFHXqA1r70MCSPAQsiXMNtm12Jolj1qMNPC0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 12:23:24 +0000 commit dbcc4fba01bbdacf29e632c800a2c3e6bda0cd98 Author: Jan Beulich AuthorDate: Wed Jun 26 14:10:40 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:10:40 2024 +0200 x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() mfn_valid() is RAM-focused; it will often return false for MMIO. Yet access to actual MMIO space should not generally be restricted to UC only; especially video frame buffer accesses are unduly affected by such a restriction. Since, as of 777c71d31325 ("x86/EPT: avoid marking non-present entries for re-configuring"), the function won't be called with INVALID_MFN or, worse, truncated forms thereof anymore, we call fully drop that check. Fixes: 81fd0d3ca4b2 ("x86/hvm: simplify 'mmio_direct' check in epte_get_entry_emt()") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 4fdd8d75566fdad06667a79ec0ce6f43cc466c54 master date: 2024-06-13 16:55:22 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index b7d7a5b68c..57fc1d352c 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -512,12 +512,6 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, return -1; } - if ( !mfn_valid(mfn) ) - { - *ipat = true; - return MTRR_TYPE_UNCACHABLE; - } - /* * Conditional must be kept in sync with the code in * {iomem,ioports}_{permit,deny}_access(). -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:23:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:23:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748811.1156699 (Exim 4.92) (envelope-from ) id 1sMRgW-00074N-I3; Wed, 26 Jun 2024 12:23:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748811.1156699; Wed, 26 Jun 2024 12:23: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 1sMRgW-00074F-FQ; Wed, 26 Jun 2024 12:23:36 +0000 Received: by outflank-mailman (input) for mailman id 748811; Wed, 26 Jun 2024 12:23:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgU-00073q-Bb for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgU-0006WK-Az for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRgU-0004wp-AC for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=95uPFGiF6FQ3zMPMOCrjsZqF8Okoq28Pq+DKX75HF+U=; b=abf/7oOjqLMirUd/LD0cyG9jgN gQlFFggVxoZ5aWSPIl3KL0ALeaokk8zOJWaOUY8FUGNECw3YljNOWf1mEYUOYIo/3PiLSrwWrqMcu gwDSIMAotXnul1k5NSrHZqGxPbKh4C7LFAErQjcK4xhXk7mobJREd/yO7BVeIYy9UhRE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/Intel: unlock CPUID earlier for the BSP Message-Id: Date: Wed, 26 Jun 2024 12:23:34 +0000 commit ee1e76ed10ec64c654925d5b305c7c7a7743f717 Author: Jan Beulich AuthorDate: Wed Jun 26 14:11:08 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:11:08 2024 +0200 x86/Intel: unlock CPUID earlier for the BSP Intel CPUs have a MSR bit to limit CPUID enumeration to leaf two. If this bit is set by the BIOS then CPUID evaluation does not work when data from any leaf greater than two is needed; early_cpu_init() in particular wants to collect leaf 7 data. Cure this by unlocking CPUID right before evaluating anything which depends on the maximum CPUID leaf being greater than two. Inspired by (and description cloned from) Linux commit 0c2f6d04619e ("x86/topology/intel: Unlock CPUID before evaluating anything"). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: fa4d026737a47cd1d66ffb797a29150b4453aa9f master date: 2024-06-18 15:12:44 +0200 --- xen/arch/x86/cpu/common.c | 3 ++- xen/arch/x86/cpu/cpu.h | 2 ++ xen/arch/x86/cpu/intel.c | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 88855f5773..14a3a97806 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -343,7 +343,8 @@ void __init early_cpu_init(void) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_INTEL: intel_unlock_cpuid_leaves(c); + actual_cpu = intel_cpu_dev; break; case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 85a67771f7..bbde5e528a 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -24,3 +24,5 @@ void amd_init_lfence(struct cpuinfo_x86 *c); void amd_init_ssbd(const struct cpuinfo_x86 *c); void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); + +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 2d439e0bd2..490f7ff6f1 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -293,15 +293,11 @@ static void __init noinline intel_init_levelling(void) ctxt_switch_masking = intel_ctxt_switch_masking; } -static void cf_check early_init_intel(struct cpuinfo_x86 *c) +/* Unmask CPUID levels (and NX) if masked. */ +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) { - u64 misc_enable, disable; - - /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ - if (c->x86 == 15 && c->x86_cache_alignment == 64) - c->x86_cache_alignment = 128; + uint64_t misc_enable, disable; - /* Unmask CPUID levels and NX if masked: */ rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); disable = misc_enable & (MSR_IA32_MISC_ENABLE_LIMIT_CPUID | @@ -309,17 +305,26 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c) if (disable) { wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); bootsym(trampoline_misc_enable_off) |= disable; - bootsym(trampoline_efer) |= EFER_NXE; } - - if (disable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) - printk(KERN_INFO "revised cpuid level: %d\n", - cpuid_eax(0)); + if (disable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) { + c->cpuid_level = cpuid_eax(0); + printk(KERN_INFO "revised cpuid level: %u\n", c->cpuid_level); + } if (disable & MSR_IA32_MISC_ENABLE_XD_DISABLE) { + bootsym(trampoline_efer) |= EFER_NXE; write_efer(read_efer() | EFER_NXE); printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); } +} + +static void cf_check early_init_intel(struct cpuinfo_x86 *c) +{ + /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ + if (c->x86 == 15 && c->x86_cache_alignment == 64) + c->x86_cache_alignment = 128; + + intel_unlock_cpuid_leaves(c); /* CPUID workaround for Intel 0F33/0F34 CPU */ if (boot_cpu_data.x86 == 0xF && boot_cpu_data.x86_model == 3 && -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:23:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:23:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748812.1156704 (Exim 4.92) (envelope-from ) id 1sMRgf-00076p-JS; Wed, 26 Jun 2024 12:23:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748812.1156704; Wed, 26 Jun 2024 12:23: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 1sMRgf-00076h-Gl; Wed, 26 Jun 2024 12:23:45 +0000 Received: by outflank-mailman (input) for mailman id 748812; Wed, 26 Jun 2024 12:23:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRge-00076Z-Eg for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRge-0006WT-Dy for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRge-0004xj-DA for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cMUSeT9GXSQJwpWqVRXgTcCYZhyozzJ6SkymDrWqOuQ=; b=3kFZdn/l2vKMVoW+cvOvGm2i6Z IDV711xHfCBiE52uRcDZorxKPReFVAwxLcwk2CmV5Nh62ExlmtDKVicE038KVnF3nkKR5D3wjtFKE kWi4ugXS/Vh75Z/D7eQIBVKac0Dn2C0RX9aIgnJiKzcHesgJulAkRQdZ9NPNi48KbwdY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 12:23:44 +0000 commit a1c62c2ca689a90684fef36a108e7e71b951b7d5 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:11:33 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:11:33 2024 +0200 x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Given the current logic it's possible for ->arch.old_cpu_mask to get out of sync: if a CPU set in old_cpu_mask is offlined and then onlined again without old_cpu_mask having been updated the data in the mask will no longer be accurate, as when brought back online the CPU will no longer have old_vector configured to handle the old interrupt source. If there's an interrupt movement in progress, and the to be offlined CPU (which is the call context) is in the old_cpu_mask, clear it and update the mask, so it doesn't contain stale data. Note that when the system is going down fixup_irqs() will be called by smp_send_stop() from CPU 0 with a mask with only CPU 0 on it, effectively asking to move all interrupts to the current caller (CPU 0) which is the only CPU to remain online. In that case we don't care to migrate interrupts that are in the process of being moved, as it's likely we won't be able to move all interrupts to CPU 0 due to vector shortage anyway. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 817d1cd627be668c358d038f0fadbf7d24d417d3 master date: 2024-06-18 15:14:49 +0200 --- xen/arch/x86/irq.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 2eac2de0b4..b1387cf6c9 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2539,7 +2539,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { bool break_affinity = false, set_affinity = true; - unsigned int vector; + unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); if ( irq == 2 ) @@ -2582,6 +2582,33 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } + if ( desc->arch.move_in_progress && + /* + * Only attempt to adjust the mask if the current CPU is going + * offline, otherwise the whole system is going down and leaving + * stale data in the masks is fine. + */ + !cpu_online(cpu) && + cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) + { + /* + * This CPU is going offline, remove it from ->arch.old_cpu_mask + * and possibly release the old vector if the old mask becomes + * empty. + * + * Note cleaning ->arch.old_cpu_mask is required if the CPU is + * brought offline and then online again, as when re-onlined the + * per-cpu vector table will no longer have ->arch.old_vector + * setup, and hence ->arch.old_cpu_mask would be stale. + */ + cpumask_clear_cpu(cpu, desc->arch.old_cpu_mask); + if ( cpumask_empty(desc->arch.old_cpu_mask) ) + { + desc->arch.move_in_progress = 0; + release_old_vec(desc); + } + } + /* * Avoid shuffling the interrupt around as long as current target CPUs * are a subset of the input mask. What fixup_irqs() cares about is -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:23:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:23:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748813.1156708 (Exim 4.92) (envelope-from ) id 1sMRgp-00079a-L7; Wed, 26 Jun 2024 12:23:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748813.1156708; Wed, 26 Jun 2024 12:23: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 1sMRgp-00079U-IE; Wed, 26 Jun 2024 12:23:55 +0000 Received: by outflank-mailman (input) for mailman id 748813; Wed, 26 Jun 2024 12:23:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgo-00079O-Hp for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgo-0006Wf-H5 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRgo-0004yf-GH for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SAwBQkvCH8MPwllDzzbKJnqzNqifT+6Td7kL/F1wEOY=; b=yhGuSmzPmsW1YMWKkPQfbB3N+0 KxWn5HAcIbc7Rdf9qPQqSO2gIXVY81YJ888WtFGglmGfOO83hI0UtIETu5RnkV1+NMV57dX+kI20U xm0zVpgtLctGSg17ODqD/y5WzFIfBQn8z9faGCnWq/HwYd4fYOrxCNOJBK6m+chrfX/c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/irq: handle moving interrupts in _assign_irq_vector() Message-Id: Date: Wed, 26 Jun 2024 12:23:54 +0000 commit 7d3fee8d8e78c3c2c25af995b9c5d1c22d98d54c Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:12:05 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:12:05 2024 +0200 x86/irq: handle moving interrupts in _assign_irq_vector() Currently there's logic in fixup_irqs() that attempts to prevent _assign_irq_vector() from failing, as fixup_irqs() is required to evacuate all interrupts from the CPUs not present in the input mask. The current logic in fixup_irqs() is incomplete, as it doesn't deal with interrupts that have move_cleanup_count > 0 and a non-empty ->arch.old_cpu_mask field. Instead of attempting to fixup the interrupt descriptor in fixup_irqs() so that _assign_irq_vector() cannot fail, introduce logic in _assign_irq_vector() to deal with interrupts that have either move_{in_progress,cleanup_count} set and no remaining online CPUs in ->arch.cpu_mask. If _assign_irq_vector() is requested to move an interrupt in the state described above, first attempt to see if ->arch.old_cpu_mask contains any valid CPUs that could be used as fallback, and if that's the case do move the interrupt back to the previous destination. Note this is easier because the vector hasn't been released yet, so there's no need to allocate and setup a new vector on the destination. Due to the logic in fixup_irqs() that clears offline CPUs from ->arch.old_cpu_mask (and releases the old vector if the mask becomes empty) it shouldn't be possible to get into _assign_irq_vector() with ->arch.move_{in_progress,cleanup_count} set but no online CPUs in ->arch.old_cpu_mask. However if ->arch.move_{in_progress,cleanup_count} is set and the interrupt has also changed affinity, it's possible the members of ->arch.old_cpu_mask are no longer part of the affinity set, move the interrupt to a different CPU part of the provided mask and keep the current ->arch.old_{cpu_mask,vector} for the pending interrupt movement to be completed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 369558924a642bbb0cb731e9a3375958867cb17b master date: 2024-06-18 15:15:10 +0200 --- xen/arch/x86/irq.c | 97 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index b1387cf6c9..0b4d4b44a5 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -553,7 +553,58 @@ static int _assign_irq_vector(struct irq_desc *desc, const cpumask_t *mask) } if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) - return -EAGAIN; + { + /* + * If the current destination is online refuse to shuffle. Retry after + * the in-progress movement has finished. + */ + if ( cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) + return -EAGAIN; + + /* + * Due to the logic in fixup_irqs() that clears offlined CPUs from + * ->arch.old_cpu_mask it shouldn't be possible to get here with + * ->arch.move_{in_progress,cleanup_count} set and no online CPUs in + * ->arch.old_cpu_mask. + */ + ASSERT(valid_irq_vector(desc->arch.old_vector)); + ASSERT(cpumask_intersects(desc->arch.old_cpu_mask, &cpu_online_map)); + + if ( cpumask_intersects(desc->arch.old_cpu_mask, mask) ) + { + /* + * Fallback to the old destination if moving is in progress and the + * current destination is to be offlined. This is only possible if + * the CPUs in old_cpu_mask intersect with the affinity mask passed + * in the 'mask' parameter. + */ + desc->arch.vector = desc->arch.old_vector; + cpumask_and(desc->arch.cpu_mask, desc->arch.old_cpu_mask, mask); + + /* Undo any possibly done cleanup. */ + for_each_cpu(cpu, desc->arch.cpu_mask) + per_cpu(vector_irq, cpu)[desc->arch.vector] = irq; + + /* Cancel the pending move and release the current vector. */ + desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; + cpumask_clear(desc->arch.old_cpu_mask); + desc->arch.move_in_progress = 0; + desc->arch.move_cleanup_count = 0; + if ( desc->arch.used_vectors ) + { + ASSERT(test_bit(old_vector, desc->arch.used_vectors)); + clear_bit(old_vector, desc->arch.used_vectors); + } + + return 0; + } + + /* + * There's an interrupt movement in progress but the destination(s) in + * ->arch.old_cpu_mask are not suitable given the 'mask' parameter, go + * through the full logic to find a new vector in a suitable CPU. + */ + } err = -ENOSPC; @@ -609,7 +660,22 @@ next: current_vector = vector; current_offset = offset; - if ( valid_irq_vector(old_vector) ) + if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) + { + ASSERT(!cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map)); + /* + * Special case when evacuating an interrupt from a CPU to be + * offlined and the interrupt was already in the process of being + * moved. Leave ->arch.old_{vector,cpu_mask} as-is and just + * replace ->arch.{cpu_mask,vector} with the new destination. + * Cleanup will be done normally for the old fields, just release + * the current vector here. + */ + if ( desc->arch.used_vectors && + !test_and_clear_bit(old_vector, desc->arch.used_vectors) ) + ASSERT_UNREACHABLE(); + } + else if ( valid_irq_vector(old_vector) ) { cpumask_and(desc->arch.old_cpu_mask, desc->arch.cpu_mask, &cpu_online_map); @@ -2620,33 +2686,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) continue; } - /* - * In order for the affinity adjustment below to be successful, we - * need _assign_irq_vector() to succeed. This in particular means - * clearing desc->arch.move_in_progress if this would otherwise - * prevent the function from succeeding. Since there's no way for the - * flag to get cleared anymore when there's no possible destination - * left (the only possibility then would be the IRQs enabled window - * after this loop), there's then also no race with us doing it here. - * - * Therefore the logic here and there need to remain in sync. - */ - if ( desc->arch.move_in_progress && - !cpumask_intersects(mask, desc->arch.cpu_mask) ) - { - unsigned int cpu; - - cpumask_and(affinity, desc->arch.old_cpu_mask, &cpu_online_map); - - spin_lock(&vector_lock); - for_each_cpu(cpu, affinity) - per_cpu(vector_irq, cpu)[desc->arch.old_vector] = ~irq; - spin_unlock(&vector_lock); - - release_old_vec(desc); - desc->arch.move_in_progress = 0; - } - if ( !cpumask_intersects(mask, desc->affinity) ) { break_affinity = true; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:24:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:24:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748814.1156711 (Exim 4.92) (envelope-from ) id 1sMRgz-0007Co-NY; Wed, 26 Jun 2024 12:24:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748814.1156711; Wed, 26 Jun 2024 12: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 1sMRgz-0007Ch-L0; Wed, 26 Jun 2024 12:24:05 +0000 Received: by outflank-mailman (input) for mailman id 748814; Wed, 26 Jun 2024 12:24:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgy-0007CR-KV for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRgy-0006XH-Jp for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRgy-000506-J9 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EGwhaWewXJhbI9htVqRDuddNXq7MekeIqKPuJioDbww=; b=txHG8jz6GeS3UPNL6Xg2x60wdi 7H56UcEPgIv0taHcSqb9ENn68CAd9lnEI9dqOKOGLROAYbwjXfTjj4kB9KjVMDU4X1bDt9aIRmhRq bx1sfbXA9zeI7mV7qw6LNbTl4TwfcNqsISzqsHkXFckMLE4WLxambJZzkkcCYzByp0ds=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] xen/ubsan: Fix UB in type_descriptor declaration Message-Id: Date: Wed, 26 Jun 2024 12:24:04 +0000 commit 9dfe294cb6de52c34f1419394fde1fe2b6c2a70b Author: Andrew Cooper AuthorDate: Wed Jun 26 14:12:38 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:12:38 2024 +0200 xen/ubsan: Fix UB in type_descriptor declaration struct type_descriptor is arranged with a NUL terminated string following the kind/info fields. The only reason this doesn't trip UBSAN detection itself (on more modern compilers at least) is because struct type_descriptor is only referenced in suppressed regions. Switch the declaration to be a real flexible member. No functional change. Fixes: 00fcf4dd8eb4 ("xen/ubsan: Import ubsan implementation from Linux 4.13") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: bd59af99700f075d06a6d47a16f777c9519928e0 master date: 2024-06-18 14:55:04 +0100 --- xen/common/ubsan/ubsan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/ubsan/ubsan.h b/xen/common/ubsan/ubsan.h index a3159040fe..3db42e75b1 100644 --- a/xen/common/ubsan/ubsan.h +++ b/xen/common/ubsan/ubsan.h @@ -10,7 +10,7 @@ enum { struct type_descriptor { u16 type_kind; u16 type_info; - char type_name[1]; + char type_name[]; }; struct source_location { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:24:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:24:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748815.1156715 (Exim 4.92) (envelope-from ) id 1sMRh9-0007Fa-P8; Wed, 26 Jun 2024 12:24:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748815.1156715; Wed, 26 Jun 2024 12: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 1sMRh9-0007FS-MX; Wed, 26 Jun 2024 12:24:15 +0000 Received: by outflank-mailman (input) for mailman id 748815; Wed, 26 Jun 2024 12:24:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRh8-0007FB-Np for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRh8-0006Yw-N3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRh8-00050c-Lt for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=U/P3hjteYutvA2XsvJ3/jzdmDD8eNKlhTJGshKnCGWk=; b=aSQ7xUnN/nrBgFZqrqicfWDla/ i5p1PKcTxh6NOXOQPWq+6FYPG3bO/tdlqmXDjyzIuDpo26ExELZ0x70+5W+p/Z/pW5eJV8TGBbukY unss8GKCCOX9UaqJo0YsRfBJan32ZPAl01gCADj1IpISsIqKDu412Mu3Gexv1CJLbECs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/xstate: Fix initialisation of XSS cache Message-Id: Date: Wed, 26 Jun 2024 12:24:14 +0000 commit 80fe1fe2fe559a7e80fb2258f968beaa11656959 Author: Andrew Cooper AuthorDate: Wed Jun 26 14:13:17 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:13:17 2024 +0200 x86/xstate: Fix initialisation of XSS cache The clobbering of this_cpu(xcr0) and this_cpu(xss) to architecturally invalid values is to force the subsequent set_xcr0() and set_msr_xss() to reload the hardware register. While XCR0 is reloaded in xstate_init(), MSR_XSS isn't. This causes get_msr_xss() to return the invalid value, and logic of the form: old = get_msr_xss(); set_msr_xss(new); ... set_msr_xss(old); to try and restore said invalid value. The architecturally invalid value must be purged from the cache, meaning the hardware register must be written at least once. This in turn highlights that the invalid value must only be used in the case that the hardware register is available. Fixes: f7f4a523927f ("x86/xstate: reset cached register values on resume") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 9e6dbbe8bf400aacb99009ddffa91d2a0c312b39 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/xstate.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index cea3d0b81f..8a636c6e80 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -642,13 +642,6 @@ void xstate_init(struct cpuinfo_x86 *c) return; } - /* - * Zap the cached values to make set_xcr0() and set_msr_xss() really - * write it. - */ - this_cpu(xcr0) = 0; - this_cpu(xss) = ~0; - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; BUG_ON(!valid_xcr0(feature_mask)); @@ -658,8 +651,19 @@ void xstate_init(struct cpuinfo_x86 *c) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); + + /* + * Zap the cached values to make set_xcr0() and set_msr_xss() really write + * the hardware register. + */ + this_cpu(xcr0) = 0; if ( !set_xcr0(feature_mask) ) BUG(); + if ( cpu_has_xsaves ) + { + this_cpu(xss) = ~0; + set_msr_xss(0); + } if ( bsp ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:24:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:24:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748816.1156720 (Exim 4.92) (envelope-from ) id 1sMRhJ-0007Ig-Qc; Wed, 26 Jun 2024 12:24:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748816.1156720; Wed, 26 Jun 2024 12: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 1sMRhJ-0007IY-Nz; Wed, 26 Jun 2024 12:24:25 +0000 Received: by outflank-mailman (input) for mailman id 748816; Wed, 26 Jun 2024 12:24:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRhI-0007IQ-QW for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRhI-0006Z5-Pp for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRhI-00051Z-P3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wKLpyv3cldjifKeUVEsXXi+ruCM0k7MBAjQoU8KBVIM=; b=ZqJdUb0ca3aGbNaAVuIi3Z0I8Q jrItElZE3+I02DjchVFGBR2tw3g0C7CzPe+j4XrIKUsxD9ZftZV80+IOdaGdxvX04W2RCFb/0KcZX TWWSgHHLGR1AGL1Cc9zG50YgBWoNlOw/BtyrAnCO1fTZXVfHZ9pWo8vKmMc8GjQ6Q41Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/cpuid: Fix handling of XSAVE dynamic leaves Message-Id: Date: Wed, 26 Jun 2024 12:24:24 +0000 commit 02f94eab2183202180689eb85a2408d21dbe5505 Author: Andrew Cooper AuthorDate: Wed Jun 26 14:13:37 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:13:37 2024 +0200 x86/cpuid: Fix handling of XSAVE dynamic leaves [ This is a minimal backport of commit 71cacfb035f4 ("x86/cpuid: Fix handling of XSAVE dynamic leaves") to fix the bugs without depending on the large rework of XSTATE handling in Xen 4.19 ] First, if XSAVE is available in hardware but not visible to the guest, the dynamic leaves shouldn't be filled in. Second, the comment concerning XSS state is wrong. VT-x doesn't manage host/guest state automatically, but there is provision for "host only" bits to be set, so the implications are still accurate. In Xen 4.18, no XSS states are supported, so it's safe to keep deferring to real hardware. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 71cacfb035f4a78ee10970dc38a3baa04d387451 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/cpuid.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index f311372cdf..ead6dde3f2 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -330,24 +330,20 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case XSTATE_CPUID: switch ( subleaf ) { - case 1: - if ( p->xstate.xsavec || p->xstate.xsaves ) - { - /* - * TODO: Figure out what to do for XSS state. VT-x manages - * host vs guest MSR_XSS automatically, so as soon as we start - * supporting any XSS states, the wrong XSS will be in - * context. - */ - BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); - - /* - * Read CPUID[0xD,0/1].EBX from hardware. They vary with - * enabled XSTATE, and appropraite XCR0|XSS are in context. - */ + /* + * Read CPUID[0xd,0/1].EBX from hardware. They vary with enabled + * XSTATE, and the appropriate XCR0 is in context. + */ case 0: - res->b = cpuid_count_ebx(leaf, subleaf); - } + if ( p->basic.xsave ) + res->b = cpuid_count_ebx(0xd, 0); + break; + + case 1: + /* This only works because Xen doesn't support XSS states yet. */ + BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); + if ( p->xstate.xsavec ) + res->b = cpuid_count_ebx(0xd, 1); break; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 12:24:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 12:24:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748817.1156723 (Exim 4.92) (envelope-from ) id 1sMRhT-0007LF-Rq; Wed, 26 Jun 2024 12:24:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748817.1156723; Wed, 26 Jun 2024 12: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 1sMRhT-0007L8-PO; Wed, 26 Jun 2024 12:24:35 +0000 Received: by outflank-mailman (input) for mailman id 748817; Wed, 26 Jun 2024 12:24:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRhS-0007L2-TN for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMRhS-0006ZE-Sk for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12:24:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMRhS-00052Q-Rx for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 12: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xnvsudbeCBHjLEEYMhS6Zb+0jxVhgomfv1v9akdmhdk=; b=YgSSLAsFY+HZ7yx7ZHbWTBLLUd CT1Ie6XqLvAx6wzKWXEvyWe0gTyQUu3odbOORwciYfVuY/KJIMGaSdQtQN/OylbgIeQ2ZqcFVmrYn dull6gCIG7ZIQnTYqpAiaD/BpW7cxTRZ+KGH7NcfTeUKQinZicbXZCRb3m8pBb0joF1Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/irq: forward pending interrupts to new destination in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 12:24:34 +0000 commit 87a49d2ec6fe2881e4b0947ea3e0e0f041dc6be3 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:14:01 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:14:01 2024 +0200 x86/irq: forward pending interrupts to new destination in fixup_irqs() fixup_irqs() is used to evacuate interrupts from to be offlined CPUs. Given the CPU is to become offline, the normal migration logic used by Xen where the vector in the previous target(s) is left configured until the interrupt is received on the new destination is not suitable. Instead attempt to do as much as possible in order to prevent loosing interrupts. If fixup_irqs() is called from the CPU to be offlined (as is currently the case for CPU hot unplug) attempt to forward pending vectors when interrupts that target the current CPU are migrated to a different destination. Additionally, for interrupts that have already been moved from the current CPU prior to the call to fixup_irqs() but that haven't been delivered to the new destination (iow: interrupts with move_in_progress set and the current CPU set in ->arch.old_cpu_mask) also check whether the previous vector is pending and forward it to the new destination. This allows us to remove the window with interrupts enabled at the bottom of fixup_irqs(). Such window wasn't safe anyway: references to the CPU to become offline are removed from interrupts masks, but the per-CPU vector_irq[] array is not updated to reflect those changes (as the CPU is going offline anyway). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e2bb28d621584fce15c907002ddc7c6772644b64 master date: 2024-06-20 12:09:32 +0200 --- xen/arch/x86/include/asm/apic.h | 5 +++++ xen/arch/x86/irq.c | 46 +++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h index 7625c0ecd6..ad8d7cc054 100644 --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -145,6 +145,11 @@ static __inline bool_t apic_isr_read(u8 vector) (vector & 0x1f)) & 1; } +static inline bool apic_irr_read(unsigned int vector) +{ + return apic_read(APIC_IRR + (vector / 32 * 0x10)) & (1U << (vector % 32)); +} + static __inline u32 get_apic_id(void) /* Get the physical APIC id */ { u32 id = apic_read(APIC_ID); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 0b4d4b44a5..11b2a213aa 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2604,7 +2604,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { - bool break_affinity = false, set_affinity = true; + bool break_affinity = false, set_affinity = true, check_irr = false; unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); @@ -2657,6 +2657,25 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) { + /* + * This to be offlined CPU was the target of an interrupt that's + * been moved, and the new destination target hasn't yet + * acknowledged any interrupt from it. + * + * We know the interrupt is configured to target the new CPU at + * this point, so we can check IRR for any pending vectors and + * forward them to the new destination. + * + * Note that for the other case of an interrupt movement being in + * progress (move_cleanup_count being non-zero) we know the new + * destination has already acked at least one interrupt from this + * source, and hence there's no need to forward any stale + * interrupts. + */ + if ( apic_irr_read(desc->arch.old_vector) ) + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + /* * This CPU is going offline, remove it from ->arch.old_cpu_mask * and possibly release the old vector if the old mask becomes @@ -2697,6 +2716,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( desc->handler->disable ) desc->handler->disable(desc); + /* + * If the current CPU is going offline and is (one of) the target(s) of + * the interrupt, signal to check whether there are any pending vectors + * to be handled in the local APIC after the interrupt has been moved. + */ + if ( !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.cpu_mask) ) + check_irr = true; + if ( desc->handler->set_affinity ) desc->handler->set_affinity(desc, affinity); else if ( !(warned++) ) @@ -2707,6 +2734,18 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) cpumask_copy(affinity, desc->affinity); + if ( check_irr && apic_irr_read(vector) ) + /* + * Forward pending interrupt to the new destination, this CPU is + * going offline and otherwise the interrupt would be lost. + * + * Do the IRR check as late as possible before releasing the irq + * desc in order for any in-flight interrupts to be delivered to + * the lapic. + */ + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + spin_unlock(&desc->lock); if ( !verbose ) @@ -2718,11 +2757,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) printk("Broke affinity for IRQ%u, new: %*pb\n", irq, CPUMASK_PR(affinity)); } - - /* That doesn't seem sufficient. Give it 1ms. */ - local_irq_enable(); - mdelay(1); - local_irq_disable(); } void fixup_eoi(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 13:44:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 13:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748974.1156939 (Exim 4.92) (envelope-from ) id 1sMSwN-0005nc-5Q; Wed, 26 Jun 2024 13:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748974.1156939; Wed, 26 Jun 2024 13: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 1sMSwN-0005nU-2r; Wed, 26 Jun 2024 13:44:03 +0000 Received: by outflank-mailman (input) for mailman id 748974; Wed, 26 Jun 2024 13:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSwM-0005nO-A3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSwM-0007vn-9C for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMSwM-00037X-7U for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mZ04kpm4OOTWPkoO7JJDU3JYeMy7HjLEkZFQVYLYbcY=; b=q1luuLz/gD7reHtg5B+qQsbWkV RL3wP+SCqpSWrm7TFC+rahWgK+u2r5tvmjuoUvGBv6AwWhTYHJeGORZ1ph5A2Jpazh24RbI3i599O XIEQ2f+b3kW97hrJRV+B5ZdeAvMz7mGCULdKLn0Asf90xtA3AW7mJK+/OCONl5IrnWV8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: configure Rule 13.6 and custom service B.UNEVALEFF Message-Id: Date: Wed, 26 Jun 2024 13:44:02 +0000 commit 0ac3b175e74167815995df463181663461f8d9f1 Author: Federico Serafini AuthorDate: Mon Jun 24 11:18:32 2024 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 25 13:41:05 2024 -0700 automation/eclair: configure Rule 13.6 and custom service B.UNEVALEFF Rule 13.6 states that "The operand of the `sizeof' operator shall not contain any expression which has potential side effects". Define service B.UNEVALEFF as an extension of Rule 13.6 to check for unevalued side effects also for typeof and alignof operators. Update ECLAIR configuration to deviate uses of BUILD_BUG_ON and alternative_v?call[0-9] for both Rule 13.6 and B.UNEVALEFF. Add service B.UNEVALEFF to the accepted.ecl guidelines to check "violations" in the weekly analysis. Signed-off-by: Federico Serafini Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl | 10 ++++++++++ automation/eclair_analysis/ECLAIR/accepted_guidelines.sh | 2 ++ automation/eclair_analysis/ECLAIR/analysis.ecl | 1 + automation/eclair_analysis/ECLAIR/deviations.ecl | 10 ++++++++++ docs/misra/deviations.rst | 10 ++++++++++ 5 files changed, 33 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl b/automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl new file mode 100644 index 0000000000..92d8db8986 --- /dev/null +++ b/automation/eclair_analysis/ECLAIR/B.UNEVALEFF.ecl @@ -0,0 +1,10 @@ +-clone_service=MC3R1.R13.6,B.UNEVALEFF + +-config=B.UNEVALEFF,summary="The operand of the `alignof' and `typeof' operators shall not contain any expression which has potential side effects" +-config=B.UNEVALEFF,stmt_child_matcher= +{"stmt(node(utrait_expr)&&operator(alignof))", expr, 0, "stmt(any())", {}}, +{"stmt(node(utrait_type)&&operator(alignof))", type, 0, "stmt(any())", {}}, +{"stmt(node(utrait_expr)&&operator(preferred_alignof))", expr, 0, "stmt(any())", {}}, +{"stmt(node(utrait_type)&&operator(preferred_alignof))", type, 0, "stmt(any())", {}}, +{"type(node(typeof_expr))", expr, 0, "stmt(any())", {}}, +{"type(node(typeof_type))", type, 0, "stmt(any())", {}} diff --git a/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh b/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh index b308bd4cda..368135122c 100755 --- a/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh +++ b/automation/eclair_analysis/ECLAIR/accepted_guidelines.sh @@ -11,3 +11,5 @@ accepted_rst=$1 grep -Eo "\`(Dir|Rule) [0-9]+\.[0-9]+" ${accepted_rst} \ | sed -e 's/`Rule /MC3R1.R/' -e 's/`Dir /MC3R1.D/' -e 's/.*/-enable=&/' > ${script_dir}/accepted.ecl + +echo "-enable=B.UNEVALEFF" >> ${script_dir}/accepted.ecl diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 9134e59617..df0b551812 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -52,6 +52,7 @@ their Standard Library equivalents." -eval_file=adopted.ecl -eval_file=out_of_scope.ecl +-eval_file=B.UNEVALEFF.ecl -eval_file=deviations.ecl -eval_file=call_properties.ecl -eval_file=tagging.ecl diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index ae2eaf50f7..8f13dabeb1 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -344,6 +344,16 @@ of the short-circuit evaluation strategy of such logical operators." -config=MC3R1.R13.5,reports+={disapplied,"any()"} -doc_end +-doc_begin="Macros alternative_v?call[0-9] use sizeof and typeof to check that the argument types match the corresponding parameter ones." +-config=MC3R1.R13.6,reports+={deliberate,"any_area(any_loc(any_exp(macro(^alternative_vcall[0-9]$))&&file(^xen/arch/x86/include/asm/alternative\\.h*$)))"} +-config=B.UNEVALEFF,reports+={deliberate,"any_area(any_loc(any_exp(macro(^alternative_v?call[0-9]$))&&file(^xen/arch/x86/include/asm/alterantive\\.h*$)))"} +-doc_end + +-doc_begin="Anything, no matter how complicated, inside the BUILD_BUG_ON macro is subject to a compile-time evaluation without relevant side effects." +-config=MC3R1.R13.6,reports+={safe,"any_area(any_loc(any_exp(macro(name(BUILD_BUG_ON)))))"} +-config=B.UNEVALEFF,reports+={safe,"any_area(any_loc(any_exp(macro(name(BUILD_BUG_ON)))))"} +-doc_end + # # Series 14 # diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 16fc345756..c6a2affc6a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -300,6 +300,16 @@ Deviations related to MISRA C:2012 Rules: the short-circuit evaluation strategy for logical operators. - Project-wide deviation; tagged as `disapplied` for ECLAIR. + * - R13.6 + - On x86, macros alternative_v?call[0-9] use sizeof and typeof to check + that the argument types match the corresponding parameter ones. + - Tagged as `deliberate` for ECLAIR. + + * - R13.6 + - Anything, no matter how complicated, inside the BUILD_BUG_ON macro is + subject to a compile-time evaluation without relevant side effects." + - Tagged as `safe` for ECLAIR. + * - R14.2 - The severe restrictions imposed by this rule on the use of 'for' statements are not counterbalanced by the presumed facilitation of the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 13:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 13:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748975.1156943 (Exim 4.92) (envelope-from ) id 1sMSwX-0005qk-72; Wed, 26 Jun 2024 13:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748975.1156943; Wed, 26 Jun 2024 13: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 1sMSwX-0005qd-4O; Wed, 26 Jun 2024 13:44:13 +0000 Received: by outflank-mailman (input) for mailman id 748975; Wed, 26 Jun 2024 13:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSwW-0005qO-D2 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSwW-0007xS-CJ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMSwW-00038K-BH for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hdq5IgfA8fn3plguoYWthaJzGo4ZHRhFVix+0uIn4LU=; b=btpKinpimkCVnGvo8BFpEBXFd4 yKglTNnY71QzCpFwZrB3sPfg7sFdynZ4lAOgxpZEIa/JlwBn8OohFgJPrSdC15vx2vCoHYNlaYwqz TOrJt5tc8zs59nrTDlL2vPJ9isGkeZIDp2/LyaShoVkOcNGNWqNIyy/jPzS6NJClHcwU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: deviate and|or|xor|not for MISRA C Rule 21.2 Message-Id: Date: Wed, 26 Jun 2024 13:44:12 +0000 commit 853f707cd9e2eb9410dbfbadbd5a01ac0252ef83 Author: Alessandro Zucchelli AuthorDate: Tue Jun 25 13:41:27 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 25 13:41:27 2024 -0700 automation/eclair_analysis: deviate and|or|xor|not for MISRA C Rule 21.2 Rule 21.2 reports identifiers reserved for the C and POSIX standard libraries: or, and, not and xor are reserved identifiers because they constitute alternate spellings for the corresponding operators (they are defined as macros by iso646.h); however Xen doesn't use standard library headers, so there is no risk of overlap. This addresses violations arising from x86_emulate/x86_emulate.c, where label statements named as or, and and xor appear. No functional change. Signed-off-by: Alessandro Zucchelli Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 8f13dabeb1..dcff4f4013 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -523,6 +523,12 @@ in the expansion." # Series 21. # +-doc_begin="or, and and xor are reserved identifiers because they constitute alternate +spellings for the corresponding operators (they are defined as macros by iso646.h). +However, Xen doesn't use standard library headers, so there is no risk of overlap." +-config=MC3R1.R21.2,reports+={safe, "any_area(stmt(ref(kind(label)&&^(or|and|xor|not)$)))"} +-doc_end + -doc_begin="Xen does not use the functions provided by the Standard Library, but implements a set of functions that share the same names as their Standard Library equivalent. The implementation of these functions is available in source form, so the undefined, unspecified -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 13:44:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 13:44:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748978.1156947 (Exim 4.92) (envelope-from ) id 1sMSwj-0005vF-AT; Wed, 26 Jun 2024 13:44:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748978.1156947; Wed, 26 Jun 2024 13:44: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 1sMSwj-0005v7-7n; Wed, 26 Jun 2024 13:44:25 +0000 Received: by outflank-mailman (input) for mailman id 748978; Wed, 26 Jun 2024 13:44:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSwi-0005uw-HD for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSwi-0007xa-GQ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMSwi-0003Hy-Fb for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5YW32Vsh62KQ4kjTiaKVseaZXK7wxP7kzSuRpoNL2GE=; b=yhhfbee7b0jQBfpEqSiZUIuKKk wKy7yrvGmoylPgtHb2o/hbtfYC6go8Waf44M5neSqxpzsZ93PQjtrkgU/RGMyOHHnDzocfOUExZf7 Sn5T1lVQ7+tJiq/DBT9OKAODpFiJjzTKNVLuhVPiUUZbvk8ItoQEecCEbJ7Er9q3PAMc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG.md: Fix indentation of "Removed" section Message-Id: Date: Wed, 26 Jun 2024 13:44:24 +0000 commit 188e5f1a80b5d64c1f0f07d9878d2c1c0ee8310d Author: George Dunlap AuthorDate: Mon Jun 24 09:43:04 2024 +0100 Commit: George Dunlap CommitDate: Wed Jun 26 14:19:29 2024 +0100 CHANGELOG.md: Fix indentation of "Removed" section Signed-off-by: George Dunlap Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1778419cae..f3c6c7954f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,12 +31,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - libxl support for backendtype=tap with tapback. ### Removed -- caml-stubdom. It hasn't built since 2014, was pinned to Ocaml 4.02, and has - been superseded by the MirageOS/SOLO5 projects. -- /usr/bin/pygrub symlink. This was deprecated in Xen 4.2 (2012) but left for - compatibility reasons. VMs configured with bootloader="/usr/bin/pygrub" - should be updated to just bootloader="pygrub". -- The Xen gdbstub on x86. + - caml-stubdom. It hasn't built since 2014, was pinned to Ocaml 4.02, and has + been superseded by the MirageOS/SOLO5 projects. + - /usr/bin/pygrub symlink. This was deprecated in Xen 4.2 (2012) but left for + compatibility reasons. VMs configured with bootloader="/usr/bin/pygrub" + should be updated to just bootloader="pygrub". + - The Xen gdbstub on x86. ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-11-16 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 13:44:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 13:44:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.748979.1156950 (Exim 4.92) (envelope-from ) id 1sMSwt-0005xc-Bm; Wed, 26 Jun 2024 13:44:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 748979.1156950; Wed, 26 Jun 2024 13:44: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 1sMSwt-0005xU-9E; Wed, 26 Jun 2024 13:44:35 +0000 Received: by outflank-mailman (input) for mailman id 748979; Wed, 26 Jun 2024 13:44:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSws-0005xO-KV for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMSws-0007xi-Jk for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMSws-0003Ia-Iu for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 13:44: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7KxnBWKkzMUdJ3GyEapL+FS82DUI/o60V856H6mlTZk=; b=4edlsbpj628cbdiW1u2IW8dKJa oLJ28XKIYJhH2PXS5oh3ly0TrmCHOlWDodLd87SRQaiVLJH23GIfMQ9+ghmB7oRSONbz4otJcjNCG u5jUDIhxRWk7DRZO2b1dDNdRWVOAALmFB06UEC85cSvdUcIhGlYp5KVXMuK8kM7b7VqY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenalyze: Remove argp_program_bug_address Message-Id: Date: Wed, 26 Jun 2024 13:44:34 +0000 commit dde20e47afb51404d59be492ca924704f0fbf71d Author: George Dunlap AuthorDate: Mon Jun 24 11:23:18 2024 +0100 Commit: George Dunlap CommitDate: Wed Jun 26 14:19:29 2024 +0100 tools/xenalyze: Remove argp_program_bug_address xenalyze sets argp_program_bug_address to my old Citrix address. This was done before xenalyze was in the xen.git tree; and it's the only program in the tree which does so. Now that xenalyze is part of the normal Xen distribution, it should be obvious where to report bugs. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- tools/xentrace/xenalyze.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index d95e52695f..adc96dd7e4 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -10920,9 +10920,6 @@ const struct argp parser_def = { .doc = "", }; -const char *argp_program_bug_address = "George Dunlap "; - - int main(int argc, char *argv[]) { /* Start with warn at stderr. */ warn = stderr; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 15:33:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 15:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749229.1157271 (Exim 4.92) (envelope-from ) id 1sMUdt-0005pa-1V; Wed, 26 Jun 2024 15:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749229.1157271; Wed, 26 Jun 2024 15: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 1sMUds-0005pS-V8; Wed, 26 Jun 2024 15:33:04 +0000 Received: by outflank-mailman (input) for mailman id 749229; Wed, 26 Jun 2024 15:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMUdr-0005pI-KY for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 15:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMUdr-0001ih-IE for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 15:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMUdr-0003fN-Gj for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 15: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+EVTgbr3o1M++zd9M4SrR5QeslpOOagNoVixzZhaMzg=; b=dZwZnqRfvDk7Zr8neFcJ9UZzLI 7zrLq/+aO6rvYxXvzhDEyc/7WE6mOB1KqLBM7u0Kv3UztMLUbTHnIlmXS2UJk/sujAcTum/8llL8G 0ygOqrScQOXaiE5LFMkcXSVWzj9/y8MiOAPOO6C67MNx1G0Qjq+zvlQAD1yPLvFMooN8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG: Add entries related to tracing Message-Id: Date: Wed, 26 Jun 2024 15:33:03 +0000 commit ecadd22a3de8ce7f1799e85af6f1e37c06c57049 Author: George Dunlap AuthorDate: Mon Jun 24 09:31:52 2024 +0100 Commit: George Dunlap CommitDate: Wed Jun 26 16:02:26 2024 +0100 CHANGELOG: Add entries related to tracing Signed-off-by: George Dunlap Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3c6c7954f..35c3488f4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - When building with Systemd support (./configure --enable-systemd), remove libsystemd as a build dependency. Systemd Notify support is retained, now using a standalone library implementation. + - xenalyze no longer requires `--svm-mode` when analyzing traces + generated on AMD CPUs ### Added - On x86: @@ -37,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) compatibility reasons. VMs configured with bootloader="/usr/bin/pygrub" should be updated to just bootloader="pygrub". - The Xen gdbstub on x86. + - xentrace_format has been removed; use xenalyze instead. ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-11-16 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:00:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749487.1157595 (Exim 4.92) (envelope-from ) id 1sMZkJ-0000gg-1X; Wed, 26 Jun 2024 21:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749487.1157595; Wed, 26 Jun 2024 21: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 1sMZkI-0000gY-Ul; Wed, 26 Jun 2024 21:00:02 +0000 Received: by outflank-mailman (input) for mailman id 749487; Wed, 26 Jun 2024 21:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkH-0000VJ-Uu for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkH-0008R5-U6 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZkH-0007jS-SY for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=F6HxFrZuUVRj6c5K9shSkTI9fSzyFmvEjsxz3XqsDs0=; b=xq8jqPG/LEgSPs0fltnziTwF4h urfpGoJ6dltaCzLMj3bRU9yGZgCDhMCJD6SBfZETACbA3FkW2GRdVImbrXcTEDqpsSUmJGvMm0x80 ww+g43hLTksfwc2PdMcFQPZujmnEGRca16ouxG1scfZTjf31OhoTywhItxBJilcEVm8g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/ucode: Further fixes to identify "ucode already up to date" Message-Id: Date: Wed, 26 Jun 2024 21:00:01 +0000 commit cd873f00bedca2f1afeaf13a78f70e719c5b1398 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:36:13 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:36:13 2024 +0200 x86/ucode: Further fixes to identify "ucode already up to date" When the revision in hardware is newer than anything Xen has to hand, 'microcode_cache' isn't set up. Then, `xen-ucode` initiates the update because it doesn't know whether the revisions across the system are symmetric or not. This involves the patch getting all the way into the apply_microcode() hooks before being found to be too old. This is all a giant mess and needs an overhaul, but in the short term simply adjust the apply_microcode() to return -EEXIST. Also, unconditionally print the preexisting microcode revision on boot. It's relevant information which is otherwise unavailable if Xen doesn't find new microcode to use. Fixes: 648db37a155a ("x86/ucode: Distinguish "ucode already up to date"") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 977d98e67c2e929c62aa1f495fc4c6341c45abb5 master date: 2024-05-16 13:59:11 +0100 --- xen/arch/x86/cpu/microcode/amd.c | 7 +++++-- xen/arch/x86/cpu/microcode/core.c | 2 ++ xen/arch/x86/cpu/microcode/intel.c | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 75fc84e445..d8f7646e88 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -222,12 +222,15 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) uint32_t rev, old_rev = sig->rev; enum microcode_match_result result = microcode_fits(patch); + if ( result == MIS_UCODE ) + return -EINVAL; + /* * Allow application of the same revision to pick up SMT-specific changes * even if the revision of the other SMT thread is already up-to-date. */ - if ( result != NEW_UCODE && result != SAME_UCODE ) - return -EINVAL; + if ( result == OLD_UCODE ) + return -EEXIST; if ( check_final_patch_levels(sig) ) { diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index d5338ad345..8a47f4471f 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -887,6 +887,8 @@ int __init early_microcode_init(unsigned long *module_map, ucode_ops.collect_cpu_info(); + printk(XENLOG_INFO "BSP microcode revision: 0x%08x\n", this_cpu(cpu_sig).rev); + /* * Some hypervisors deliberately report a microcode revision of -1 to * mean that they will not accept microcode updates. diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index 060c529a6e..a2d88e3ac0 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -294,10 +294,13 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) result = microcode_update_match(patch); - if ( result != NEW_UCODE && - !(opt_ucode_allow_same && result == SAME_UCODE) ) + if ( result == MIS_UCODE ) return -EINVAL; + if ( result == OLD_UCODE || + (result == SAME_UCODE && !opt_ucode_allow_same) ) + return -EEXIST; + wbinvd(); wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:00:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749488.1157599 (Exim 4.92) (envelope-from ) id 1sMZkT-0001Kl-2f; Wed, 26 Jun 2024 21:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749488.1157599; Wed, 26 Jun 2024 21: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 1sMZkS-0001Kd-WE; Wed, 26 Jun 2024 21:00:13 +0000 Received: by outflank-mailman (input) for mailman id 749488; Wed, 26 Jun 2024 21:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkS-0001KP-27 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkS-0008RS-0z for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZkS-0007l0-08 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yadaMfODBVu7l4bo2bHMD+jxeVXyG7YZ4vJgdU7YcqM=; b=BwcoVOaIoioWu0xpHqOnJD20bI 8CVQ4umjM5EFyQyYt+xnkHfAgFzhu2gPwfzM91u3iSBOjLU46wTHongXJVD41AEzRxfimhCRTGIHE j2+P2EwdFyk96/AXGyHGxPqi+qhvHgQWWRV/rQnXqbncaEsclAHSDucbSbnsMy4D6Jqo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/msi: prevent watchdog triggering when dumping MSI state Message-Id: Date: Wed, 26 Jun 2024 21:00:12 +0000 commit 1ffb29d132600e6a7965c2885505615a6fd6c647 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:36:52 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:36:52 2024 +0200 x86/msi: prevent watchdog triggering when dumping MSI state Use the same check that's used in dump_irqs(). Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 594b22ca5be681ec1b42c34f321cc2600d582210 master date: 2024-05-20 14:29:44 +0100 --- xen/arch/x86/msi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index a78367d7cf..3eaeffd1e0 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -1405,6 +1406,9 @@ static void cf_check dump_msi(unsigned char key) unsigned long flags; const char *type = "???"; + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + if ( !irq_desc_initialized(desc) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:00:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749489.1157603 (Exim 4.92) (envelope-from ) id 1sMZkd-0001Nt-4b; Wed, 26 Jun 2024 21:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749489.1157603; Wed, 26 Jun 2024 21: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 1sMZkd-0001Nl-1b; Wed, 26 Jun 2024 21:00:23 +0000 Received: by outflank-mailman (input) for mailman id 749489; Wed, 26 Jun 2024 21:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkc-0001NR-6D for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkc-0008Rh-4f for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZkc-0007mS-3G for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4VuAuFHWWKwh4TED7B+mRzR6YbvZ1dYMVhMGo+vlNek=; b=FYYzqfvtr6QNrD3zebZ6ra3fc1 zK9qbM1Zj3ebJorgBirKej2R0hDmMi22X8VwrYNvu+sTxUDhbsn6zGwByESVprdl3+9HsO0I2TXNH 6iyEg2XB3bkPSGY//Q704FoesWknIie8DgdBX4NOtIlQ9/PxWkVcNVgjxAumh5EqqPAw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count Message-Id: Date: Wed, 26 Jun 2024 21:00:22 +0000 commit 52e16bf065cb42b79d14ac74d701d1f9d8506430 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:37:20 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:37:20 2024 +0200 x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count When adjusting move_cleanup_count to account for CPUs that are offline also adjust old_cpu_mask, otherwise further calls to fixup_irqs() could subtract those again and create an imbalance in move_cleanup_count. Fixes: 472e0b74c5c4 ('x86/IRQ: deal with move cleanup count state in fixup_irqs()') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e63209d3ba2fd1b2f232babd14c9c679ffa7b09a master date: 2024-06-10 10:33:22 +0200 --- xen/arch/x86/irq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e07006391a..db14df93db 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2576,6 +2576,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) desc->arch.move_cleanup_count -= cpumask_weight(affinity); if ( !desc->arch.move_cleanup_count ) release_old_vec(desc); + else + /* + * Adjust old_cpu_mask to account for the offline CPUs, + * otherwise further calls to fixup_irqs() could subtract those + * again and possibly underflow the counter. + */ + cpumask_andnot(desc->arch.old_cpu_mask, desc->arch.old_cpu_mask, + affinity); } if ( !desc->action || cpumask_subset(desc->affinity, mask) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:00:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749490.1157606 (Exim 4.92) (envelope-from ) id 1sMZkn-0001Qr-5h; Wed, 26 Jun 2024 21:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749490.1157606; Wed, 26 Jun 2024 21: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 1sMZkn-0001Qk-32; Wed, 26 Jun 2024 21:00:33 +0000 Received: by outflank-mailman (input) for mailman id 749490; Wed, 26 Jun 2024 21:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkm-0001QU-9K for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkm-0008Rt-8d for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZkm-0007np-75 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=S12z2+p8CokcuHREFdrDoA6JnEATLAGcLefN6frNvyY=; b=oaU4K2WCf68loLK9J8lFR//KnR YyE9uHjIVJ5URhlSXdkpYWNkyHAb4iCefbwFBqOcSxnWA1OTGfj66iUE3YIv0xjJdgRnuKz8kxRni twAG1Dl3E3Dk5GnvbW6kEpwqSI9u5/q8D1yZddQHZ93qA8qHFCHupEa03azl/1mSNCbM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] CI: Update FreeBSD to 13.3 Message-Id: Date: Wed, 26 Jun 2024 21:00:32 +0000 commit 80f2d2c2a515a6b9a4ea1b128267c6e1b5085002 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:37:58 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:37:58 2024 +0200 CI: Update FreeBSD to 13.3 Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Stefano Stabellini master commit: 5ea7f2c9d7a1334b3b2bd5f67fab4d447b60613d master date: 2024-06-11 17:00:10 +0100 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 63f3afb104..e961877881 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,7 @@ freebsd_template: &FREEBSD_TEMPLATE task: name: 'FreeBSD 13' freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-3 << : *FREEBSD_TEMPLATE task: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:00:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749491.1157611 (Exim 4.92) (envelope-from ) id 1sMZkx-0001TV-85; Wed, 26 Jun 2024 21:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749491.1157611; Wed, 26 Jun 2024 21: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 1sMZkx-0001TN-4v; Wed, 26 Jun 2024 21:00:43 +0000 Received: by outflank-mailman (input) for mailman id 749491; Wed, 26 Jun 2024 21:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkw-0001TD-CZ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZkw-0008S0-Bw for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZkw-0007pF-B3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=g3bv+ZlfNHXcM/B33+k3eDWQ21UshW6G/tmWKWv0E9c=; b=WZmejRJ6bGnOO2FtYHZeO0Dr3Y UYssAiR+6dtkLVDK6TtYxzU7z8tnA+Z9LdXLDfEFtkifdwNaeYvhvFr98lN1XbIi/wluv5F+r8Sx7 vCPjONnXRYdUOXDr8qsyNpdggj2vXA6ttE/KYpJgOm51kd/PjOzMxCMLyRrlRcg+/N1s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Message-Id: Date: Wed, 26 Jun 2024 21:00:42 +0000 commit 98238d49ecb149a5ac07cb8032817904c404ac2b Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:38:36 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:38:36 2024 +0200 x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Due to the current rwlock logic, if the CPU calling get_cpu_maps() does so from a cpu_hotplug_{begin,done}() region the function will still return success, because a CPU taking the rwlock in read mode after having taken it in write mode is allowed. Such corner case makes using get_cpu_maps() alone not enough to prevent using the shorthand in CPU hotplug regions. Introduce a new helper to detect whether the current caller is between a cpu_hotplug_{begin,done}() region and use it in send_IPI_mask() to restrict shorthand usage. Fixes: 5500d265a2a8 ('x86/smp: use APIC ALLBUT destination shorthand when possible') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 171c52fba5d94e050d704770480dcb983490d0ad master date: 2024-06-12 14:29:31 +0200 --- xen/arch/x86/smp.c | 2 +- xen/common/cpu.c | 5 +++++ xen/include/xen/cpu.h | 10 ++++++++++ xen/include/xen/rwlock.h | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 3a331cbdbc..340fcafb46 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -88,7 +88,7 @@ void send_IPI_mask(const cpumask_t *mask, int vector) * the system have been accounted for. */ if ( system_state > SYS_STATE_smp_boot && - !unaccounted_cpus && !disabled_cpus && + !unaccounted_cpus && !disabled_cpus && !cpu_in_hotplug_context() && /* NB: get_cpu_maps lock requires enabled interrupts. */ local_irq_is_enabled() && (cpus_locked = get_cpu_maps()) && (park_offline_cpus || diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 8709db4d29..6e35b114c0 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -68,6 +68,11 @@ void cpu_hotplug_done(void) write_unlock(&cpu_add_remove_lock); } +bool cpu_in_hotplug_context(void) +{ + return rw_is_write_locked_by_me(&cpu_add_remove_lock); +} + static NOTIFIER_HEAD(cpu_chain); void __init register_cpu_notifier(struct notifier_block *nb) diff --git a/xen/include/xen/cpu.h b/xen/include/xen/cpu.h index e1d4eb5967..6bf5786750 100644 --- a/xen/include/xen/cpu.h +++ b/xen/include/xen/cpu.h @@ -13,6 +13,16 @@ void put_cpu_maps(void); void cpu_hotplug_begin(void); void cpu_hotplug_done(void); +/* + * Returns true when the caller CPU is between a cpu_hotplug_{begin,done}() + * region. + * + * This is required to safely identify hotplug contexts, as get_cpu_maps() + * would otherwise succeed because a caller holding the lock in write mode is + * allowed to acquire the same lock in read mode. + */ +bool cpu_in_hotplug_context(void); + /* Receive notification of CPU hotplug events. */ void register_cpu_notifier(struct notifier_block *nb); diff --git a/xen/include/xen/rwlock.h b/xen/include/xen/rwlock.h index 9e35ee2edf..dc74d1c057 100644 --- a/xen/include/xen/rwlock.h +++ b/xen/include/xen/rwlock.h @@ -309,6 +309,8 @@ static always_inline void write_lock_irq(rwlock_t *l) #define rw_is_locked(l) _rw_is_locked(l) #define rw_is_write_locked(l) _rw_is_write_locked(l) +#define rw_is_write_locked_by_me(l) \ + lock_evaluate_nospec(_is_write_locked_by_me(atomic_read(&(l)->cnts))) typedef struct percpu_rwlock percpu_rwlock_t; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:00:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:00:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749492.1157615 (Exim 4.92) (envelope-from ) id 1sMZl7-0001XU-AE; Wed, 26 Jun 2024 21:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749492.1157615; Wed, 26 Jun 2024 21: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 1sMZl7-0001XM-7d; Wed, 26 Jun 2024 21:00:53 +0000 Received: by outflank-mailman (input) for mailman id 749492; Wed, 26 Jun 2024 21:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZl6-0001X2-Fu for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZl6-0008S9-FD for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZl6-0007qW-EF for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/tSPxpm3kDlLVIoWndXTib6hPVHytckf69X6ojMi2BY=; b=wxGn2oVpM8FZVhWru2r6SXsUTU czO1XjojCRZbYFdxBhLTDCbgbPQp0GPfwViW2gjL++2N1/3Nuj0mPK5ZEUhBdmNNPwy+am6cdrngp 9GqB2wu5uYRUTn1+wqQwYEQOCkREyCkwl0eeXzcFnXySHGUJL+7Ao1KVJRu76g0ZdLek=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/irq: limit interrupt movement done by fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 21:00:52 +0000 commit ce0a0cb0a74a909abf988f242aa228acdd2917fe Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:39:11 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:39:11 2024 +0200 x86/irq: limit interrupt movement done by fixup_irqs() The current check used in fixup_irqs() to decide whether to move around interrupts is based on the affinity mask, but such mask can have all bits set, and hence is unlikely to be a subset of the input mask. For example if an interrupt has an affinity mask of all 1s, any input to fixup_irqs() that's not an all set CPU mask would cause that interrupt to be shuffled around unconditionally. What fixup_irqs() care about is evacuating interrupts from CPUs not set on the input CPU mask, and for that purpose it should check whether the interrupt is assigned to a CPU not present in the input mask. Assume that ->arch.cpu_mask is a subset of the ->affinity mask, and keep the current logic that resets the ->affinity mask if the interrupt has to be shuffled around. Doing the affinity movement based on ->arch.cpu_mask requires removing the special handling to ->arch.cpu_mask done for high priority vectors, otherwise the adjustment done to cpu_mask makes them always skip the CPU interrupt movement. While there also adjust the comment as to the purpose of fixup_irqs(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: c7564d7366d865cc407e3d64bca816d07edee174 master date: 2024-06-12 14:30:40 +0200 --- xen/arch/x86/include/asm/irq.h | 2 +- xen/arch/x86/irq.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index d7fb8ec7e8..71d4a8fc56 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -132,7 +132,7 @@ void free_domain_pirqs(struct domain *d); int map_domain_emuirq_pirq(struct domain *d, int pirq, int emuirq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose); void fixup_eoi(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index db14df93db..566331bec1 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2529,7 +2529,7 @@ static int __init cf_check setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose) { unsigned int irq; @@ -2553,19 +2553,15 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && - vector <= LAST_HIPRIORITY_VECTOR ) + vector <= LAST_HIPRIORITY_VECTOR && + desc->handler == &no_irq_type ) { - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); - /* * This can in particular happen when parking secondary threads * during boot and when the serial console wants to use a PCI IRQ. */ - if ( desc->handler == &no_irq_type ) - { - spin_unlock(&desc->lock); - continue; - } + spin_unlock(&desc->lock); + continue; } if ( desc->arch.move_cleanup_count ) @@ -2586,7 +2582,12 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } - if ( !desc->action || cpumask_subset(desc->affinity, mask) ) + /* + * Avoid shuffling the interrupt around as long as current target CPUs + * are a subset of the input mask. What fixup_irqs() cares about is + * evacuating interrupts from CPUs not in the input mask. + */ + if ( !desc->action || cpumask_subset(desc->arch.cpu_mask, mask) ) { spin_unlock(&desc->lock); continue; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:01:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:01:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749493.1157619 (Exim 4.92) (envelope-from ) id 1sMZlH-0001aT-Bn; Wed, 26 Jun 2024 21:01:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749493.1157619; Wed, 26 Jun 2024 21:01: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 1sMZlH-0001aL-93; Wed, 26 Jun 2024 21:01:03 +0000 Received: by outflank-mailman (input) for mailman id 749493; Wed, 26 Jun 2024 21:01:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlG-0001a7-JP for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlG-0008SZ-Ij for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZlG-0007rx-HW for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HlT5S/5kxe9M++yX2ObJiDJTGhQ6qu7I5jleiJYrzcA=; b=bv55qMhqsse4IbWYX2ZaHI2S5p O7SY94lAMvL3NNb9aGINLdc8RSGdbDS1Y+yBN389iVKkRfN7DEmAI9Nd8kyLPbihuS/yjCu4Rg8Ib qy4C4iMjIkjf71d9iPLAyMEur1HvtKPjGhGaSvVg+bX2tsAT1lTA2W2QYN5P10UOnELE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/EPT: correct special page checking in epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 21:01:02 +0000 commit 6e647efaf2b02ce92bcf80bec47c18cca5084f8a Author: Jan Beulich AuthorDate: Wed Jun 26 13:39:44 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:39:44 2024 +0200 x86/EPT: correct special page checking in epte_get_entry_emt() mfn_valid() granularity is (currently) 256Mb. Therefore the start of a 1Gb page passing the test doesn't necessarily mean all parts of such a range would also pass. Yet using the result of mfn_to_page() on an MFN which doesn't pass mfn_valid() checking is liable to result in a crash (the invocation of mfn_to_page() alone is presumably "just" UB in such a case). Fixes: ca24b2ffdbd9 ("x86/hvm: set 'ipat' in EPT for special pages") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 5540b94e8191059eb9cbbe98ac316232a42208f6 master date: 2024-06-13 16:53:34 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 85c4e8e54f..1aa6bbc771 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -518,8 +518,12 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, } for ( special_pgs = i = 0; i < (1ul << order); i++ ) - if ( is_special_page(mfn_to_page(mfn_add(mfn, i))) ) + { + mfn_t cur = mfn_add(mfn, i); + + if ( mfn_valid(cur) && is_special_page(mfn_to_page(cur)) ) special_pgs++; + } if ( special_pgs ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:01:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:01:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749494.1157623 (Exim 4.92) (envelope-from ) id 1sMZlR-0001d3-D9; Wed, 26 Jun 2024 21:01:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749494.1157623; Wed, 26 Jun 2024 21:01: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 1sMZlR-0001cv-AU; Wed, 26 Jun 2024 21:01:13 +0000 Received: by outflank-mailman (input) for mailman id 749494; Wed, 26 Jun 2024 21:01:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlQ-0001cn-MX for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlQ-0008TB-Lw for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZlQ-0007sx-L4 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QbSdI+XxsuMGLGuwtnTzdTyEfdY7ArPeC4qcZX9RJfA=; b=ke8IFDszP5+glyCPQpN2Y7kZQo gOsm5TBe5UARwA0sfS24wMpq+pmoMS5kDcwc9mAniN3duDKE2Zwp/Hu3CsIrRgDNNrmJ6qPCSLZkc HlTivHXfN01IBG18HSS8MWo3MulgZB42+NO09ZPdphVqCnZnv4YG4+FxT1V2RIXQzbjY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/EPT: avoid marking non-present entries for re-configuring Message-Id: Date: Wed, 26 Jun 2024 21:01:12 +0000 commit d31385be5c8e8bc5efb6f8848057bd0c69e8274a Author: Jan Beulich AuthorDate: Wed Jun 26 13:40:11 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:40:11 2024 +0200 x86/EPT: avoid marking non-present entries for re-configuring For non-present entries EMT, like most other fields, is meaningless to hardware. Make the logic in ept_set_entry() setting the field (and iPAT) conditional upon dealing with a present entry, leaving the value at 0 otherwise. This has two effects for epte_get_entry_emt() which we'll want to leverage subsequently: 1) The call moved here now won't be issued with INVALID_MFN anymore (a respective BUG_ON() is being added). 2) Neither of the other two calls could now be issued with a truncated form of INVALID_MFN anymore (as long as there's no bug anywhere marking an entry present when that was populated using INVALID_MFN). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 777c71d31325bc55ba1cc3f317d4155fe519ab0b master date: 2024-06-13 16:54:17 +0200 --- xen/arch/x86/mm/p2m-ept.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 1aa6bbc771..641d61b350 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -649,6 +649,8 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) if ( e.emt != MTRR_NUM_TYPES ) break; + ASSERT(is_epte_present(&e)); + if ( level == 0 ) { for ( gfn -= i, i = 0; i < EPT_PAGETABLE_ENTRIES; ++i ) @@ -914,17 +916,6 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { - bool ipat; - int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, - i * EPT_TABLE_ORDER, &ipat, - p2mt); - - if ( emt >= 0 ) - new_entry.emt = emt; - else /* ept_handle_misconfig() will need to take care of this. */ - new_entry.emt = MTRR_NUM_TYPES; - - new_entry.ipat = ipat; new_entry.sp = !!i; new_entry.sa_p2mt = p2mt; new_entry.access = p2ma; @@ -940,6 +931,22 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, need_modify_vtd_table = 0; ept_p2m_type_to_flags(p2m, &new_entry); + + if ( is_epte_present(&new_entry) ) + { + bool ipat; + int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, + i * EPT_TABLE_ORDER, &ipat, + p2mt); + + BUG_ON(mfn_eq(mfn, INVALID_MFN)); + + if ( emt >= 0 ) + new_entry.emt = emt; + else /* ept_handle_misconfig() will need to take care of this. */ + new_entry.emt = MTRR_NUM_TYPES; + new_entry.ipat = ipat; + } } if ( sve != -1 ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:01:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:01:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749495.1157627 (Exim 4.92) (envelope-from ) id 1sMZlb-0001fe-Em; Wed, 26 Jun 2024 21:01:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749495.1157627; Wed, 26 Jun 2024 21:01: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 1sMZlb-0001fW-C1; Wed, 26 Jun 2024 21:01:23 +0000 Received: by outflank-mailman (input) for mailman id 749495; Wed, 26 Jun 2024 21:01:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZla-0001fO-Pg for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZla-0008TM-Oy for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZla-0007vY-OE for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TUn6oY3oq+GUnLBEX4D26ZO61xRzJd2kF1JKYKxL0YI=; b=jtTpHqgQ/ButQPU08Nc156stl4 zi/JWLKRDfGSUZIiqdpQDib9fcv5Wl6UDKYjJCt6BMQieDMoT6I8ZLcz9zSQlsaFltc85urVRKUmW lyN1ouIo7Fmi74JC8aa5UnLBInHNkm3K92a3S4e5jTOM0vahGW7o3dP1IqxfctmNoZVU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 21:01:22 +0000 commit 3b777c2ce4ea8cf67b79a5496e51201145606798 Author: Jan Beulich AuthorDate: Wed Jun 26 13:40:35 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:40:35 2024 +0200 x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() mfn_valid() is RAM-focused; it will often return false for MMIO. Yet access to actual MMIO space should not generally be restricted to UC only; especially video frame buffer accesses are unduly affected by such a restriction. Since, as of 777c71d31325 ("x86/EPT: avoid marking non-present entries for re-configuring"), the function won't be called with INVALID_MFN or, worse, truncated forms thereof anymore, we call fully drop that check. Fixes: 81fd0d3ca4b2 ("x86/hvm: simplify 'mmio_direct' check in epte_get_entry_emt()") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 4fdd8d75566fdad06667a79ec0ce6f43cc466c54 master date: 2024-06-13 16:55:22 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 641d61b350..d325424e97 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -500,12 +500,6 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, return -1; } - if ( !mfn_valid(mfn) ) - { - *ipat = true; - return X86_MT_UC; - } - /* * Conditional must be kept in sync with the code in * {iomem,ioports}_{permit,deny}_access(). -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:01:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:01:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749496.1157631 (Exim 4.92) (envelope-from ) id 1sMZll-0001iB-G6; Wed, 26 Jun 2024 21:01:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749496.1157631; Wed, 26 Jun 2024 21:01: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 1sMZll-0001i3-DU; Wed, 26 Jun 2024 21:01:33 +0000 Received: by outflank-mailman (input) for mailman id 749496; Wed, 26 Jun 2024 21:01:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlk-0001hx-T0 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlk-0008TT-SF for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZlk-0007wd-RE for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Dx7C+Wio9byzkfB7GVl5OdhAsjIoZBqQ1wkfKxJLob4=; b=kiCKfOnJJZscNTABDugEs1R+MO POvlfpYF7L9cieZg5Ep02xYyQ0JpA3pCyYJeKB6sp3caCVDmXuqqDRI39xG3kiscDe2oVp7r0daET xzt1Id71ldOOqjGL47T7hU2Ow9oseTgdGWAGqmvBv+HNsT375WvHJnr4M730f4yRZK4A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/Intel: unlock CPUID earlier for the BSP Message-Id: Date: Wed, 26 Jun 2024 21:01:32 +0000 commit c4b284912695a5802433512b913e968eda01544f Author: Jan Beulich AuthorDate: Wed Jun 26 13:41:05 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:41:05 2024 +0200 x86/Intel: unlock CPUID earlier for the BSP Intel CPUs have a MSR bit to limit CPUID enumeration to leaf two. If this bit is set by the BIOS then CPUID evaluation does not work when data from any leaf greater than two is needed; early_cpu_init() in particular wants to collect leaf 7 data. Cure this by unlocking CPUID right before evaluating anything which depends on the maximum CPUID leaf being greater than two. Inspired by (and description cloned from) Linux commit 0c2f6d04619e ("x86/topology/intel: Unlock CPUID before evaluating anything"). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: fa4d026737a47cd1d66ffb797a29150b4453aa9f master date: 2024-06-18 15:12:44 +0200 --- xen/arch/x86/cpu/common.c | 3 ++- xen/arch/x86/cpu/cpu.h | 2 ++ xen/arch/x86/cpu/intel.c | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 26eed2ade1..edec0a2546 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -336,7 +336,8 @@ void __init early_cpu_init(bool verbose) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_INTEL: intel_unlock_cpuid_leaves(c); + actual_cpu = intel_cpu_dev; break; case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index e3d06278b3..8be65e975a 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -24,3 +24,5 @@ void amd_init_lfence(struct cpuinfo_x86 *c); void amd_init_ssbd(const struct cpuinfo_x86 *c); void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); + +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index deb7b70464..0dc7c27601 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -303,10 +303,24 @@ static void __init noinline intel_init_levelling(void) ctxt_switch_masking = intel_ctxt_switch_masking; } -static void cf_check early_init_intel(struct cpuinfo_x86 *c) +/* Unmask CPUID levels if masked. */ +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) { - u64 misc_enable, disable; + uint64_t misc_enable, disable; + + rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + + disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; + if (disable) { + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); + bootsym(trampoline_misc_enable_off) |= disable; + c->cpuid_level = cpuid_eax(0); + printk(KERN_INFO "revised cpuid level: %u\n", c->cpuid_level); + } +} +static void cf_check early_init_intel(struct cpuinfo_x86 *c) +{ /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; @@ -315,16 +329,7 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c) bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE) printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); - /* Unmask CPUID levels and NX if masked: */ - rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - - disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; - if (disable) { - wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); - bootsym(trampoline_misc_enable_off) |= disable; - printk(KERN_INFO "revised cpuid level: %d\n", - cpuid_eax(0)); - } + intel_unlock_cpuid_leaves(c); /* CPUID workaround for Intel 0F33/0F34 CPU */ if (boot_cpu_data.x86 == 0xF && boot_cpu_data.x86_model == 3 && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:01:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:01:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749497.1157635 (Exim 4.92) (envelope-from ) id 1sMZlw-0001lG-Hr; Wed, 26 Jun 2024 21:01:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749497.1157635; Wed, 26 Jun 2024 21:01: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 1sMZlw-0001l8-Ey; Wed, 26 Jun 2024 21:01:44 +0000 Received: by outflank-mailman (input) for mailman id 749497; Wed, 26 Jun 2024 21:01:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlu-0001kc-Vy for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZlu-0008Td-VK for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZlu-0007xD-UT for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IetXhyBf0V3D2R4oYFiZpjrP3lcCBUMpjqQXPbYKoMg=; b=yNRl6W8FA3UaO8Vx5/94BXIhqH HEa8mcJdmZWBINdGivVeys8e8dU+QTGy6l+ie7lTYSontBQdSZCW5JXEMrJXCnFkbBLU6+4RDZnVr 12XLsL3JXHMe0WCR4EzE6H18lRCsinPlWtpl42FV+E53B+48QvPBj0Q+CmmzofE+ysuY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 21:01:42 +0000 commit 39a6170c15bf369a2b26c855ea7621387ed4070b Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:41:35 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:41:35 2024 +0200 x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Given the current logic it's possible for ->arch.old_cpu_mask to get out of sync: if a CPU set in old_cpu_mask is offlined and then onlined again without old_cpu_mask having been updated the data in the mask will no longer be accurate, as when brought back online the CPU will no longer have old_vector configured to handle the old interrupt source. If there's an interrupt movement in progress, and the to be offlined CPU (which is the call context) is in the old_cpu_mask, clear it and update the mask, so it doesn't contain stale data. Note that when the system is going down fixup_irqs() will be called by smp_send_stop() from CPU 0 with a mask with only CPU 0 on it, effectively asking to move all interrupts to the current caller (CPU 0) which is the only CPU to remain online. In that case we don't care to migrate interrupts that are in the process of being moved, as it's likely we won't be able to move all interrupts to CPU 0 due to vector shortage anyway. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 817d1cd627be668c358d038f0fadbf7d24d417d3 master date: 2024-06-18 15:14:49 +0200 --- xen/arch/x86/irq.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 566331bec1..f877327975 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2539,7 +2539,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { bool break_affinity = false, set_affinity = true; - unsigned int vector; + unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); if ( irq == 2 ) @@ -2582,6 +2582,33 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } + if ( desc->arch.move_in_progress && + /* + * Only attempt to adjust the mask if the current CPU is going + * offline, otherwise the whole system is going down and leaving + * stale data in the masks is fine. + */ + !cpu_online(cpu) && + cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) + { + /* + * This CPU is going offline, remove it from ->arch.old_cpu_mask + * and possibly release the old vector if the old mask becomes + * empty. + * + * Note cleaning ->arch.old_cpu_mask is required if the CPU is + * brought offline and then online again, as when re-onlined the + * per-cpu vector table will no longer have ->arch.old_vector + * setup, and hence ->arch.old_cpu_mask would be stale. + */ + cpumask_clear_cpu(cpu, desc->arch.old_cpu_mask); + if ( cpumask_empty(desc->arch.old_cpu_mask) ) + { + desc->arch.move_in_progress = 0; + release_old_vec(desc); + } + } + /* * Avoid shuffling the interrupt around as long as current target CPUs * are a subset of the input mask. What fixup_irqs() cares about is -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:01:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:01:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749498.1157638 (Exim 4.92) (envelope-from ) id 1sMZm6-0001op-Kp; Wed, 26 Jun 2024 21:01:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749498.1157638; Wed, 26 Jun 2024 21:01: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 1sMZm6-0001oi-IL; Wed, 26 Jun 2024 21:01:54 +0000 Received: by outflank-mailman (input) for mailman id 749498; Wed, 26 Jun 2024 21:01:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZm5-0001oU-2d for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZm5-0008Tu-21 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZm5-0007y5-1H for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:01: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4OKStHHAZ9ZVVAvcVNMV/z6Z3s8UHBua64b7gWmZkF8=; b=emAC9KapZSpxzYvAj7o9XPMxVL yBeYBiBxzwce44Q/fUJmdhh7O/X1KQndeJGf+ZyCWpdTRxRHvrD8YZcY5Fe1BsR17+Zu5Wa5oQAR9 aSXW3+1jA8nm/dLblJw8BIJeOYkHuYHSaZe5QA3ttQvoS9uwVcRD+GjQCwXl8XKEDT/E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/irq: handle moving interrupts in _assign_irq_vector() Message-Id: Date: Wed, 26 Jun 2024 21:01:53 +0000 commit 3a8f4ec75d8ed8da6370deac95c341cbada96802 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:42:05 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:42:05 2024 +0200 x86/irq: handle moving interrupts in _assign_irq_vector() Currently there's logic in fixup_irqs() that attempts to prevent _assign_irq_vector() from failing, as fixup_irqs() is required to evacuate all interrupts from the CPUs not present in the input mask. The current logic in fixup_irqs() is incomplete, as it doesn't deal with interrupts that have move_cleanup_count > 0 and a non-empty ->arch.old_cpu_mask field. Instead of attempting to fixup the interrupt descriptor in fixup_irqs() so that _assign_irq_vector() cannot fail, introduce logic in _assign_irq_vector() to deal with interrupts that have either move_{in_progress,cleanup_count} set and no remaining online CPUs in ->arch.cpu_mask. If _assign_irq_vector() is requested to move an interrupt in the state described above, first attempt to see if ->arch.old_cpu_mask contains any valid CPUs that could be used as fallback, and if that's the case do move the interrupt back to the previous destination. Note this is easier because the vector hasn't been released yet, so there's no need to allocate and setup a new vector on the destination. Due to the logic in fixup_irqs() that clears offline CPUs from ->arch.old_cpu_mask (and releases the old vector if the mask becomes empty) it shouldn't be possible to get into _assign_irq_vector() with ->arch.move_{in_progress,cleanup_count} set but no online CPUs in ->arch.old_cpu_mask. However if ->arch.move_{in_progress,cleanup_count} is set and the interrupt has also changed affinity, it's possible the members of ->arch.old_cpu_mask are no longer part of the affinity set, move the interrupt to a different CPU part of the provided mask and keep the current ->arch.old_{cpu_mask,vector} for the pending interrupt movement to be completed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 369558924a642bbb0cb731e9a3375958867cb17b master date: 2024-06-18 15:15:10 +0200 --- xen/arch/x86/irq.c | 97 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f877327975..13ef61a5b7 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -553,7 +553,58 @@ static int _assign_irq_vector(struct irq_desc *desc, const cpumask_t *mask) } if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) - return -EAGAIN; + { + /* + * If the current destination is online refuse to shuffle. Retry after + * the in-progress movement has finished. + */ + if ( cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) + return -EAGAIN; + + /* + * Due to the logic in fixup_irqs() that clears offlined CPUs from + * ->arch.old_cpu_mask it shouldn't be possible to get here with + * ->arch.move_{in_progress,cleanup_count} set and no online CPUs in + * ->arch.old_cpu_mask. + */ + ASSERT(valid_irq_vector(desc->arch.old_vector)); + ASSERT(cpumask_intersects(desc->arch.old_cpu_mask, &cpu_online_map)); + + if ( cpumask_intersects(desc->arch.old_cpu_mask, mask) ) + { + /* + * Fallback to the old destination if moving is in progress and the + * current destination is to be offlined. This is only possible if + * the CPUs in old_cpu_mask intersect with the affinity mask passed + * in the 'mask' parameter. + */ + desc->arch.vector = desc->arch.old_vector; + cpumask_and(desc->arch.cpu_mask, desc->arch.old_cpu_mask, mask); + + /* Undo any possibly done cleanup. */ + for_each_cpu(cpu, desc->arch.cpu_mask) + per_cpu(vector_irq, cpu)[desc->arch.vector] = irq; + + /* Cancel the pending move and release the current vector. */ + desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; + cpumask_clear(desc->arch.old_cpu_mask); + desc->arch.move_in_progress = 0; + desc->arch.move_cleanup_count = 0; + if ( desc->arch.used_vectors ) + { + ASSERT(test_bit(old_vector, desc->arch.used_vectors)); + clear_bit(old_vector, desc->arch.used_vectors); + } + + return 0; + } + + /* + * There's an interrupt movement in progress but the destination(s) in + * ->arch.old_cpu_mask are not suitable given the 'mask' parameter, go + * through the full logic to find a new vector in a suitable CPU. + */ + } err = -ENOSPC; @@ -609,7 +660,22 @@ next: current_vector = vector; current_offset = offset; - if ( valid_irq_vector(old_vector) ) + if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) + { + ASSERT(!cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map)); + /* + * Special case when evacuating an interrupt from a CPU to be + * offlined and the interrupt was already in the process of being + * moved. Leave ->arch.old_{vector,cpu_mask} as-is and just + * replace ->arch.{cpu_mask,vector} with the new destination. + * Cleanup will be done normally for the old fields, just release + * the current vector here. + */ + if ( desc->arch.used_vectors && + !test_and_clear_bit(old_vector, desc->arch.used_vectors) ) + ASSERT_UNREACHABLE(); + } + else if ( valid_irq_vector(old_vector) ) { cpumask_and(desc->arch.old_cpu_mask, desc->arch.cpu_mask, &cpu_online_map); @@ -2620,33 +2686,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) continue; } - /* - * In order for the affinity adjustment below to be successful, we - * need _assign_irq_vector() to succeed. This in particular means - * clearing desc->arch.move_in_progress if this would otherwise - * prevent the function from succeeding. Since there's no way for the - * flag to get cleared anymore when there's no possible destination - * left (the only possibility then would be the IRQs enabled window - * after this loop), there's then also no race with us doing it here. - * - * Therefore the logic here and there need to remain in sync. - */ - if ( desc->arch.move_in_progress && - !cpumask_intersects(mask, desc->arch.cpu_mask) ) - { - unsigned int cpu; - - cpumask_and(affinity, desc->arch.old_cpu_mask, &cpu_online_map); - - spin_lock(&vector_lock); - for_each_cpu(cpu, affinity) - per_cpu(vector_irq, cpu)[desc->arch.old_vector] = ~irq; - spin_unlock(&vector_lock); - - release_old_vec(desc); - desc->arch.move_in_progress = 0; - } - if ( !cpumask_intersects(mask, desc->affinity) ) { break_affinity = true; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:02:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:02:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749499.1157642 (Exim 4.92) (envelope-from ) id 1sMZmG-0001rr-MW; Wed, 26 Jun 2024 21:02:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749499.1157642; Wed, 26 Jun 2024 21:02: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 1sMZmG-0001rk-Jr; Wed, 26 Jun 2024 21:02:04 +0000 Received: by outflank-mailman (input) for mailman id 749499; Wed, 26 Jun 2024 21:02:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmF-0001ra-5V for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmF-0008UG-4p for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZmF-0007zP-43 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sCrnuxgi6nrDSM8JyWFtHhhT3MVXOCPLUQA0npbrQLk=; b=Ur37rqNg3JGCvyd0YZb8M20f5b CH51gbGIO3gP+0dV2tF4xt/4GB90maoz82lcBtH6D02100fXTPZ1QyFIv8WFa09mdRd2WxWAAC+KZ O17GSAdlA/85PLAjvq/i4GhIYn/005qisfy/zOTzDDiY1nNuIdZbbDqunMlwLMmtCctU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] xen/ubsan: Fix UB in type_descriptor declaration Message-Id: Date: Wed, 26 Jun 2024 21:02:03 +0000 commit 5397ab9995f7354e7f8122a8a91c810256afa3d1 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:42:30 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:42:30 2024 +0200 xen/ubsan: Fix UB in type_descriptor declaration struct type_descriptor is arranged with a NUL terminated string following the kind/info fields. The only reason this doesn't trip UBSAN detection itself (on more modern compilers at least) is because struct type_descriptor is only referenced in suppressed regions. Switch the declaration to be a real flexible member. No functional change. Fixes: 00fcf4dd8eb4 ("xen/ubsan: Import ubsan implementation from Linux 4.13") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: bd59af99700f075d06a6d47a16f777c9519928e0 master date: 2024-06-18 14:55:04 +0100 --- xen/common/ubsan/ubsan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/ubsan/ubsan.h b/xen/common/ubsan/ubsan.h index a3159040fe..3db42e75b1 100644 --- a/xen/common/ubsan/ubsan.h +++ b/xen/common/ubsan/ubsan.h @@ -10,7 +10,7 @@ enum { struct type_descriptor { u16 type_kind; u16 type_info; - char type_name[1]; + char type_name[]; }; struct source_location { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:02:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:02:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749500.1157648 (Exim 4.92) (envelope-from ) id 1sMZmQ-0001uo-Og; Wed, 26 Jun 2024 21:02:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749500.1157648; Wed, 26 Jun 2024 21:02: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 1sMZmQ-0001ug-LN; Wed, 26 Jun 2024 21:02:14 +0000 Received: by outflank-mailman (input) for mailman id 749500; Wed, 26 Jun 2024 21:02:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmP-0001uW-8h for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmP-0008Uk-84 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZmP-000802-6v for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UYsmogQeWMOAjDz+8FKI/V2kABeM/Nv66cQtXF/94L0=; b=4GUr6kmVpZ2g/gJvg251ipeNce Zvso029rYA5H3IEBBRAVckMxEqiFPG9crkq0muQeh4PW/zQzxyVa9cmnjPQ0eaWFgCBf6IOigV0Vd n4FDTEDIJTgqyLDtUZ1gY17IYRRtEOJKoUVnd1NSprA0dXZpzu241U7kCuU6BXfEf+RM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/xstate: Fix initialisation of XSS cache Message-Id: Date: Wed, 26 Jun 2024 21:02:13 +0000 commit 4ee1df89d9c92609e5fff3c9b261ce4b1bb88e42 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:43:19 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:43:19 2024 +0200 x86/xstate: Fix initialisation of XSS cache The clobbering of this_cpu(xcr0) and this_cpu(xss) to architecturally invalid values is to force the subsequent set_xcr0() and set_msr_xss() to reload the hardware register. While XCR0 is reloaded in xstate_init(), MSR_XSS isn't. This causes get_msr_xss() to return the invalid value, and logic of the form: old = get_msr_xss(); set_msr_xss(new); ... set_msr_xss(old); to try and restore said invalid value. The architecturally invalid value must be purged from the cache, meaning the hardware register must be written at least once. This in turn highlights that the invalid value must only be used in the case that the hardware register is available. Fixes: f7f4a523927f ("x86/xstate: reset cached register values on resume") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 9e6dbbe8bf400aacb99009ddffa91d2a0c312b39 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/xstate.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index f442610fc5..ca76f98fe2 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -641,13 +641,6 @@ void xstate_init(struct cpuinfo_x86 *c) return; } - /* - * Zap the cached values to make set_xcr0() and set_msr_xss() really - * write it. - */ - this_cpu(xcr0) = 0; - this_cpu(xss) = ~0; - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; BUG_ON(!valid_xcr0(feature_mask)); @@ -657,8 +650,19 @@ void xstate_init(struct cpuinfo_x86 *c) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); + + /* + * Zap the cached values to make set_xcr0() and set_msr_xss() really write + * the hardware register. + */ + this_cpu(xcr0) = 0; if ( !set_xcr0(feature_mask) ) BUG(); + if ( cpu_has_xsaves ) + { + this_cpu(xss) = ~0; + set_msr_xss(0); + } if ( bsp ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:02:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:02:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749501.1157651 (Exim 4.92) (envelope-from ) id 1sMZma-0001xk-PR; Wed, 26 Jun 2024 21:02:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749501.1157651; Wed, 26 Jun 2024 21:02: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 1sMZma-0001xd-Ml; Wed, 26 Jun 2024 21:02:24 +0000 Received: by outflank-mailman (input) for mailman id 749501; Wed, 26 Jun 2024 21:02:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmZ-0001xN-BZ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmZ-0008Uv-At for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZmZ-00080v-AB for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qTxCJ/Ry39npj5iKGfCfsV88F8OCmNw5Pkd2M4uOz3M=; b=FWHFpVwoOCtOV6XY4MFSgLkhgw mf8Yf+/yTnPXSwgDF8HN70sRt/x/hZyTg4PJvlFTyeRx5z0KgwsSeHX1hRwqQ7SLV9KXpdgXV53mt vlyKcM/iZvrpZuLIUUdRBg3hfp84z3Xvb1AqBSbYYUSN56nfpK7PgJPi76kgDMUVcmkE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/cpuid: Fix handling of XSAVE dynamic leaves Message-Id: Date: Wed, 26 Jun 2024 21:02:23 +0000 commit 9b43092d54b5f9e9d39d9f20393671e303b19e81 Author: Andrew Cooper AuthorDate: Wed Jun 26 13:43:44 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:43:44 2024 +0200 x86/cpuid: Fix handling of XSAVE dynamic leaves [ This is a minimal backport of commit 71cacfb035f4 ("x86/cpuid: Fix handling of XSAVE dynamic leaves") to fix the bugs without depending on the large rework of XSTATE handling in Xen 4.19 ] First, if XSAVE is available in hardware but not visible to the guest, the dynamic leaves shouldn't be filled in. Second, the comment concerning XSS state is wrong. VT-x doesn't manage host/guest state automatically, but there is provision for "host only" bits to be set, so the implications are still accurate. In Xen 4.18, no XSS states are supported, so it's safe to keep deferring to real hardware. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 71cacfb035f4a78ee10970dc38a3baa04d387451 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/cpuid.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 455a09b2dd..f6fd6cc6b3 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -330,24 +330,20 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case XSTATE_CPUID: switch ( subleaf ) { - case 1: - if ( p->xstate.xsavec || p->xstate.xsaves ) - { - /* - * TODO: Figure out what to do for XSS state. VT-x manages - * host vs guest MSR_XSS automatically, so as soon as we start - * supporting any XSS states, the wrong XSS will be in - * context. - */ - BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); - - /* - * Read CPUID[0xD,0/1].EBX from hardware. They vary with - * enabled XSTATE, and appropraite XCR0|XSS are in context. - */ + /* + * Read CPUID[0xd,0/1].EBX from hardware. They vary with enabled + * XSTATE, and the appropriate XCR0 is in context. + */ case 0: - res->b = cpuid_count_ebx(leaf, subleaf); - } + if ( p->basic.xsave ) + res->b = cpuid_count_ebx(0xd, 0); + break; + + case 1: + /* This only works because Xen doesn't support XSS states yet. */ + BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); + if ( p->xstate.xsavec ) + res->b = cpuid_count_ebx(0xd, 1); break; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 21:02:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 21:02:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749502.1157654 (Exim 4.92) (envelope-from ) id 1sMZmk-00020U-RS; Wed, 26 Jun 2024 21:02:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749502.1157654; Wed, 26 Jun 2024 21:02: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 1sMZmk-00020K-OR; Wed, 26 Jun 2024 21:02:34 +0000 Received: by outflank-mailman (input) for mailman id 749502; Wed, 26 Jun 2024 21:02:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmj-000208-Ea for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMZmj-0008V8-Du for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMZmj-00081S-DF for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 21:02: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Nz6GyhemCU6bjbUy4N7grmgGKv9aMIULdERUSWtH2Zg=; b=ITTmxN2B3mPbFvrh+/yMka8KC4 txkqA9/d2WDLouJA8WCoPFumwzYSsz2s3iMY32BR3lImzmHmBdI6qaNuREuKVWGlxNIlYXyyGNglg QMbIb+i5Q4bcHyuOxlexBB/U9E1T0Tj+s4GAZ3UIOem0GCdmMo/x8EOBnai1MOZ3iZC4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/irq: forward pending interrupts to new destination in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 21:02:33 +0000 commit e95d30f9e5eed0c5d9dbf72d4cc3ae373152ab10 Author: Roger Pau Monné AuthorDate: Wed Jun 26 13:44:08 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 13:44:08 2024 +0200 x86/irq: forward pending interrupts to new destination in fixup_irqs() fixup_irqs() is used to evacuate interrupts from to be offlined CPUs. Given the CPU is to become offline, the normal migration logic used by Xen where the vector in the previous target(s) is left configured until the interrupt is received on the new destination is not suitable. Instead attempt to do as much as possible in order to prevent loosing interrupts. If fixup_irqs() is called from the CPU to be offlined (as is currently the case for CPU hot unplug) attempt to forward pending vectors when interrupts that target the current CPU are migrated to a different destination. Additionally, for interrupts that have already been moved from the current CPU prior to the call to fixup_irqs() but that haven't been delivered to the new destination (iow: interrupts with move_in_progress set and the current CPU set in ->arch.old_cpu_mask) also check whether the previous vector is pending and forward it to the new destination. This allows us to remove the window with interrupts enabled at the bottom of fixup_irqs(). Such window wasn't safe anyway: references to the CPU to become offline are removed from interrupts masks, but the per-CPU vector_irq[] array is not updated to reflect those changes (as the CPU is going offline anyway). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e2bb28d621584fce15c907002ddc7c6772644b64 master date: 2024-06-20 12:09:32 +0200 --- xen/arch/x86/include/asm/apic.h | 5 +++++ xen/arch/x86/irq.c | 46 +++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h index 7625c0ecd6..ad8d7cc054 100644 --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -145,6 +145,11 @@ static __inline bool_t apic_isr_read(u8 vector) (vector & 0x1f)) & 1; } +static inline bool apic_irr_read(unsigned int vector) +{ + return apic_read(APIC_IRR + (vector / 32 * 0x10)) & (1U << (vector % 32)); +} + static __inline u32 get_apic_id(void) /* Get the physical APIC id */ { u32 id = apic_read(APIC_ID); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 13ef61a5b7..290f8d26e7 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2604,7 +2604,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { - bool break_affinity = false, set_affinity = true; + bool break_affinity = false, set_affinity = true, check_irr = false; unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); @@ -2657,6 +2657,25 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) { + /* + * This to be offlined CPU was the target of an interrupt that's + * been moved, and the new destination target hasn't yet + * acknowledged any interrupt from it. + * + * We know the interrupt is configured to target the new CPU at + * this point, so we can check IRR for any pending vectors and + * forward them to the new destination. + * + * Note that for the other case of an interrupt movement being in + * progress (move_cleanup_count being non-zero) we know the new + * destination has already acked at least one interrupt from this + * source, and hence there's no need to forward any stale + * interrupts. + */ + if ( apic_irr_read(desc->arch.old_vector) ) + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + /* * This CPU is going offline, remove it from ->arch.old_cpu_mask * and possibly release the old vector if the old mask becomes @@ -2697,6 +2716,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( desc->handler->disable ) desc->handler->disable(desc); + /* + * If the current CPU is going offline and is (one of) the target(s) of + * the interrupt, signal to check whether there are any pending vectors + * to be handled in the local APIC after the interrupt has been moved. + */ + if ( !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.cpu_mask) ) + check_irr = true; + if ( desc->handler->set_affinity ) desc->handler->set_affinity(desc, affinity); else if ( !(warned++) ) @@ -2707,6 +2734,18 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) cpumask_copy(affinity, desc->affinity); + if ( check_irr && apic_irr_read(vector) ) + /* + * Forward pending interrupt to the new destination, this CPU is + * going offline and otherwise the interrupt would be lost. + * + * Do the IRR check as late as possible before releasing the irq + * desc in order for any in-flight interrupts to be delivered to + * the lapic. + */ + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + spin_unlock(&desc->lock); if ( !verbose ) @@ -2718,11 +2757,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) printk("Broke affinity for IRQ%u, new: %*pb\n", irq, CPUMASK_PR(affinity)); } - - /* That doesn't seem sufficient. Give it 1ms. */ - local_irq_enable(); - mdelay(1); - local_irq_disable(); } void fixup_eoi(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:33:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749546.1157688 (Exim 4.92) (envelope-from ) id 1sMc8M-0007ne-Lg; Wed, 26 Jun 2024 23:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749546.1157688; Wed, 26 Jun 2024 23: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 1sMc8M-0007nW-JD; Wed, 26 Jun 2024 23:33:02 +0000 Received: by outflank-mailman (input) for mailman id 749546; Wed, 26 Jun 2024 23:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8M-0007nQ-1S for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8L-0002rr-VP for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc8L-0001UK-UI for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=40QuCykfac+ymKkRqYGVOwAu3uqrUIZh+RyVfsy5kas=; b=mA9cePwMNO40uNXemwyy3h8zvb MviQ/ZMkNH/cvUNJbDvKjPMs+uwIEBMK5CkO/A26gHcJcvCCaxLWFHCsqLWv+y9YKXLgDtFofmJ+U 3zf1oVZwZdKNj1hdCkv/Eti7NEpzIGoD7eJOS2wrLheuKRijgFVeS/L8fSSgxPsyNrWg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/ucode: Further fixes to identify "ucode already up to date" Message-Id: Date: Wed, 26 Jun 2024 23:33:01 +0000 commit cd8aab43d2b9bbd2cd99f0027dd2d918e0a393d5 Author: Andrew Cooper AuthorDate: Wed Jun 26 14:05:54 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:05:54 2024 +0200 x86/ucode: Further fixes to identify "ucode already up to date" When the revision in hardware is newer than anything Xen has to hand, 'microcode_cache' isn't set up. Then, `xen-ucode` initiates the update because it doesn't know whether the revisions across the system are symmetric or not. This involves the patch getting all the way into the apply_microcode() hooks before being found to be too old. This is all a giant mess and needs an overhaul, but in the short term simply adjust the apply_microcode() to return -EEXIST. Also, unconditionally print the preexisting microcode revision on boot. It's relevant information which is otherwise unavailable if Xen doesn't find new microcode to use. Fixes: 648db37a155a ("x86/ucode: Distinguish "ucode already up to date"") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 977d98e67c2e929c62aa1f495fc4c6341c45abb5 master date: 2024-05-16 13:59:11 +0100 --- xen/arch/x86/cpu/microcode/amd.c | 7 +++++-- xen/arch/x86/cpu/microcode/core.c | 2 ++ xen/arch/x86/cpu/microcode/intel.c | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index c6d13f3fb3..b28171f2d4 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -222,12 +222,15 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) uint32_t rev, old_rev = sig->rev; enum microcode_match_result result = microcode_fits(patch); + if ( result == MIS_UCODE ) + return -EINVAL; + /* * Allow application of the same revision to pick up SMT-specific changes * even if the revision of the other SMT thread is already up-to-date. */ - if ( result != NEW_UCODE && result != SAME_UCODE ) - return -EINVAL; + if ( result == OLD_UCODE ) + return -EEXIST; if ( check_final_patch_levels(sig) ) { diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 667b1baf91..3150395478 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -819,6 +819,8 @@ int __init early_microcode_init(void) alternative_vcall(ucode_ops.collect_cpu_info); + printk(XENLOG_INFO "BSP microcode revision: 0x%08x\n", this_cpu(cpu_sig).rev); + if ( ucode_mod.mod_end || ucode_blob.size ) rc = early_microcode_update_cpu(); diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index cb08f63d2e..91d82f9dde 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -294,10 +294,13 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) result = microcode_update_match(patch); - if ( result != NEW_UCODE && - !(opt_ucode_allow_same && result == SAME_UCODE) ) + if ( result == MIS_UCODE ) return -EINVAL; + if ( result == OLD_UCODE || + (result == SAME_UCODE && !opt_ucode_allow_same) ) + return -EEXIST; + wbinvd(); wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:33:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749547.1157693 (Exim 4.92) (envelope-from ) id 1sMc8W-0007pQ-NX; Wed, 26 Jun 2024 23:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749547.1157693; Wed, 26 Jun 2024 23: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 1sMc8W-0007pI-Kf; Wed, 26 Jun 2024 23:33:12 +0000 Received: by outflank-mailman (input) for mailman id 749547; Wed, 26 Jun 2024 23:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8W-0007p0-3R for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8W-0002sE-2i for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc8W-0001V0-1L for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dfYXHYkd/HIrZTBZLC7+ggTDLt1XrdGu+dU3hgIX+Io=; b=GkHO4pKZ/GPxRS+xOYDmgeRBv0 GCoxzKEKSZusYQvmgebfbu4qMepAeM4WH01buDaBv2W0T0paNGCFK30d5L9Shg57wS9nj+YQClffZ cuNqfpCVVi8A1KnLmFd54UtUkoPIUOqfm6GBs1xetQCaKdJHGyWmiGGF78EeyinRdEp4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/msi: prevent watchdog triggering when dumping MSI state Message-Id: Date: Wed, 26 Jun 2024 23:33:12 +0000 commit 373e02254ce88baae37b89159149c15904fffc13 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:06:35 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:06:35 2024 +0200 x86/msi: prevent watchdog triggering when dumping MSI state Use the same check that's used in dump_irqs(). Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 594b22ca5be681ec1b42c34f321cc2600d582210 master date: 2024-05-20 14:29:44 +0100 --- xen/arch/x86/msi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index d0bf63df1d..3d36fc4204 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -1428,6 +1429,9 @@ static void cf_check dump_msi(unsigned char key) unsigned long flags; const char *type = "???"; + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + if ( !irq_desc_initialized(desc) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:33:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749548.1157697 (Exim 4.92) (envelope-from ) id 1sMc8h-0007s7-Os; Wed, 26 Jun 2024 23:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749548.1157697; Wed, 26 Jun 2024 23: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 1sMc8h-0007s0-M5; Wed, 26 Jun 2024 23:33:23 +0000 Received: by outflank-mailman (input) for mailman id 749548; Wed, 26 Jun 2024 23:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8g-0007rg-7b for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8g-0002sQ-6p for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc8g-0001VR-4y for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nGpPd1YveesQSptHTEdKLHMOt4lmaiRp1b10BHAGhnI=; b=GJMTpMFhoyVnI5idBUnAXXRjOb AJD+69BILBcH5txxBromENsE3sokdErZ/hLvVqkk4kxYs+la7klSfI8fpZucWBo0c/50nLFmBT+36 /ruO6LoT/0xpaSWEbXjmL81ntjpyjr8pSjrF9nrNnCex1t3UiU3tgnJw0zDl1ZXS6CVQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count Message-Id: Date: Wed, 26 Jun 2024 23:33:22 +0000 commit 9fa0df93babcbb4b0fba9dbc78bbfb1318b85360 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:07:06 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:07:06 2024 +0200 x86/irq: remove offline CPUs from old CPU mask when adjusting move_cleanup_count When adjusting move_cleanup_count to account for CPUs that are offline also adjust old_cpu_mask, otherwise further calls to fixup_irqs() could subtract those again and create an imbalance in move_cleanup_count. Fixes: 472e0b74c5c4 ('x86/IRQ: deal with move cleanup count state in fixup_irqs()') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e63209d3ba2fd1b2f232babd14c9c679ffa7b09a master date: 2024-06-10 10:33:22 +0200 --- xen/arch/x86/irq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index abd6f577dd..5e6edc0905 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2576,6 +2576,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) desc->arch.move_cleanup_count -= cpumask_weight(affinity); if ( !desc->arch.move_cleanup_count ) release_old_vec(desc); + else + /* + * Adjust old_cpu_mask to account for the offline CPUs, + * otherwise further calls to fixup_irqs() could subtract those + * again and possibly underflow the counter. + */ + cpumask_andnot(desc->arch.old_cpu_mask, desc->arch.old_cpu_mask, + affinity); } if ( !desc->action || cpumask_subset(desc->affinity, mask) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:33:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749549.1157701 (Exim 4.92) (envelope-from ) id 1sMc8r-0007uy-QG; Wed, 26 Jun 2024 23:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749549.1157701; Wed, 26 Jun 2024 23: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 1sMc8r-0007uq-Ne; Wed, 26 Jun 2024 23:33:33 +0000 Received: by outflank-mailman (input) for mailman id 749549; Wed, 26 Jun 2024 23:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8q-0007ua-BU for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc8q-0002sZ-AL for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc8q-0001Vx-8z for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/lNy+S9Gy+G87vC5dpwDy+zHgANYAgKg5jV1Um0RLTk=; b=tZNTNjyfHYEzWRflJdttYJvyrl AcaO2yffarX9oOjZKSkYKCHIkQEJRPKLOM3YFCD+3/mfuzQ+FaMxlcc0WCNhXAsosUZlJgrwqx+Es QEc4UWeVWH3BsGV9bqhDVjtcLfhaEiP3n1pmbVmtVtPg9lsMKHR1Rd863SPzi1cPQXm8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] CI: Update FreeBSD to 13.3 Message-Id: Date: Wed, 26 Jun 2024 23:33:32 +0000 commit f15af3ee5bd60893673fe9aae202e90533d3c0dc Author: Andrew Cooper AuthorDate: Wed Jun 26 14:07:53 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:07:53 2024 +0200 CI: Update FreeBSD to 13.3 Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Stefano Stabellini master commit: 5ea7f2c9d7a1334b3b2bd5f67fab4d447b60613d master date: 2024-06-11 17:00:10 +0100 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 63f3afb104..e961877881 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,7 @@ freebsd_template: &FREEBSD_TEMPLATE task: name: 'FreeBSD 13' freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-3 << : *FREEBSD_TEMPLATE task: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:33:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749550.1157705 (Exim 4.92) (envelope-from ) id 1sMc91-0007xt-Ra; Wed, 26 Jun 2024 23:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749550.1157705; Wed, 26 Jun 2024 23: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 1sMc91-0007xl-P2; Wed, 26 Jun 2024 23:33:43 +0000 Received: by outflank-mailman (input) for mailman id 749550; Wed, 26 Jun 2024 23:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc90-0007xV-Eg for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc90-0002sg-DY for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc90-0001WR-Cf for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KpuSS9lhxpG94syK98a0gHDVQOHuQ7PM6mP7VK8OEu4=; b=AOqwRgnYC0RW8b9UdylncS9ehq CPCn4uPtj2kF9/FUYlDhE3D+IyS4s7WeiLqS8FHRwyg5II6/k9uTtqrnVq/rIyaikr/IxkzQmNlz+ 5X4bF2SkNFLDDY2ekzXCzntS2Mu7jDsIn2hfQocmVp+Bvl7sZRZeZwp/TuyfZJbhQvwQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Message-Id: Date: Wed, 26 Jun 2024 23:33:42 +0000 commit 2165a8d88862c5f4b23577dc079c5ef777d94df2 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:08:40 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:08:40 2024 +0200 x86/smp: do not use shorthand IPI destinations in CPU hot{,un}plug contexts Due to the current rwlock logic, if the CPU calling get_cpu_maps() does so from a cpu_hotplug_{begin,done}() region the function will still return success, because a CPU taking the rwlock in read mode after having taken it in write mode is allowed. Such corner case makes using get_cpu_maps() alone not enough to prevent using the shorthand in CPU hotplug regions. Introduce a new helper to detect whether the current caller is between a cpu_hotplug_{begin,done}() region and use it in send_IPI_mask() to restrict shorthand usage. Fixes: 5500d265a2a8 ('x86/smp: use APIC ALLBUT destination shorthand when possible') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 171c52fba5d94e050d704770480dcb983490d0ad master date: 2024-06-12 14:29:31 +0200 --- xen/arch/x86/smp.c | 2 +- xen/common/cpu.c | 5 +++++ xen/include/xen/cpu.h | 10 ++++++++++ xen/include/xen/rwlock.h | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index b42603c351..1f27b20286 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -89,7 +89,7 @@ void send_IPI_mask(const cpumask_t *mask, int vector) * the system have been accounted for. */ if ( system_state > SYS_STATE_smp_boot && - !unaccounted_cpus && !disabled_cpus && + !unaccounted_cpus && !disabled_cpus && !cpu_in_hotplug_context() && /* NB: get_cpu_maps lock requires enabled interrupts. */ local_irq_is_enabled() && (cpus_locked = get_cpu_maps()) && (park_offline_cpus || diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 778b6820b7..9a2c088873 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -68,6 +68,11 @@ void cpu_hotplug_done(void) write_unlock(&cpu_add_remove_lock); } +bool cpu_in_hotplug_context(void) +{ + return rw_is_write_locked_by_me(&cpu_add_remove_lock); +} + static NOTIFIER_HEAD(cpu_chain); void __init register_cpu_notifier(struct notifier_block *nb) diff --git a/xen/include/xen/cpu.h b/xen/include/xen/cpu.h index e8eeb217a0..8a1afb1837 100644 --- a/xen/include/xen/cpu.h +++ b/xen/include/xen/cpu.h @@ -13,6 +13,16 @@ void put_cpu_maps(void); void cpu_hotplug_begin(void); void cpu_hotplug_done(void); +/* + * Returns true when the caller CPU is between a cpu_hotplug_{begin,done}() + * region. + * + * This is required to safely identify hotplug contexts, as get_cpu_maps() + * would otherwise succeed because a caller holding the lock in write mode is + * allowed to acquire the same lock in read mode. + */ +bool cpu_in_hotplug_context(void); + /* Receive notification of CPU hotplug events. */ void register_cpu_notifier(struct notifier_block *nb); diff --git a/xen/include/xen/rwlock.h b/xen/include/xen/rwlock.h index abe0804bf7..02369079f9 100644 --- a/xen/include/xen/rwlock.h +++ b/xen/include/xen/rwlock.h @@ -297,6 +297,8 @@ static always_inline void write_lock_irq(rwlock_t *l) #define rw_is_locked(l) _rw_is_locked(l) #define rw_is_write_locked(l) _rw_is_write_locked(l) +#define rw_is_write_locked_by_me(l) \ + lock_evaluate_nospec(_is_write_locked_by_me(atomic_read(&(l)->cnts))) typedef struct percpu_rwlock percpu_rwlock_t; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:33:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749551.1157709 (Exim 4.92) (envelope-from ) id 1sMc9B-00080k-T1; Wed, 26 Jun 2024 23:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749551.1157709; Wed, 26 Jun 2024 23:33: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 1sMc9B-00080c-QX; Wed, 26 Jun 2024 23:33:53 +0000 Received: by outflank-mailman (input) for mailman id 749551; Wed, 26 Jun 2024 23:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9A-00080S-Hz for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9A-0002sq-HH for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc9A-0001Wu-Fu for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:33: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jS3H/SzX96kFnldXxPDsTV673jX6qGfWjxkGf5NZV6Q=; b=5EMBbyG2M0czYVpRsrM8ee8sKU PTwofFi2IsVg7jTBvh+4XBYz5hl+Z/ZySV1kmhpb8Ys51AYJ/NGDZfXYW2/DoeLq50Q8u+CSUhiT3 75eXxdFhKHdBfXpjwNTdKoCHdMlmIjD0A0HWzUCYuvNhnGBylvbtLy6rs+jA6IPGAgA0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/irq: limit interrupt movement done by fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 23:33:52 +0000 commit eeefc570559f129223ed8c0e24183cfdb1c39e5b Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:09:15 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:09:15 2024 +0200 x86/irq: limit interrupt movement done by fixup_irqs() The current check used in fixup_irqs() to decide whether to move around interrupts is based on the affinity mask, but such mask can have all bits set, and hence is unlikely to be a subset of the input mask. For example if an interrupt has an affinity mask of all 1s, any input to fixup_irqs() that's not an all set CPU mask would cause that interrupt to be shuffled around unconditionally. What fixup_irqs() care about is evacuating interrupts from CPUs not set on the input CPU mask, and for that purpose it should check whether the interrupt is assigned to a CPU not present in the input mask. Assume that ->arch.cpu_mask is a subset of the ->affinity mask, and keep the current logic that resets the ->affinity mask if the interrupt has to be shuffled around. Doing the affinity movement based on ->arch.cpu_mask requires removing the special handling to ->arch.cpu_mask done for high priority vectors, otherwise the adjustment done to cpu_mask makes them always skip the CPU interrupt movement. While there also adjust the comment as to the purpose of fixup_irqs(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: c7564d7366d865cc407e3d64bca816d07edee174 master date: 2024-06-12 14:30:40 +0200 --- xen/arch/x86/include/asm/irq.h | 2 +- xen/arch/x86/irq.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 26850e5077..207c9fede2 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -136,7 +136,7 @@ void free_domain_pirqs(struct domain *d); int map_domain_emuirq_pirq(struct domain *d, int pirq, int irq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose); void fixup_eoi(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 5e6edc0905..2eac2de0b4 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2529,7 +2529,7 @@ static int __init cf_check setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* Reset irq affinities to match the given CPU mask. */ +/* Evacuate interrupts assigned to CPUs not present in the input CPU mask. */ void fixup_irqs(const cpumask_t *mask, bool verbose) { unsigned int irq; @@ -2553,19 +2553,15 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && - vector <= LAST_HIPRIORITY_VECTOR ) + vector <= LAST_HIPRIORITY_VECTOR && + desc->handler == &no_irq_type ) { - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); - /* * This can in particular happen when parking secondary threads * during boot and when the serial console wants to use a PCI IRQ. */ - if ( desc->handler == &no_irq_type ) - { - spin_unlock(&desc->lock); - continue; - } + spin_unlock(&desc->lock); + continue; } if ( desc->arch.move_cleanup_count ) @@ -2586,7 +2582,12 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } - if ( !desc->action || cpumask_subset(desc->affinity, mask) ) + /* + * Avoid shuffling the interrupt around as long as current target CPUs + * are a subset of the input mask. What fixup_irqs() cares about is + * evacuating interrupts from CPUs not in the input mask. + */ + if ( !desc->action || cpumask_subset(desc->arch.cpu_mask, mask) ) { spin_unlock(&desc->lock); continue; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:34:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749552.1157713 (Exim 4.92) (envelope-from ) id 1sMc9L-00083T-Ug; Wed, 26 Jun 2024 23:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749552.1157713; Wed, 26 Jun 2024 23:34: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 1sMc9L-00083J-S2; Wed, 26 Jun 2024 23:34:03 +0000 Received: by outflank-mailman (input) for mailman id 749552; Wed, 26 Jun 2024 23:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9K-000835-L9 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9K-0002tA-KJ for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc9K-0001Xz-JU for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ADGIqGHn9tiq9CHNWwQsVU7N1xuX6tQrfZE2O8ZHa0A=; b=55nw72sIobVt2rvRrkTEr++fUt Ig2SzEJ6yOt4Al8rPdPy6OdvRAaQqDrdmjUkBkBlR6r6wtPyrFjKHGFymQtsWWhNYnhcL5y0dr827 62jkpB8yFAMy/MKp3rmMqTb+Z0oLS41b0tEmZ6mBUjfAgssDLRegklVyD+ZklxDuXsSM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/EPT: correct special page checking in epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 23:34:02 +0000 commit a86a0df4c0af15df36a6b4fa397c8cc2e876cbfa Author: Jan Beulich AuthorDate: Wed Jun 26 14:09:50 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:09:50 2024 +0200 x86/EPT: correct special page checking in epte_get_entry_emt() mfn_valid() granularity is (currently) 256Mb. Therefore the start of a 1Gb page passing the test doesn't necessarily mean all parts of such a range would also pass. Yet using the result of mfn_to_page() on an MFN which doesn't pass mfn_valid() checking is liable to result in a crash (the invocation of mfn_to_page() alone is presumably "just" UB in such a case). Fixes: ca24b2ffdbd9 ("x86/hvm: set 'ipat' in EPT for special pages") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 5540b94e8191059eb9cbbe98ac316232a42208f6 master date: 2024-06-13 16:53:34 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index d61d66c20e..54fa13fa7e 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -530,8 +530,12 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, } for ( special_pgs = i = 0; i < (1ul << order); i++ ) - if ( is_special_page(mfn_to_page(mfn_add(mfn, i))) ) + { + mfn_t cur = mfn_add(mfn, i); + + if ( mfn_valid(cur) && is_special_page(mfn_to_page(cur)) ) special_pgs++; + } if ( special_pgs ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:34:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:34:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749553.1157717 (Exim 4.92) (envelope-from ) id 1sMc9W-00086b-1T; Wed, 26 Jun 2024 23:34:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749553.1157717; Wed, 26 Jun 2024 23:34: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 1sMc9V-00086T-Uu; Wed, 26 Jun 2024 23:34:13 +0000 Received: by outflank-mailman (input) for mailman id 749553; Wed, 26 Jun 2024 23:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9U-00086N-OW for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9U-0002v5-NM for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc9U-0001Z4-MV for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/AtwcDTDA8yNmDh+YxpWz06hlrd3r1YpfXa1O+oFBj4=; b=pKG7zsqtWYTh37F3j8F/qZ2D0M 31qb/pgs9/FZ3PAD/t/60ryXuD2FkS1aWQwJs7ImIKSTzTO3CERj0KcazZrAssyUOYjP0wehfn6eS p9knVt/DvPW6guIBZFqe7gRjs1GnL7YpAgPF2d+aVaCsh85PVDeQJsngwtJI9OqG/jTg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/EPT: avoid marking non-present entries for re-configuring Message-Id: Date: Wed, 26 Jun 2024 23:34:12 +0000 commit 6f39608e1f2cebb55a2265d426c16f1f4132f63e Author: Jan Beulich AuthorDate: Wed Jun 26 14:10:15 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:10:15 2024 +0200 x86/EPT: avoid marking non-present entries for re-configuring For non-present entries EMT, like most other fields, is meaningless to hardware. Make the logic in ept_set_entry() setting the field (and iPAT) conditional upon dealing with a present entry, leaving the value at 0 otherwise. This has two effects for epte_get_entry_emt() which we'll want to leverage subsequently: 1) The call moved here now won't be issued with INVALID_MFN anymore (a respective BUG_ON() is being added). 2) Neither of the other two calls could now be issued with a truncated form of INVALID_MFN anymore (as long as there's no bug anywhere marking an entry present when that was populated using INVALID_MFN). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 777c71d31325bc55ba1cc3f317d4155fe519ab0b master date: 2024-06-13 16:54:17 +0200 --- xen/arch/x86/mm/p2m-ept.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 54fa13fa7e..b7d7a5b68c 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -662,6 +662,8 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) if ( e.emt != MTRR_NUM_TYPES ) break; + ASSERT(is_epte_present(&e)); + if ( level == 0 ) { for ( gfn -= i, i = 0; i < EPT_PAGETABLE_ENTRIES; ++i ) @@ -927,17 +929,6 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { - bool ipat; - int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, - i * EPT_TABLE_ORDER, &ipat, - p2mt); - - if ( emt >= 0 ) - new_entry.emt = emt; - else /* ept_handle_misconfig() will need to take care of this. */ - new_entry.emt = MTRR_NUM_TYPES; - - new_entry.ipat = ipat; new_entry.sp = !!i; new_entry.sa_p2mt = p2mt; new_entry.access = p2ma; @@ -953,6 +944,22 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, need_modify_vtd_table = 0; ept_p2m_type_to_flags(p2m, &new_entry); + + if ( is_epte_present(&new_entry) ) + { + bool ipat; + int emt = epte_get_entry_emt(p2m->domain, _gfn(gfn), mfn, + i * EPT_TABLE_ORDER, &ipat, + p2mt); + + BUG_ON(mfn_eq(mfn, INVALID_MFN)); + + if ( emt >= 0 ) + new_entry.emt = emt; + else /* ept_handle_misconfig() will need to take care of this. */ + new_entry.emt = MTRR_NUM_TYPES; + new_entry.ipat = ipat; + } } if ( sve != -1 ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:34:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:34:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749554.1157721 (Exim 4.92) (envelope-from ) id 1sMc9g-00089H-2k; Wed, 26 Jun 2024 23:34:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749554.1157721; Wed, 26 Jun 2024 23:34: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 1sMc9g-00089A-07; Wed, 26 Jun 2024 23:34:24 +0000 Received: by outflank-mailman (input) for mailman id 749554; Wed, 26 Jun 2024 23:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9e-000892-R7 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9e-0002vC-QO for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc9e-0001Zj-PV for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lCDYDdqtiPbxa2rdL23dnEIiUTHS0frShMa5wV1Iv/I=; b=475f78OvYEBIGihnkYTrt//rn3 7O815I2XWIh88SwrMVkDA39iOpzSUu51ELqBo8GVL1xLquevo/L5unchZUib3H/eLoh9lBclJE3dy Q3p0H5vU207QI6gi0Ztr7NpKsdUhcVMTzfvGJIV5MWnQHXGF4t/SrvAjODa4zSa2mPow=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() Message-Id: Date: Wed, 26 Jun 2024 23:34:22 +0000 commit dbcc4fba01bbdacf29e632c800a2c3e6bda0cd98 Author: Jan Beulich AuthorDate: Wed Jun 26 14:10:40 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:10:40 2024 +0200 x86/EPT: drop questionable mfn_valid() from epte_get_entry_emt() mfn_valid() is RAM-focused; it will often return false for MMIO. Yet access to actual MMIO space should not generally be restricted to UC only; especially video frame buffer accesses are unduly affected by such a restriction. Since, as of 777c71d31325 ("x86/EPT: avoid marking non-present entries for re-configuring"), the function won't be called with INVALID_MFN or, worse, truncated forms thereof anymore, we call fully drop that check. Fixes: 81fd0d3ca4b2 ("x86/hvm: simplify 'mmio_direct' check in epte_get_entry_emt()") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: 4fdd8d75566fdad06667a79ec0ce6f43cc466c54 master date: 2024-06-13 16:55:22 +0200 --- xen/arch/x86/mm/p2m-ept.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index b7d7a5b68c..57fc1d352c 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -512,12 +512,6 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, return -1; } - if ( !mfn_valid(mfn) ) - { - *ipat = true; - return MTRR_TYPE_UNCACHABLE; - } - /* * Conditional must be kept in sync with the code in * {iomem,ioports}_{permit,deny}_access(). -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:34:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:34:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749555.1157725 (Exim 4.92) (envelope-from ) id 1sMc9q-0008C6-4I; Wed, 26 Jun 2024 23:34:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749555.1157725; Wed, 26 Jun 2024 23:34: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 1sMc9q-0008By-1V; Wed, 26 Jun 2024 23:34:34 +0000 Received: by outflank-mailman (input) for mailman id 749555; Wed, 26 Jun 2024 23:34:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9o-0008Bf-U6 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9o-0002vK-TP for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc9o-0001ak-Sa for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2nVgALHRbL4s9JfejfukgQ2DgCAp19xDdFh6D/MyMIw=; b=u7c4WVC74pGULftWW6c7cDURy6 n/qB5YoHyidI8Le9oGOUHb6TK6Ze0tMy/yEhKfxIu7FhHj7vuNg/EkpC6vwxsPw11MxvNOd2hFNK9 vK5izsBBw8J9lRIciUszb5z40g9j+JGk1I0Eq9//U7dVfDkx21hwzQGpHYh0GEEqvFCU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/Intel: unlock CPUID earlier for the BSP Message-Id: Date: Wed, 26 Jun 2024 23:34:32 +0000 commit ee1e76ed10ec64c654925d5b305c7c7a7743f717 Author: Jan Beulich AuthorDate: Wed Jun 26 14:11:08 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:11:08 2024 +0200 x86/Intel: unlock CPUID earlier for the BSP Intel CPUs have a MSR bit to limit CPUID enumeration to leaf two. If this bit is set by the BIOS then CPUID evaluation does not work when data from any leaf greater than two is needed; early_cpu_init() in particular wants to collect leaf 7 data. Cure this by unlocking CPUID right before evaluating anything which depends on the maximum CPUID leaf being greater than two. Inspired by (and description cloned from) Linux commit 0c2f6d04619e ("x86/topology/intel: Unlock CPUID before evaluating anything"). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné master commit: fa4d026737a47cd1d66ffb797a29150b4453aa9f master date: 2024-06-18 15:12:44 +0200 --- xen/arch/x86/cpu/common.c | 3 ++- xen/arch/x86/cpu/cpu.h | 2 ++ xen/arch/x86/cpu/intel.c | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 88855f5773..14a3a97806 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -343,7 +343,8 @@ void __init early_cpu_init(void) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_INTEL: intel_unlock_cpuid_leaves(c); + actual_cpu = intel_cpu_dev; break; case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 85a67771f7..bbde5e528a 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -24,3 +24,5 @@ void amd_init_lfence(struct cpuinfo_x86 *c); void amd_init_ssbd(const struct cpuinfo_x86 *c); void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); + +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 2d439e0bd2..490f7ff6f1 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -293,15 +293,11 @@ static void __init noinline intel_init_levelling(void) ctxt_switch_masking = intel_ctxt_switch_masking; } -static void cf_check early_init_intel(struct cpuinfo_x86 *c) +/* Unmask CPUID levels (and NX) if masked. */ +void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) { - u64 misc_enable, disable; - - /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ - if (c->x86 == 15 && c->x86_cache_alignment == 64) - c->x86_cache_alignment = 128; + uint64_t misc_enable, disable; - /* Unmask CPUID levels and NX if masked: */ rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); disable = misc_enable & (MSR_IA32_MISC_ENABLE_LIMIT_CPUID | @@ -309,17 +305,26 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c) if (disable) { wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); bootsym(trampoline_misc_enable_off) |= disable; - bootsym(trampoline_efer) |= EFER_NXE; } - - if (disable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) - printk(KERN_INFO "revised cpuid level: %d\n", - cpuid_eax(0)); + if (disable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) { + c->cpuid_level = cpuid_eax(0); + printk(KERN_INFO "revised cpuid level: %u\n", c->cpuid_level); + } if (disable & MSR_IA32_MISC_ENABLE_XD_DISABLE) { + bootsym(trampoline_efer) |= EFER_NXE; write_efer(read_efer() | EFER_NXE); printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); } +} + +static void cf_check early_init_intel(struct cpuinfo_x86 *c) +{ + /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ + if (c->x86 == 15 && c->x86_cache_alignment == 64) + c->x86_cache_alignment = 128; + + intel_unlock_cpuid_leaves(c); /* CPUID workaround for Intel 0F33/0F34 CPU */ if (boot_cpu_data.x86 == 0xF && boot_cpu_data.x86_model == 3 && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:34:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:34:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749556.1157730 (Exim 4.92) (envelope-from ) id 1sMcA0-0008Eh-6k; Wed, 26 Jun 2024 23:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749556.1157730; Wed, 26 Jun 2024 23:34: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 1sMcA0-0008EZ-2v; Wed, 26 Jun 2024 23:34:44 +0000 Received: by outflank-mailman (input) for mailman id 749556; Wed, 26 Jun 2024 23:34:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9z-0008EH-0m for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMc9z-0002vT-0A for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMc9y-0001by-Vf for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GHZXv4d3gjdjpvjsI9hw38yq/fr6t27gDZyEfeh4p5U=; b=Ht0RtbujMjpC/lTJcFDjZzRdrU deWrKxGDWdfAqHk93e8pkI2TtJj2joozTTIQ4nL1Txz0wLxduIXlTJwZ3xKg3MPXoWSV0e0/9N/gP ZOw/4OPo0H67GiXFhfg+EGB/X390BIEpFpI20hYu+PSDUypZUW0dljPafi6nt96Dqh70=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 23:34:42 +0000 commit a1c62c2ca689a90684fef36a108e7e71b951b7d5 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:11:33 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:11:33 2024 +0200 x86/irq: deal with old_cpu_mask for interrupts in movement in fixup_irqs() Given the current logic it's possible for ->arch.old_cpu_mask to get out of sync: if a CPU set in old_cpu_mask is offlined and then onlined again without old_cpu_mask having been updated the data in the mask will no longer be accurate, as when brought back online the CPU will no longer have old_vector configured to handle the old interrupt source. If there's an interrupt movement in progress, and the to be offlined CPU (which is the call context) is in the old_cpu_mask, clear it and update the mask, so it doesn't contain stale data. Note that when the system is going down fixup_irqs() will be called by smp_send_stop() from CPU 0 with a mask with only CPU 0 on it, effectively asking to move all interrupts to the current caller (CPU 0) which is the only CPU to remain online. In that case we don't care to migrate interrupts that are in the process of being moved, as it's likely we won't be able to move all interrupts to CPU 0 due to vector shortage anyway. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 817d1cd627be668c358d038f0fadbf7d24d417d3 master date: 2024-06-18 15:14:49 +0200 --- xen/arch/x86/irq.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 2eac2de0b4..b1387cf6c9 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2539,7 +2539,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { bool break_affinity = false, set_affinity = true; - unsigned int vector; + unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); if ( irq == 2 ) @@ -2582,6 +2582,33 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) affinity); } + if ( desc->arch.move_in_progress && + /* + * Only attempt to adjust the mask if the current CPU is going + * offline, otherwise the whole system is going down and leaving + * stale data in the masks is fine. + */ + !cpu_online(cpu) && + cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) + { + /* + * This CPU is going offline, remove it from ->arch.old_cpu_mask + * and possibly release the old vector if the old mask becomes + * empty. + * + * Note cleaning ->arch.old_cpu_mask is required if the CPU is + * brought offline and then online again, as when re-onlined the + * per-cpu vector table will no longer have ->arch.old_vector + * setup, and hence ->arch.old_cpu_mask would be stale. + */ + cpumask_clear_cpu(cpu, desc->arch.old_cpu_mask); + if ( cpumask_empty(desc->arch.old_cpu_mask) ) + { + desc->arch.move_in_progress = 0; + release_old_vec(desc); + } + } + /* * Avoid shuffling the interrupt around as long as current target CPUs * are a subset of the input mask. What fixup_irqs() cares about is -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:34:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:34:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749557.1157733 (Exim 4.92) (envelope-from ) id 1sMcAA-0008He-76; Wed, 26 Jun 2024 23:34:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749557.1157733; Wed, 26 Jun 2024 23:34: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 1sMcAA-0008HX-4T; Wed, 26 Jun 2024 23:34:54 +0000 Received: by outflank-mailman (input) for mailman id 749557; Wed, 26 Jun 2024 23:34:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcA9-0008HG-3q for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcA9-0002va-38 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:34:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMcA9-0001cw-2O for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J4FddPCETXKlNizN63prShYbSeShoAb/IxjhUuJbHDE=; b=xnm6tGraNKTYPS5j4yizIQbFJ6 YtgtJXzm7Bre7xN1CFB/dF0AUKDjr2rPrB81N+wrmUzU72J6seq0/1hgKlbP2k+ps5263np9I1Wal RxDfLOY+y3FNxCxmXeFARFRNlPsU3TN7tl42FDrjJ5O7XK8iUA7uxCDvsGDEhlnn1K/o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/irq: handle moving interrupts in _assign_irq_vector() Message-Id: Date: Wed, 26 Jun 2024 23:34:53 +0000 commit 7d3fee8d8e78c3c2c25af995b9c5d1c22d98d54c Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:12:05 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:12:05 2024 +0200 x86/irq: handle moving interrupts in _assign_irq_vector() Currently there's logic in fixup_irqs() that attempts to prevent _assign_irq_vector() from failing, as fixup_irqs() is required to evacuate all interrupts from the CPUs not present in the input mask. The current logic in fixup_irqs() is incomplete, as it doesn't deal with interrupts that have move_cleanup_count > 0 and a non-empty ->arch.old_cpu_mask field. Instead of attempting to fixup the interrupt descriptor in fixup_irqs() so that _assign_irq_vector() cannot fail, introduce logic in _assign_irq_vector() to deal with interrupts that have either move_{in_progress,cleanup_count} set and no remaining online CPUs in ->arch.cpu_mask. If _assign_irq_vector() is requested to move an interrupt in the state described above, first attempt to see if ->arch.old_cpu_mask contains any valid CPUs that could be used as fallback, and if that's the case do move the interrupt back to the previous destination. Note this is easier because the vector hasn't been released yet, so there's no need to allocate and setup a new vector on the destination. Due to the logic in fixup_irqs() that clears offline CPUs from ->arch.old_cpu_mask (and releases the old vector if the mask becomes empty) it shouldn't be possible to get into _assign_irq_vector() with ->arch.move_{in_progress,cleanup_count} set but no online CPUs in ->arch.old_cpu_mask. However if ->arch.move_{in_progress,cleanup_count} is set and the interrupt has also changed affinity, it's possible the members of ->arch.old_cpu_mask are no longer part of the affinity set, move the interrupt to a different CPU part of the provided mask and keep the current ->arch.old_{cpu_mask,vector} for the pending interrupt movement to be completed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 369558924a642bbb0cb731e9a3375958867cb17b master date: 2024-06-18 15:15:10 +0200 --- xen/arch/x86/irq.c | 97 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index b1387cf6c9..0b4d4b44a5 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -553,7 +553,58 @@ static int _assign_irq_vector(struct irq_desc *desc, const cpumask_t *mask) } if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) - return -EAGAIN; + { + /* + * If the current destination is online refuse to shuffle. Retry after + * the in-progress movement has finished. + */ + if ( cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) + return -EAGAIN; + + /* + * Due to the logic in fixup_irqs() that clears offlined CPUs from + * ->arch.old_cpu_mask it shouldn't be possible to get here with + * ->arch.move_{in_progress,cleanup_count} set and no online CPUs in + * ->arch.old_cpu_mask. + */ + ASSERT(valid_irq_vector(desc->arch.old_vector)); + ASSERT(cpumask_intersects(desc->arch.old_cpu_mask, &cpu_online_map)); + + if ( cpumask_intersects(desc->arch.old_cpu_mask, mask) ) + { + /* + * Fallback to the old destination if moving is in progress and the + * current destination is to be offlined. This is only possible if + * the CPUs in old_cpu_mask intersect with the affinity mask passed + * in the 'mask' parameter. + */ + desc->arch.vector = desc->arch.old_vector; + cpumask_and(desc->arch.cpu_mask, desc->arch.old_cpu_mask, mask); + + /* Undo any possibly done cleanup. */ + for_each_cpu(cpu, desc->arch.cpu_mask) + per_cpu(vector_irq, cpu)[desc->arch.vector] = irq; + + /* Cancel the pending move and release the current vector. */ + desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; + cpumask_clear(desc->arch.old_cpu_mask); + desc->arch.move_in_progress = 0; + desc->arch.move_cleanup_count = 0; + if ( desc->arch.used_vectors ) + { + ASSERT(test_bit(old_vector, desc->arch.used_vectors)); + clear_bit(old_vector, desc->arch.used_vectors); + } + + return 0; + } + + /* + * There's an interrupt movement in progress but the destination(s) in + * ->arch.old_cpu_mask are not suitable given the 'mask' parameter, go + * through the full logic to find a new vector in a suitable CPU. + */ + } err = -ENOSPC; @@ -609,7 +660,22 @@ next: current_vector = vector; current_offset = offset; - if ( valid_irq_vector(old_vector) ) + if ( desc->arch.move_in_progress || desc->arch.move_cleanup_count ) + { + ASSERT(!cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map)); + /* + * Special case when evacuating an interrupt from a CPU to be + * offlined and the interrupt was already in the process of being + * moved. Leave ->arch.old_{vector,cpu_mask} as-is and just + * replace ->arch.{cpu_mask,vector} with the new destination. + * Cleanup will be done normally for the old fields, just release + * the current vector here. + */ + if ( desc->arch.used_vectors && + !test_and_clear_bit(old_vector, desc->arch.used_vectors) ) + ASSERT_UNREACHABLE(); + } + else if ( valid_irq_vector(old_vector) ) { cpumask_and(desc->arch.old_cpu_mask, desc->arch.cpu_mask, &cpu_online_map); @@ -2620,33 +2686,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) continue; } - /* - * In order for the affinity adjustment below to be successful, we - * need _assign_irq_vector() to succeed. This in particular means - * clearing desc->arch.move_in_progress if this would otherwise - * prevent the function from succeeding. Since there's no way for the - * flag to get cleared anymore when there's no possible destination - * left (the only possibility then would be the IRQs enabled window - * after this loop), there's then also no race with us doing it here. - * - * Therefore the logic here and there need to remain in sync. - */ - if ( desc->arch.move_in_progress && - !cpumask_intersects(mask, desc->arch.cpu_mask) ) - { - unsigned int cpu; - - cpumask_and(affinity, desc->arch.old_cpu_mask, &cpu_online_map); - - spin_lock(&vector_lock); - for_each_cpu(cpu, affinity) - per_cpu(vector_irq, cpu)[desc->arch.old_vector] = ~irq; - spin_unlock(&vector_lock); - - release_old_vec(desc); - desc->arch.move_in_progress = 0; - } - if ( !cpumask_intersects(mask, desc->affinity) ) { break_affinity = true; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:35:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:35:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749558.1157737 (Exim 4.92) (envelope-from ) id 1sMcAK-0008Kh-9q; Wed, 26 Jun 2024 23:35:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749558.1157737; Wed, 26 Jun 2024 23:35: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 1sMcAK-0008KZ-7D; Wed, 26 Jun 2024 23:35:04 +0000 Received: by outflank-mailman (input) for mailman id 749558; Wed, 26 Jun 2024 23:35:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAJ-0008KP-6n for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAJ-0002vv-62 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMcAJ-0001e6-5H for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NQwBlN4eIyUm9LJntIKmvLBgvIWNTy0AnnB7gUKy+pA=; b=21l9XhWdHlGapu2VXEZD8ldKII zsFX3QgrKkRLcIItb4jozWxvyWmkZPw6ydUfACrJNA4sLC+Do02XIXbk+drX56oQRXfOF7cX0qAGf sP8qBeGcUhYkQjejQ7yVoDfsEF883mXiaeJVbZ/U86AB55oOarbuQTY/A4qGud2TMq4c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xen/ubsan: Fix UB in type_descriptor declaration Message-Id: Date: Wed, 26 Jun 2024 23:35:03 +0000 commit 9dfe294cb6de52c34f1419394fde1fe2b6c2a70b Author: Andrew Cooper AuthorDate: Wed Jun 26 14:12:38 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:12:38 2024 +0200 xen/ubsan: Fix UB in type_descriptor declaration struct type_descriptor is arranged with a NUL terminated string following the kind/info fields. The only reason this doesn't trip UBSAN detection itself (on more modern compilers at least) is because struct type_descriptor is only referenced in suppressed regions. Switch the declaration to be a real flexible member. No functional change. Fixes: 00fcf4dd8eb4 ("xen/ubsan: Import ubsan implementation from Linux 4.13") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: bd59af99700f075d06a6d47a16f777c9519928e0 master date: 2024-06-18 14:55:04 +0100 --- xen/common/ubsan/ubsan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/ubsan/ubsan.h b/xen/common/ubsan/ubsan.h index a3159040fe..3db42e75b1 100644 --- a/xen/common/ubsan/ubsan.h +++ b/xen/common/ubsan/ubsan.h @@ -10,7 +10,7 @@ enum { struct type_descriptor { u16 type_kind; u16 type_info; - char type_name[1]; + char type_name[]; }; struct source_location { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:35:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:35:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749559.1157741 (Exim 4.92) (envelope-from ) id 1sMcAU-0008N2-BW; Wed, 26 Jun 2024 23:35:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749559.1157741; Wed, 26 Jun 2024 23:35: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 1sMcAU-0008Mu-8d; Wed, 26 Jun 2024 23:35:14 +0000 Received: by outflank-mailman (input) for mailman id 749559; Wed, 26 Jun 2024 23:35:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAT-0008Mm-9U for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAT-0002wL-8u for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMcAT-0001ez-8F for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DsDdMLhCexUJpVOfFSq+/iFrfqFJzlZpeCGx3Drej3o=; b=g1RgVA5XuT/ovLXJBc4zw5YEt4 qnbbf4y1VxKRcYoAIGt7Aj6gG3Z8+qT7Zaksy2I2GPEYLrkQpE+5x0jlPq2X2yaayEC+PhEn/1xU1 sxY49TFV/vZzPFMYCsiK5dhP184KHPNnj5QtoB2zlHAH0u/M/4SKnoA/uzT9xQWfv5LY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/xstate: Fix initialisation of XSS cache Message-Id: Date: Wed, 26 Jun 2024 23:35:13 +0000 commit 80fe1fe2fe559a7e80fb2258f968beaa11656959 Author: Andrew Cooper AuthorDate: Wed Jun 26 14:13:17 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:13:17 2024 +0200 x86/xstate: Fix initialisation of XSS cache The clobbering of this_cpu(xcr0) and this_cpu(xss) to architecturally invalid values is to force the subsequent set_xcr0() and set_msr_xss() to reload the hardware register. While XCR0 is reloaded in xstate_init(), MSR_XSS isn't. This causes get_msr_xss() to return the invalid value, and logic of the form: old = get_msr_xss(); set_msr_xss(new); ... set_msr_xss(old); to try and restore said invalid value. The architecturally invalid value must be purged from the cache, meaning the hardware register must be written at least once. This in turn highlights that the invalid value must only be used in the case that the hardware register is available. Fixes: f7f4a523927f ("x86/xstate: reset cached register values on resume") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 9e6dbbe8bf400aacb99009ddffa91d2a0c312b39 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/xstate.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index cea3d0b81f..8a636c6e80 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -642,13 +642,6 @@ void xstate_init(struct cpuinfo_x86 *c) return; } - /* - * Zap the cached values to make set_xcr0() and set_msr_xss() really - * write it. - */ - this_cpu(xcr0) = 0; - this_cpu(xss) = ~0; - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; BUG_ON(!valid_xcr0(feature_mask)); @@ -658,8 +651,19 @@ void xstate_init(struct cpuinfo_x86 *c) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); + + /* + * Zap the cached values to make set_xcr0() and set_msr_xss() really write + * the hardware register. + */ + this_cpu(xcr0) = 0; if ( !set_xcr0(feature_mask) ) BUG(); + if ( cpu_has_xsaves ) + { + this_cpu(xss) = ~0; + set_msr_xss(0); + } if ( bsp ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:35:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:35:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749560.1157744 (Exim 4.92) (envelope-from ) id 1sMcAe-0008Pj-Co; Wed, 26 Jun 2024 23:35:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749560.1157744; Wed, 26 Jun 2024 23:35: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 1sMcAe-0008Pe-AD; Wed, 26 Jun 2024 23:35:24 +0000 Received: by outflank-mailman (input) for mailman id 749560; Wed, 26 Jun 2024 23:35:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAd-0008PM-CO for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAd-0002wS-Bl for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMcAd-0001gA-B3 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ckzM8ZlpgNSgdRetMszUEref3ciEwxetn1HnvCvMyEY=; b=kLI+SZdhZXrrtfKxt9/5KpkI2t BOPYbm00enCChKDYZRzy4LCDorELq+MUvFBBCsh6fLDuNfMboPZjJljweIh3fb4g1Q9Ktw1WCyNhs GnzV9nWXQMn4K2+RN7wXElSTcgN7cMvCgJWVHNxjO8/aUkd58yecLbFnuVzeBHZQ5In4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/cpuid: Fix handling of XSAVE dynamic leaves Message-Id: Date: Wed, 26 Jun 2024 23:35:23 +0000 commit 02f94eab2183202180689eb85a2408d21dbe5505 Author: Andrew Cooper AuthorDate: Wed Jun 26 14:13:37 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:13:37 2024 +0200 x86/cpuid: Fix handling of XSAVE dynamic leaves [ This is a minimal backport of commit 71cacfb035f4 ("x86/cpuid: Fix handling of XSAVE dynamic leaves") to fix the bugs without depending on the large rework of XSTATE handling in Xen 4.19 ] First, if XSAVE is available in hardware but not visible to the guest, the dynamic leaves shouldn't be filled in. Second, the comment concerning XSS state is wrong. VT-x doesn't manage host/guest state automatically, but there is provision for "host only" bits to be set, so the implications are still accurate. In Xen 4.18, no XSS states are supported, so it's safe to keep deferring to real hardware. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 71cacfb035f4a78ee10970dc38a3baa04d387451 master date: 2024-06-19 13:00:06 +0100 --- xen/arch/x86/cpuid.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index f311372cdf..ead6dde3f2 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -330,24 +330,20 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case XSTATE_CPUID: switch ( subleaf ) { - case 1: - if ( p->xstate.xsavec || p->xstate.xsaves ) - { - /* - * TODO: Figure out what to do for XSS state. VT-x manages - * host vs guest MSR_XSS automatically, so as soon as we start - * supporting any XSS states, the wrong XSS will be in - * context. - */ - BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); - - /* - * Read CPUID[0xD,0/1].EBX from hardware. They vary with - * enabled XSTATE, and appropraite XCR0|XSS are in context. - */ + /* + * Read CPUID[0xd,0/1].EBX from hardware. They vary with enabled + * XSTATE, and the appropriate XCR0 is in context. + */ case 0: - res->b = cpuid_count_ebx(leaf, subleaf); - } + if ( p->basic.xsave ) + res->b = cpuid_count_ebx(0xd, 0); + break; + + case 1: + /* This only works because Xen doesn't support XSS states yet. */ + BUILD_BUG_ON(XSTATE_XSAVES_ONLY != 0); + if ( p->xstate.xsavec ) + res->b = cpuid_count_ebx(0xd, 1); break; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jun 26 23:35:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jun 2024 23:35:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749561.1157749 (Exim 4.92) (envelope-from ) id 1sMcAp-0008Sf-Et; Wed, 26 Jun 2024 23:35:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749561.1157749; Wed, 26 Jun 2024 23: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 1sMcAp-0008SX-C4; Wed, 26 Jun 2024 23:35:35 +0000 Received: by outflank-mailman (input) for mailman id 749561; Wed, 26 Jun 2024 23:35:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAn-0008SL-FW for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMcAn-0002wZ-Er for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMcAn-0001hI-E8 for xen-changelog@lists.xenproject.org; Wed, 26 Jun 2024 23:35: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W2y8S42phqp6cKpp9kL6/xE9NHV6LdW5xdXCB5Kwt5Q=; b=sOj1IbwSC1/8ZG1zMpLN+cs1U3 zX4lS7OlDOO1kqZH+x5GCF3HtingvrVnjsOiuqUhchrMbIt/I45B7gIeCr0ERJY5dsERg8Njyy6ub yy79iDVG0rGtz46/n8974UQcf1KUBWOcSyH3KDzrftqZuflrP5l1utcSB0L8tLxNwPeA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/irq: forward pending interrupts to new destination in fixup_irqs() Message-Id: Date: Wed, 26 Jun 2024 23:35:33 +0000 commit 87a49d2ec6fe2881e4b0947ea3e0e0f041dc6be3 Author: Roger Pau Monné AuthorDate: Wed Jun 26 14:14:01 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 14:14:01 2024 +0200 x86/irq: forward pending interrupts to new destination in fixup_irqs() fixup_irqs() is used to evacuate interrupts from to be offlined CPUs. Given the CPU is to become offline, the normal migration logic used by Xen where the vector in the previous target(s) is left configured until the interrupt is received on the new destination is not suitable. Instead attempt to do as much as possible in order to prevent loosing interrupts. If fixup_irqs() is called from the CPU to be offlined (as is currently the case for CPU hot unplug) attempt to forward pending vectors when interrupts that target the current CPU are migrated to a different destination. Additionally, for interrupts that have already been moved from the current CPU prior to the call to fixup_irqs() but that haven't been delivered to the new destination (iow: interrupts with move_in_progress set and the current CPU set in ->arch.old_cpu_mask) also check whether the previous vector is pending and forward it to the new destination. This allows us to remove the window with interrupts enabled at the bottom of fixup_irqs(). Such window wasn't safe anyway: references to the CPU to become offline are removed from interrupts masks, but the per-CPU vector_irq[] array is not updated to reflect those changes (as the CPU is going offline anyway). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: e2bb28d621584fce15c907002ddc7c6772644b64 master date: 2024-06-20 12:09:32 +0200 --- xen/arch/x86/include/asm/apic.h | 5 +++++ xen/arch/x86/irq.c | 46 +++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h index 7625c0ecd6..ad8d7cc054 100644 --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -145,6 +145,11 @@ static __inline bool_t apic_isr_read(u8 vector) (vector & 0x1f)) & 1; } +static inline bool apic_irr_read(unsigned int vector) +{ + return apic_read(APIC_IRR + (vector / 32 * 0x10)) & (1U << (vector % 32)); +} + static __inline u32 get_apic_id(void) /* Get the physical APIC id */ { u32 id = apic_read(APIC_ID); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 0b4d4b44a5..11b2a213aa 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2604,7 +2604,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) for ( irq = 0; irq < nr_irqs; irq++ ) { - bool break_affinity = false, set_affinity = true; + bool break_affinity = false, set_affinity = true, check_irr = false; unsigned int vector, cpu = smp_processor_id(); cpumask_t *affinity = this_cpu(scratch_cpumask); @@ -2657,6 +2657,25 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.old_cpu_mask) ) { + /* + * This to be offlined CPU was the target of an interrupt that's + * been moved, and the new destination target hasn't yet + * acknowledged any interrupt from it. + * + * We know the interrupt is configured to target the new CPU at + * this point, so we can check IRR for any pending vectors and + * forward them to the new destination. + * + * Note that for the other case of an interrupt movement being in + * progress (move_cleanup_count being non-zero) we know the new + * destination has already acked at least one interrupt from this + * source, and hence there's no need to forward any stale + * interrupts. + */ + if ( apic_irr_read(desc->arch.old_vector) ) + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + /* * This CPU is going offline, remove it from ->arch.old_cpu_mask * and possibly release the old vector if the old mask becomes @@ -2697,6 +2716,14 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( desc->handler->disable ) desc->handler->disable(desc); + /* + * If the current CPU is going offline and is (one of) the target(s) of + * the interrupt, signal to check whether there are any pending vectors + * to be handled in the local APIC after the interrupt has been moved. + */ + if ( !cpu_online(cpu) && cpumask_test_cpu(cpu, desc->arch.cpu_mask) ) + check_irr = true; + if ( desc->handler->set_affinity ) desc->handler->set_affinity(desc, affinity); else if ( !(warned++) ) @@ -2707,6 +2734,18 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) cpumask_copy(affinity, desc->affinity); + if ( check_irr && apic_irr_read(vector) ) + /* + * Forward pending interrupt to the new destination, this CPU is + * going offline and otherwise the interrupt would be lost. + * + * Do the IRR check as late as possible before releasing the irq + * desc in order for any in-flight interrupts to be delivered to + * the lapic. + */ + send_IPI_mask(cpumask_of(cpumask_any(desc->arch.cpu_mask)), + desc->arch.vector); + spin_unlock(&desc->lock); if ( !verbose ) @@ -2718,11 +2757,6 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) printk("Broke affinity for IRQ%u, new: %*pb\n", irq, CPUMASK_PR(affinity)); } - - /* That doesn't seem sufficient. Give it 1ms. */ - local_irq_enable(); - mdelay(1); - local_irq_disable(); } void fixup_eoi(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 03:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 03:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749669.1157903 (Exim 4.92) (envelope-from ) id 1sMg3H-0007CF-Ea; Thu, 27 Jun 2024 03:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749669.1157903; Thu, 27 Jun 2024 03: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 1sMg3H-0007C7-Bt; Thu, 27 Jun 2024 03:44:03 +0000 Received: by outflank-mailman (input) for mailman id 749669; Thu, 27 Jun 2024 03:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMg3G-0007By-0T for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 03:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMg3F-0007jI-VF for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 03:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMg3F-0007Ls-TO for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 03: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kqLkgeIjdjzCZKv15lCdleXoJfxluQCF+z2r79lrpjs=; b=Wtmz/O65dP/0fBeWNK1vexslav PgXgeGRASTwZr6ESxa6tD6TmbEcYFYTkqe62Z2/5N4RmDuJBR854V/Vr2YWt+EfFN4xTa2HCVgarw YgxvGiE1eDzvAcI/VqV9IEqI5VeQRa2lJI7MxwMfUFIQkHF3rI3ug0JLBJf/nPTU4uck=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Config.mk: update MiniOS commit Message-Id: Date: Thu, 27 Jun 2024 03:44:01 +0000 commit 4712e3b3769e6c03e0aaaa8179395f0fb7b141cc Author: Jan Beulich AuthorDate: Wed Jun 26 12:49:08 2024 +0200 Commit: Jan Beulich CommitDate: Wed Jun 26 12:49:08 2024 +0200 Config.mk: update MiniOS commit Pull in the gcc14 build fix there. Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Release-Acked-by: Oleksii Kurochko --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index a962f095ca..1a3938b6c4 100644 --- a/Config.mk +++ b/Config.mk @@ -224,7 +224,7 @@ QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git QEMU_UPSTREAM_REVISION ?= master MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git -MINIOS_UPSTREAM_REVISION ?= b6a5b4d72b88e5c4faed01f5a44505de022860fc +MINIOS_UPSTREAM_REVISION ?= 8b038c7411ae7e823eaf6d15d5efbe037a07197a SEABIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/seabios.git SEABIOS_UPSTREAM_REVISION ?= rel-1.16.3 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 11:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 11:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749982.1158227 (Exim 4.92) (envelope-from ) id 1sMniT-0004EU-Py; Thu, 27 Jun 2024 11:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749982.1158227; Thu, 27 Jun 2024 11: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 1sMniT-0004EM-MS; Thu, 27 Jun 2024 11:55:05 +0000 Received: by outflank-mailman (input) for mailman id 749982; Thu, 27 Jun 2024 11:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMniS-0004EG-3z for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMniS-0000dk-24 for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMniS-0002Qc-0x for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5G3P6aqQHPYzH2kMSkl2hbecT3W5yibrb9nLW0Z8K1Y=; b=Y+gpJO0hp8OF3Nlk6RxPN4cBk0 IVh5YvPllC/gzJgiKQCLOPHO7Jy+Mhv8k8oLEMGotsoAHxlWPP/Yq7TpM0iyDYAK8zU0LrH+51yBQ 2ZDHHYJMXQ+vYPHXxIbWiHcv3R6O/QBmWa5SKPCZzuq7WgD29pOY9N3jaXAfNLhPrf38=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: address violations of MISRA C Rule 20.7 Message-Id: Date: Thu, 27 Jun 2024 11:55:04 +0000 commit 0dca0f2b9a7e05a4f3b982e260352e405eb405f8 Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:45:18 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:45:18 2024 +0200 automation/eclair: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". The helper macro bitmap_switch has parameters that cannot be parenthesized in order to comply with the rule, as that would break its functionality. Moreover, the risk of misuse due developer confusion is deemed not substantial enough to warrant a more involved refactor, thus the macro is deviated for this rule. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- docs/misra/safe.json | 8 ++++++++ xen/include/xen/bitmap.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/docs/misra/safe.json b/docs/misra/safe.json index c213e0a0be..3f18ef401c 100644 --- a/docs/misra/safe.json +++ b/docs/misra/safe.json @@ -60,6 +60,14 @@ }, { "id": "SAF-7-safe", + "analyser": { + "eclair": "MC3R1.R20.7" + }, + "name": "MC3R1.R20.7: deliberately non-parenthesized macro argument", + "text": "A macro parameter expands to an expression that is non-parenthesized, as doing so would break the functionality." + }, + { + "id": "SAF-8-safe", "analyser": {}, "name": "Sentinel", "text": "Next ID to be used" diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index b9f980e919..6ee39aa35a 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -103,10 +103,13 @@ extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); #define bitmap_switch(nbits, zero, small, large) \ unsigned int n__ = (nbits); \ if (__builtin_constant_p(nbits) && !n__) { \ + /* SAF-7-safe Rule 20.7 non-parenthesized macro argument */ \ zero; \ } else if (__builtin_constant_p(nbits) && n__ <= BITS_PER_LONG) { \ + /* SAF-7-safe Rule 20.7 non-parenthesized macro argument */ \ small; \ } else { \ + /* SAF-7-safe Rule 20.7 non-parenthesized macro argument */ \ large; \ } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 11:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 11:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749983.1158230 (Exim 4.92) (envelope-from ) id 1sMnid-0004G8-RG; Thu, 27 Jun 2024 11:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749983.1158230; Thu, 27 Jun 2024 11: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 1sMnid-0004G0-Nv; Thu, 27 Jun 2024 11:55:15 +0000 Received: by outflank-mailman (input) for mailman id 749983; Thu, 27 Jun 2024 11:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnic-0004Fq-6k for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnic-0000do-5Z for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMnic-0002RI-4D for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8QJMGZb9qhSGkwiV0rMSZc7lzArkpxY86Mkk6/g11kU=; b=3Zug8d+VSCvsRyKcCAOXy1QXUO AU901IR+LQQeooKAq5v8Qi27FvmB7xgZGc64tNy22DqGscGjCJnanqhyvXLr5uwzxyiB4JpP0vTCA rBbWa44jyNA9+Erx6rSF0PRNA9q5zLRv7i1rexcEoCtxTO4b4TYKytJY5ce3J8isQaJo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/self-tests: address violations of MISRA rule 20.7 Message-Id: Date: Thu, 27 Jun 2024 11:55:14 +0000 commit 4929fea7bd7322da2ede70f2ea53c3696c83032e Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:46:02 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:46:02 2024 +0200 xen/self-tests: address violations of MISRA rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/include/xen/self-tests.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h index 42a4cc4d17..58484fe5a8 100644 --- a/xen/include/xen/self-tests.h +++ b/xen/include/xen/self-tests.h @@ -19,11 +19,11 @@ #if !defined(CONFIG_CC_IS_CLANG) || CONFIG_CLANG_VERSION >= 80000 #define COMPILE_CHECK(fn, val, res) \ do { \ - typeof(fn(val)) real = fn(val); \ + typeof((fn)(val)) real = (fn)(val); \ \ if ( !__builtin_constant_p(real) ) \ asm ( ".error \"'" STR(fn(val)) "' not compile-time constant\"" ); \ - else if ( real != res ) \ + else if ( real != (res) ) \ asm ( ".error \"Compile time check '" STR(fn(val) == res) "' failed\"" ); \ } while ( 0 ) #else @@ -37,9 +37,9 @@ */ #define RUNTIME_CHECK(fn, val, res) \ do { \ - typeof(fn(val)) real = fn(HIDE(val)); \ + typeof((fn)(val)) real = (fn)(HIDE(val)); \ \ - if ( real != res ) \ + if ( real != (res) ) \ panic("%s: %s(%s) expected %u, got %u\n", \ __func__, #fn, #val, real, res); \ } while ( 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 11:55:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 11:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749984.1158236 (Exim 4.92) (envelope-from ) id 1sMnin-0004JG-Uo; Thu, 27 Jun 2024 11:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749984.1158236; Thu, 27 Jun 2024 11:55: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 1sMnin-0004J7-RE; Thu, 27 Jun 2024 11:55:25 +0000 Received: by outflank-mailman (input) for mailman id 749984; Thu, 27 Jun 2024 11:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnim-0004Iv-A4 for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnim-0000eJ-8f for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMnim-0002S7-7e for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WzYgaf8+1GAK2jUlh2AnTMytWNCvyusdC5/1yKqKMbI=; b=gTOOZW8H4Xet0Cmvxh0/tVeXcs a6iKqbteKmQJA/KFVvQXTLJ/SgDgZDyQIAPhx/Oc64ZUW00V4j6BJ+KtKM9gWqJpkxXIIJvO2qYJv tud7nBg9fhfUuZugBjoyk5+0i+QI1XyPzHthSMSUbbtoVnRfCLRGXRim8KTiXC08kV6s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/guest_access: address violations of MISRA rule 20.7 Message-Id: Date: Thu, 27 Jun 2024 11:55:24 +0000 commit f39642c308af4e174c6e54a45a3e51db373435a2 Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:46:27 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:46:27 2024 +0200 xen/guest_access: address violations of MISRA rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/include/xen/guest_access.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/guest_access.h b/xen/include/xen/guest_access.h index a2146749e3..2e0971c487 100644 --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -51,9 +51,9 @@ ((XEN_GUEST_HANDLE(type)) { &(hnd).p->fld }) #define guest_handle_from_ptr(ptr, type) \ - ((XEN_GUEST_HANDLE_PARAM(type)) { (type *)ptr }) + ((XEN_GUEST_HANDLE_PARAM(type)) { (type *)(ptr) }) #define const_guest_handle_from_ptr(ptr, type) \ - ((XEN_GUEST_HANDLE_PARAM(const_##type)) { (const type *)ptr }) + ((XEN_GUEST_HANDLE_PARAM(const_##type)) { (const type *)(ptr) }) /* * Copy an array of objects to guest context via a guest handle, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 11:55:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 11:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749985.1158238 (Exim 4.92) (envelope-from ) id 1sMnix-0004Lk-VI; Thu, 27 Jun 2024 11:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749985.1158238; Thu, 27 Jun 2024 11: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 1sMnix-0004Lc-Se; Thu, 27 Jun 2024 11:55:35 +0000 Received: by outflank-mailman (input) for mailman id 749985; Thu, 27 Jun 2024 11:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMniw-0004LQ-CY for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMniw-0000eQ-Bs for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMniw-0002TA-Ar for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DWxr169TNQDBN4wBCh0JCe6F+H3z6km3YA953Phjirk=; b=YA0wHY5NPBKqlU1h6MersE1Vp3 cpV1J3tDIzHyYsjzIHTKOiCIcjXmR6EbcY+eNsXxtxj3X6aC23EveCXlYTJQkDISWfjIsHmGkh0Na EbFOWXn6mgiyz1con4U59HvAD0rLQABdQYeJVI3FeENNKCmC5NPVrtRFbZp+XXzRsVgA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: address violations of MISRA C Rule 20.7 Message-Id: Date: Thu, 27 Jun 2024 11:55:34 +0000 commit c7e195fac02b850696d24a462612462ade4fe97b Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:46:57 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:46:57 2024 +0200 automation/eclair_analysis: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". The local helpers GRP2 and XADD in the x86 emulator use their first argument as the constant expression for a case label. This pattern is deviated project-wide, because it is very unlikely to induce developer confusion and result in the wrong control flow being carried out. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++-- docs/misra/deviations.rst | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index dcff4f4013..d12be858fe 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -458,13 +458,15 @@ unexpected result when the structure is given as argument to a sizeof() operator -doc_begin="Code violating Rule 20.7 is safe when macro parameters are used: (1) as function arguments; (2) as macro arguments; (3) as array indices; (4) as lhs -in assignments; (5) as initializers, possibly designated, in initalizer lists." +in assignments; (5) as initializers, possibly designated, in initalizer lists; +(6) as the constant expression in a switch clause label." -config=MC3R1.R20.7,expansion_context= {safe, "context(__call_expr_arg_contexts)"}, {safe, "left_right(^[(,\\[]$,^[),\\]]$)"}, {safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(array_subscript_expr), subscript)))"}, {safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(operator(assign), lhs)))"}, -{safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(init_list_expr||designated_init_expr), init)))"} +{safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(init_list_expr||designated_init_expr), init)))"}, +{safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(case_stmt), lower||upper)))"} -doc_end -doc_begin="Violations involving the __config_enabled macros cannot be fixed without diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index c6a2affc6a..7be2322123 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -416,7 +416,8 @@ Deviations related to MISRA C:2012 Rules: (2) as macro arguments; (3) as array indices; (4) as lhs in assignments; - (5) as initializers, possibly designated, in initalizer lists. + (5) as initializers, possibly designated, in initalizer lists; + (6) as constant expressions of switch case labels. - Tagged as `safe` for ECLAIR. * - R20.7 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 11:55:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 11:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749986.1158242 (Exim 4.92) (envelope-from ) id 1sMnj8-0004P4-0f; Thu, 27 Jun 2024 11:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749986.1158242; Thu, 27 Jun 2024 11: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 1sMnj7-0004Ow-U7; Thu, 27 Jun 2024 11:55:45 +0000 Received: by outflank-mailman (input) for mailman id 749986; Thu, 27 Jun 2024 11:55:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnj6-0004Of-Fp for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnj6-0000eX-F6 for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMnj6-0002U2-Dx for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Y83suK2+JKH1c0AA+McQBW2Q8xtCzvk0DNd0o1ZXwWI=; b=ZB3Rnd8pcgjHCxi5jdWhaUDzid J8zy33Nqm+wEaw41V36eqdGp6ZzQDzsWBIHvhWPEK0fW2n8o/azUwBIua1QXkfgRmwrFomwx3LdWY eEzXc4YXDQHXX7zu4tPT8nUZqIxuH/j/9Jb35xCPs519xkjbtVnVuKj/N8vpu5VSqNos=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/irq: address violations of MISRA C Rule 20.7 Message-Id: Date: Thu, 27 Jun 2024 11:55:44 +0000 commit 8f5581d7e1f37f38c3c92c01611e9f19b38e4881 Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:47:16 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:47:16 2024 +0200 x86/irq: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/include/xen/irq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 580ae37e74..17211f3399 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -178,7 +178,7 @@ extern struct pirq *pirq_get_info(struct domain *d, int pirq); #define pirq_field(d, p, f, def) ({ \ const struct pirq *__pi = pirq_info(d, p); \ - __pi ? __pi->f : def; \ + __pi ? __pi->f : (def); \ }) #define pirq_to_evtchn(d, pirq) pirq_field(d, pirq, evtchn, 0) #define pirq_masked(d, pirq) pirq_field(d, pirq, masked, 0) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 11:55:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 11:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749987.1158245 (Exim 4.92) (envelope-from ) id 1sMnjI-0004Rv-1v; Thu, 27 Jun 2024 11:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749987.1158245; Thu, 27 Jun 2024 11: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 1sMnjH-0004Ro-Vj; Thu, 27 Jun 2024 11:55:55 +0000 Received: by outflank-mailman (input) for mailman id 749987; Thu, 27 Jun 2024 11:55:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnjG-0004Rd-Ib for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnjG-0000eg-Hv for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:55:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMnjG-0002VF-HA for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Cim1H5v5LUNlrFJMdALjfwM1msEzq2mb1GBWioAUTEE=; b=5TSiTKHqKmkJQW8irQUWXXx8UW rSIjLwtJC6x/6h4dfhCL1pocCdb6VicDJ2J3U0pF0T2nF3YJ0HYD2o9UMM0+bP17FCZXJhGsSPFMH cBekrVXRnKI/Q2/5c9a7+9CkYMTOAXQb3WA+fcJ/f/LdGwQc2hn1SjHHRl4nt4vaSnUg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: clean ECLAIR configuration scripts Message-Id: Date: Thu, 27 Jun 2024 11:55:54 +0000 commit bfea273b7b1590554473b79fe7c0574ef36c642a Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:47:56 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:47:56 2024 +0200 automation/eclair_analysis: clean ECLAIR configuration scripts Remove from the ECLAIR integration scripts an unused option, which was already ignored, and make the help texts consistent with the rest of the scripts. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/analyze.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analyze.sh b/automation/eclair_analysis/ECLAIR/analyze.sh index 0ea5520c93..e96456c3c1 100755 --- a/automation/eclair_analysis/ECLAIR/analyze.sh +++ b/automation/eclair_analysis/ECLAIR/analyze.sh @@ -11,7 +11,7 @@ fatal() { } usage() { - fatal "Usage: ${script_name} " + fatal "Usage: ${script_name} " } if [[ $# -ne 2 ]]; then @@ -40,7 +40,6 @@ ECLAIR_REPORT_LOG=${ECLAIR_OUTPUT_DIR}/REPORT.log if [[ "$1" = "X86_64" ]]; then export CROSS_COMPILE= export XEN_TARGET_ARCH=x86_64 - EXTRA_ECLAIR_ENV_OPTIONS=-disable=MC3R1.R20.7 elif [[ "$1" = "ARM64" ]]; then export CROSS_COMPILE=aarch64-linux-gnu- export XEN_TARGET_ARCH=arm64 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 11:56:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 11:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.749988.1158250 (Exim 4.92) (envelope-from ) id 1sMnjS-0004Ub-3v; Thu, 27 Jun 2024 11:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 749988.1158250; Thu, 27 Jun 2024 11:56: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 1sMnjS-0004UU-0u; Thu, 27 Jun 2024 11:56:06 +0000 Received: by outflank-mailman (input) for mailman id 749988; Thu, 27 Jun 2024 11:56:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnjQ-0004UE-Lt for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:56:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMnjQ-0000f2-LB for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:56:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMnjQ-0002Wp-K6 for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 11:56: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pSucgDlAAerhJLkxY1z3zwu4LoI4klquj2JcozbQsdA=; b=xO/3LLpkCB75HObYSDqIq0wuEU anauGPwmQxGVgWBuAiJIrc3C04qtAYLEuFN8/emf+RquccTcYI/hR4mcJMXWlJOicMJowXtEUKFxh cW3E+cnFNOMJgp1g9t8SNeoV7WjFFCgTN4dLki8RmjqaOB5H8YvtAsLlT4mZKSbzlzXk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: address violations of MISRA C Rule 20.7 Message-Id: Date: Thu, 27 Jun 2024 11:56:04 +0000 commit 402e473249cf62dd4c6b3b137aa845db0fe1453a Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:48:08 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:48:08 2024 +0200 x86/traps: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- 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 9906e874d5..ee91fc56b1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -123,7 +123,7 @@ unsigned int __ro_after_init ler_msr; const unsigned int nmi_cpu; #define stack_words_per_line 4 -#define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)regs->rsp) +#define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)(regs)->rsp) void show_code(const struct cpu_user_regs *regs) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 13:00:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 13:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750071.1158324 (Exim 4.92) (envelope-from ) id 1sMojL-0008Oa-Lc; Thu, 27 Jun 2024 13:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750071.1158324; Thu, 27 Jun 2024 13: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 1sMojL-0008OR-IQ; Thu, 27 Jun 2024 13:00:03 +0000 Received: by outflank-mailman (input) for mailman id 750071; Thu, 27 Jun 2024 13:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMojK-00089Y-68 for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMojK-0001nT-3e for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMojK-0000El-1b for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Evg40+9FAidVPPXhOd57McwgVSeupS8E4JUALvAT6rE=; b=iDVqrdVJzeaoXv7st8ARFjD7U4 Br0C/nygnTL+zu8OJ236X3AH3u7a2RWHmVk3pPQ4GawcaGQV8phh5EgHxW7anVAT80gz3rM3qmzXT 2ZYjTHnWTKG16PikL2Vqt1j9CGZXWuynjllU1zxLWYVDs37kt7cCmj1KfaTmZ+1r3WVg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG.md: Fix indentation of "Removed" section Message-Id: Date: Thu, 27 Jun 2024 13:00:02 +0000 commit 188e5f1a80b5d64c1f0f07d9878d2c1c0ee8310d Author: George Dunlap AuthorDate: Mon Jun 24 09:43:04 2024 +0100 Commit: George Dunlap CommitDate: Wed Jun 26 14:19:29 2024 +0100 CHANGELOG.md: Fix indentation of "Removed" section Signed-off-by: George Dunlap Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1778419cae..f3c6c7954f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,12 +31,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - libxl support for backendtype=tap with tapback. ### Removed -- caml-stubdom. It hasn't built since 2014, was pinned to Ocaml 4.02, and has - been superseded by the MirageOS/SOLO5 projects. -- /usr/bin/pygrub symlink. This was deprecated in Xen 4.2 (2012) but left for - compatibility reasons. VMs configured with bootloader="/usr/bin/pygrub" - should be updated to just bootloader="pygrub". -- The Xen gdbstub on x86. + - caml-stubdom. It hasn't built since 2014, was pinned to Ocaml 4.02, and has + been superseded by the MirageOS/SOLO5 projects. + - /usr/bin/pygrub symlink. This was deprecated in Xen 4.2 (2012) but left for + compatibility reasons. VMs configured with bootloader="/usr/bin/pygrub" + should be updated to just bootloader="pygrub". + - The Xen gdbstub on x86. ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-11-16 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 13:00:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 13:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750073.1158328 (Exim 4.92) (envelope-from ) id 1sMojV-0000Zg-MO; Thu, 27 Jun 2024 13:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750073.1158328; Thu, 27 Jun 2024 13: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 1sMojV-0000ZY-Jn; Thu, 27 Jun 2024 13:00:13 +0000 Received: by outflank-mailman (input) for mailman id 750073; Thu, 27 Jun 2024 13:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMojU-0000ZI-8e for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMojU-0001na-7A for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMojU-0000GZ-67 for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=G9IrnV/S6nZgi+crcinmfmAY+iUBKeBrLufzW/rhnPA=; b=hRAaZeXPnHC4L8cLUbTAUNRS3X ZqgbeHyib53lLeLzKuz4b4HERTWYkNWLAML4+KRwlGyutwARHfwamDTH2qeyXhQmJraLTls1m0IXE kcdk3hLtQfhoB/ATQCJF7Xepm6G4buVutzr0rXnfF//+2YhgLkMo0h1ndyQJ7h3nqoyM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenalyze: Remove argp_program_bug_address Message-Id: Date: Thu, 27 Jun 2024 13:00:12 +0000 commit dde20e47afb51404d59be492ca924704f0fbf71d Author: George Dunlap AuthorDate: Mon Jun 24 11:23:18 2024 +0100 Commit: George Dunlap CommitDate: Wed Jun 26 14:19:29 2024 +0100 tools/xenalyze: Remove argp_program_bug_address xenalyze sets argp_program_bug_address to my old Citrix address. This was done before xenalyze was in the xen.git tree; and it's the only program in the tree which does so. Now that xenalyze is part of the normal Xen distribution, it should be obvious where to report bugs. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- tools/xentrace/xenalyze.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index d95e52695f..adc96dd7e4 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -10920,9 +10920,6 @@ const struct argp parser_def = { .doc = "", }; -const char *argp_program_bug_address = "George Dunlap "; - - int main(int argc, char *argv[]) { /* Start with warn at stderr. */ warn = stderr; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 13:00:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 13:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750074.1158332 (Exim 4.92) (envelope-from ) id 1sMojf-0000dP-No; Thu, 27 Jun 2024 13:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750074.1158332; Thu, 27 Jun 2024 13: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 1sMojf-0000dH-LC; Thu, 27 Jun 2024 13:00:23 +0000 Received: by outflank-mailman (input) for mailman id 750074; Thu, 27 Jun 2024 13:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMoje-0000d2-B2 for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMoje-0001ny-AH for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMoje-0000Hh-9B for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 13: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AzvJuTutjtIhQTxtbYLQKZn7q72Yo0tG44YHCkEuq+0=; b=4X5089EDvyjC8CjvfeSTuYNEAK 3FnT9XKSu4uugJjkhVM28Jzl78MzC6b7Ej5vL52ubGZ3vJgZYXGaYp/KI5gO1zbgFaPRvGTfkbgZG aSlqqr/VFt/2+kgcyZghhQ3YHo322ZKpjpu0ef4by3YVOXYSld3DjnFOuttaI7eB48eM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG: Add entries related to tracing Message-Id: Date: Thu, 27 Jun 2024 13:00:22 +0000 commit ecadd22a3de8ce7f1799e85af6f1e37c06c57049 Author: George Dunlap AuthorDate: Mon Jun 24 09:31:52 2024 +0100 Commit: George Dunlap CommitDate: Wed Jun 26 16:02:26 2024 +0100 CHANGELOG: Add entries related to tracing Signed-off-by: George Dunlap Acked-by: Andrew Cooper Release-Acked-by: Oleksii Kurochko --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3c6c7954f..35c3488f4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - When building with Systemd support (./configure --enable-systemd), remove libsystemd as a build dependency. Systemd Notify support is retained, now using a standalone library implementation. + - xenalyze no longer requires `--svm-mode` when analyzing traces + generated on AMD CPUs ### Added - On x86: @@ -37,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) compatibility reasons. VMs configured with bootloader="/usr/bin/pygrub" should be updated to just bootloader="pygrub". - The Xen gdbstub on x86. + - xentrace_format has been removed; use xenalyze instead. ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-11-16 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 27 23:33:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Jun 2024 23:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750394.1158565 (Exim 4.92) (envelope-from ) id 1sMybw-00083H-OO; Thu, 27 Jun 2024 23:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750394.1158565; Thu, 27 Jun 2024 23: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 1sMybw-000839-LZ; Thu, 27 Jun 2024 23:33:04 +0000 Received: by outflank-mailman (input) for mailman id 750394; Thu, 27 Jun 2024 23:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMybv-000833-LN for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 23:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sMybv-0004xh-JD for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 23:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sMybv-0000ij-GB for xen-changelog@lists.xenproject.org; Thu, 27 Jun 2024 23: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T3Kv91ZR69/yXQZVmOAXzmryDRfQneYyHyBBVkH7aOE=; b=WVYLvUxiwKWyGAjPdaL/KXGxWn gtjuis6pXBalLHIGj/NlnNdcWHEKeBMHwSEHF4i2fSmtCfWqlfES6jZCtIWsKelgUqoxBEPC1c3AE a8B1WOd6NGvpGL9XcLyzjDXRnyRcvewlF6qZWvccJrVejlW/5Lyevm3hZoujqSr4V204=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: add deviations agreed in MISRA meetings Message-Id: Date: Thu, 27 Jun 2024 23:33:03 +0000 commit 6d41f5b9e112e8934f59edfd7168a36706e0341a Author: Federico Serafini AuthorDate: Wed Jun 26 08:10:50 2024 +0200 Commit: Stefano Stabellini CommitDate: Thu Jun 27 15:38:33 2024 -0700 automation/eclair: add deviations agreed in MISRA meetings Update ECLAIR configuration to take into account the deviations agreed during the MISRA meetings. While doing this, remove the obsolete "Set [123]" comments. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 93 +++++++++++++++++++++--- docs/misra/deviations.rst | 81 +++++++++++++++++++-- 2 files changed, 158 insertions(+), 16 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index d12be858fe..0af1cb93d1 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -1,5 +1,3 @@ -### Set 1 ### - # # Series 2. # @@ -23,6 +21,11 @@ Constant expressions and unreachable branches of if and switch statements are ex -config=MC3R1.R2.1,reports+={deliberate, "any_area(any_loc(any_exp(macro(name(ASSERT_UNREACHABLE||PARSE_ERR_RET||PARSE_ERR||FAIL_MSR||FAIL_CPUID)))))"} -doc_end +-doc_begin="The asm-offset files are not linked deliberately, since they are used to generate definitions for asm modules." +-file_tag+={asm_offsets, "^xen/arch/(arm|x86)/(arm32|arm64|x86_64)/asm-offsets\\.c$"} +-config=MC3R1.R2.1,reports+={deliberate, "any_area(any_loc(file(asm_offsets)))"} +-doc_end + -doc_begin="Pure declarations (i.e., declarations without initialization) are not executable, and therefore it is safe for them to be unreachable." -config=MC3R1.R2.1,ignored_stmts+={"any()", "pure_decl()"} @@ -63,6 +66,12 @@ they are not instances of commented-out code." -config=MC3R1.D4.3,reports+={disapplied,"!(any_area(any_loc(file(^xen/arch/arm/arm64/.*$))))"} -doc_end +-doc_begin="The inline asm in 'arm64/lib/bitops.c' is tightly coupled with the surronding C code that acts as a wrapper, so it has been decided not to add an additional encapsulation layer." +-file_tag+={arm64_bitops, "^xen/arch/arm/arm64/lib/bitops\\.c$"} +-config=MC3R1.D4.3,reports+={deliberate, "all_area(any_loc(file(arm64_bitops)&&any_exp(macro(^(bit|test)op$))))"} +-config=MC3R1.D4.3,reports+={deliberate, "any_area(any_loc(file(arm64_bitops))&&context(name(int_clear_mask16)))"} +-doc_end + -doc_begin="This header file is autogenerated or empty, therefore it poses no risk if included more than once." -file_tag+={empty_header, "^xen/arch/arm/efi/runtime\\.h$"} @@ -213,10 +222,25 @@ Therefore the absence of prior declarations is safe." -config=MC3R1.R8.4,declarations+={safe, "loc(file(asm_defns))&&^current_stack_pointer$"} -doc_end +-doc_begin="The function apei_(read|check|clear)_mce are dead code and are excluded from non-debug builds, therefore the absence of prior declarations is safe." +-config=MC3R1.R8.4,declarations+={safe, "^apei_(read|check|clear)_mce\\(.*$"} +-doc_end + -doc_begin="asmlinkage is a marker to indicate that the function is only used to interface with asm modules." -config=MC3R1.R8.4,declarations+={safe,"loc(text(^(?s).*asmlinkage.*$, -1..0))"} -doc_end +-doc_begin="Given that bsearch and sort are defined with the attribute 'gnu_inline', it's deliberate not to have a prior declaration. +See Section \"6.33.1 Common Function Attributes\" of \"GCC_MANUAL\" for a full explanation of gnu_inline." +-file_tag+={bsearch_sort, "^xen/include/xen/(sort|lib)\\.h$"} +-config=MC3R1.R8.4,reports+={deliberate, "any_area(any_loc(file(bsearch_sort))&&decl(name(bsearch||sort)))"} +-doc_end + +-doc_begin="first_valid_mfn is defined in this way because the current lack of NUMA support in Arm and PPC requires it." +-file_tag+={first_valid_mfn, "^xen/common/page_alloc\\.c$"} +-config=MC3R1.R8.4,declarations+={deliberate,"loc(file(first_valid_mfn))"} +-doc_end + -doc_begin="The following variables are compiled in multiple translation units belonging to different executables and therefore are safe." -config=MC3R1.R8.6,declarations+={safe, "name(current_stack_pointer||bsearch||sort)"} @@ -257,8 +281,6 @@ dimension is higher than omitting the dimension." -config=MC3R1.R9.5,reports+={deliberate, "any()"} -doc_end -### Set 2 ### - # # Series 10. # @@ -299,7 +321,6 @@ integers arguments on two's complement architectures -config=MC3R1.R10.1,reports+={safe, "any_area(any_loc(any_exp(macro(^ISOLATE_LSB$))))"} -doc_end -### Set 3 ### -doc_begin="XEN only supports architectures where signed integers are representend using two's complement and all the XEN developers are aware of this." @@ -323,6 +344,49 @@ constant expressions are required.\"" # Series 11 # +-doc_begin="The conversion from a function pointer to unsigned long or (void *) does not lose any information, provided that the target type has enough bits to store it." +-config=MC3R1.R11.1,casts+={safe, + "from(type(canonical(__function_pointer_types))) + &&to(type(canonical(builtin(unsigned long)||pointer(builtin(void))))) + &&relation(definitely_preserves_value)" +} +-doc_end + +-doc_begin="The conversion from a function pointer to a boolean has a well-known semantics that do not lead to unexpected behaviour." +-config=MC3R1.R11.1,casts+={safe, + "from(type(canonical(__function_pointer_types))) + &&kind(pointer_to_boolean)" +} +-doc_end + +-doc_begin="The conversion from a pointer to an incomplete type to unsigned long does not lose any information, provided that the target type has enough bits to store it." +-config=MC3R1.R11.2,casts+={safe, + "from(type(any())) + &&to(type(canonical(builtin(unsigned long)))) + &&relation(definitely_preserves_value)" +} +-doc_end + +-doc_begin="Conversions to object pointers that have a pointee type with a smaller (i.e., less strict) alignment requirement are safe." +-config=MC3R1.R11.3,casts+={safe, + "!relation(more_aligned_pointee)" +} +-doc_end + +-doc_begin="Conversions from and to integral types are safe, in the assumption that the target type has enough bits to store the value. +See also Section \"4.7 Arrays and Pointers\" of \"GCC_MANUAL\"" +-config=MC3R1.R11.6,casts+={safe, + "(from(type(canonical(integral())))||to(type(canonical(integral())))) + &&relation(definitely_preserves_value)"} +-doc_end + +-doc_begin="The conversion from a pointer to a boolean has a well-known semantics that do not lead to unexpected behaviour." +-config=MC3R1.R11.6,casts+={safe, + "from(type(canonical(__pointer_types))) + &&kind(pointer_to_boolean)" +} +-doc_end + -doc_begin="Violations caused by container_of are due to pointer arithmetic operations with the provided offset. The resulting pointer is then immediately cast back to its original type, which preserves the qualifier. This use is deemed safe. @@ -364,9 +428,18 @@ activity." -config=MC3R1.R14.2,reports+={disapplied,"any()"} -doc_end --doc_begin="The XEN team relies on the fact that invariant conditions of 'if' -statements are deliberate" --config=MC3R1.R14.3,statements={deliberate , "wrapped(any(),node(if_stmt))" } +-doc_begin="The XEN team relies on the fact that invariant conditions of 'if' statements and conditional operators are deliberate" +-config=MC3R1.R14.3,statements+={deliberate, "wrapped(any(),node(if_stmt||conditional_operator||binary_conditional_operator))" } +-doc_end + +-doc_begin="Switches having a 'sizeof' operator as the condition are deliberate and have limited scope." +-config=MC3R1.R14.3,statements+={deliberate, "wrapped(any(),node(switch_stmt)&&child(cond, operator(sizeof)))" } +-doc_end + +-doc_begin="The use of an invariant size argument in {put,get}_unsafe_size and array_access_ok, as defined in arch/x86(_64)?/include/asm/uaccess.h is deliberate and is deemed safe." +-file_tag+={x86_uaccess, "^xen/arch/x86(_64)?/include/asm/uaccess\\.h$"} +-config=MC3R1.R14.3,reports+={deliberate, "any_area(any_loc(file(x86_uaccess)&&any_exp(macro(^(put|get)_unsafe_size$))))"} +-config=MC3R1.R14.3,reports+={deliberate, "any_area(any_loc(file(x86_uaccess)&&any_exp(macro(^array_access_ok$))))"} -doc_end -doc_begin="A controlling expression of 'if' and iteration statements having integer, character or pointer type has a semantics that is well-known to all Xen developers." @@ -545,8 +618,8 @@ falls under the jurisdiction of other MISRA rules." # General # --doc_begin="do-while-0 is a well recognized loop idiom by the xen community." --loop_idioms={do_stmt, "literal(0)"} +-doc_begin="do-while-[01] is a well recognized loop idiom by the xen community." +-loop_idioms={do_stmt, "literal(0)||literal(1)"} -doc_end -doc_begin="while-[01] is a well recognized loop idiom by the xen community." -loop_idioms+={while_stmt, "literal(0)||literal(1)"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 7be2322123..1ecce1469a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -63,6 +63,11 @@ Deviations related to MISRA C:2012 Rules: switch statement. - ECLAIR has been configured to ignore those statements. + * - R2.1 + - The asm-offset files are not linked deliberately, since they are used to + generate definitions for asm modules. + - Tagged as `deliberate` for ECLAIR. + * - R2.2 - Proving compliance with respect to Rule 2.2 is generally impossible: see ``_ for details. Moreover, peer @@ -203,6 +208,26 @@ Deviations related to MISRA C:2012 Rules: it. - Tagged as `safe` for ECLAIR. + * - R8.4 + - Some functions are excluded from non-debug build, therefore the absence + of declaration is safe. + - Tagged as `safe` for ECLAIR, such functions are: + - apei_read_mce() + - apei_check_mce() + - apei_clear_mce() + + * - R8.4 + - Given that bsearch and sort are defined with the attribute 'gnu_inline', + it's deliberate not to have a prior declaration. + See Section \"6.33.1 Common Function Attributes\" of \"GCC_MANUAL\" for + a full explanation of gnu_inline. + - Tagged as `deliberate` for ECLAIR. + + * - R8.4 + - first_valid_mfn is defined in this way because the current lack of NUMA + support in Arm and PPC requires it. + - Tagged as `deliberate` for ECLAIR. + * - R8.6 - The following variables are compiled in multiple translation units belonging to different executables and therefore are safe. @@ -282,6 +307,39 @@ Deviations related to MISRA C:2012 Rules: If no bits are set, 0 is returned. - Tagged as `safe` for ECLAIR. + * - R11.1 + - The conversion from a function pointer to unsigned long or (void \*) does + not lose any information, provided that the target type has enough bits + to store it. + - Tagged as `safe` for ECLAIR. + + * - R11.1 + - The conversion from a function pointer to a boolean has a well-known + semantics that do not lead to unexpected behaviour. + - Tagged as `safe` for ECLAIR. + + * - R11.2 + - The conversion from a pointer to an incomplete type to unsigned long + does not lose any information, provided that the target type has enough + bits to store it. + - Tagged as `safe` for ECLAIR. + + * - R11.3 + - Conversions to object pointers that have a pointee type with a smaller + (i.e., less strict) alignment requirement are safe. + - Tagged as `safe` for ECLAIR. + + * - R11.6 + - Conversions from and to integral types are safe, in the assumption that + the target type has enough bits to store the value. + See also Section \"4.7 Arrays and Pointers\" of \"GCC_MANUAL\" + - Tagged as `safe` for ECLAIR. + + * - R11.6 + - The conversion from a pointer to a boolean has a well-known semantics + that do not lead to unexpected behaviour. + - Tagged as `safe` for ECLAIR. + * - R11.8 - Violations caused by container_of are due to pointer arithmetic operations with the provided offset. The resulting pointer is then immediately cast back to its @@ -318,8 +376,19 @@ Deviations related to MISRA C:2012 Rules: * - R14.3 - The Xen team relies on the fact that invariant conditions of 'if' - statements are deliberate. - - Project-wide deviation; tagged as `disapplied` for ECLAIR. + statements and conditional operators are deliberate. + - Tagged as `deliberate` for ECLAIR. + + * - R14.3 + - Switches having a 'sizeof' operator as the condition are deliberate and + have limited scope. + - Tagged as `deliberate` for ECLAIR. + + * - R14.3 + - The use of an invariant size argument in {put,get}_unsafe_size and + array_access_ok, as defined in arch/x86(_64)?/include/asm/uaccess.h is + deliberate and is deemed safe. + - Tagged as `deliberate` for ECLAIR. * - R14.4 - A controlling expression of 'if' and iteration statements having @@ -486,10 +555,10 @@ Other deviations: * - Deviation - Justification - * - do-while-0 loops - - The do-while-0 is a well-recognized loop idiom used by the Xen community - and can therefore be used, even though it would cause a number of - violations in some instances. + * - do-while-0 and do-while-1 loops + - The do-while-0 and do-while-1 loops are well-recognized loop idioms used + by the Xen community and can therefore be used, even though they would + cause a number of violations in some instances. * - while-0 and while-1 loops - while-0 and while-1 are well-recognized loop idioms used by the Xen -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 07:55:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 07:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750564.1158679 (Exim 4.92) (envelope-from ) id 1sN6Rj-0000YT-MX; Fri, 28 Jun 2024 07:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750564.1158679; Fri, 28 Jun 2024 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 1sN6Rj-0000YM-Iq; Fri, 28 Jun 2024 07:55:03 +0000 Received: by outflank-mailman (input) for mailman id 750564; Fri, 28 Jun 2024 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 1sN6Ri-0000YG-GB for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6Ri-00088L-CI for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sN6Ri-0007rv-Aj for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9U5SULnze583XLAIOWsxvby0vg4qq2P0/nmWOlymw00=; b=fh8aCucVpGjjyUi+PvJTI7Zg+9 Ub6UsMViiSfmm59AQ5CSbMJCB91izsL+m8oxQzg6JQABQvrLGp35O0tU+mDSugScJufAxZ/jHNfiQ lQryEj+sW33McJbBZnCnthG2xDVvNw+weMBSFRPYSIfaWRqoDJgy1/qN8qxQwLDmyG7o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: address violations of MISRA C Rule 20.7 Message-Id: Date: Fri, 28 Jun 2024 07:55:02 +0000 commit 0dca0f2b9a7e05a4f3b982e260352e405eb405f8 Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:45:18 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:45:18 2024 +0200 automation/eclair: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". The helper macro bitmap_switch has parameters that cannot be parenthesized in order to comply with the rule, as that would break its functionality. Moreover, the risk of misuse due developer confusion is deemed not substantial enough to warrant a more involved refactor, thus the macro is deviated for this rule. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- docs/misra/safe.json | 8 ++++++++ xen/include/xen/bitmap.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/docs/misra/safe.json b/docs/misra/safe.json index c213e0a0be..3f18ef401c 100644 --- a/docs/misra/safe.json +++ b/docs/misra/safe.json @@ -60,6 +60,14 @@ }, { "id": "SAF-7-safe", + "analyser": { + "eclair": "MC3R1.R20.7" + }, + "name": "MC3R1.R20.7: deliberately non-parenthesized macro argument", + "text": "A macro parameter expands to an expression that is non-parenthesized, as doing so would break the functionality." + }, + { + "id": "SAF-8-safe", "analyser": {}, "name": "Sentinel", "text": "Next ID to be used" diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index b9f980e919..6ee39aa35a 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -103,10 +103,13 @@ extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); #define bitmap_switch(nbits, zero, small, large) \ unsigned int n__ = (nbits); \ if (__builtin_constant_p(nbits) && !n__) { \ + /* SAF-7-safe Rule 20.7 non-parenthesized macro argument */ \ zero; \ } else if (__builtin_constant_p(nbits) && n__ <= BITS_PER_LONG) { \ + /* SAF-7-safe Rule 20.7 non-parenthesized macro argument */ \ small; \ } else { \ + /* SAF-7-safe Rule 20.7 non-parenthesized macro argument */ \ large; \ } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 07:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 07:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750565.1158683 (Exim 4.92) (envelope-from ) id 1sN6Rt-0000b1-Ok; Fri, 28 Jun 2024 07:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750565.1158683; Fri, 28 Jun 2024 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 1sN6Rt-0000au-Lv; Fri, 28 Jun 2024 07:55:13 +0000 Received: by outflank-mailman (input) for mailman id 750565; Fri, 28 Jun 2024 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 1sN6Rs-0000al-G8 for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6Rs-00088P-FM for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sN6Rs-0007t0-EK for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RLCICZuVWKjcwndW0jq2TeDV2NrjAgFNpkuN3Yi1lgk=; b=A0tyfVsYciM+QRljQue3q6AG2j xGqcPvj04A4ddiB7T817006+6tl34vB6C5vfLIBD29jrnI8m0wVpIo5x28H0Gbme8G3CG224zM+0B mUZeLJRpbDmym/JMaT1gGCQhtph9yAWonAs+e1ufc0uSVA4zA4U4TWNOn+uEAf+AZKRo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/self-tests: address violations of MISRA rule 20.7 Message-Id: Date: Fri, 28 Jun 2024 07:55:12 +0000 commit 4929fea7bd7322da2ede70f2ea53c3696c83032e Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:46:02 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:46:02 2024 +0200 xen/self-tests: address violations of MISRA rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/include/xen/self-tests.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h index 42a4cc4d17..58484fe5a8 100644 --- a/xen/include/xen/self-tests.h +++ b/xen/include/xen/self-tests.h @@ -19,11 +19,11 @@ #if !defined(CONFIG_CC_IS_CLANG) || CONFIG_CLANG_VERSION >= 80000 #define COMPILE_CHECK(fn, val, res) \ do { \ - typeof(fn(val)) real = fn(val); \ + typeof((fn)(val)) real = (fn)(val); \ \ if ( !__builtin_constant_p(real) ) \ asm ( ".error \"'" STR(fn(val)) "' not compile-time constant\"" ); \ - else if ( real != res ) \ + else if ( real != (res) ) \ asm ( ".error \"Compile time check '" STR(fn(val) == res) "' failed\"" ); \ } while ( 0 ) #else @@ -37,9 +37,9 @@ */ #define RUNTIME_CHECK(fn, val, res) \ do { \ - typeof(fn(val)) real = fn(HIDE(val)); \ + typeof((fn)(val)) real = (fn)(HIDE(val)); \ \ - if ( real != res ) \ + if ( real != (res) ) \ panic("%s: %s(%s) expected %u, got %u\n", \ __func__, #fn, #val, real, res); \ } while ( 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 07:55:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 07:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750566.1158687 (Exim 4.92) (envelope-from ) id 1sN6S3-0000dt-Py; Fri, 28 Jun 2024 07:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750566.1158687; Fri, 28 Jun 2024 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 1sN6S3-0000dl-NN; Fri, 28 Jun 2024 07:55:23 +0000 Received: by outflank-mailman (input) for mailman id 750566; Fri, 28 Jun 2024 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 1sN6S2-0000db-KD for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6S2-00088a-JU for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sN6S2-0007tf-HJ for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1XYF3Bg4rpD8wDLYAATa8pjEtJkMxXTm3V45DU2Eeeo=; b=H/b52Lw4rOz257vybZN/65BHfJ GK5ehygzavivdBS3nkDu3q2lC2vVSVAlvZ0rTKO1G1FFmdfTHMVDxvSuMtzJXAPJyWt6Z/bIgeY7c iYH//QDqzeMWl+deWdwFRW7q+Fa+XbaMQKBMo1P9bFJ0uFvlrv6tKsg9VQnk1prKe0lk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/guest_access: address violations of MISRA rule 20.7 Message-Id: Date: Fri, 28 Jun 2024 07:55:22 +0000 commit f39642c308af4e174c6e54a45a3e51db373435a2 Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:46:27 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:46:27 2024 +0200 xen/guest_access: address violations of MISRA rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/include/xen/guest_access.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/guest_access.h b/xen/include/xen/guest_access.h index a2146749e3..2e0971c487 100644 --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -51,9 +51,9 @@ ((XEN_GUEST_HANDLE(type)) { &(hnd).p->fld }) #define guest_handle_from_ptr(ptr, type) \ - ((XEN_GUEST_HANDLE_PARAM(type)) { (type *)ptr }) + ((XEN_GUEST_HANDLE_PARAM(type)) { (type *)(ptr) }) #define const_guest_handle_from_ptr(ptr, type) \ - ((XEN_GUEST_HANDLE_PARAM(const_##type)) { (const type *)ptr }) + ((XEN_GUEST_HANDLE_PARAM(const_##type)) { (const type *)(ptr) }) /* * Copy an array of objects to guest context via a guest handle, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 07:55:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 07:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750567.1158690 (Exim 4.92) (envelope-from ) id 1sN6SD-0000gi-Ra; Fri, 28 Jun 2024 07:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750567.1158690; Fri, 28 Jun 2024 07: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 1sN6SD-0000gb-Os; Fri, 28 Jun 2024 07:55:33 +0000 Received: by outflank-mailman (input) for mailman id 750567; Fri, 28 Jun 2024 07:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6SC-0000gP-O5 for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6SC-000891-Ma for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sN6SC-0007uX-Le for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NAfcBB6OgSI0OkQIF6YD275rYtIqqNpodxMcIiPy7TE=; b=otXBXdIf87CBPwZgFkF8yJRtnt NZi/PZUuTZQ8YmejBe5EkYZxiZwMFLT8/s703IxZ9NNwU8dZke8VuTgaz04tubooBxuGi/p8suycz MsjfyczJyPE5HJRhz/sS8IesXCNF7JMsOCPr4ajXIYVeKUeQOSQbhvoKMRhuwCQJS6Uk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: address violations of MISRA C Rule 20.7 Message-Id: Date: Fri, 28 Jun 2024 07:55:32 +0000 commit c7e195fac02b850696d24a462612462ade4fe97b Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:46:57 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:46:57 2024 +0200 automation/eclair_analysis: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". The local helpers GRP2 and XADD in the x86 emulator use their first argument as the constant expression for a case label. This pattern is deviated project-wide, because it is very unlikely to induce developer confusion and result in the wrong control flow being carried out. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++-- docs/misra/deviations.rst | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index dcff4f4013..d12be858fe 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -458,13 +458,15 @@ unexpected result when the structure is given as argument to a sizeof() operator -doc_begin="Code violating Rule 20.7 is safe when macro parameters are used: (1) as function arguments; (2) as macro arguments; (3) as array indices; (4) as lhs -in assignments; (5) as initializers, possibly designated, in initalizer lists." +in assignments; (5) as initializers, possibly designated, in initalizer lists; +(6) as the constant expression in a switch clause label." -config=MC3R1.R20.7,expansion_context= {safe, "context(__call_expr_arg_contexts)"}, {safe, "left_right(^[(,\\[]$,^[),\\]]$)"}, {safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(array_subscript_expr), subscript)))"}, {safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(operator(assign), lhs)))"}, -{safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(init_list_expr||designated_init_expr), init)))"} +{safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(init_list_expr||designated_init_expr), init)))"}, +{safe, "context(skip_to(__expr_non_syntactic_contexts, stmt_child(node(case_stmt), lower||upper)))"} -doc_end -doc_begin="Violations involving the __config_enabled macros cannot be fixed without diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index c6a2affc6a..7be2322123 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -416,7 +416,8 @@ Deviations related to MISRA C:2012 Rules: (2) as macro arguments; (3) as array indices; (4) as lhs in assignments; - (5) as initializers, possibly designated, in initalizer lists. + (5) as initializers, possibly designated, in initalizer lists; + (6) as constant expressions of switch case labels. - Tagged as `safe` for ECLAIR. * - R20.7 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 07:55:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 07:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750568.1158695 (Exim 4.92) (envelope-from ) id 1sN6SN-0000jM-TG; Fri, 28 Jun 2024 07:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750568.1158695; Fri, 28 Jun 2024 07: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 1sN6SN-0000jC-Qd; Fri, 28 Jun 2024 07:55:43 +0000 Received: by outflank-mailman (input) for mailman id 750568; Fri, 28 Jun 2024 07:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6SM-0000j1-QC for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6SM-000898-PS for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sN6SM-0007vN-Oe for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Itatxrytom/+zqTbVBPZL2WUFfdRuNRWasI/1mWVJxk=; b=L3mP14dFoOmmGOf7e/iUzES0yL 0tLEEcgl7qmzoY0VRm8eLdnR+4fL7SB0ZuYiMNL4dNRK7mbX+6khUlEeMtDFHkuXyonSn5CuG5Hua bKDT7gioM7p0OAz1LqArceSZAbkfWYk9QR5/+ToUSAFO2SyYuTGCiAcQnCUsrFVd3aLU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/irq: address violations of MISRA C Rule 20.7 Message-Id: Date: Fri, 28 Jun 2024 07:55:42 +0000 commit 8f5581d7e1f37f38c3c92c01611e9f19b38e4881 Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:47:16 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:47:16 2024 +0200 x86/irq: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/include/xen/irq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 580ae37e74..17211f3399 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -178,7 +178,7 @@ extern struct pirq *pirq_get_info(struct domain *d, int pirq); #define pirq_field(d, p, f, def) ({ \ const struct pirq *__pi = pirq_info(d, p); \ - __pi ? __pi->f : def; \ + __pi ? __pi->f : (def); \ }) #define pirq_to_evtchn(d, pirq) pirq_field(d, pirq, evtchn, 0) #define pirq_masked(d, pirq) pirq_field(d, pirq, masked, 0) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 07:55:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 07:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750569.1158699 (Exim 4.92) (envelope-from ) id 1sN6SX-0000lw-Uy; Fri, 28 Jun 2024 07:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750569.1158699; Fri, 28 Jun 2024 07: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 1sN6SX-0000lo-S2; Fri, 28 Jun 2024 07:55:53 +0000 Received: by outflank-mailman (input) for mailman id 750569; Fri, 28 Jun 2024 07:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6SW-0000lg-T4 for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6SW-00089G-SM for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sN6SW-0007wq-RT for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0UkSWlZ34hBg+iGjPOZVUq3GoTiH2kXdW/ONhAuC0wg=; b=jiCR0twL5eCDwwzPiS5klXrfLZ 0rONbEh0ZwZk2GQAeFED14Ut+vTaZtXfv9wU/YsujEDGQscLmrGBQNuc8REHn4iq4wYiiq3G9Y46z KpyLf6Cwcw0ZSzloWknL3CzbKXAN5t3d5++XmgjRBe3SUyiGeNlXCWcfl4VRY5IrNdqE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: clean ECLAIR configuration scripts Message-Id: Date: Fri, 28 Jun 2024 07:55:52 +0000 commit bfea273b7b1590554473b79fe7c0574ef36c642a Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:47:56 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:47:56 2024 +0200 automation/eclair_analysis: clean ECLAIR configuration scripts Remove from the ECLAIR integration scripts an unused option, which was already ignored, and make the help texts consistent with the rest of the scripts. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/analyze.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analyze.sh b/automation/eclair_analysis/ECLAIR/analyze.sh index 0ea5520c93..e96456c3c1 100755 --- a/automation/eclair_analysis/ECLAIR/analyze.sh +++ b/automation/eclair_analysis/ECLAIR/analyze.sh @@ -11,7 +11,7 @@ fatal() { } usage() { - fatal "Usage: ${script_name} " + fatal "Usage: ${script_name} " } if [[ $# -ne 2 ]]; then @@ -40,7 +40,6 @@ ECLAIR_REPORT_LOG=${ECLAIR_OUTPUT_DIR}/REPORT.log if [[ "$1" = "X86_64" ]]; then export CROSS_COMPILE= export XEN_TARGET_ARCH=x86_64 - EXTRA_ECLAIR_ENV_OPTIONS=-disable=MC3R1.R20.7 elif [[ "$1" = "ARM64" ]]; then export CROSS_COMPILE=aarch64-linux-gnu- export XEN_TARGET_ARCH=arm64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 07:56:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 07:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750570.1158703 (Exim 4.92) (envelope-from ) id 1sN6Si-0000oX-0X; Fri, 28 Jun 2024 07:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750570.1158703; Fri, 28 Jun 2024 07: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 1sN6Sh-0000oP-TW; Fri, 28 Jun 2024 07:56:03 +0000 Received: by outflank-mailman (input) for mailman id 750570; Fri, 28 Jun 2024 07:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6Sh-0000oE-0h for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sN6Sh-00089a-01 for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sN6Sg-0007yV-UR for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 07: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FoRSeFMdy23mFwQoGqZo/L3/r6QdwoCgyBVJ0qJaDdI=; b=Tc23qD3Q/1mqVgWMjvTX2uOgb2 fbnLufKV4ZM51fEFuvLZShvDUFJNpjOJMvEVyHLb7614/sLnwDUrygWK7u3/wWY+J++SMQGVoJDV3 mAFZPvaU0p4IN9zVLD3YMBrg4JeNMgo2Yx3uWEoWV6IYvgrPRyDWGABYLI2N/NBvH6lQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: address violations of MISRA C Rule 20.7 Message-Id: Date: Fri, 28 Jun 2024 07:56:02 +0000 commit 402e473249cf62dd4c6b3b137aa845db0fe1453a Author: Nicola Vetrini AuthorDate: Thu Jun 27 13:48:08 2024 +0200 Commit: Jan Beulich CommitDate: Thu Jun 27 13:48:08 2024 +0200 x86/traps: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- 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 9906e874d5..ee91fc56b1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -123,7 +123,7 @@ unsigned int __ro_after_init ler_msr; const unsigned int nmi_cpu; #define stack_words_per_line 4 -#define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)regs->rsp) +#define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)(regs)->rsp) void show_code(const struct cpu_user_regs *regs) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 14:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 14:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750658.1158726 (Exim 4.92) (envelope-from ) id 1sNCUF-0000tY-RT; Fri, 28 Jun 2024 14:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750658.1158726; Fri, 28 Jun 2024 14: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 1sNCUF-0000tR-P4; Fri, 28 Jun 2024 14:22:03 +0000 Received: by outflank-mailman (input) for mailman id 750658; Fri, 28 Jun 2024 14:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sNCUF-0000tL-5D for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 14:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sNCUF-0000Mg-4C for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 14:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sNCUF-0005VD-1H for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YdP5IU883mHu/OiyIMGYLT2vTSUw5qimRxx2kRQn0nw=; b=4HyKt+FJX133oKDnpnZsYmi3WS VlGsDnbITSWiiQtnxSQQzNPDrpBeK9ZhaAolTy7w0Vtf/yFMf3+ZDCh6VWMVWr70FrT0Mb+lyir/c 0p0ynBeb5r5GVzE6K6kLbPmc0fTBY5k7VecVBLjVvp8tN6sYNU88zYkm9h4NjmqBxMCM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: Step down as maintainer and committer Message-Id: Date: Fri, 28 Jun 2024 14:22:03 +0000 commit 08f9b1dd9c9435d4cca006e43917245710b39be3 Author: George Dunlap AuthorDate: Wed Jun 26 16:07:30 2024 +0100 Commit: George Dunlap CommitDate: Fri Jun 28 14:56:44 2024 +0100 MAINTAINERS: Step down as maintainer and committer Remain a Reviewer on the golang bindings and scheduler for now (using a xenproject.org alias), since there may be architectural decisions I can shed light on. Remove the XENTRACE section entirely, as there's no obvious candidate to take it over; having the respective parts fall back to the tools and The Rest seems the most reasonable option. Signed-off-by: George Dunlap Acked-by: Stefano Stabellini Acked-by: Juergen Gross Acked-by: Bertrand Marquis --- MAINTAINERS | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9d66b898ec..2b0c894527 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -325,8 +325,8 @@ F: xen/arch/x86/debug.c F: tools/debugger/gdbsx/ GOLANG BINDINGS -M: George Dunlap M: Nick Rosbrook +R: George Dunlap S: Maintained F: tools/golang @@ -490,9 +490,9 @@ S: Supported F: xen/common/sched/rt.c SCHEDULING -M: George Dunlap M: Dario Faggioli M: Juergen Gross +R: George Dunlap S: Supported F: xen/common/sched/ @@ -597,7 +597,6 @@ F: tools/tests/x86_emulator/ X86 MEMORY MANAGEMENT M: Jan Beulich M: Andrew Cooper -R: George Dunlap S: Supported F: xen/arch/x86/mm/ @@ -641,13 +640,6 @@ F: tools/libs/store/ F: tools/xenstored/ F: tools/xs-clients/ -XENTRACE -M: George Dunlap -S: Supported -F: tools/xentrace/ -F: xen/common/trace.c -F: xen/include/xen/trace.h - XEN MISRA ANALYSIS TOOLS M: Luca Fancellu S: Supported @@ -670,7 +662,6 @@ K: \b(xsm|XSM)\b THE REST M: Andrew Cooper -M: George Dunlap M: Jan Beulich M: Julien Grall M: Stefano Stabellini -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 28 21:11:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Jun 2024 21:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750783.1158824 (Exim 4.92) (envelope-from ) id 1sNIs2-0007jZ-Up; Fri, 28 Jun 2024 21:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750783.1158824; Fri, 28 Jun 2024 21: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 1sNIs2-0007jS-Rl; Fri, 28 Jun 2024 21:11:02 +0000 Received: by outflank-mailman (input) for mailman id 750783; Fri, 28 Jun 2024 21:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sNIs1-0007jK-Jj for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 21:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sNIs1-0008QC-J1 for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 21:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sNIs1-0007b7-Hw for xen-changelog@lists.xenproject.org; Fri, 28 Jun 2024 21: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Rrs/1wpQpfhyd83REUtvnKW4LB+7IVWahPzatVonCEw=; b=6lU55lGovxfwM7zHbqvqvvnwH3 Z0h4Mi4nqyYGvbkID9aGipeb9UAbPykjj3hqCJEnkq+Q5pg2zZNvsaS0sjh7ILr/boKM8WnM2oPaP N7IFKoH/SWQFLY+CBh8wH+4LM7dcBzosa6qkPf0oJQwSY+BZXtRa+7UFnKmM0b0WnhH4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: add deviations agreed in MISRA meetings Message-Id: Date: Fri, 28 Jun 2024 21:11:01 +0000 commit 6d41f5b9e112e8934f59edfd7168a36706e0341a Author: Federico Serafini AuthorDate: Wed Jun 26 08:10:50 2024 +0200 Commit: Stefano Stabellini CommitDate: Thu Jun 27 15:38:33 2024 -0700 automation/eclair: add deviations agreed in MISRA meetings Update ECLAIR configuration to take into account the deviations agreed during the MISRA meetings. While doing this, remove the obsolete "Set [123]" comments. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Release-Acked-By: Oleksii Kurochko --- automation/eclair_analysis/ECLAIR/deviations.ecl | 93 +++++++++++++++++++++--- docs/misra/deviations.rst | 81 +++++++++++++++++++-- 2 files changed, 158 insertions(+), 16 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index d12be858fe..0af1cb93d1 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -1,5 +1,3 @@ -### Set 1 ### - # # Series 2. # @@ -23,6 +21,11 @@ Constant expressions and unreachable branches of if and switch statements are ex -config=MC3R1.R2.1,reports+={deliberate, "any_area(any_loc(any_exp(macro(name(ASSERT_UNREACHABLE||PARSE_ERR_RET||PARSE_ERR||FAIL_MSR||FAIL_CPUID)))))"} -doc_end +-doc_begin="The asm-offset files are not linked deliberately, since they are used to generate definitions for asm modules." +-file_tag+={asm_offsets, "^xen/arch/(arm|x86)/(arm32|arm64|x86_64)/asm-offsets\\.c$"} +-config=MC3R1.R2.1,reports+={deliberate, "any_area(any_loc(file(asm_offsets)))"} +-doc_end + -doc_begin="Pure declarations (i.e., declarations without initialization) are not executable, and therefore it is safe for them to be unreachable." -config=MC3R1.R2.1,ignored_stmts+={"any()", "pure_decl()"} @@ -63,6 +66,12 @@ they are not instances of commented-out code." -config=MC3R1.D4.3,reports+={disapplied,"!(any_area(any_loc(file(^xen/arch/arm/arm64/.*$))))"} -doc_end +-doc_begin="The inline asm in 'arm64/lib/bitops.c' is tightly coupled with the surronding C code that acts as a wrapper, so it has been decided not to add an additional encapsulation layer." +-file_tag+={arm64_bitops, "^xen/arch/arm/arm64/lib/bitops\\.c$"} +-config=MC3R1.D4.3,reports+={deliberate, "all_area(any_loc(file(arm64_bitops)&&any_exp(macro(^(bit|test)op$))))"} +-config=MC3R1.D4.3,reports+={deliberate, "any_area(any_loc(file(arm64_bitops))&&context(name(int_clear_mask16)))"} +-doc_end + -doc_begin="This header file is autogenerated or empty, therefore it poses no risk if included more than once." -file_tag+={empty_header, "^xen/arch/arm/efi/runtime\\.h$"} @@ -213,10 +222,25 @@ Therefore the absence of prior declarations is safe." -config=MC3R1.R8.4,declarations+={safe, "loc(file(asm_defns))&&^current_stack_pointer$"} -doc_end +-doc_begin="The function apei_(read|check|clear)_mce are dead code and are excluded from non-debug builds, therefore the absence of prior declarations is safe." +-config=MC3R1.R8.4,declarations+={safe, "^apei_(read|check|clear)_mce\\(.*$"} +-doc_end + -doc_begin="asmlinkage is a marker to indicate that the function is only used to interface with asm modules." -config=MC3R1.R8.4,declarations+={safe,"loc(text(^(?s).*asmlinkage.*$, -1..0))"} -doc_end +-doc_begin="Given that bsearch and sort are defined with the attribute 'gnu_inline', it's deliberate not to have a prior declaration. +See Section \"6.33.1 Common Function Attributes\" of \"GCC_MANUAL\" for a full explanation of gnu_inline." +-file_tag+={bsearch_sort, "^xen/include/xen/(sort|lib)\\.h$"} +-config=MC3R1.R8.4,reports+={deliberate, "any_area(any_loc(file(bsearch_sort))&&decl(name(bsearch||sort)))"} +-doc_end + +-doc_begin="first_valid_mfn is defined in this way because the current lack of NUMA support in Arm and PPC requires it." +-file_tag+={first_valid_mfn, "^xen/common/page_alloc\\.c$"} +-config=MC3R1.R8.4,declarations+={deliberate,"loc(file(first_valid_mfn))"} +-doc_end + -doc_begin="The following variables are compiled in multiple translation units belonging to different executables and therefore are safe." -config=MC3R1.R8.6,declarations+={safe, "name(current_stack_pointer||bsearch||sort)"} @@ -257,8 +281,6 @@ dimension is higher than omitting the dimension." -config=MC3R1.R9.5,reports+={deliberate, "any()"} -doc_end -### Set 2 ### - # # Series 10. # @@ -299,7 +321,6 @@ integers arguments on two's complement architectures -config=MC3R1.R10.1,reports+={safe, "any_area(any_loc(any_exp(macro(^ISOLATE_LSB$))))"} -doc_end -### Set 3 ### -doc_begin="XEN only supports architectures where signed integers are representend using two's complement and all the XEN developers are aware of this." @@ -323,6 +344,49 @@ constant expressions are required.\"" # Series 11 # +-doc_begin="The conversion from a function pointer to unsigned long or (void *) does not lose any information, provided that the target type has enough bits to store it." +-config=MC3R1.R11.1,casts+={safe, + "from(type(canonical(__function_pointer_types))) + &&to(type(canonical(builtin(unsigned long)||pointer(builtin(void))))) + &&relation(definitely_preserves_value)" +} +-doc_end + +-doc_begin="The conversion from a function pointer to a boolean has a well-known semantics that do not lead to unexpected behaviour." +-config=MC3R1.R11.1,casts+={safe, + "from(type(canonical(__function_pointer_types))) + &&kind(pointer_to_boolean)" +} +-doc_end + +-doc_begin="The conversion from a pointer to an incomplete type to unsigned long does not lose any information, provided that the target type has enough bits to store it." +-config=MC3R1.R11.2,casts+={safe, + "from(type(any())) + &&to(type(canonical(builtin(unsigned long)))) + &&relation(definitely_preserves_value)" +} +-doc_end + +-doc_begin="Conversions to object pointers that have a pointee type with a smaller (i.e., less strict) alignment requirement are safe." +-config=MC3R1.R11.3,casts+={safe, + "!relation(more_aligned_pointee)" +} +-doc_end + +-doc_begin="Conversions from and to integral types are safe, in the assumption that the target type has enough bits to store the value. +See also Section \"4.7 Arrays and Pointers\" of \"GCC_MANUAL\"" +-config=MC3R1.R11.6,casts+={safe, + "(from(type(canonical(integral())))||to(type(canonical(integral())))) + &&relation(definitely_preserves_value)"} +-doc_end + +-doc_begin="The conversion from a pointer to a boolean has a well-known semantics that do not lead to unexpected behaviour." +-config=MC3R1.R11.6,casts+={safe, + "from(type(canonical(__pointer_types))) + &&kind(pointer_to_boolean)" +} +-doc_end + -doc_begin="Violations caused by container_of are due to pointer arithmetic operations with the provided offset. The resulting pointer is then immediately cast back to its original type, which preserves the qualifier. This use is deemed safe. @@ -364,9 +428,18 @@ activity." -config=MC3R1.R14.2,reports+={disapplied,"any()"} -doc_end --doc_begin="The XEN team relies on the fact that invariant conditions of 'if' -statements are deliberate" --config=MC3R1.R14.3,statements={deliberate , "wrapped(any(),node(if_stmt))" } +-doc_begin="The XEN team relies on the fact that invariant conditions of 'if' statements and conditional operators are deliberate" +-config=MC3R1.R14.3,statements+={deliberate, "wrapped(any(),node(if_stmt||conditional_operator||binary_conditional_operator))" } +-doc_end + +-doc_begin="Switches having a 'sizeof' operator as the condition are deliberate and have limited scope." +-config=MC3R1.R14.3,statements+={deliberate, "wrapped(any(),node(switch_stmt)&&child(cond, operator(sizeof)))" } +-doc_end + +-doc_begin="The use of an invariant size argument in {put,get}_unsafe_size and array_access_ok, as defined in arch/x86(_64)?/include/asm/uaccess.h is deliberate and is deemed safe." +-file_tag+={x86_uaccess, "^xen/arch/x86(_64)?/include/asm/uaccess\\.h$"} +-config=MC3R1.R14.3,reports+={deliberate, "any_area(any_loc(file(x86_uaccess)&&any_exp(macro(^(put|get)_unsafe_size$))))"} +-config=MC3R1.R14.3,reports+={deliberate, "any_area(any_loc(file(x86_uaccess)&&any_exp(macro(^array_access_ok$))))"} -doc_end -doc_begin="A controlling expression of 'if' and iteration statements having integer, character or pointer type has a semantics that is well-known to all Xen developers." @@ -545,8 +618,8 @@ falls under the jurisdiction of other MISRA rules." # General # --doc_begin="do-while-0 is a well recognized loop idiom by the xen community." --loop_idioms={do_stmt, "literal(0)"} +-doc_begin="do-while-[01] is a well recognized loop idiom by the xen community." +-loop_idioms={do_stmt, "literal(0)||literal(1)"} -doc_end -doc_begin="while-[01] is a well recognized loop idiom by the xen community." -loop_idioms+={while_stmt, "literal(0)||literal(1)"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 7be2322123..1ecce1469a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -63,6 +63,11 @@ Deviations related to MISRA C:2012 Rules: switch statement. - ECLAIR has been configured to ignore those statements. + * - R2.1 + - The asm-offset files are not linked deliberately, since they are used to + generate definitions for asm modules. + - Tagged as `deliberate` for ECLAIR. + * - R2.2 - Proving compliance with respect to Rule 2.2 is generally impossible: see ``_ for details. Moreover, peer @@ -203,6 +208,26 @@ Deviations related to MISRA C:2012 Rules: it. - Tagged as `safe` for ECLAIR. + * - R8.4 + - Some functions are excluded from non-debug build, therefore the absence + of declaration is safe. + - Tagged as `safe` for ECLAIR, such functions are: + - apei_read_mce() + - apei_check_mce() + - apei_clear_mce() + + * - R8.4 + - Given that bsearch and sort are defined with the attribute 'gnu_inline', + it's deliberate not to have a prior declaration. + See Section \"6.33.1 Common Function Attributes\" of \"GCC_MANUAL\" for + a full explanation of gnu_inline. + - Tagged as `deliberate` for ECLAIR. + + * - R8.4 + - first_valid_mfn is defined in this way because the current lack of NUMA + support in Arm and PPC requires it. + - Tagged as `deliberate` for ECLAIR. + * - R8.6 - The following variables are compiled in multiple translation units belonging to different executables and therefore are safe. @@ -282,6 +307,39 @@ Deviations related to MISRA C:2012 Rules: If no bits are set, 0 is returned. - Tagged as `safe` for ECLAIR. + * - R11.1 + - The conversion from a function pointer to unsigned long or (void \*) does + not lose any information, provided that the target type has enough bits + to store it. + - Tagged as `safe` for ECLAIR. + + * - R11.1 + - The conversion from a function pointer to a boolean has a well-known + semantics that do not lead to unexpected behaviour. + - Tagged as `safe` for ECLAIR. + + * - R11.2 + - The conversion from a pointer to an incomplete type to unsigned long + does not lose any information, provided that the target type has enough + bits to store it. + - Tagged as `safe` for ECLAIR. + + * - R11.3 + - Conversions to object pointers that have a pointee type with a smaller + (i.e., less strict) alignment requirement are safe. + - Tagged as `safe` for ECLAIR. + + * - R11.6 + - Conversions from and to integral types are safe, in the assumption that + the target type has enough bits to store the value. + See also Section \"4.7 Arrays and Pointers\" of \"GCC_MANUAL\" + - Tagged as `safe` for ECLAIR. + + * - R11.6 + - The conversion from a pointer to a boolean has a well-known semantics + that do not lead to unexpected behaviour. + - Tagged as `safe` for ECLAIR. + * - R11.8 - Violations caused by container_of are due to pointer arithmetic operations with the provided offset. The resulting pointer is then immediately cast back to its @@ -318,8 +376,19 @@ Deviations related to MISRA C:2012 Rules: * - R14.3 - The Xen team relies on the fact that invariant conditions of 'if' - statements are deliberate. - - Project-wide deviation; tagged as `disapplied` for ECLAIR. + statements and conditional operators are deliberate. + - Tagged as `deliberate` for ECLAIR. + + * - R14.3 + - Switches having a 'sizeof' operator as the condition are deliberate and + have limited scope. + - Tagged as `deliberate` for ECLAIR. + + * - R14.3 + - The use of an invariant size argument in {put,get}_unsafe_size and + array_access_ok, as defined in arch/x86(_64)?/include/asm/uaccess.h is + deliberate and is deemed safe. + - Tagged as `deliberate` for ECLAIR. * - R14.4 - A controlling expression of 'if' and iteration statements having @@ -486,10 +555,10 @@ Other deviations: * - Deviation - Justification - * - do-while-0 loops - - The do-while-0 is a well-recognized loop idiom used by the Xen community - and can therefore be used, even though it would cause a number of - violations in some instances. + * - do-while-0 and do-while-1 loops + - The do-while-0 and do-while-1 loops are well-recognized loop idioms used + by the Xen community and can therefore be used, even though they would + cause a number of violations in some instances. * - while-0 and while-1 loops - while-0 and while-1 are well-recognized loop idioms used by the Xen -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 29 05:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 29 Jun 2024 05:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.750826.1158848 (Exim 4.92) (envelope-from ) id 1sNR39-0007x6-Ft; Sat, 29 Jun 2024 05:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 750826.1158848; Sat, 29 Jun 2024 05: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 1sNR39-0007wy-DE; Sat, 29 Jun 2024 05:55:03 +0000 Received: by outflank-mailman (input) for mailman id 750826; Sat, 29 Jun 2024 05:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sNR38-0007wq-8o for xen-changelog@lists.xenproject.org; Sat, 29 Jun 2024 05:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sNR38-0004tX-7J for xen-changelog@lists.xenproject.org; Sat, 29 Jun 2024 05:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sNR38-00089C-5A for xen-changelog@lists.xenproject.org; Sat, 29 Jun 2024 05: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=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cuioAbBq2IBht3XotT+DCJu7ZRaOrytNgiUADCi3/iM=; b=sOnfTdUFVDW+dkLiw9ZgQwc545 SB2fTmAmbJ5aEXH/3fxK5p8C1x/j/KHGThR1o/Yr9/5PMdKScBDHZ8X6WT1mXQBS7Jd/vqhTHv2rg JUjqmNpdrp66ak1OFq0bDGi7KbRaHVhcVjsk4/fqaeCe94LvwZ3V28V/wuTeIWRJiayo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: Step down as maintainer and committer Message-Id: Date: Sat, 29 Jun 2024 05:55:02 +0000 commit 08f9b1dd9c9435d4cca006e43917245710b39be3 Author: George Dunlap AuthorDate: Wed Jun 26 16:07:30 2024 +0100 Commit: George Dunlap CommitDate: Fri Jun 28 14:56:44 2024 +0100 MAINTAINERS: Step down as maintainer and committer Remain a Reviewer on the golang bindings and scheduler for now (using a xenproject.org alias), since there may be architectural decisions I can shed light on. Remove the XENTRACE section entirely, as there's no obvious candidate to take it over; having the respective parts fall back to the tools and The Rest seems the most reasonable option. Signed-off-by: George Dunlap Acked-by: Stefano Stabellini Acked-by: Juergen Gross Acked-by: Bertrand Marquis --- MAINTAINERS | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9d66b898ec..2b0c894527 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -325,8 +325,8 @@ F: xen/arch/x86/debug.c F: tools/debugger/gdbsx/ GOLANG BINDINGS -M: George Dunlap M: Nick Rosbrook +R: George Dunlap S: Maintained F: tools/golang @@ -490,9 +490,9 @@ S: Supported F: xen/common/sched/rt.c SCHEDULING -M: George Dunlap M: Dario Faggioli M: Juergen Gross +R: George Dunlap S: Supported F: xen/common/sched/ @@ -597,7 +597,6 @@ F: tools/tests/x86_emulator/ X86 MEMORY MANAGEMENT M: Jan Beulich M: Andrew Cooper -R: George Dunlap S: Supported F: xen/arch/x86/mm/ @@ -641,13 +640,6 @@ F: tools/libs/store/ F: tools/xenstored/ F: tools/xs-clients/ -XENTRACE -M: George Dunlap -S: Supported -F: tools/xentrace/ -F: xen/common/trace.c -F: xen/include/xen/trace.h - XEN MISRA ANALYSIS TOOLS M: Luca Fancellu S: Supported @@ -670,7 +662,6 @@ K: \b(xsm|XSM)\b THE REST M: Andrew Cooper -M: George Dunlap M: Jan Beulich M: Julien Grall M: Stefano Stabellini -- generated by git-patchbot for /home/xen/git/xen.git#master