From xen-changelog-bounces@lists.xenproject.org Sat Sep 02 12:44:49 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Sep 2023 12:44:49 +0000 Received: from list by lists.xenproject.org with outflank-mailman.594824.928259 (Exim 4.92) (envelope-from ) id 1qcPyu-0002N3-17; Sat, 02 Sep 2023 12:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 594824.928259; Sat, 02 Sep 2023 12: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 1qcPyt-0002Mu-UU; Sat, 02 Sep 2023 12:44:03 +0000 Received: by outflank-mailman (input) for mailman id 594824; Sat, 02 Sep 2023 12:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPys-0002Mn-8O for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPys-00040v-5y for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qcPys-0000yV-4v for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3U+tB5xqI+5RkeRAP8ZF6IpdXkM7O3Y86m8LDVX/LVs=; b=Vn/hQqZlg4DeFQ4ttxJmNHJ3Ze PKae78JDEdOC7xG7Tk6vcG4q6GCmKPQfZ2opEQQGTdS6SNRe7hEBKuogLUBSVL95SiG34IMOLxmV3 FSmI3GGLG3Px8+cWOSo0zShLlfvdnkX9tZd+EzMFUm28acbvyMcYDjOuFIo+blmLDJps=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add rules 10.1 10.2 10.3 10.4 Message-Id: Date: Sat, 02 Sep 2023 12:44:02 +0000 commit 591fd09ffba5c6e587477d07302792ec2e68cf16 Author: Stefano Stabellini AuthorDate: Fri Aug 25 14:48:42 2023 -0700 Commit: Stefano Stabellini CommitDate: Wed Aug 30 18:30:51 2023 -0700 docs/misra: add rules 10.1 10.2 10.3 10.4 10.1 with several caveats, described in the notes. 10.3 and 10.4 as "aspirational" guidelines, as clarified in the notes. Signed-off-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- docs/misra/rules.rst | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index db30632b93..34916e266a 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -310,6 +310,59 @@ maintainers if you want to suggest a change. - An element of an object shall not be initialized more than once - + * - `Rule 10.1 `_ + - Required + - Operands shall not be of an inappropriate essential type + - The following are allowed: + - Value-preserving conversions of integer constants + - Bitwise and, or, xor, one's complement, bitwise and assignment, + bitwise or assignment, bitwise xor assignment (bitwise and, or, xor + are safe on non-negative integers; also Xen assumes two's complement + representation) + - Left shift, right shift, left shift assignment, right shift + assignment (see C-language-toolchain.rst for uses of + compilers' extensions) + - Implicit conversions to boolean for conditionals (?: if while + for) and logical operators (! || &&) + + * - `Rule 10.2 `_ + - Required + - Expressions of essentially character type shall not be used + inappropriately in addition and subtraction operations + - + + * - `Rule 10.3 `_ + - Required + - The value of an expression shall not be assigned to an object + with a narrower essential type or of a different essential type + category + - Please beware that this rule has many violations in the Xen + codebase today, and its adoption is aspirational. However, when + submitting new patches please try to decrease the number of + violations when possible. + + gcc has a helpful warning that can help you spot and remove + violations of this kind: conversion. For instance, you can use + it as follows: + + CFLAGS="-Wconversion -Wno-error=sign-conversion -Wno-error=conversion" make -C xen + + * - `Rule 10.4 `_ + - Required + - Both operands of an operator in which the usual arithmetic + conversions are performed shall have the same essential type + category + - Please beware that this rule has many violations in the Xen + codebase today, and its adoption is aspirational. However, when + submitting new patches please try to decrease the number of + violations when possible. + + gcc has a helpful warning that can help you spot and remove + violations of this kind: arith-conversion. For instance, you + can use it as follows: + + CFLAGS="-Warith-conversion -Wno-error=arith-conversion" make -C xen + * - `Rule 12.5 `_ - Mandatory - The sizeof operator shall not have an operand which is a function -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 02 12:44:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Sep 2023 12:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.594826.928264 (Exim 4.92) (envelope-from ) id 1qcPz4-0002Oy-3N; Sat, 02 Sep 2023 12:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 594826.928264; Sat, 02 Sep 2023 12:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPz3-0002Oq-W2; Sat, 02 Sep 2023 12:44:13 +0000 Received: by outflank-mailman (input) for mailman id 594826; Sat, 02 Sep 2023 12:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPz2-0002Oi-BP for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPz2-00041N-AY for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qcPz2-0000z4-85 for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zDIMAb207NKgZ/IMGmx+9UaoUts9O48H4MtBBhRmKZM=; b=ZyHG6wirp1g4TLG0H90/zSDfLg VCpBUPSvjYbLq6C0XlTpIxR1xZzuOqd8rRYZE0v5sdF3XS96Lu9uRjJ//ZcvtMHeoKETID+tBq0gl f+MwUZNzv8QMwWFx+tkpq68FFeDi/y6Y7GcRV1X0zlRQcYSCmVkCJSF0SETySB3YvCPs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sched: address violations of MISRA C:2012 Directive 4.10 Message-Id: Date: Sat, 02 Sep 2023 12:44:12 +0000 commit 1f2f5087c0bbc8c6219e5ce33e5bf17575f1cc00 Author: Simone Ballarin AuthorDate: Mon Aug 28 15:20:08 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Aug 30 18:58:58 2023 -0700 xen/sched: address violations of MISRA C:2012 Directive 4.10 Add inclusion guards to address violations of MISRA C:2012 Directive 4.10 ("Precautions shall be taken in order to prevent the contents of a header file being included more than once"). Mechanical change. Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Reviewed-by: George Dunlap --- xen/common/sched/compat.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/common/sched/compat.c b/xen/common/sched/compat.c index a596e3a226..d718e450d4 100644 --- a/xen/common/sched/compat.c +++ b/xen/common/sched/compat.c @@ -3,6 +3,10 @@ * */ +#ifndef __COMMON_SCHED_COMPAT_C__ +#define __COMMON_SCHED_COMPAT_C__ + + #include #define COMPAT @@ -44,6 +48,8 @@ int compat_set_timer_op(uint32_t lo, int32_t hi) return do_set_timer_op(((s64)hi << 32) | lo); } +#endif /* __COMMON_SCHED_COMPAT_C__ */ + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 02 12:45:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Sep 2023 12:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.594827.928267 (Exim 4.92) (envelope-from ) id 1qcPzE-0002RF-3w; Sat, 02 Sep 2023 12:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 594827.928267; Sat, 02 Sep 2023 12:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzE-0002R7-1D; Sat, 02 Sep 2023 12:44:24 +0000 Received: by outflank-mailman (input) for mailman id 594827; Sat, 02 Sep 2023 12:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzC-0002Qu-EX for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzC-00041R-Dj for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qcPzC-0000zd-Ci for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mkwPr/j3ZUy/qffUMdecJDAEUkU9/mDcTIp91Qfpcbw=; b=v8/NRxAePPBSrxFELaGJStUAe7 XGxrMlYiUC4kT+9upx8/5OIaAD2AQMfi4p7lgYBtZU2zreoKI+q3HkZ3DBeNH/l0J1RxFT2qsFLCt gW6z8leuWBahwk5vmNjTh3ZkqyoJRTBnGbgdqLs7yDBPHZ9uWWo/jfSkyI2y0e5aULgE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: document gcc-specific behavior with shifting signed integers Message-Id: Date: Sat, 02 Sep 2023 12:44:22 +0000 commit 1b7dc185f8421b6ad849e88c0e9b2a81c2a99331 Author: Stefano Stabellini AuthorDate: Mon Aug 21 18:02:28 2023 -0700 Commit: Stefano Stabellini CommitDate: Wed Aug 30 18:59:52 2023 -0700 docs/misra: document gcc-specific behavior with shifting signed integers Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misra/C-language-toolchain.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-toolchain.rst index 785aed1eaf..4c4942a113 100644 --- a/docs/misra/C-language-toolchain.rst +++ b/docs/misra/C-language-toolchain.rst @@ -200,6 +200,15 @@ The table columns are as follows: - ARM64, X86_64 - See Section "6.29 Designated Initializers" of GCC_MANUAL + * - Signed << compiler-defined behavior + - All architectures + - See Section "4.5 Integers" of GCC_MANUAL. As an extension to the + C language, GCC does not use the latitude given in C99 and C11 + only to treat certain aspects of signed << as undefined. + + * - Signed >> acts on negative numbers by sign extension + - All architectures + - See Section "4.5 Integers" of GCC_MANUAL. Translation Limits __________________ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 02 12:45:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Sep 2023 12:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.594828.928270 (Exim 4.92) (envelope-from ) id 1qcPzO-0002TZ-5G; Sat, 02 Sep 2023 12:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 594828.928270; Sat, 02 Sep 2023 12:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzO-0002TQ-2d; Sat, 02 Sep 2023 12:44:34 +0000 Received: by outflank-mailman (input) for mailman id 594828; Sat, 02 Sep 2023 12:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzM-0002TA-J5 for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzM-00041X-IE for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qcPzM-00010H-Fm for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6Pg+lDQWcnPZZD4a+MgRje7j0FV7I91XjROlJsGQ7rU=; b=oFthLid66YBJ+zsU2I/f9lLViI er+mkDC4pXwlE/1hpkkk9XyZnhEFSomkdJuemDfFo4F6EdjS8fCduHwmNZeMfMT6w1CDnvUiJ6WZM WyyLxAgMYcEQ16c6XSN3LT2NCe9G5Fv8qZ0/tqCBoyJbFyqz1CN1Z2qcR7QqIig74kp0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm64/vfp: address MISRA C:2012 Dir 4.3 Message-Id: Date: Sat, 02 Sep 2023 12:44:32 +0000 commit 6621932264e3e86df3913db4249ecd3eb100b13f Author: Nicola Vetrini AuthorDate: Fri Aug 25 16:00:23 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Aug 30 19:00:35 2023 -0700 arm64/vfp: address MISRA C:2012 Dir 4.3 Directive 4.3 prescribes the following: "Assembly language shall be encapsulated and isolated", on the grounds of improved readability and ease of maintenance. A static inline function is the chosen encapsulation mechanism. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/arch/arm/arm64/vfp.c | 82 ++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c index 2d0d7c2e6d..c4f89c7b0e 100644 --- a/xen/arch/arm/arm64/vfp.c +++ b/xen/arch/arm/arm64/vfp.c @@ -4,6 +4,48 @@ #include #include +static inline void save_state(uint64_t *fpregs) +{ + asm volatile("stp q0, q1, [%1, #16 * 0]\n\t" + "stp q2, q3, [%1, #16 * 2]\n\t" + "stp q4, q5, [%1, #16 * 4]\n\t" + "stp q6, q7, [%1, #16 * 6]\n\t" + "stp q8, q9, [%1, #16 * 8]\n\t" + "stp q10, q11, [%1, #16 * 10]\n\t" + "stp q12, q13, [%1, #16 * 12]\n\t" + "stp q14, q15, [%1, #16 * 14]\n\t" + "stp q16, q17, [%1, #16 * 16]\n\t" + "stp q18, q19, [%1, #16 * 18]\n\t" + "stp q20, q21, [%1, #16 * 20]\n\t" + "stp q22, q23, [%1, #16 * 22]\n\t" + "stp q24, q25, [%1, #16 * 24]\n\t" + "stp q26, q27, [%1, #16 * 26]\n\t" + "stp q28, q29, [%1, #16 * 28]\n\t" + "stp q30, q31, [%1, #16 * 30]\n\t" + : "=Q" (*fpregs) : "r" (fpregs)); +} + +static inline void restore_state(const uint64_t *fpregs) +{ + asm volatile("ldp q0, q1, [%1, #16 * 0]\n\t" + "ldp q2, q3, [%1, #16 * 2]\n\t" + "ldp q4, q5, [%1, #16 * 4]\n\t" + "ldp q6, q7, [%1, #16 * 6]\n\t" + "ldp q8, q9, [%1, #16 * 8]\n\t" + "ldp q10, q11, [%1, #16 * 10]\n\t" + "ldp q12, q13, [%1, #16 * 12]\n\t" + "ldp q14, q15, [%1, #16 * 14]\n\t" + "ldp q16, q17, [%1, #16 * 16]\n\t" + "ldp q18, q19, [%1, #16 * 18]\n\t" + "ldp q20, q21, [%1, #16 * 20]\n\t" + "ldp q22, q23, [%1, #16 * 22]\n\t" + "ldp q24, q25, [%1, #16 * 24]\n\t" + "ldp q26, q27, [%1, #16 * 26]\n\t" + "ldp q28, q29, [%1, #16 * 28]\n\t" + "ldp q30, q31, [%1, #16 * 30]\n\t" + : : "Q" (*fpregs), "r" (fpregs)); +} + void vfp_save_state(struct vcpu *v) { if ( !cpu_has_fp ) @@ -12,25 +54,7 @@ void vfp_save_state(struct vcpu *v) if ( is_sve_domain(v->domain) ) sve_save_state(v); else - { - asm volatile("stp q0, q1, [%1, #16 * 0]\n\t" - "stp q2, q3, [%1, #16 * 2]\n\t" - "stp q4, q5, [%1, #16 * 4]\n\t" - "stp q6, q7, [%1, #16 * 6]\n\t" - "stp q8, q9, [%1, #16 * 8]\n\t" - "stp q10, q11, [%1, #16 * 10]\n\t" - "stp q12, q13, [%1, #16 * 12]\n\t" - "stp q14, q15, [%1, #16 * 14]\n\t" - "stp q16, q17, [%1, #16 * 16]\n\t" - "stp q18, q19, [%1, #16 * 18]\n\t" - "stp q20, q21, [%1, #16 * 20]\n\t" - "stp q22, q23, [%1, #16 * 22]\n\t" - "stp q24, q25, [%1, #16 * 24]\n\t" - "stp q26, q27, [%1, #16 * 26]\n\t" - "stp q28, q29, [%1, #16 * 28]\n\t" - "stp q30, q31, [%1, #16 * 30]\n\t" - : "=Q" (*v->arch.vfp.fpregs) : "r" (v->arch.vfp.fpregs)); - } + save_state(v->arch.vfp.fpregs); v->arch.vfp.fpsr = READ_SYSREG(FPSR); v->arch.vfp.fpcr = READ_SYSREG(FPCR); @@ -46,25 +70,7 @@ void vfp_restore_state(struct vcpu *v) if ( is_sve_domain(v->domain) ) sve_restore_state(v); else - { - asm volatile("ldp q0, q1, [%1, #16 * 0]\n\t" - "ldp q2, q3, [%1, #16 * 2]\n\t" - "ldp q4, q5, [%1, #16 * 4]\n\t" - "ldp q6, q7, [%1, #16 * 6]\n\t" - "ldp q8, q9, [%1, #16 * 8]\n\t" - "ldp q10, q11, [%1, #16 * 10]\n\t" - "ldp q12, q13, [%1, #16 * 12]\n\t" - "ldp q14, q15, [%1, #16 * 14]\n\t" - "ldp q16, q17, [%1, #16 * 16]\n\t" - "ldp q18, q19, [%1, #16 * 18]\n\t" - "ldp q20, q21, [%1, #16 * 20]\n\t" - "ldp q22, q23, [%1, #16 * 22]\n\t" - "ldp q24, q25, [%1, #16 * 24]\n\t" - "ldp q26, q27, [%1, #16 * 26]\n\t" - "ldp q28, q29, [%1, #16 * 28]\n\t" - "ldp q30, q31, [%1, #16 * 30]\n\t" - : : "Q" (*v->arch.vfp.fpregs), "r" (v->arch.vfp.fpregs)); - } + restore_state(v->arch.vfp.fpregs); WRITE_SYSREG(v->arch.vfp.fpsr, FPSR); WRITE_SYSREG(v->arch.vfp.fpcr, FPCR); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 02 12:45:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Sep 2023 12:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.594829.928276 (Exim 4.92) (envelope-from ) id 1qcPzY-0002Wt-7P; Sat, 02 Sep 2023 12:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 594829.928276; Sat, 02 Sep 2023 12:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzY-0002Wl-4A; Sat, 02 Sep 2023 12:44:44 +0000 Received: by outflank-mailman (input) for mailman id 594829; Sat, 02 Sep 2023 12:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzW-0002WR-Nu for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzW-00041h-N8 for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qcPzW-00010g-KP for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tOxWPXnLxigsT2Wv1AGvXYoSlDsg54yWkeATaxYxQsw=; b=cimmz49rsPy0/MLPerSyMRVpNm ZZok1c8VZuGLx/CdWyEGYAckk4MgiOXZO4UUpMQagdS2Qhq0RtiThHXppkuU9SFzNy+159eSeu+fp 4TotN6dPZHnjPH+vdvIAOSvJKBZEiJLHHdO1y8B88EvGbuWRkisIurRJlpTX3Lpi9esg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Add public/arch-ppc.h Message-Id: Date: Sat, 02 Sep 2023 12:44:42 +0000 commit 08c192cc1127ffb4c1ab6d7f92a55123967b815b Author: Shawn Anastasio AuthorDate: Fri Sep 1 09:16:39 2023 +0200 Commit: Jan Beulich CommitDate: Fri Sep 1 09:16:39 2023 +0200 xen/ppc: Add public/arch-ppc.h Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/include/public/arch-ppc.h | 112 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/xen/include/public/arch-ppc.h b/xen/include/public/arch-ppc.h new file mode 100644 index 0000000000..33a24e3795 --- /dev/null +++ b/xen/include/public/arch-ppc.h @@ -0,0 +1,112 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) IBM Corp. 2005, 2006 + * Copyright (C) Raptor Engineering, LLC 2023 + * + * Authors: Hollis Blanchard + * Timothy Pearson + * Shawn Anastasio + */ + +#ifndef __XEN_PUBLIC_ARCH_PPC_H__ +#define __XEN_PUBLIC_ARCH_PPC_H__ + +#if defined(__XEN__) || defined(__XEN_TOOLS__) +#define int64_aligned_t int64_t __attribute__((__aligned__(8))) +#define uint64_aligned_t uint64_t __attribute__((__aligned__(8))) +#endif + +#ifndef __ASSEMBLY__ +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ + typedef union { type *p; unsigned long q; } \ + __guest_handle_ ## name; \ + typedef union { type *p; uint64_aligned_t q; } \ + __guest_handle_64_ ## name + +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ + ___DEFINE_XEN_GUEST_HANDLE(name, type); \ + ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type) +#define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) +#define __XEN_GUEST_HANDLE(name) __guest_handle_64_ ## name +#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name) +#define XEN_GUEST_HANDLE_PARAM(name) __guest_handle_ ## name +#define set_xen_guest_handle_raw(hnd, val) \ + do { \ + __typeof__(&(hnd)) sxghr_tmp_ = &(hnd); \ + sxghr_tmp_->q = 0; \ + sxghr_tmp_->p = (val); \ + } while ( 0 ) +#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val) + +#ifdef __XEN_TOOLS__ +#define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0) +#endif + +typedef uint64_t xen_pfn_t; +#define PRI_xen_pfn PRIx64 +#define PRIu_xen_pfn PRIu64 + +/* + * Maximum number of virtual CPUs in legacy multi-processor guests. + * Only one. All other VCPUS must use VCPUOP_register_vcpu_info. + */ +#define XEN_LEGACY_MAX_VCPUS 1 + +typedef uint64_t xen_ulong_t; +#define PRI_xen_ulong PRIx64 +#endif + +#ifndef __ASSEMBLY__ + +typedef uint64_t xen_ulong_t; + +/* + * User-accessible registers: most of these need to be saved/restored + * for every nested Xen invocation. + */ +struct vcpu_guest_core_regs +{ + uint64_t gprs[32]; + uint64_t lr; + uint64_t ctr; + uint64_t srr0; + uint64_t srr1; + uint64_t pc; + uint64_t msr; + uint64_t fpscr; /* XXX Is this necessary */ + uint64_t xer; + uint64_t hid4; /* debug only */ + uint64_t dar; /* debug only */ + uint32_t dsisr; /* debug only */ + uint32_t cr; + uint32_t __pad; /* good spot for another 32bit reg */ + uint32_t entry_vector; +}; +typedef struct vcpu_guest_core_regs vcpu_guest_core_regs_t; + +typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ /* XXX timebase */ + +/* ONLY used to communicate with dom0! See also struct exec_domain. */ +struct vcpu_guest_context { + vcpu_guest_core_regs_t user_regs; /* User-level CPU registers */ + uint64_t sdr1; /* Pagetable base */ + /* XXX etc */ +}; +typedef struct vcpu_guest_context vcpu_guest_context_t; +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); + +struct arch_shared_info { + uint64_t boot_timebase; +}; + +struct arch_vcpu_info { +}; + +struct xen_arch_domainconfig { +}; + +typedef struct xen_pmu_arch { uint8_t dummy; } xen_pmu_arch_t; + +#endif + +#endif /* __XEN_PUBLIC_ARCH_PPC_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 02 12:45:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Sep 2023 12:45:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.594831.928281 (Exim 4.92) (envelope-from ) id 1qcPzh-0002Zd-8n; Sat, 02 Sep 2023 12:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 594831.928281; Sat, 02 Sep 2023 12:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzh-0002ZV-5Y; Sat, 02 Sep 2023 12:44:53 +0000 Received: by outflank-mailman (input) for mailman id 594831; Sat, 02 Sep 2023 12:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzg-0002ZN-Te for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzg-00041t-Qd for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qcPzg-000117-PI for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GhzTs67rdll6Tc6TXrrmEC3tu3nhOULoBCTb27E55k0=; b=dVKxbLvJHcy0b/JN7xXRI1g+Nn A2dDEJ1Aju9kAdlnxPWu3BW9bq4XWwiIrUxHBHhJaoTh2mEcnV/IkViQ8Rho7xleKqDvV4m/b2aGZ dATMcOGj8SMtAnb8YmeOrg6YoeVHqx+F9NZptb95HFkWRLpo3UxqaiHvAmPMm1Nunw0g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Define bug frames table in linker script Message-Id: Date: Sat, 02 Sep 2023 12:44:52 +0000 commit 629dd78c3658e91e4a6ada241b7e53e2c7275263 Author: Shawn Anastasio AuthorDate: Fri Sep 1 09:17:01 2023 +0200 Commit: Jan Beulich CommitDate: Fri Sep 1 09:17:01 2023 +0200 xen/ppc: Define bug frames table in linker script Define the bug frames table in ppc's linker script as is done by other architectures. Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/xen.lds.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/ppc/xen.lds.S b/xen/arch/ppc/xen.lds.S index 2fa81d5a83..9e46035155 100644 --- a/xen/arch/ppc/xen.lds.S +++ b/xen/arch/ppc/xen.lds.S @@ -41,6 +41,16 @@ SECTIONS . = ALIGN(PAGE_SIZE); .rodata : { _srodata = .; /* Read-only data */ + /* Bug frames table */ + __start_bug_frames = .; + *(.bug_frames.0) + __stop_bug_frames_0 = .; + *(.bug_frames.1) + __stop_bug_frames_1 = .; + *(.bug_frames.2) + __stop_bug_frames_2 = .; + *(.bug_frames.3) + __stop_bug_frames_3 = .; *(.rodata) *(.rodata.*) *(.data.rel.ro) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 02 12:45:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Sep 2023 12:45:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.594832.928282 (Exim 4.92) (envelope-from ) id 1qcPzr-0002ck-Ao; Sat, 02 Sep 2023 12:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 594832.928282; Sat, 02 Sep 2023 12:45:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzr-0002cd-8D; Sat, 02 Sep 2023 12:45:03 +0000 Received: by outflank-mailman (input) for mailman id 594832; Sat, 02 Sep 2023 12:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzq-0002cV-VU for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qcPzq-00042U-Uk for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qcPzq-00012C-Sp for xen-changelog@lists.xenproject.org; Sat, 02 Sep 2023 12: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=yiYun3z3l5D+ngyNtaChRTETjVCxB44ygt1XRbqdrak=; b=B+np8RaA0c88LlIf6Jr0XeoUlG 3DYkvLsC4Y4fwLb8l4HfBN9YubbPR55wwAYgs+RuWI1Im+51exds8xUKpg70sTN5Rf4Swwcux0jQm MXIjbV6G7RWYe5oIEBt8JNAo7DbGEsD6KGXlkHoXtsCcYG/l0Jduxqh7BBQRkTjXm32c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: consolidate vm-event/monitor entry Message-Id: Date: Sat, 02 Sep 2023 12:45:02 +0000 commit f805cf3e9b87584e16b03b5059b1163fd22bf5a0 Author: Jan Beulich AuthorDate: Fri Sep 1 09:17:41 2023 +0200 Commit: Jan Beulich CommitDate: Fri Sep 1 09:17:41 2023 +0200 MAINTAINERS: consolidate vm-event/monitor entry If the F: description is to be trusted, the two xen/arch/x86/hvm/ lines were fully redundant with the earlier wildcard ones. Arch header files, otoh, were no longer covered by anything as of the move from include/asm-*/ to arch/*/include/asm/. Further also generalize (by folding) the x86- and Arm-specific mem_access.c entries. Finally, again assuming the F: description can be trusted, there's no point listing arch/, common/, and include/ entries separately. Fold them all. Signed-off-by: Jan Beulich Acked-by: Tamas K Lengyel --- MAINTAINERS | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index bf71ac144c..59103dbac0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -558,20 +558,9 @@ R: Alexandru Isaila R: Petre Pircalabu S: Supported F: tools/misc/xen-access.c -F: xen/arch/*/monitor.c -F: xen/arch/*/vm_event.c -F: xen/arch/arm/mem_access.c -F: xen/arch/x86/include/asm/hvm/monitor.h -F: xen/arch/x86/include/asm/hvm/vm_event.h -F: xen/arch/x86/mm/mem_access.c -F: xen/arch/x86/hvm/monitor.c -F: xen/arch/x86/hvm/vm_event.c -F: xen/common/mem_access.c -F: xen/common/monitor.c -F: xen/common/vm_event.c -F: xen/include/*/mem_access.h -F: xen/include/*/monitor.h -F: xen/include/*/vm_event.h +F: xen/*/mem_access.[ch] +F: xen/*/monitor.[ch] +F: xen/*/vm_event.[ch] VPCI M: Roger Pau Monné -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:22:47 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:22:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595886.929523 (Exim 4.92) (envelope-from ) id 1qdeQt-00067Z-0R; Tue, 05 Sep 2023 22:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595886.929523; Tue, 05 Sep 2023 22: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 1qdeQs-00067R-Tw; Tue, 05 Sep 2023 22:22:02 +0000 Received: by outflank-mailman (input) for mailman id 595886; Tue, 05 Sep 2023 22:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeQs-00067L-A5 for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeQs-0004LT-7D for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeQs-0002H5-5m for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LGhIUnhE/ZWdlpI2G38IKe9P0zuKHl6RdKDGZL3inQI=; b=jB9qO2fyUXA4/36IYv/DailwNF n76WBfmZreN8MrZFSTiN4xdzVIKSLEGrrb5IB/+9gBLYWbt8HmUTEwmB0k7GRngfzpVzoL9Rjx7OM vtHiG/hDPWuDTXOnM6XtmYkDgv4FvS/LWoZt7JmWEgrqbnEFW3fruMVaxfyyJA1wJwTQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xen/vcpu: ignore VCPU_SSHOTTMR_future Message-Id: Date: Tue, 05 Sep 2023 22:22:02 +0000 commit 7b5155a79ea946dd513847d4e7ad2b7e6a4ebb73 Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:45:29 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:45:29 2023 +0200 xen/vcpu: ignore VCPU_SSHOTTMR_future The usage of VCPU_SSHOTTMR_future in Linux prior to 4.7 is bogus. When the hypervisor returns -ETIME (timeout in the past) Linux keeps retrying to setup the timer with a higher timeout instead of self-injecting a timer interrupt. On boxes without any hardware assistance for logdirty we have seen HVM Linux guests < 4.7 with 32vCPUs give up trying to setup the timer when logdirty is enabled: CE: Reprogramming failure. Giving up CE: xen increased min_delta_ns to 1000000 nsec CE: Reprogramming failure. Giving up CE: Reprogramming failure. Giving up CE: xen increased min_delta_ns to 506250 nsec CE: xen increased min_delta_ns to 759375 nsec CE: xen increased min_delta_ns to 1000000 nsec CE: Reprogramming failure. Giving up CE: Reprogramming failure. Giving up CE: Reprogramming failure. Giving up Freezing user space processes ... INFO: rcu_sched detected stalls on CPUs/tasks: { 14} (detected by 10, t=60002 jiffies, g=4006, c=4005, q=14130) Task dump for CPU 14: swapper/14 R running task 0 0 1 0x00000000 Call Trace: [] ? rcu_eqs_enter_common.isra.30+0x3d/0xf0 [] ? default_idle+0x1e/0xd0 [] ? arch_cpu_idle+0x20/0xc0 [] ? cpu_startup_entry+0x14a/0x1e0 [] ? start_secondary+0x1f7/0x270 [] ? start_cpu+0x5/0x14 INFO: rcu_sched detected stalls on CPUs/tasks: { 26} (detected by 24, t=60002 jiffies, g=6922, c=6921, q=7013) Task dump for CPU 26: swapper/26 R running task 0 0 1 0x00000000 Call Trace: [] ? rcu_eqs_enter_common.isra.30+0x3d/0xf0 [] ? default_idle+0x1e/0xd0 [] ? arch_cpu_idle+0x20/0xc0 [] ? cpu_startup_entry+0x14a/0x1e0 [] ? start_secondary+0x1f7/0x270 [] ? start_cpu+0x5/0x14 INFO: rcu_sched detected stalls on CPUs/tasks: { 26} (detected by 24, t=60002 jiffies, g=8499, c=8498, q=7664) Task dump for CPU 26: swapper/26 R running task 0 0 1 0x00000000 Call Trace: [] ? rcu_eqs_enter_common.isra.30+0x3d/0xf0 [] ? default_idle+0x1e/0xd0 [] ? arch_cpu_idle+0x20/0xc0 [] ? cpu_startup_entry+0x14a/0x1e0 [] ? start_secondary+0x1f7/0x270 [] ? start_cpu+0x5/0x14 Thus leading to CPU stalls and a broken system as a result. Workaround this bogus usage by ignoring the VCPU_SSHOTTMR_future in the hypervisor. Old Linux versions are the only ones known to have (wrongly) attempted to use the flag, and ignoring it is compatible with the behavior expected by any guests setting that flag. Note the usage of the flag has been removed from Linux by commit: c06b6d70feb3 xen/x86: don't lose event interrupts Which landed in Linux 4.7. Signed-off-by: Roger Pau Monné Acked-by: Henry Wang # CHANGELOG Acked-by: Jan Beulich master commit: 19c6cbd90965b1440bd551069373d6fa3f2f365d master date: 2023-05-03 13:36:05 +0200 --- CHANGELOG.md | 6 ++++++ xen/common/domain.c | 13 ++++++++++--- xen/include/public/vcpu.h | 5 ++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f4d0f25e9..bb0eceb69a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [4.17.3](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.17.3) + +### Changed + - Ignore VCPUOP_set_singleshot_timer's VCPU_SSHOTTMR_future flag. The only + known user doesn't use it properly, leading to in-guest breakage. + ## [4.17.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.17.0) - 2022-12-12 ### Changed diff --git a/xen/common/domain.c b/xen/common/domain.c index 53f7e734fe..30c2279673 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1691,9 +1691,16 @@ long common_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&set, arg, 1) ) return -EFAULT; - if ( (set.flags & VCPU_SSHOTTMR_future) && - (set.timeout_abs_ns < NOW()) ) - return -ETIME; + if ( set.timeout_abs_ns < NOW() ) + { + /* + * Simplify the logic if the timeout has already expired and just + * inject the event. + */ + stop_timer(&v->singleshot_timer); + send_timer_event(v); + break; + } migrate_timer(&v->singleshot_timer, smp_processor_id()); set_timer(&v->singleshot_timer, set.timeout_abs_ns); diff --git a/xen/include/public/vcpu.h b/xen/include/public/vcpu.h index 81a3b3a743..a836b264a9 100644 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -150,7 +150,10 @@ typedef struct vcpu_set_singleshot_timer vcpu_set_singleshot_timer_t; DEFINE_XEN_GUEST_HANDLE(vcpu_set_singleshot_timer_t); /* Flags to VCPUOP_set_singleshot_timer. */ - /* Require the timeout to be in the future (return -ETIME if it's passed). */ + /* + * Request the timeout to be in the future (return -ETIME if it's passed) + * but can be ignored by the hypervisor. + */ #define _VCPU_SSHOTTMR_future (0) #define VCPU_SSHOTTMR_future (1U << _VCPU_SSHOTTMR_future) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:22:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595887.929527 (Exim 4.92) (envelope-from ) id 1qdeR3-00069A-1e; Tue, 05 Sep 2023 22:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595887.929527; Tue, 05 Sep 2023 22: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 1qdeR2-000693-VP; Tue, 05 Sep 2023 22:22:12 +0000 Received: by outflank-mailman (input) for mailman id 595887; Tue, 05 Sep 2023 22:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeR2-00068x-BL for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeR2-0004La-AT for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeR2-0002HY-9T for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=lUDD69BHzV+UULsWrOuGyFn2LNj2atfYtwuZUKr0wiI=; b=eizhtwheytvf6NLGV/2ekqf1AA 1mHllNK2XEN/qtNePv6+QVx4kISXdDVyPQlAFa8HoQKvffft175z34Tt7XYIoFOOzMabuEF59C3bl 3+AgLUhmXnS0y0aMuOgDJXX6JtoXJMEvQrQ7V1m/xxg6AOpPNZRA42j7nbpv0jJDqdOQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/head: check base address alignment Message-Id: Date: Tue, 05 Sep 2023 22:22:12 +0000 commit e5f9987d5f63ecc3cc9884c614aca699a41e7ca7 Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:46:28 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:46:28 2023 +0200 x86/head: check base address alignment Ensure that the base address is 2M aligned, or else the page table entries created would be corrupt as reserved bits on the PDE end up set. We have encountered a broken firmware where grub2 would end up loading Xen at a non 2M aligned region when using the multiboot2 protocol, and that caused a very difficult to debug triple fault. If the alignment is not as required by the page tables print an error message and stop the boot. Also add a build time check that the calculation of symbol offsets don't break alignment of passed addresses. The check could be performed earlier, but so far the alignment is required by the page tables, and hence feels more natural that the check lives near to the piece of code that requires it. Note that when booted as an EFI application from the PE entry point the alignment check is already performed by efi_arch_load_addr_check(), and hence there's no need to add another check at the point where page tables get built in efi_arch_memory_setup(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 0946068e7faea22868c577d7afa54ba4970ff520 master date: 2023-05-03 13:36:25 +0200 --- xen/arch/x86/boot/head.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 245c859dd7..6bc64c9e86 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -1,3 +1,4 @@ +#include #include #include #include @@ -121,6 +122,7 @@ multiboot2_header: .Lbad_ldr_nst: .asciz "ERR: EFI SystemTable is not provided by bootloader!" .Lbad_ldr_nih: .asciz "ERR: EFI ImageHandle is not provided by bootloader!" .Lbad_efi_msg: .asciz "ERR: EFI IA-32 platforms are not supported!" +.Lbad_alg_msg: .asciz "ERR: Xen must be loaded at a 2Mb boundary!" .section .init.data, "aw", @progbits .align 4 @@ -146,6 +148,9 @@ bad_cpu: not_multiboot: mov $sym_offs(.Lbad_ldr_msg), %ecx jmp .Lget_vtb +.Lnot_aligned: + mov $sym_offs(.Lbad_alg_msg), %ecx + jmp .Lget_vtb .Lmb2_no_st: /* * Here we are on EFI platform. vga_text_buffer was zapped earlier @@ -673,6 +678,15 @@ trampoline_setup: cmp %edi, %eax jb 1b + .if !IS_ALIGNED(sym_offs(0), 1 << L2_PAGETABLE_SHIFT) + .error "Symbol offset calculation breaks alignment" + .endif + + /* Check that the image base is aligned. */ + lea sym_esi(_start), %eax + test $(1 << L2_PAGETABLE_SHIFT) - 1, %eax + jnz .Lnot_aligned + /* Map Xen into the higher mappings using 2M superpages. */ lea _PAGE_PSE + PAGE_HYPERVISOR_RWX + sym_esi(_start), %eax mov $sym_offs(_start), %ecx /* %eax = PTE to write ^ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:23:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595888.929531 (Exim 4.92) (envelope-from ) id 1qdeRD-0006B8-3X; Tue, 05 Sep 2023 22:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595888.929531; Tue, 05 Sep 2023 22: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 1qdeRD-0006B0-0d; Tue, 05 Sep 2023 22:22:23 +0000 Received: by outflank-mailman (input) for mailman id 595888; Tue, 05 Sep 2023 22:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRC-0006Au-En for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRC-0004Le-E0 for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeRC-0002Hx-Cv for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=2U6DY1l5yzOO822eOgzofJEQyY1/yxtPsk0Cwm30+zg=; b=3Iyk29S11V3fVff/Q1JGZqObPv 1xF+wJYfRwyxOm1nq21Rm4z9BEX8eoHqRFIwT+EMDzMXmYYHVUdDY3q4UX92FMvqjJ77h5OESvVIf g87B1iyK+dYPMIUZy3HvUld13T213XNvqqiBM2n8ls6N78VcZC2tl2R7Ct8iIj6UDNsQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xenalyze: Handle start-of-day ->RUNNING transitions Message-Id: Date: Tue, 05 Sep 2023 22:22:22 +0000 commit f04295dd802fb6cd43a02ec59a5964b2c5950fe1 Author: George Dunlap AuthorDate: Tue Sep 5 08:47:14 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:47:14 2023 +0200 xenalyze: Handle start-of-day ->RUNNING transitions A recent xentrace highlighted an unhandled corner case in the vcpu "start-of-day" logic, if the trace starts after the last running -> non-running transition, but before the first non-running -> running transition. Because start-of-day wasn't handled, vcpu_next_update() was expecting p->current to be NULL, and tripping out with the following error message when it wasn't: vcpu_next_update: FATAL: p->current not NULL! (d32768dv$p, runstate RUNSTATE_INIT) where 32768 is the DEFAULT_DOMAIN, and $p is the pcpu number. Instead of calling vcpu_start() piecemeal throughout sched_runstate_process(), call it at the top of the function if the vcpu in question is still in RUNSTATE_INIT, so that we can handle all the cases in one place. Sketch out at the top of the function all cases which we need to handle, and what to do in those cases. Some transitions tell us where v is running; some transitions tell us about what is (or is not) running on p; some transitions tell us neither. If a transition tells us where v is now running, update its state; otherwise leave it in INIT, in order to avoid having to deal with TSC skew on start-up. If a transition tells us what is or is not running on p, update p->current (either to v or NULL). Otherwise leave it alone. If neither, do nothing. Reifying those rules: - If we're continuing to run, set v to RUNNING, and use p->first_tsc as the runstate time. - If we're starting to run, set v to RUNNING, and use ri->tsc as the runstate time. - If v is being deschedled, leave v in the INIT state to avoid dealing with TSC skew; but set p->current to NULL so that whatever is scheduled next won't trigger the assert in vcpu_next_update(). - If a vcpu is waking up (switching from one non-runnable state to another non-runnable state), leave v in INIT, and p in whatever state it's in (which may be the default domain, or some other vcpu which has already run). While here, fix the comment above vcpu_start; it's called when the vcpu state is INIT, not when current is the default domain. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Acked-by: Anthony PERARD master commit: aab4b38b5d77e3c65f44bacd56427a85b7392a11 master date: 2023-06-30 11:25:33 +0100 --- tools/xentrace/xenalyze.c | 159 +++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 58 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index e7ec284eea..9b4b62c82f 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6885,39 +6885,86 @@ void vcpu_next_update(struct pcpu_info *p, struct vcpu_data *next, tsc_t tsc) p->lost_record.seen_valid_schedule = 1; } -/* If current is the default domain, we're fixing up from something - * like start-of-day. Update what we can. */ -void vcpu_start(struct pcpu_info *p, struct vcpu_data *v) { - /* If vcpus are created, or first show up, in a "dead zone", this will - * fail. */ - if( !p->current || p->current->d->did != DEFAULT_DOMAIN) { - fprintf(stderr, "Strange, p->current not default domain!\n"); - error(ERR_FILE, NULL); - return; - } +/* + * If the vcpu in question is in state INIT, we're fixing up from something + * like start-of-day. Update what we can. + */ +void vcpu_start(struct pcpu_info *p, struct vcpu_data *v, + int old_runstate, int new_runstate, tsc_t ri_tsc) { + tsc_t tsc; + + /* + * + * Cases: + * running -> running: + * v -> running, using p->first_tsc + * {runnable, blocked} -> running: + * v -> running, using ri->tsc + * running -> {runnable, blocked}: + * Leave v INIT, but clear p->current in case another vcpu is scheduled + * blocked -> runnable: + * Leave INIT, and also leave p->current, since we still don't know who's scheduled here + */ + + /* + * NB that a vcpu won't come out of INIT until it starts running somewhere. + * If this event is pcpu that has already seen a scheduling event, p->current + * should be null; if this is the first scheduling event on this pcpu, + * p->current should be the default domain. + */ + if( old_runstate == RUNSTATE_RUNNING ) { + if ( !p->current || p->current->d->did != DEFAULT_DOMAIN) { + fprintf(stderr, "Strange, p->current not default domain!\n"); + error(ERR_FILE, NULL); + return; - if(!p->first_tsc) { - fprintf(stderr, "Strange, p%d first_tsc 0!\n", p->pid); - error(ERR_FILE, NULL); + } + + if(!p->first_tsc) { + fprintf(stderr, "Strange, p%d first_tsc 0!\n", p->pid); + error(ERR_FILE, NULL); + } + + if(p->first_tsc <= p->current->runstate.tsc) { + fprintf(stderr, "Strange, first_tsc %llx < default_domain runstate tsc %llx!\n", + p->first_tsc, + p->current->runstate.tsc); + error(ERR_FILE, NULL); + } + + /* Change default domain to 'queued' */ + runstate_update(p->current, RUNSTATE_QUEUED, p->first_tsc); + + /* + * Set current to NULL, so that if another vcpu (not in INIT) + * is scheduled here, we don't trip over the check in + * vcpu_next_update() + */ + p->current = NULL; } - if(p->first_tsc <= p->current->runstate.tsc) { - fprintf(stderr, "Strange, first_tsc %llx < default_domain runstate tsc %llx!\n", - p->first_tsc, - p->current->runstate.tsc); - error(ERR_FILE, NULL); + /* TSC skew at start-of-day is hard to deal with. Don't + * bring a vcpu out of INIT until it's seen to be actually + * running somewhere. */ + if ( new_runstate != RUNSTATE_RUNNING ) { + fprintf(warn, "First schedule for d%dv%d doesn't take us into a running state; leaving INIT\n", + v->d->did, v->vid); + + return; } - /* Change default domain to 'queued' */ - runstate_update(p->current, RUNSTATE_QUEUED, p->first_tsc); + tsc = ri_tsc; + if ( old_runstate == RUNSTATE_RUNNING ) { + /* FIXME: Copy over data from the default domain this interval */ + fprintf(warn, "Using first_tsc for d%dv%d (%lld cycles)\n", + v->d->did, v->vid, p->last_tsc - p->first_tsc); - /* FIXME: Copy over data from the default domain this interval */ - fprintf(warn, "Using first_tsc for d%dv%d (%lld cycles)\n", - v->d->did, v->vid, p->last_tsc - p->first_tsc); + tsc = p->first_tsc; + } /* Simulate the time since the first tsc */ - runstate_update(v, RUNSTATE_RUNNING, p->first_tsc); - p->time.tsc = p->first_tsc; + runstate_update(v, RUNSTATE_RUNNING, tsc); + p->time.tsc = tsc; p->current = v; pcpu_string_draw(p); v->p = p; @@ -7021,6 +7068,13 @@ void sched_runstate_process(struct pcpu_info *p) last_oldstate = v->runstate.last_oldstate; v->runstate.last_oldstate.wrong = RUNSTATE_INIT; + /* Handle all "start-of-day" issues in one place. This can be + * done before any of the other tracks or sanity checks. */ + if ( v->runstate.state == RUNSTATE_INIT ) { + vcpu_start(p, v, sevt.old_runstate, sevt.new_runstate, ri->tsc); + return; + } + /* Close vmexits when the putative reason for blocking / &c stops. * This way, we don't account cpu contention to some other overhead. */ if(sevt.new_runstate == RUNSTATE_RUNNABLE @@ -7190,32 +7244,27 @@ update: * or stopping actually running on a physical cpu. */ if ( type == CONTINUE ) { - if( v->runstate.state == RUNSTATE_INIT ) { - /* Start-of-day; account first tsc -> now to v */ - vcpu_start(p, v); - } else { - /* Continue running. First, do some sanity checks */ - if ( v->runstate.state == RUNSTATE_LOST ) { - fprintf(warn, "WARNING: continue with d%dv%d in RUNSTATE_LOST. Resetting current.\n", - v->d->did, v->vid); - if ( p->current ) - vcpu_prev_update(p, p->current, ri->tsc, RUNSTATE_LOST); - vcpu_next_update(p, v, ri->tsc); - } - else if( v->runstate.state != RUNSTATE_RUNNING ) { - /* This should never happen. */ - fprintf(warn, "FATAL: sevt.old_runstate running, but d%dv%d runstate %s!\n", - v->d->did, v->vid, runstate_name[v->runstate.state]); - error(ERR_FILE, NULL); - } else if ( v->p != p ) { - fprintf(warn, "FATAL: continue on p%d, but d%dv%d p%d!\n", - p->pid, v->d->did, v->vid, - v->p ? v->p->pid : -1); - error(ERR_FILE, NULL); - } - - runstate_update(v, RUNSTATE_RUNNING, ri->tsc); + /* Continue running. First, do some sanity checks */ + if ( v->runstate.state == RUNSTATE_LOST ) { + fprintf(warn, "WARNING: continue with d%dv%d in RUNSTATE_LOST. Resetting current.\n", + v->d->did, v->vid); + if ( p->current ) + vcpu_prev_update(p, p->current, ri->tsc, RUNSTATE_LOST); + vcpu_next_update(p, v, ri->tsc); + } + else if( v->runstate.state != RUNSTATE_RUNNING ) { + /* This should never happen. */ + fprintf(warn, "FATAL: sevt.old_runstate running, but d%dv%d runstate %s!\n", + v->d->did, v->vid, runstate_name[v->runstate.state]); + error(ERR_FILE, NULL); + } else if ( v->p != p ) { + fprintf(warn, "FATAL: continue on p%d, but d%dv%d p%d!\n", + p->pid, v->d->did, v->vid, + v->p ? v->p->pid : -1); + error(ERR_FILE, NULL); } + + runstate_update(v, RUNSTATE_RUNNING, ri->tsc); } else if ( sevt.old_runstate == RUNSTATE_RUNNING || v->runstate.state == RUNSTATE_RUNNING ) @@ -7232,10 +7281,7 @@ update: * # (should never happen) */ if( sevt.old_runstate == RUNSTATE_RUNNING ) { - if( v->runstate.state == RUNSTATE_INIT ) { - /* Start-of-day; account first tsc -> now to v */ - vcpu_start(p, v); - } else if( v->runstate.state != RUNSTATE_RUNNING + if( v->runstate.state != RUNSTATE_RUNNING && v->runstate.state != RUNSTATE_LOST ) { /* This should never happen. */ fprintf(warn, "FATAL: sevt.old_runstate running, but d%dv%d runstate %s!\n", @@ -7264,11 +7310,8 @@ update: vcpu_next_update(p, v, ri->tsc); } - else if ( v->runstate.state != RUNSTATE_INIT ) + else { - /* TSC skew at start-of-day is hard to deal with. Don't - * bring a vcpu out of INIT until it's seen to be actually - * running somewhere. */ runstate_update(v, sevt.new_runstate, ri->tsc); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:23:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595889.929535 (Exim 4.92) (envelope-from ) id 1qdeRN-0006DR-4u; Tue, 05 Sep 2023 22:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595889.929535; Tue, 05 Sep 2023 22: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 1qdeRN-0006DJ-2D; Tue, 05 Sep 2023 22:22:33 +0000 Received: by outflank-mailman (input) for mailman id 595889; Tue, 05 Sep 2023 22:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRM-0006DD-IM for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRM-0004Li-Hb for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeRM-0002IM-GL for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=JhBb56GTCbC16uWtbJoefpCqyvRkPcBKJfHFnLkwO8M=; b=CUI1eroRKMnR5PnUl8PMNO03Ff wBhscKpuR/5q2UqmKnon8oWc/Gad5AWIp6qvuOnQ+YG6MmdhwzmW9KZZVL8SFTRSQTKNy7kWZxbdg sEaIyCejPQnHKtN5TJEDmMOB1WobG6/YXIguTH0iHZg8YZxxvwk7I+08WyblqLJcS7lM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/ioapic: sanitize IO-APIC pins before enabling lapic LVTERR/ESR Message-Id: Date: Tue, 05 Sep 2023 22:22:32 +0000 commit d0cdd34dd815bf99c3f8a7bddfdde5ae59b0f0db Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:47:34 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:47:34 2023 +0200 x86/ioapic: sanitize IO-APIC pins before enabling lapic LVTERR/ESR The current logic to init the local APIC and the IO-APIC does init the local APIC LVTERR/ESR before doing any sanitization on the IO-APIC pin configuration. It's already noted on enable_IO_APIC() that Xen shouldn't trust the IO-APIC being empty at bootup. At XenServer we have a system where the IO-APIC 0 is handed to Xen with pin 0 unmasked, set to Fixed delivery mode, edge triggered and with a vector of 0 (all fields of the RTE are zeroed). Once the local APIC LVTERR/ESR is enabled periodic injections from such pin cause the local APIC to in turn inject periodic error vectors: APIC error on CPU0: 00(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector That prevents Xen from booting. Move the masking of the IO-APIC pins ahead of the setup of the local APIC. This has the side effect of also moving the detection of the pin where the i8259 is connected, as such detection must be done before masking any pins. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 813da5f0e73b8cbd2ac3c7922506e58c28cd736d master date: 2023-07-17 10:31:10 +0200 --- xen/arch/x86/apic.c | 4 ++++ xen/arch/x86/include/asm/irq.h | 1 + xen/arch/x86/io_apic.c | 4 +--- xen/arch/x86/smpboot.c | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 47e6e5fe41..33103d3e91 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1491,6 +1491,10 @@ int __init APIC_init_uniprocessor (void) physids_clear(phys_cpu_present_map); physid_set(boot_cpu_physical_apicid, phys_cpu_present_map); + if ( !skip_ioapic_setup && nr_ioapics ) + /* Sanitize the IO-APIC pins before enabling the lapic LVTERR/ESR. */ + enable_IO_APIC(); + setup_local_APIC(true); if (nmi_watchdog == NMI_LOCAL_APIC) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 76e6ed6d60..f6a0207a80 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -122,6 +122,7 @@ bool bogus_8259A_irq(unsigned int irq); int i8259A_suspend(void); int i8259A_resume(void); +void enable_IO_APIC(void); void setup_IO_APIC(void); void disable_IO_APIC(void); void setup_ioapic_dest(void); diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 9b8a972cf5..25a08b1ea6 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1273,7 +1273,7 @@ static void cf_check _print_IO_APIC_keyhandler(unsigned char key) __print_IO_APIC(0); } -static void __init enable_IO_APIC(void) +void __init enable_IO_APIC(void) { int i8259_apic, i8259_pin; int i, apic; @@ -2067,8 +2067,6 @@ static void __init ioapic_pm_state_alloc(void) void __init setup_IO_APIC(void) { - enable_IO_APIC(); - if (acpi_ioapic) io_apic_irqs = ~0; /* all IRQs go through IOAPIC */ else diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index b46fd9ab18..41ec3211ac 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1232,6 +1232,11 @@ void __init smp_prepare_cpus(void) verify_local_APIC(); connect_bsp_APIC(); + + if ( !skip_ioapic_setup && nr_ioapics ) + /* Sanitize the IO-APIC pins before enabling the lapic LVTERR/ESR. */ + enable_IO_APIC(); + setup_local_APIC(true); if ( !skip_ioapic_setup && nr_ioapics ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:23:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595890.929539 (Exim 4.92) (envelope-from ) id 1qdeRY-0006Fq-7d; Tue, 05 Sep 2023 22:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595890.929539; Tue, 05 Sep 2023 22: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 1qdeRY-0006Fi-50; Tue, 05 Sep 2023 22:22:44 +0000 Received: by outflank-mailman (input) for mailman id 595890; Tue, 05 Sep 2023 22:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRW-0006FZ-NV for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRW-0004Lm-Ku for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeRW-0002Il-Js for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=YH/dh545ojovC7BAdPH3psr3QrTaI/4sPuqkHgkp2O8=; b=Jooigr1YerXotShoSXuUUGnThq IbFIteH5N54kvEVuxpHQuiFqhHELWLYYLUzJnNszVcUcnfGsNdz5w++h1RQN6+sfSj8DaHkFMV9BD KjSgr8yPQ4wOYe4Ue+Q+14RJrOJv3ty8CKkFb3CqIGhnpMj27RvBlJC8/Xml83MXfTJ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/ioapic: add a raw field to RTE struct Message-Id: Date: Tue, 05 Sep 2023 22:22:42 +0000 commit a885649098e06432939907eee84f735a644883e6 Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:48:43 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:48:43 2023 +0200 x86/ioapic: add a raw field to RTE struct Further changes will require access to the full RTE as a single value in order to pass it to IOMMU interrupt remapping handlers. No functional change intended. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: cdc48cb5a74b10c2b07a09d2f554756d730bfee3 master date: 2023-07-28 09:39:44 +0200 --- xen/arch/x86/include/asm/io_apic.h | 57 +++++++++++++++++--------------- xen/arch/x86/io_apic.c | 2 +- xen/drivers/passthrough/amd/iommu_intr.c | 4 +-- xen/drivers/passthrough/vtd/intremap.c | 4 +-- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/include/asm/io_apic.h b/xen/arch/x86/include/asm/io_apic.h index ef0878b09e..a558bb063c 100644 --- a/xen/arch/x86/include/asm/io_apic.h +++ b/xen/arch/x86/include/asm/io_apic.h @@ -89,35 +89,38 @@ enum ioapic_irq_destination_types { }; struct IO_APIC_route_entry { - unsigned int vector:8; - unsigned int delivery_mode:3; /* - * 000: FIXED - * 001: lowest prio - * 111: ExtINT - */ - unsigned int dest_mode:1; /* 0: physical, 1: logical */ - unsigned int delivery_status:1; - unsigned int polarity:1; /* 0: low, 1: high */ - unsigned int irr:1; - unsigned int trigger:1; /* 0: edge, 1: level */ - unsigned int mask:1; /* 0: enabled, 1: disabled */ - unsigned int __reserved_2:15; - union { struct { - unsigned int __reserved_1:24; - unsigned int physical_dest:4; - unsigned int __reserved_2:4; - } physical; - - struct { - unsigned int __reserved_1:24; - unsigned int logical_dest:8; - } logical; - - /* used when Interrupt Remapping with EIM is enabled */ - unsigned int dest32; - } dest; + unsigned int vector:8; + unsigned int delivery_mode:3; /* + * 000: FIXED + * 001: lowest prio + * 111: ExtINT + */ + unsigned int dest_mode:1; /* 0: physical, 1: logical */ + unsigned int delivery_status:1; + unsigned int polarity:1; /* 0: low, 1: high */ + unsigned int irr:1; + unsigned int trigger:1; /* 0: edge, 1: level */ + unsigned int mask:1; /* 0: enabled, 1: disabled */ + unsigned int __reserved_2:15; + + union { + struct { + unsigned int __reserved_1:24; + unsigned int physical_dest:4; + unsigned int __reserved_2:4; + } physical; + + struct { + unsigned int __reserved_1:24; + unsigned int logical_dest:8; + } logical; + unsigned int dest32; + } dest; + }; + uint64_t raw; + }; }; /* diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 25a08b1ea6..aada2ef96c 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2360,7 +2360,7 @@ int ioapic_guest_read(unsigned long physbase, unsigned int reg, u32 *pval) int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) { int apic, pin, irq, ret, pirq; - struct IO_APIC_route_entry rte = { 0 }; + struct IO_APIC_route_entry rte = { }; unsigned long flags; struct irq_desc *desc; diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index f4de09f431..9e6be3be35 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -352,8 +352,8 @@ static int update_intremap_entry_from_ioapic( void cf_check amd_iommu_ioapic_update_ire( unsigned int apic, unsigned int reg, unsigned int value) { - struct IO_APIC_route_entry old_rte = { 0 }; - struct IO_APIC_route_entry new_rte = { 0 }; + struct IO_APIC_route_entry old_rte = { }; + struct IO_APIC_route_entry new_rte = { }; unsigned int rte_lo = (reg & 1) ? reg - 1 : reg; unsigned int pin = (reg - 0x10) / 2; int seg, bdf, rc; diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 1512e4866b..019c21c556 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -419,7 +419,7 @@ unsigned int cf_check io_apic_read_remap_rte( { unsigned int ioapic_pin = (reg - 0x10) / 2; int index; - struct IO_xAPIC_route_entry old_rte = { 0 }; + struct IO_xAPIC_route_entry old_rte = { }; int rte_upper = (reg & 1) ? 1 : 0; struct vtd_iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic)); @@ -442,7 +442,7 @@ void cf_check io_apic_write_remap_rte( unsigned int apic, unsigned int reg, unsigned int value) { unsigned int ioapic_pin = (reg - 0x10) / 2; - struct IO_xAPIC_route_entry old_rte = { 0 }; + struct IO_xAPIC_route_entry old_rte = { }; struct IO_APIC_route_remap_entry *remap_rte; unsigned int rte_upper = (reg & 1) ? 1 : 0; struct vtd_iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:23:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595891.929543 (Exim 4.92) (envelope-from ) id 1qdeRi-0006IP-9M; Tue, 05 Sep 2023 22:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595891.929543; Tue, 05 Sep 2023 22: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 1qdeRi-0006II-6e; Tue, 05 Sep 2023 22:22:54 +0000 Received: by outflank-mailman (input) for mailman id 595891; Tue, 05 Sep 2023 22:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRg-0006Hn-Ou for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRg-0004Lx-O8 for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeRg-0002JC-ND for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=j5GXKCp7vdDFu3m7Mwsbg6ORwwSw+koZ8fYJynOOZvk=; b=My/DJ3fEA4Z659RgIXu81EYwPa IxttSw+SFgD/DukBzn0/KbgRLSgCOu6RltwNQZlwQm88TCEEe3vsZrypSzNSAmMewVxppm09vA7Tp 4oZmxqIER7RkN63UKck3tlALvwai8ObFAoOUtQrerAcbxal86xbBNA+jHizZYasw0tbk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/ioapic: RTE modifications must use ioapic_write_entry Message-Id: Date: Tue, 05 Sep 2023 22:22:52 +0000 commit 1bd4523d696d26976f64a919df8c7a1b3ea32f6f Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:49:37 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:49:37 2023 +0200 x86/ioapic: RTE modifications must use ioapic_write_entry Do not allow to write to RTE registers using io_apic_write and instead require changes to RTE to be performed using ioapic_write_entry. This is in preparation for passing the full contents of the RTE to the IOMMU interrupt remapping handlers, so remapping entries for IO-APIC RTEs can be updated atomically when possible. While immediately this commit might expand the number of MMIO accesses in order to update an IO-APIC RTE, further changes will benefit from getting the full RTE value passed to the IOMMU handlers, as the logic is greatly simplified when the IOMMU handlers can get the complete RTE value in one go. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: ef7995ed1bcd7eac37fb3c3fe56eaa54ea9baf6c master date: 2023-07-28 09:40:20 +0200 --- xen/arch/x86/include/asm/io_apic.h | 8 +++--- xen/arch/x86/io_apic.c | 43 ++++++++++++++++---------------- xen/drivers/passthrough/amd/iommu_intr.c | 6 ----- 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/include/asm/io_apic.h b/xen/arch/x86/include/asm/io_apic.h index a558bb063c..6b514b4e3d 100644 --- a/xen/arch/x86/include/asm/io_apic.h +++ b/xen/arch/x86/include/asm/io_apic.h @@ -161,8 +161,8 @@ static inline void __io_apic_write(unsigned int apic, unsigned int reg, unsigned static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned int value) { - if ( ioapic_reg_remapped(reg) ) - return iommu_update_ire_from_apic(apic, reg, value); + /* RTE writes must use ioapic_write_entry. */ + BUG_ON(reg >= 0x10); __io_apic_write(apic, reg, value); } @@ -172,8 +172,8 @@ static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned i */ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value) { - if ( ioapic_reg_remapped(reg) ) - return iommu_update_ire_from_apic(apic, reg, value); + /* RTE writes must use ioapic_write_entry. */ + BUG_ON(reg >= 0x10); *(IO_APIC_BASE(apic) + 4) = value; } diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index aada2ef96c..041233b9b7 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -237,15 +237,15 @@ struct IO_APIC_route_entry __ioapic_read_entry( { union entry_union eu; - if ( raw ) + if ( raw || !iommu_intremap ) { eu.w1 = __io_apic_read(apic, 0x10 + 2 * pin); eu.w2 = __io_apic_read(apic, 0x11 + 2 * pin); } else { - eu.w1 = io_apic_read(apic, 0x10 + 2 * pin); - eu.w2 = io_apic_read(apic, 0x11 + 2 * pin); + eu.w1 = iommu_read_apic_from_ire(apic, 0x10 + 2 * pin); + eu.w2 = iommu_read_apic_from_ire(apic, 0x11 + 2 * pin); } return eu.entry; @@ -269,15 +269,15 @@ void __ioapic_write_entry( { union entry_union eu = { .entry = e }; - if ( raw ) + if ( raw || !iommu_intremap ) { __io_apic_write(apic, 0x11 + 2 * pin, eu.w2); __io_apic_write(apic, 0x10 + 2 * pin, eu.w1); } else { - io_apic_write(apic, 0x11 + 2 * pin, eu.w2); - io_apic_write(apic, 0x10 + 2 * pin, eu.w1); + iommu_update_ire_from_apic(apic, 0x11 + 2 * pin, eu.w2); + iommu_update_ire_from_apic(apic, 0x10 + 2 * pin, eu.w1); } } @@ -433,16 +433,17 @@ static void modify_IO_APIC_irq(unsigned int irq, unsigned int enable, unsigned int disable) { struct irq_pin_list *entry = irq_2_pin + irq; - unsigned int pin, reg; for (;;) { - pin = entry->pin; + unsigned int pin = entry->pin; + struct IO_APIC_route_entry rte; + if (pin == -1) break; - reg = io_apic_read(entry->apic, 0x10 + pin*2); - reg &= ~disable; - reg |= enable; - io_apic_modify(entry->apic, 0x10 + pin*2, reg); + rte = __ioapic_read_entry(entry->apic, pin, false); + rte.raw &= ~(uint64_t)disable; + rte.raw |= enable; + __ioapic_write_entry(entry->apic, pin, false, rte); if (!entry->next) break; entry = irq_2_pin + entry->next; @@ -584,16 +585,16 @@ set_ioapic_affinity_irq(struct irq_desc *desc, const cpumask_t *mask) dest = SET_APIC_LOGICAL_ID(dest); entry = irq_2_pin + irq; for (;;) { - unsigned int data; + struct IO_APIC_route_entry rte; + pin = entry->pin; if (pin == -1) break; - io_apic_write(entry->apic, 0x10 + 1 + pin*2, dest); - data = io_apic_read(entry->apic, 0x10 + pin*2); - data &= ~IO_APIC_REDIR_VECTOR_MASK; - data |= MASK_INSR(desc->arch.vector, IO_APIC_REDIR_VECTOR_MASK); - io_apic_modify(entry->apic, 0x10 + pin*2, data); + rte = __ioapic_read_entry(entry->apic, pin, false); + rte.dest.dest32 = dest; + rte.vector = desc->arch.vector; + __ioapic_write_entry(entry->apic, pin, false, rte); if (!entry->next) break; @@ -2127,10 +2128,8 @@ void ioapic_resume(void) reg_00.bits.ID = mp_ioapics[apic].mpc_apicid; __io_apic_write(apic, 0, reg_00.raw); } - for (i = 0; i < nr_ioapic_entries[apic]; i++, entry++) { - __io_apic_write(apic, 0x11+2*i, *(((int *)entry)+1)); - __io_apic_write(apic, 0x10+2*i, *(((int *)entry)+0)); - } + for (i = 0; i < nr_ioapic_entries[apic]; i++, entry++) + __ioapic_write_entry(apic, i, true, *entry); } spin_unlock_irqrestore(&ioapic_lock, flags); } diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index 9e6be3be35..f32c418a7e 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -361,12 +361,6 @@ void cf_check amd_iommu_ioapic_update_ire( struct amd_iommu *iommu; unsigned int idx; - if ( !iommu_intremap ) - { - __io_apic_write(apic, reg, value); - return; - } - idx = ioapic_id_to_index(IO_APIC_ID(apic)); if ( idx == MAX_IO_APICS ) return; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:23:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595892.929547 (Exim 4.92) (envelope-from ) id 1qdeRs-0006N6-B0; Tue, 05 Sep 2023 22:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595892.929547; Tue, 05 Sep 2023 22: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 1qdeRs-0006My-8D; Tue, 05 Sep 2023 22:23:04 +0000 Received: by outflank-mailman (input) for mailman id 595892; Tue, 05 Sep 2023 22:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRq-0006Mh-Rz for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeRq-0004Ml-RE for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeRq-0002Jr-QG for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=DriWdJ4TLAlY+306tGK2/Z10higVTqtqekworyL+Irs=; b=F6UfYp4+pN/y89lagbme4aDItT r7Qe32T8GvPaIO4y+nP3xm3WbJ6L5q3IWJlqpIqpcKeau/4AMoPeK7W0EG226g6YKBOfuzIc7pfRe zkQHBrPX7JJqdTjeoNwtqtKwJlGyEpAYvF+dQzp/tOd3GRFCjfUO/cnsk6/lJWslncZc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] iommu/vtd: rename io_apic_read_remap_rte() local variable Message-Id: Date: Tue, 05 Sep 2023 22:23:02 +0000 commit e08e7330c58b7ee1efb00e348521a6afc524dc38 Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:50:05 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:50:05 2023 +0200 iommu/vtd: rename io_apic_read_remap_rte() local variable Preparatory change to unify the IO-APIC pin variable name between io_apic_read_remap_rte() and amd_iommu_ioapic_update_ire(), so that the local variable can be made a function parameter with the same name across vendors. Signed-off-by: Roger Pau Monné Reviewed-by: Kevin Tian master commit: a478b38c01b65fa030303f0324a3380d872eb165 master date: 2023-07-28 09:40:42 +0200 --- xen/drivers/passthrough/vtd/intremap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 019c21c556..53c9de9a75 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -441,14 +441,14 @@ unsigned int cf_check io_apic_read_remap_rte( void cf_check io_apic_write_remap_rte( unsigned int apic, unsigned int reg, unsigned int value) { - unsigned int ioapic_pin = (reg - 0x10) / 2; + unsigned int pin = (reg - 0x10) / 2; struct IO_xAPIC_route_entry old_rte = { }; struct IO_APIC_route_remap_entry *remap_rte; unsigned int rte_upper = (reg & 1) ? 1 : 0; struct vtd_iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic)); int saved_mask; - old_rte = __ioapic_read_entry(apic, ioapic_pin, true); + old_rte = __ioapic_read_entry(apic, pin, true); remap_rte = (struct IO_APIC_route_remap_entry *) &old_rte; @@ -458,7 +458,7 @@ void cf_check io_apic_write_remap_rte( __io_apic_write(apic, reg & ~1, *(u32 *)&old_rte); remap_rte->mask = saved_mask; - if ( ioapic_rte_to_remap_entry(iommu, apic, ioapic_pin, + if ( ioapic_rte_to_remap_entry(iommu, apic, pin, &old_rte, rte_upper, value) ) { __io_apic_write(apic, reg, value); @@ -468,7 +468,7 @@ void cf_check io_apic_write_remap_rte( __io_apic_write(apic, reg & ~1, *(u32 *)&old_rte); } else - __ioapic_write_entry(apic, ioapic_pin, true, old_rte); + __ioapic_write_entry(apic, pin, true, old_rte); } static void set_msi_source_id(struct pci_dev *pdev, struct iremap_entry *ire) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:23:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595893.929551 (Exim 4.92) (envelope-from ) id 1qdeS2-0006Q3-CR; Tue, 05 Sep 2023 22:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595893.929551; Tue, 05 Sep 2023 22: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 1qdeS2-0006Pw-9l; Tue, 05 Sep 2023 22:23:14 +0000 Received: by outflank-mailman (input) for mailman id 595893; Tue, 05 Sep 2023 22:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeS0-0006PY-VH for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeS0-0004Ms-UU for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeS0-0002KK-Td for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=p6XSOokuJ6W6oFecOMcq11F7212nQCJjDtAchb039KY=; b=ygz7J2AiYZhjLQZ3iumfXtv30I HZLrVgzMgSXAHMjnVrW/RVtdw77zEBY7z5qjK3e5m6/3DvbfMpRtzwQLms+erhPXtXZEwlufI4CSY w5xXBLE828k0Oo3C+mwyM8ETebp7UtV7vf3k5S6E6HfbI9+4g/ml4CL0LvrLhEj+QY3Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/iommu: pass full IO-APIC RTE for remapping table update Message-Id: Date: Tue, 05 Sep 2023 22:23:12 +0000 commit 5116fe12d8238cc7d6582ceefd3f7e944bff9a1d Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:50:39 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:50:39 2023 +0200 x86/iommu: pass full IO-APIC RTE for remapping table update So that the remapping entry can be updated atomically when possible. Doing such update atomically will avoid Xen having to mask the IO-APIC pin prior to performing any interrupt movements (ie: changing the destination and vector fields), as the interrupt remapping entry is always consistent. This also simplifies some of the logic on both VT-d and AMD-Vi implementations, as having the full RTE available instead of half of it avoids to possibly read and update the missing other half from hardware. While there remove the explicit zeroing of new_ire fields in ioapic_rte_to_remap_entry() and initialize the variable at definition so all fields are zeroed. Note fields could be also initialized with final values at definition, but I found that likely too much to be done at this time. Signed-off-by: Roger Pau Monné Reviewed-by: Kevin Tian Reviewed-by: Jan Beulich master commit: 3e033172b0250446bfe119f31c7f0f51684b0472 master date: 2023-08-01 11:48:39 +0200 --- xen/arch/x86/include/asm/iommu.h | 3 +- xen/arch/x86/io_apic.c | 5 +- xen/drivers/passthrough/amd/iommu.h | 2 +- xen/drivers/passthrough/amd/iommu_intr.c | 100 +++-------------------- xen/drivers/passthrough/vtd/extern.h | 2 +- xen/drivers/passthrough/vtd/intremap.c | 131 +++++++++++++++---------------- xen/drivers/passthrough/x86/iommu.c | 4 +- xen/include/xen/iommu.h | 3 +- 8 files changed, 82 insertions(+), 168 deletions(-) diff --git a/xen/arch/x86/include/asm/iommu.h b/xen/arch/x86/include/asm/iommu.h index fc0afe35bf..c0d4ad3742 100644 --- a/xen/arch/x86/include/asm/iommu.h +++ b/xen/arch/x86/include/asm/iommu.h @@ -97,7 +97,8 @@ struct iommu_init_ops { extern const struct iommu_init_ops *iommu_init_ops; -void iommu_update_ire_from_apic(unsigned int apic, unsigned int reg, unsigned int value); +void iommu_update_ire_from_apic(unsigned int apic, unsigned int pin, + uint64_t rte); unsigned int iommu_read_apic_from_ire(unsigned int apic, unsigned int reg); int iommu_setup_hpet_msi(struct msi_desc *); diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 041233b9b7..b3afef8933 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -275,10 +275,7 @@ void __ioapic_write_entry( __io_apic_write(apic, 0x10 + 2 * pin, eu.w1); } else - { - iommu_update_ire_from_apic(apic, 0x11 + 2 * pin, eu.w2); - iommu_update_ire_from_apic(apic, 0x10 + 2 * pin, eu.w1); - } + iommu_update_ire_from_apic(apic, pin, e.raw); } static void ioapic_write_entry( diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 8bc3c35b1b..5429ada58e 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -300,7 +300,7 @@ int cf_check amd_iommu_free_intremap_table( unsigned int amd_iommu_intremap_table_order( const void *irt, const struct amd_iommu *iommu); void cf_check amd_iommu_ioapic_update_ire( - unsigned int apic, unsigned int reg, unsigned int value); + unsigned int apic, unsigned int pin, uint64_t rte); unsigned int cf_check amd_iommu_read_ioapic_from_ire( unsigned int apic, unsigned int reg); int cf_check amd_iommu_msi_msg_update_ire( diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index f32c418a7e..e83a2a932a 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -247,11 +247,6 @@ static void update_intremap_entry(const struct amd_iommu *iommu, } } -static inline int get_rte_index(const struct IO_APIC_route_entry *rte) -{ - return rte->vector | (rte->delivery_mode << 8); -} - static inline void set_rte_index(struct IO_APIC_route_entry *rte, int offset) { rte->vector = (u8)offset; @@ -267,7 +262,6 @@ static int update_intremap_entry_from_ioapic( int bdf, struct amd_iommu *iommu, struct IO_APIC_route_entry *rte, - bool_t lo_update, u16 *index) { unsigned long flags; @@ -315,31 +309,6 @@ static int update_intremap_entry_from_ioapic( spin_lock(lock); } - if ( fresh ) - /* nothing */; - else if ( !lo_update ) - { - /* - * Low half of incoming RTE is already in remapped format, - * so need to recover vector and delivery mode from IRTE. - */ - ASSERT(get_rte_index(rte) == offset); - if ( iommu->ctrl.ga_en ) - vector = entry.ptr128->full.vector; - else - vector = entry.ptr32->flds.vector; - /* The IntType fields match for both formats. */ - delivery_mode = entry.ptr32->flds.int_type; - } - else if ( x2apic_enabled ) - { - /* - * High half of incoming RTE was read from the I/O APIC and hence may - * not hold the full destination, so need to recover full destination - * from IRTE. - */ - dest = get_full_dest(entry.ptr128); - } update_intremap_entry(iommu, entry, vector, delivery_mode, dest_mode, dest); spin_unlock_irqrestore(lock, flags); @@ -350,14 +319,11 @@ static int update_intremap_entry_from_ioapic( } void cf_check amd_iommu_ioapic_update_ire( - unsigned int apic, unsigned int reg, unsigned int value) + unsigned int apic, unsigned int pin, uint64_t rte) { - struct IO_APIC_route_entry old_rte = { }; - struct IO_APIC_route_entry new_rte = { }; - unsigned int rte_lo = (reg & 1) ? reg - 1 : reg; - unsigned int pin = (reg - 0x10) / 2; + struct IO_APIC_route_entry old_rte; + struct IO_APIC_route_entry new_rte = { .raw = rte }; int seg, bdf, rc; - bool saved_mask, fresh = false; struct amd_iommu *iommu; unsigned int idx; @@ -373,58 +339,23 @@ void cf_check amd_iommu_ioapic_update_ire( { AMD_IOMMU_WARN("failed to find IOMMU for IO-APIC @ %04x:%04x\n", seg, bdf); - __io_apic_write(apic, reg, value); + __ioapic_write_entry(apic, pin, true, new_rte); return; } - /* save io-apic rte lower 32 bits */ - *((u32 *)&old_rte) = __io_apic_read(apic, rte_lo); - saved_mask = old_rte.mask; - - if ( reg == rte_lo ) - { - *((u32 *)&new_rte) = value; - /* read upper 32 bits from io-apic rte */ - *(((u32 *)&new_rte) + 1) = __io_apic_read(apic, reg + 1); - } - else - { - *((u32 *)&new_rte) = *((u32 *)&old_rte); - *(((u32 *)&new_rte) + 1) = value; - } - - if ( ioapic_sbdf[idx].pin_2_idx[pin] >= INTREMAP_MAX_ENTRIES ) - { - ASSERT(saved_mask); - - /* - * There's nowhere except the IRTE to store a full 32-bit destination, - * so we may not bypass entry allocation and updating of the low RTE - * half in the (usual) case of the high RTE half getting written first. - */ - if ( new_rte.mask && !x2apic_enabled ) - { - __io_apic_write(apic, reg, value); - return; - } - - fresh = true; - } - + old_rte = __ioapic_read_entry(apic, pin, true); /* mask the interrupt while we change the intremap table */ - if ( !saved_mask ) + if ( !old_rte.mask ) { old_rte.mask = 1; - __io_apic_write(apic, rte_lo, *((u32 *)&old_rte)); + __ioapic_write_entry(apic, pin, true, old_rte); } /* Update interrupt remapping entry */ rc = update_intremap_entry_from_ioapic( - bdf, iommu, &new_rte, reg == rte_lo, + bdf, iommu, &new_rte, &ioapic_sbdf[idx].pin_2_idx[pin]); - __io_apic_write(apic, reg, ((u32 *)&new_rte)[reg != rte_lo]); - if ( rc ) { /* Keep the entry masked. */ @@ -433,20 +364,7 @@ void cf_check amd_iommu_ioapic_update_ire( return; } - /* For lower bits access, return directly to avoid double writes */ - if ( reg == rte_lo ) - return; - - /* - * Unmask the interrupt after we have updated the intremap table. Also - * write the low half if a fresh entry was allocated for a high half - * update in x2APIC mode. - */ - if ( !saved_mask || (x2apic_enabled && fresh) ) - { - old_rte.mask = saved_mask; - __io_apic_write(apic, rte_lo, *((u32 *)&old_rte)); - } + __ioapic_write_entry(apic, pin, true, new_rte); } unsigned int cf_check amd_iommu_read_ioapic_from_ire( diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index 39602d1f88..d49e40c5ce 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -92,7 +92,7 @@ int cf_check intel_iommu_get_reserved_device_memory( unsigned int cf_check io_apic_read_remap_rte( unsigned int apic, unsigned int reg); void cf_check io_apic_write_remap_rte( - unsigned int apic, unsigned int reg, unsigned int value); + unsigned int apic, unsigned int pin, uint64_t rte); struct msi_desc; struct msi_msg; diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 53c9de9a75..78d7bc139a 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -328,15 +328,14 @@ static int remap_entry_to_ioapic_rte( static int ioapic_rte_to_remap_entry(struct vtd_iommu *iommu, int apic, unsigned int ioapic_pin, struct IO_xAPIC_route_entry *old_rte, - unsigned int rte_upper, unsigned int value) + struct IO_xAPIC_route_entry new_rte) { struct iremap_entry *iremap_entry = NULL, *iremap_entries; struct iremap_entry new_ire; struct IO_APIC_route_remap_entry *remap_rte; - struct IO_xAPIC_route_entry new_rte; int index; unsigned long flags; - bool init = false; + bool init = false, masked = old_rte->mask; remap_rte = (struct IO_APIC_route_remap_entry *) old_rte; spin_lock_irqsave(&iommu->intremap.lock, flags); @@ -364,48 +363,40 @@ static int ioapic_rte_to_remap_entry(struct vtd_iommu *iommu, new_ire = *iremap_entry; - if ( rte_upper ) - { - if ( x2apic_enabled ) - new_ire.remap.dst = value; - else - new_ire.remap.dst = (value >> 24) << 8; - } + if ( x2apic_enabled ) + new_ire.remap.dst = new_rte.dest.dest32; else - { - *(((u32 *)&new_rte) + 0) = value; - new_ire.remap.fpd = 0; - new_ire.remap.dm = new_rte.dest_mode; - new_ire.remap.tm = new_rte.trigger; - new_ire.remap.dlm = new_rte.delivery_mode; - /* Hardware require RH = 1 for LPR delivery mode */ - new_ire.remap.rh = (new_ire.remap.dlm == dest_LowestPrio); - new_ire.remap.avail = 0; - new_ire.remap.res_1 = 0; - new_ire.remap.vector = new_rte.vector; - new_ire.remap.res_2 = 0; - - set_ioapic_source_id(IO_APIC_ID(apic), &new_ire); - new_ire.remap.res_3 = 0; - new_ire.remap.res_4 = 0; - new_ire.remap.p = 1; /* finally, set present bit */ - - /* now construct new ioapic rte entry */ - remap_rte->vector = new_rte.vector; - remap_rte->delivery_mode = 0; /* has to be 0 for remap format */ - remap_rte->index_15 = (index >> 15) & 0x1; - remap_rte->index_0_14 = index & 0x7fff; - - remap_rte->delivery_status = new_rte.delivery_status; - remap_rte->polarity = new_rte.polarity; - remap_rte->irr = new_rte.irr; - remap_rte->trigger = new_rte.trigger; - remap_rte->mask = new_rte.mask; - remap_rte->reserved = 0; - remap_rte->format = 1; /* indicate remap format */ - } - - update_irte(iommu, iremap_entry, &new_ire, !init); + new_ire.remap.dst = GET_xAPIC_ID(new_rte.dest.dest32) << 8; + + new_ire.remap.dm = new_rte.dest_mode; + new_ire.remap.tm = new_rte.trigger; + new_ire.remap.dlm = new_rte.delivery_mode; + /* Hardware require RH = 1 for LPR delivery mode. */ + new_ire.remap.rh = (new_ire.remap.dlm == dest_LowestPrio); + new_ire.remap.vector = new_rte.vector; + + set_ioapic_source_id(IO_APIC_ID(apic), &new_ire); + /* Finally, set present bit. */ + new_ire.remap.p = 1; + + /* Now construct new ioapic rte entry. */ + remap_rte->vector = new_rte.vector; + /* Has to be 0 for remap format. */ + remap_rte->delivery_mode = 0; + remap_rte->index_15 = (index >> 15) & 0x1; + remap_rte->index_0_14 = index & 0x7fff; + + remap_rte->delivery_status = new_rte.delivery_status; + remap_rte->polarity = new_rte.polarity; + remap_rte->irr = new_rte.irr; + remap_rte->trigger = new_rte.trigger; + remap_rte->mask = new_rte.mask; + remap_rte->reserved = 0; + /* Indicate remap format. */ + remap_rte->format = 1; + + /* If cmpxchg16b is not available the caller must mask the IO-APIC pin. */ + update_irte(iommu, iremap_entry, &new_ire, !init && !masked); iommu_sync_cache(iremap_entry, sizeof(*iremap_entry)); iommu_flush_iec_index(iommu, 0, index); @@ -439,36 +430,42 @@ unsigned int cf_check io_apic_read_remap_rte( } void cf_check io_apic_write_remap_rte( - unsigned int apic, unsigned int reg, unsigned int value) + unsigned int apic, unsigned int pin, uint64_t rte) { - unsigned int pin = (reg - 0x10) / 2; + struct IO_xAPIC_route_entry new_rte = { .raw = rte }; struct IO_xAPIC_route_entry old_rte = { }; - struct IO_APIC_route_remap_entry *remap_rte; - unsigned int rte_upper = (reg & 1) ? 1 : 0; struct vtd_iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic)); - int saved_mask; - - old_rte = __ioapic_read_entry(apic, pin, true); - - remap_rte = (struct IO_APIC_route_remap_entry *) &old_rte; - - /* mask the interrupt while we change the intremap table */ - saved_mask = remap_rte->mask; - remap_rte->mask = 1; - __io_apic_write(apic, reg & ~1, *(u32 *)&old_rte); - remap_rte->mask = saved_mask; + bool masked = true; + int rc; - if ( ioapic_rte_to_remap_entry(iommu, apic, pin, - &old_rte, rte_upper, value) ) + if ( !cpu_has_cx16 ) { - __io_apic_write(apic, reg, value); + /* + * Cannot atomically update the IRTE entry: mask the IO-APIC pin to + * avoid interrupts seeing an inconsistent IRTE entry. + */ + old_rte = __ioapic_read_entry(apic, pin, true); + if ( !old_rte.mask ) + { + masked = false; + old_rte.mask = 1; + __ioapic_write_entry(apic, pin, true, old_rte); + } + } - /* Recover the original value of 'mask' bit */ - if ( rte_upper ) - __io_apic_write(apic, reg & ~1, *(u32 *)&old_rte); + rc = ioapic_rte_to_remap_entry(iommu, apic, pin, &old_rte, new_rte); + if ( rc ) + { + if ( !masked ) + { + /* Recover the original value of 'mask' bit */ + old_rte.mask = 0; + __ioapic_write_entry(apic, pin, true, old_rte); + } + return; } - else - __ioapic_write_entry(apic, pin, true, old_rte); + /* old_rte will contain the updated IO-APIC RTE on success. */ + __ioapic_write_entry(apic, pin, true, old_rte); } static void set_msi_source_id(struct pci_dev *pdev, struct iremap_entry *ire) diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index f671b0f2bb..8bd0ccb2e9 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -142,9 +142,9 @@ int iommu_enable_x2apic(void) } void iommu_update_ire_from_apic( - unsigned int apic, unsigned int reg, unsigned int value) + unsigned int apic, unsigned int pin, uint64_t rte) { - iommu_vcall(&iommu_ops, update_ire_from_apic, apic, reg, value); + iommu_vcall(&iommu_ops, update_ire_from_apic, apic, pin, rte); } unsigned int iommu_read_apic_from_ire(unsigned int apic, unsigned int reg) diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 4f22fc1bed..f8a52627f7 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -274,7 +274,8 @@ struct iommu_ops { int (*enable_x2apic)(void); void (*disable_x2apic)(void); - void (*update_ire_from_apic)(unsigned int apic, unsigned int reg, unsigned int value); + void (*update_ire_from_apic)(unsigned int apic, unsigned int pin, + uint64_t rte); unsigned int (*read_apic_from_ire)(unsigned int apic, unsigned int reg); int (*setup_hpet_msi)(struct msi_desc *); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:24:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:24:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595894.929555 (Exim 4.92) (envelope-from ) id 1qdeSC-0006T9-FT; Tue, 05 Sep 2023 22:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595894.929555; Tue, 05 Sep 2023 22: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 1qdeSC-0006T1-Cs; Tue, 05 Sep 2023 22:23:24 +0000 Received: by outflank-mailman (input) for mailman id 595894; Tue, 05 Sep 2023 22:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSB-0006Se-2P for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSB-0004N1-1H for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeSB-0002Kj-0U for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=jHdByF6esOCLuaVbpPhYVTaeZcQUgiTcNOAiku13KWc=; b=t2fRPcl2r0U7UdPEJTA3/iYZjw 8LKjaq0+cUIcb7iyf/8Tb00ObSfQ/Sb26/oOXGTFBbckSd50mI41OemEvk17wAwq4rplR+ppcHfxN QwSRqZm+Dfnt3FltPgKvtMwXtOSRbHnJr2ZCLQ6NxTUYVwWMwmnCfoQWcRXvndTLwoCc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] build: correct gas --noexecstack check Message-Id: Date: Tue, 05 Sep 2023 22:23:23 +0000 commit ba360fbb6413231f84a7d68f5cb34858f81d4d23 Author: Jan Beulich AuthorDate: Tue Sep 5 08:51:50 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:51:50 2023 +0200 build: correct gas --noexecstack check The check was missing an escape for the inner $, thus breaking things in the unlikely event that the underlying assembler doesn't support this option. Fixes: 62d22296a95d ("build: silence GNU ld warning about executable stacks") Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD master commit: d1f6a58dfdc508c43a51c1865c826d519bf16493 master date: 2023-08-14 09:58:19 +0200 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 7bb9de7bdc..455916c757 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -405,7 +405,7 @@ endif AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$(comma)--noexecstack) +$(call cc-option-add,AFLAGS,CC,-Wa$$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:24:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:24:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595895.929559 (Exim 4.92) (envelope-from ) id 1qdeSM-0006Vo-HI; Tue, 05 Sep 2023 22:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595895.929559; Tue, 05 Sep 2023 22: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 1qdeSM-0006Vd-EJ; Tue, 05 Sep 2023 22:23:34 +0000 Received: by outflank-mailman (input) for mailman id 595895; Tue, 05 Sep 2023 22:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSL-0006VR-4t for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSL-0004Of-4A for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeSL-0002M7-3M for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=Sbrr7xmTgWRvwU3mi4pkndYi53R9W6Ezlj26BVC/3EU=; b=2HuzKpw5R3tDqwVNdNiQnC4D0C OGcXuFHMYAfzH2uHGvKjL5wvVR9SkLNkWvLnu/8Stb/5LhIAB2D/RoR9AXvsr+mzkPlR1IWTvtHPK 6yVtaCQV607Snlgb3C3ClZJY1m6bUIPax4+tZvqyd0Gva5siKZVFDQHwVaEoIFEagKcs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] libxl: slightly correct JSON generation of CPU policy Message-Id: Date: Tue, 05 Sep 2023 22:23:33 +0000 commit 042982297802e7b746dc2fac95a453cc88d0aa83 Author: Jan Beulich AuthorDate: Tue Sep 5 08:52:15 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:52:15 2023 +0200 libxl: slightly correct JSON generation of CPU policy The "cpuid_empty" label is also (in principle; maybe only for rubbish input) reachable in the "cpuid_only" case. Hence the label needs to live ahead of the check of the variable. Fixes: 5b80cecb747b ("libxl: introduce MSR data in libxl_cpuid_policy") Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD master commit: ebce4e3a146c39e57bb7a890e059e89c32b6d547 master date: 2023-08-17 16:24:17 +0200 --- tools/libs/light/libxl_cpuid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 849722541c..5c66d094b2 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -710,10 +710,11 @@ parse_cpuid: libxl__strdup(NOGC, libxl__json_object_get_string(r)); } } + +cpuid_empty: if (cpuid_only) return 0; -cpuid_empty: co = libxl__json_map_get("msr", o, JSON_ARRAY); if (!libxl__json_object_is_array(co)) return ERROR_FAIL; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:24:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:24:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595896.929564 (Exim 4.92) (envelope-from ) id 1qdeSW-0006YL-Is; Tue, 05 Sep 2023 22:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595896.929564; Tue, 05 Sep 2023 22:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSW-0006YD-Fn; Tue, 05 Sep 2023 22:23:44 +0000 Received: by outflank-mailman (input) for mailman id 595896; Tue, 05 Sep 2023 22:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSV-0006Y3-81 for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSV-0004Om-7D for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeSV-0002NA-6I for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=WUz9OtA7avkEhzo9kA9rpBeWsrUe883FcDC5TzJxbVQ=; b=Qq5SqggYCqsv23nMk0GX7SgDLO X82BFGFT+JMYkDsmjd/WJN52P6JN+eNSiEQ8ILrN4vf7tMfGjGItfT2hRKI/F2JyZ8nAcinJAwnVx 6X4agn0sstxRBOkUwbQsgIoFnMqm3HRTHhpZifpqXDtmIlrDHDDALm4cEdnHWPT65aog=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] tboot: Disable CET at shutdown Message-Id: Date: Tue, 05 Sep 2023 22:23:43 +0000 commit 7ca58fbef489fcb17631872a2bdc929823a2a494 Author: Jason Andryuk AuthorDate: Tue Sep 5 08:52:33 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:52:33 2023 +0200 tboot: Disable CET at shutdown tboot_shutdown() calls into tboot to perform the actual system shutdown. tboot isn't built with endbr annotations, and Xen has CET-IBT enabled on newer hardware. shutdown_entry isn't annotated with endbr and Xen faults: Panic on CPU 0: CONTROL-FLOW PROTECTION FAULT: #CP[0003] endbranch And Xen hangs at this point. Disabling CET-IBT let Xen and tboot power off, but reboot was perfoming a poweroff instead of a warm reboot. Disabling all of CET, i.e. shadow stacks as well, lets tboot reboot properly. Fixes: cdbe2b0a1aec ("x86: Enable CET Indirect Branch Tracking") Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper Reviewed-by: Daniel P. Smith master commit: 0801868f550539d417d46f82c49307480947ccaa master date: 2023-08-17 16:24:49 +0200 --- xen/arch/x86/tboot.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index fe1abfdf08..a2e9e97ed7 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -398,6 +398,16 @@ void tboot_shutdown(uint32_t shutdown_type) tboot_gen_xenheap_integrity(g_tboot_shared->s3_key, &xenheap_mac); } + /* + * Disable CET - tboot may not be built with endbr, and it doesn't support + * shadow stacks. + */ + if ( read_cr4() & X86_CR4_CET ) + { + wrmsrl(MSR_S_CET, 0); + write_cr4(read_cr4() & ~X86_CR4_CET); + } + /* * During early boot, we can be called by panic before idle_vcpu[0] is * setup, but in that case we don't need to change page tables. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:24:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:24:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595897.929568 (Exim 4.92) (envelope-from ) id 1qdeSg-0006bG-KC; Tue, 05 Sep 2023 22:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595897.929568; Tue, 05 Sep 2023 22: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 1qdeSg-0006b7-HG; Tue, 05 Sep 2023 22:23:54 +0000 Received: by outflank-mailman (input) for mailman id 595897; Tue, 05 Sep 2023 22:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSf-0006aj-Aq for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSf-0004Ot-A9 for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeSf-0002Nh-9P for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=fbro6bGBOnVyZLZpcKmKAKo/h/fh/euhb3MEEONOm2o=; b=XTIo3SFystPdV22RRNOSnLR3hm L79pectx1M9qPXyZfEPyb+EO6XapBcSrMxg9laubvM7Es7A0TLr7xF3j7biJSHoQ4o1ofyw7c9N4Z +Kbs7Dpt4o0FSkehxQXXHvOTTn6zwn5xSeBgQGhBiZ+KfNvJkwqgiFUuA3OThwLTBvRQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/svm: Fix valid condition in svm_get_pending_event() Message-Id: Date: Tue, 05 Sep 2023 22:23:53 +0000 commit a939e953cdd522da3d8f0efeaea84448b5b570f9 Author: Jinoh Kang AuthorDate: Tue Sep 5 08:53:01 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:53:01 2023 +0200 x86/svm: Fix valid condition in svm_get_pending_event() Fixes: 9864841914c2 ("x86/vm_event: add support for VM_EVENT_REASON_INTERRUPT") Signed-off-by: Jinoh Kang master commit: b2865c2b6f164d2c379177cdd1cb200e4eaba549 master date: 2023-08-18 20:21:44 +0100 --- xen/arch/x86/hvm/svm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 5fa945c526..e8f50e7c5e 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2490,7 +2490,7 @@ static bool cf_check svm_get_pending_event( { const struct vmcb_struct *vmcb = v->arch.hvm.svm.vmcb; - if ( vmcb->event_inj.v ) + if ( !vmcb->event_inj.v ) return false; info->vector = vmcb->event_inj.vector; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:24:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:24:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595898.929571 (Exim 4.92) (envelope-from ) id 1qdeSq-0006eL-Li; Tue, 05 Sep 2023 22:24:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595898.929571; Tue, 05 Sep 2023 22: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 1qdeSq-0006e3-If; Tue, 05 Sep 2023 22:24:04 +0000 Received: by outflank-mailman (input) for mailman id 595898; Tue, 05 Sep 2023 22:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSp-0006do-Dz for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSp-0004PT-DK for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeSp-0002OU-CX for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=MJHrJeFkiQ51avj10YkP1aWvjI3KwmRryDkCM5jJ7Wo=; b=Rr0tAYG6Lr4e9W6zhV95tZJYJe cDZdrwjv+2wh5R0g8GPayyEU0t5K6rH/3smjIDl3ps9MDEeFUkztKLGz6HZmBNDuueSwUHaSYc8sV Rdh7mxCrxUfDlm9mjVrOR36cLeYkhfH6mwCttTDusy1ucv1W/H6L8fS6p9unJ3szfU94=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/vmx: Revert "x86/VMX: sanitize rIP before re-entering guest" Message-Id: Date: Tue, 05 Sep 2023 22:24:03 +0000 commit 8be85d8c0df2445c012fac42117396b483db5db0 Author: Andrew Cooper AuthorDate: Tue Sep 5 08:53:31 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:53:31 2023 +0200 x86/vmx: Revert "x86/VMX: sanitize rIP before re-entering guest" At the time of XSA-170, the x86 instruction emulator was genuinely broken. It would load arbitrary values into %rip and putting a check here probably was the best stopgap security fix. It should have been reverted following c/s 81d3a0b26c1 "x86emul: limit-check branch targets" which corrected the emulator behaviour. However, everyone involved in XSA-170, myself included, failed to read the SDM correctly. On the subject of %rip consistency checks, the SDM stated: If the processor supports N < 64 linear-address bits, bits 63:N must be identical A non-canonical %rip (and SSP more recently) is an explicitly legal state in x86, and the VMEntry consistency checks are intentionally off-by-one from a regular canonical check. The consequence of this bug is that Xen will currently take a legal x86 state which would successfully VMEnter, and corrupt it into having non-architectural behaviour. Furthermore, in the time this bugfix has been pending in public, I successfully persuaded Intel to clarify the SDM, adding the following clarification: The guest RIP value is not required to be canonical; the value of bit N-1 may differ from that of bit N. Fixes: ffbbfda377 ("x86/VMX: sanitize rIP before re-entering guest") Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: 10c83bb0f5d158d101d983883741b76f927e54a3 master date: 2023-08-23 18:44:59 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f256dc2635..072288a5ef 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3975,7 +3975,7 @@ static void undo_nmis_unblocked_by_iret(void) void vmx_vmexit_handler(struct cpu_user_regs *regs) { unsigned long exit_qualification, exit_reason, idtv_info, intr_info = 0; - unsigned int vector = 0, mode; + unsigned int vector = 0; struct vcpu *v = current; struct domain *currd = v->domain; @@ -4650,38 +4650,6 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) out: if ( nestedhvm_vcpu_in_guestmode(v) ) nvmx_idtv_handling(); - - /* - * VM entry will fail (causing the guest to get crashed) if rIP (and - * rFLAGS, but we don't have an issue there) doesn't meet certain - * criteria. As we must not allow less than fully privileged mode to have - * such an effect on the domain, we correct rIP in that case (accepting - * this not being architecturally correct behavior, as the injected #GP - * fault will then not see the correct [invalid] return address). - * And since we know the guest will crash, we crash it right away if it - * already is in most privileged mode. - */ - mode = vmx_guest_x86_mode(v); - if ( mode == 8 ? !is_canonical_address(regs->rip) - : regs->rip != regs->eip ) - { - gprintk(XENLOG_WARNING, "Bad rIP %lx for mode %u\n", regs->rip, mode); - - if ( vmx_get_cpl() ) - { - __vmread(VM_ENTRY_INTR_INFO, &intr_info); - if ( !(intr_info & INTR_INFO_VALID_MASK) ) - hvm_inject_hw_exception(TRAP_gp_fault, 0); - /* Need to fix rIP nevertheless. */ - if ( mode == 8 ) - regs->rip = (long)(regs->rip << (64 - VADDR_BITS)) >> - (64 - VADDR_BITS); - else - regs->rip = regs->eip; - } - else - domain_crash(v->domain); - } } static void lbr_tsx_fixup(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Sep 05 22:24:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Sep 2023 22:24:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.595899.929575 (Exim 4.92) (envelope-from ) id 1qdeT0-0006gp-Mo; Tue, 05 Sep 2023 22:24:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595899.929575; Tue, 05 Sep 2023 22: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 1qdeT0-0006ge-KG; Tue, 05 Sep 2023 22:24:14 +0000 Received: by outflank-mailman (input) for mailman id 595899; Tue, 05 Sep 2023 22:24:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSz-0006gO-Gz for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:24:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdeSz-0004Pf-GK for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdeSz-0002Ov-FQ for xen-changelog@lists.xenproject.org; Tue, 05 Sep 2023 22: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=lp6zP/HVZjQPo3ur0FeEWP5nQRIbri4uIspQT38MPJk=; b=NEIm/ugOAyaH3isXISUTF8H/4w 5qb0KtgJVLCjQEuems9yYfT1Pvv19lWGVhYfGO3z9sToxXfy21EuJMt/URIGd6cAihs2h38A6I4Yd Wmcq1zVL66ZzcVQM+JlfjP4xv66TwCp0vpAyb/RzcJwSoQPOWxsGI5SNZBkAPrL/6FWk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/irq: fix reporting of spurious i8259 interrupts Message-Id: Date: Tue, 05 Sep 2023 22:24:13 +0000 commit 699de512748d8e3bdcb3225b3b2a77c10cfd2408 Author: Roger Pau Monné AuthorDate: Tue Sep 5 08:53:57 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 08:53:57 2023 +0200 x86/irq: fix reporting of spurious i8259 interrupts The return value of bogus_8259A_irq() is wrong: the function will return `true` when the IRQ is real and `false` when it's a spurious IRQ. This causes the "No irq handler for vector ..." message in do_IRQ() to be printed for spurious i8259 interrupts which is not intended (and not helpful). Fix by inverting the return value of bogus_8259A_irq(). Fixes: 132906348a14 ('x86/i8259: Handle bogus spurious interrupts more quietly') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 709f6c8ce6422475c372e67507606170a31ccb65 master date: 2023-08-30 10:03:53 +0200 --- xen/arch/x86/i8259.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index 6b35be10f0..ed9f55abe5 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -37,7 +37,7 @@ static bool _mask_and_ack_8259A_irq(unsigned int irq); bool bogus_8259A_irq(unsigned int irq) { - return _mask_and_ack_8259A_irq(irq); + return !_mask_and_ack_8259A_irq(irq); } static void cf_check mask_and_ack_8259A_irq(struct irq_desc *desc) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Sep 06 05:22:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Sep 2023 05:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.596206.929992 (Exim 4.92) (envelope-from ) id 1qdkzK-0004ZS-59; Wed, 06 Sep 2023 05:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 596206.929992; Wed, 06 Sep 2023 05: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 1qdkzK-0004ZK-2P; Wed, 06 Sep 2023 05:22:02 +0000 Received: by outflank-mailman (input) for mailman id 596206; Wed, 06 Sep 2023 05:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdkzJ-0004ZE-Hf for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 05:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdkzJ-0000To-GA for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 05:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdkzJ-0001CJ-Dg for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 05: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=zWRJ98ZC04vJqly73VR32AF69mnsTVi6H7nA19/XTK0=; b=5H4rKxlJj3s/v+SU08ReOdVe4P o7ejZTzfhAvNxeU4ki4IXEHG07AUNFfO/p1xHefi36MH5Aic1CDh/1JTyF/wMaJsaquhXB7OyyZU7 Mx4bhtUeVpS2HzFRiMxlSwW5ooJfKCcKiCmbyyolYKJWefR9i85XhKpJG226i4HDxVE0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xen/arm: page: Handle cache flush of an element at the top of the address space Message-Id: Date: Wed, 06 Sep 2023 05:22:01 +0000 commit d31e5b2a9c39816a954d1088d4cfc782f0006f39 Author: Stefano Stabellini AuthorDate: Tue Sep 5 14:33:29 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 14:33:29 2023 +0200 xen/arm: page: Handle cache flush of an element at the top of the address space The region that needs to be cleaned/invalidated may be at the top of the address space. This means that 'end' (i.e. 'p + size') will be 0 and therefore nothing will be cleaned/invalidated as the check in the loop will always be false. On Arm64, we only support we only support up to 48-bit Virtual address space. So this is not a concern there. However, for 32-bit, the mapcache is using the last 2GB of the address space. Therefore we may not clean/invalidate properly some pages. This could lead to memory corruption or data leakage (the scrubbed value may still sit in the cache when the guest could read directly the memory and therefore read the old content). Rework invalidate_dcache_va_range(), clean_dcache_va_range(), clean_and_invalidate_dcache_va_range() to handle a cache flush with an element at the top of the address space. This is CVE-2023-34321 / XSA-437. Reported-by: Julien Grall Signed-off-by: Stefano Stabellini Signed-off-by: Julien Grall Acked-by: Bertrand Marquis master commit: 9a216e92de9f9011097e4f1fb55ff67ba0a21704 master date: 2023-09-05 14:30:08 +0200 --- xen/arch/arm/include/asm/page.h | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/include/asm/page.h b/xen/arch/arm/include/asm/page.h index e7cd62190c..d7fe770a5e 100644 --- a/xen/arch/arm/include/asm/page.h +++ b/xen/arch/arm/include/asm/page.h @@ -160,26 +160,25 @@ static inline size_t read_dcache_line_bytes(void) static inline int invalidate_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; size_t cacheline_mask = dcache_line_bytes - 1; dsb(sy); /* So the CPU issues all writes to the range */ if ( (uintptr_t)p & cacheline_mask ) { + size -= dcache_line_bytes - ((uintptr_t)p & cacheline_mask); p = (void *)((uintptr_t)p & ~cacheline_mask); asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); p += dcache_line_bytes; } - if ( (uintptr_t)end & cacheline_mask ) - { - end = (void *)((uintptr_t)end & ~cacheline_mask); - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (end)); - } - for ( ; p < end; p += dcache_line_bytes ) + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__invalidate_dcache_one(0) : : "r" (p)); + if ( size > 0 ) + asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); + dsb(sy); /* So we know the flushes happen before continuing */ return 0; @@ -187,10 +186,14 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) static inline int clean_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ @@ -200,10 +203,14 @@ static inline int clean_dcache_va_range(const void *p, unsigned long size) static inline int clean_and_invalidate_dcache_va_range (const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Sep 06 06:55:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Sep 2023 06:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.596270.930089 (Exim 4.92) (envelope-from ) id 1qdmRL-0003e6-Sl; Wed, 06 Sep 2023 06:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 596270.930089; Wed, 06 Sep 2023 06: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 1qdmRL-0003dy-Pr; Wed, 06 Sep 2023 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 596270; Wed, 06 Sep 2023 06:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdmRJ-0003ds-VS for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 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 1qdmRJ-0002a1-TA for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 06:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qdmRJ-0004mW-Rn for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 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=VY1iPmIMfxY6ELj8aLwZRsCVGj9AR7V+QvAmBf/VXLg=; b=SAQZWVmvNCk2HI2nSHGLEROXqS CWC5+gqxcp9At6TcLzN3n47qCuiGnV3LbkTrVJ0gQf8jUvwe271MP9r7rG8n/2yFQK9kksJus5usZ MsVe5eub0oFVTI2lMHtOF1bbjTTns9Lo2urhiyztzJML6SHWB/3XbRIfVCShheQCOefA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Implement initial Radix MMU support Message-Id: Date: Wed, 06 Sep 2023 06:55:01 +0000 commit 74b725a64d800822e007e0f449317ff0a8249971 Author: Shawn Anastasio AuthorDate: Tue Aug 22 18:03:52 2023 -0500 Commit: Jan Beulich CommitDate: Tue Sep 5 09:34:10 2023 +0200 xen/ppc: Implement initial Radix MMU support Add code to construct early identity-mapped page tables as well as the required process and partition tables to enable the MMU. Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/Makefile | 2 + xen/arch/ppc/include/asm/bitops.h | 9 ++ xen/arch/ppc/include/asm/mm.h | 18 +++ xen/arch/ppc/include/asm/page-bits.h | 3 +- xen/arch/ppc/include/asm/page.h | 181 ++++++++++++++++++++++++ xen/arch/ppc/include/asm/processor.h | 34 +++++ xen/arch/ppc/include/asm/regs.h | 124 ++++++++++++++++ xen/arch/ppc/include/asm/types.h | 1 + xen/arch/ppc/mm-radix.c | 267 +++++++++++++++++++++++++++++++++++ xen/arch/ppc/ppc64/head.S | 15 ++ xen/arch/ppc/setup.c | 3 + xen/arch/ppc/tlb-radix.c | 96 +++++++++++++ 12 files changed, 752 insertions(+), 1 deletion(-) diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile index 0c0a7884a1..a059ac4c0a 100644 --- a/xen/arch/ppc/Makefile +++ b/xen/arch/ppc/Makefile @@ -2,8 +2,10 @@ obj-$(CONFIG_PPC64) += ppc64/ obj-y += boot-of.init.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.init.o +obj-y += mm-radix.o obj-y += opal.o obj-y += setup.o +obj-y += tlb-radix.o $(TARGET): $(TARGET)-syms cp -f $< $@ diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h new file mode 100644 index 0000000000..548e97b414 --- /dev/null +++ b/xen/arch/ppc/include/asm/bitops.h @@ -0,0 +1,9 @@ +#ifndef _ASM_PPC_BITOPS_H +#define _ASM_PPC_BITOPS_H + +/* PPC bit number conversion */ +#define PPC_BITLSHIFT(be) (BITS_PER_LONG - 1 - (be)) +#define PPC_BIT(bit) (1UL << PPC_BITLSHIFT(bit)) +#define PPC_BITMASK(bs, be) ((PPC_BIT(bs) - PPC_BIT(be)) | PPC_BIT(bs)) + +#endif /* _ASM_PPC_BITOPS_H */ diff --git a/xen/arch/ppc/include/asm/mm.h b/xen/arch/ppc/include/asm/mm.h new file mode 100644 index 0000000000..c85a7ed686 --- /dev/null +++ b/xen/arch/ppc/include/asm/mm.h @@ -0,0 +1,18 @@ +#ifndef _ASM_PPC_MM_H +#define _ASM_PPC_MM_H + +#include + +#define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) +#define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) + +#define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK)) +#define maddr_to_virt(pa) ((void *)((paddr_t)(pa) | XEN_VIRT_START)) + +/* Convert between Xen-heap virtual addresses and machine addresses. */ +#define __pa(x) (virt_to_maddr(x)) +#define __va(x) (maddr_to_virt(x)) + +void setup_initial_pagetables(void); + +#endif /* _ASM_PPC_MM_H */ diff --git a/xen/arch/ppc/include/asm/page-bits.h b/xen/arch/ppc/include/asm/page-bits.h index 4c01bf9716..0286177520 100644 --- a/xen/arch/ppc/include/asm/page-bits.h +++ b/xen/arch/ppc/include/asm/page-bits.h @@ -2,6 +2,7 @@ #define __PPC_PAGE_BITS_H__ #define PAGE_SHIFT 16 /* 64 KiB Pages */ -#define PADDR_BITS 48 +#define PADDR_BITS 53 +#define VADDR_BITS 52 #endif /* __PPC_PAGE_BITS_H__ */ diff --git a/xen/arch/ppc/include/asm/page.h b/xen/arch/ppc/include/asm/page.h new file mode 100644 index 0000000000..c5ee047df7 --- /dev/null +++ b/xen/arch/ppc/include/asm/page.h @@ -0,0 +1,181 @@ +#ifndef _ASM_PPC_PAGE_H +#define _ASM_PPC_PAGE_H + +#include + +#include +#include + +#define PDE_VALID PPC_BIT(0) +#define PDE_NLB_MASK 0x1ffffffffffffe0UL +#define PDE_NLS_MASK 0x1f + +#define PTE_VALID PPC_BIT(0) +#define PTE_LEAF PPC_BIT(1) +#define PTE_REFERENCE PPC_BIT(55) +#define PTE_CHANGE PPC_BIT(56) + +/* PTE Attributes */ +#define PTE_ATT_SAO PPC_BIT(59) /* Strong Access Ordering */ +#define PTE_ATT_NON_IDEMPOTENT PPC_BIT(58) +#define PTE_ATT_TOLERANT (PPC_BIT(58) | PPC_BIT(59)) + +/* PTE Encoded Access Authority*/ +#define PTE_EAA_PRIVILEGED PPC_BIT(60) +#define PTE_EAA_READ PPC_BIT(61) +#define PTE_EAA_WRITE PPC_BIT(62) +#define PTE_EAA_EXECUTE PPC_BIT(63) + +/* Field shifts/masks */ +#define PTE_RPN_MASK 0x1fffffffffff000UL +#define PTE_ATT_MASK 0x30UL +#define PTE_EAA_MASK 0xfUL + +#define PTE_XEN_BASE (PTE_VALID | PTE_EAA_PRIVILEGED | PTE_REFERENCE) +#define PTE_XEN_RW (PTE_XEN_BASE | PTE_EAA_READ | PTE_EAA_WRITE | PTE_CHANGE) +#define PTE_XEN_RO (PTE_XEN_BASE | PTE_EAA_READ) +#define PTE_XEN_RX (PTE_XEN_BASE | PTE_EAA_READ | PTE_EAA_EXECUTE) + +/* + * Radix Tree layout for 64KB pages: + * + * [ L1 (ROOT) PAGE DIRECTORY (8192 * sizeof(pde_t)) ] + * | + * | + * v + * [ L2 PAGE DIRECTORY (512 * sizeof(pde_t)) ] + * | + * | + * v + * [ L3 PAGE DIRECTORY (512 * sizeof(pde_t)) ] + * | + * | + * v + * [ L4 PAGE TABLE (32 * sizeof(pte_t)) ] + * | + * | + * v + * [ PAGE TABLE ENTRY ] + */ + +#define XEN_PT_ENTRIES_LOG2_LVL_1 13 /* 2**13 entries, maps 2**13 * 512GB = 4PB */ +#define XEN_PT_ENTRIES_LOG2_LVL_2 9 /* 2**9 entries, maps 2**9 * 1GB = 512GB */ +#define XEN_PT_ENTRIES_LOG2_LVL_3 9 /* 2**9 entries, maps 2**9 * 1GB = 512GB */ +#define XEN_PT_ENTRIES_LOG2_LVL_4 5 /* 2**5 entries, maps 2**5 * 64K = 2MB */ + +#define XEN_PT_SHIFT_LVL_1 (XEN_PT_SHIFT_LVL_2 + XEN_PT_ENTRIES_LOG2_LVL_2) +#define XEN_PT_SHIFT_LVL_2 (XEN_PT_SHIFT_LVL_3 + XEN_PT_ENTRIES_LOG2_LVL_3) +#define XEN_PT_SHIFT_LVL_3 (XEN_PT_SHIFT_LVL_4 + XEN_PT_ENTRIES_LOG2_LVL_4) +#define XEN_PT_SHIFT_LVL_4 PAGE_SHIFT + +#define XEN_PT_ENTRIES_LOG2_LVL(lvl) (XEN_PT_ENTRIES_LOG2_LVL_##lvl) +#define XEN_PT_SHIFT_LVL(lvl) (XEN_PT_SHIFT_LVL_##lvl) +#define XEN_PT_ENTRIES_LVL(lvl) (1UL << XEN_PT_ENTRIES_LOG2_LVL(lvl)) +#define XEN_PT_SIZE_LVL(lvl) (sizeof(uint64_t) * XEN_PT_ENTRIES_LVL(lvl)) +#define XEN_PT_MASK_LVL(lvl) (XEN_PT_ENTRIES_LVL(lvl) - 1) +#define XEN_PT_INDEX_LVL(lvl, va) (((va) >> XEN_PT_SHIFT_LVL(lvl)) & XEN_PT_MASK_LVL(lvl)) + +/* + * Calculate the index of the provided virtual address in the provided + * page table struct + */ +#define pt_index(pt, va) _Generic((pt), \ + struct lvl1_pd * : XEN_PT_INDEX_LVL(1, (va)), \ + struct lvl2_pd * : XEN_PT_INDEX_LVL(2, (va)), \ + struct lvl3_pd * : XEN_PT_INDEX_LVL(3, (va)), \ + struct lvl4_pt * : XEN_PT_INDEX_LVL(4, (va))) + +#define pt_entry(pt, va) (&((pt)->entries[pt_index((pt), (va))])) + +typedef struct +{ + __be64 pde; +} pde_t; + +typedef struct +{ + __be64 pte; +} pte_t; + +struct lvl1_pd +{ + pde_t entries[XEN_PT_ENTRIES_LVL(1)]; +} __aligned(XEN_PT_SIZE_LVL(1)); + +struct lvl2_pd +{ + pde_t entries[XEN_PT_ENTRIES_LVL(2)]; +} __aligned(XEN_PT_SIZE_LVL(2)); + +struct lvl3_pd +{ + pde_t entries[XEN_PT_ENTRIES_LVL(3)]; +} __aligned(XEN_PT_SIZE_LVL(3)); + +struct lvl4_pt +{ + pte_t entries[XEN_PT_ENTRIES_LVL(4)]; +} __aligned(XEN_PT_SIZE_LVL(4)); + +static inline pte_t paddr_to_pte(paddr_t paddr, unsigned long flags) +{ + paddr_t paddr_aligned = paddr & PTE_RPN_MASK; + + return (pte_t){ .pte = cpu_to_be64(paddr_aligned | flags | PTE_LEAF) }; +} + +static inline pde_t paddr_to_pde(paddr_t paddr, unsigned long flags, + unsigned long nls) +{ + paddr_t paddr_aligned = paddr & PDE_NLB_MASK; + + return (pde_t){ .pde = cpu_to_be64(paddr_aligned | flags | nls) }; +} + +static inline paddr_t pte_to_paddr(pte_t pte) +{ + return be64_to_cpu(pte.pte) & PTE_RPN_MASK; +} + +static inline paddr_t pde_to_paddr(pde_t pde) +{ + return be64_to_cpu(pde.pde) & PDE_NLB_MASK; +} + +static inline bool pte_is_valid(pte_t pte) +{ + return pte.pte & be64_to_cpu(PTE_VALID); +} + +static inline bool pde_is_valid(pde_t pde) +{ + return pde.pde & be64_to_cpu(PDE_VALID); +} + +/* + * ISA 3.0 partition and process table entry format + */ +struct patb_entry { + __be64 patb0; + __be64 patb1; +}; +#define PATB0_HR PPC_BIT(0) /* host uses radix */ +#define PATB1_GR PPC_BIT(0) /* guest uses radix; must match HR */ + +struct prtb_entry { + __be64 prtb0; + __be64 reserved; +}; + +/* + * We support 52 bits, hence: + * bits 52 - 31 = 21, 0b10101 + * RTS encoding details + * bits 0 - 2 of rts -> bits 5 - 7 of unsigned long + * bits 3 - 4 of rts -> bits 61 - 62 of unsigned long + */ +#define RTS_FIELD ((0x2UL << 61) | (0x5UL << 5)) + +void tlbie_all(void); + +#endif /* _ASM_PPC_PAGE_H */ diff --git a/xen/arch/ppc/include/asm/processor.h b/xen/arch/ppc/include/asm/processor.h index 2300640787..edb8a6088d 100644 --- a/xen/arch/ppc/include/asm/processor.h +++ b/xen/arch/ppc/include/asm/processor.h @@ -133,6 +133,40 @@ struct cpu_user_regs uint32_t entry_vector; }; +static inline void sync(void) +{ + asm volatile ( "sync" ); +} + +static inline void isync(void) +{ + asm volatile ( "isync" ); +} + +static inline unsigned long mfmsr(void) +{ + unsigned long msr; + asm volatile ( "mfmsr %0" : "=r" (msr) ); + return msr; +} + +static inline void mtmsrd(unsigned long msr) +{ + asm volatile ( "mtmsrd %0" : : "r" (msr) ); +} + +static inline void mtspr(uint16_t spr, unsigned long val) +{ + asm volatile ( "mtspr %0, %1" : : "K" (spr), "r" (val) ); +} + +static inline unsigned long mfspr(uint16_t spr) +{ + unsigned long val; + asm volatile ( "mfspr %0, %1" : "=r" (val) : "K" (spr) ); + return val; +} + /* * panic() isn't available at the moment so an infinite loop will be * used temporarily. diff --git a/xen/arch/ppc/include/asm/regs.h b/xen/arch/ppc/include/asm/regs.h new file mode 100644 index 0000000000..cbf1a9c8e4 --- /dev/null +++ b/xen/arch/ppc/include/asm/regs.h @@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright IBM Corp. 2005, 2007 + * + * Authors: Jimi Xenidis + * Christian Ehrhardt + */ + +#ifndef _ASM_REG_DEFS_H_ +#define _ASM_REG_DEFS_H_ + +/* Special Purpose Registers */ +#define SPRN_VRSAVE 256 +#define SPRN_DSISR 18 +#define SPRN_DAR 19 +#define SPRN_DEC 22 +#define SPRN_SRR0 26 +#define SPRN_SRR1 27 +#define SPRN_TBRL 268 +#define SPRN_TBRU 269 +#define SPRN_SPRG0 272 +#define SPRN_SPRG1 273 +#define SPRN_SPRG2 274 +#define SPRN_SPRG3 275 +#define SPRN_TBWL 284 +#define SPRN_TBWU 285 + +#define SPRN_HSPRG0 304 +#define SPRN_HSPRG1 305 +#define SPRN_HDEC 310 +#define SPRN_HIOR 311 +#define SPRN_RMOR 312 +#define SPRN_HRMOR 313 +#define SPRN_HSRR0 314 +#define SPRN_HSRR1 315 +#define SPRN_LPIDR 319 + +#define SPRN_PTCR 0x1D0 /* Partition table control Register */ +#define SPRN_PID 0x030 /* Process ID */ + +/* Performance monitor spr encodings */ +#define SPRN_MMCRA 786 +#define MMCRA_SAMPHV _AC(0x10000000, UL) /* state of MSR HV when SIAR set */ +#define MMCRA_SAMPPR _AC(0x08000000, UL) /* state of MSR PR when SIAR set */ +#define MMCRA_SAMPLE_ENABLE _AC(0x00000001, UL) /* enable sampling */ +#define NUM_PMCS 8 +#define SPRN_PMC1 787 +#define SPRN_PMC2 788 +#define SPRN_PMC3 789 +#define SPRN_PMC4 790 +#define SPRN_PMC5 791 +#define SPRN_PMC6 792 +#define SPRN_PMC7 793 +#define SPRN_PMC8 794 +#define SPRN_MMCR0 795 +#define MMCR0_FC _AC(0x80000000, UL) /* freeze counters */ +#define MMCR0_FCS _AC(0x40000000, UL) /* freeze in supervisor state */ +#define MMCR0_FCP _AC(0x20000000, UL) /* freeze in problem state */ +#define MMCR0_FCM1 _AC(0x10000000, UL) /* freeze counters while MSR mark = 1 */ +#define MMCR0_FCM0 _AC(0x08000000, UL) /* freeze counters while MSR mark = 0 */ +#define MMCR0_PMAE _AC(0x04000000, UL) /* performance monitor alert enabled */ +#define MMCR0_PMAO _AC(0x00000080, UL) /* performance monitor alert occurred */ +#define MMCR0_FCH _AC(0x00000001, UL) /* freeze conditions in hypervisor */ +#define SPRN_SIAR 796 +#define SPRN_SDAR 797 +#define SPRN_MMCR1 798 + +/* As defined for PU G4 */ +#define SPRN_HID0 1008 +#define SPRN_HID1 1009 +#define SPRN_HID4 1012 + +#define SPRN_DABR 1013 +#define SPRN_HID5 1014 +#define SPRN_DABRX 1015 +#define SPRN_HID6 1017 +#define SPRN_HID7 1018 +#define SPRN_HID8 1019 +#define SPRN_PIR 1023 + +#define SPRN_LPCR 0x13E /* LPAR Control Register */ +#define LPCR_VPM0 _AC(0x8000000000000000, UL) +#define LPCR_VPM1 _AC(0x4000000000000000, UL) +#define LPCR_ISL _AC(0x2000000000000000, UL) +#define LPCR_VC_SH 61 +#define LPCR_DPFD_SH 52 +#define LPCR_DPFD (_AC(7, UL) << LPCR_DPFD_SH) +#define LPCR_VRMASD_SH 47 +#define LPCR_VRMASD (_AC(0x1f, UL) << LPCR_VRMASD_SH) +#define LPCR_VRMA_L _AC(0x0008000000000000, UL) +#define LPCR_VRMA_LP0 _AC(0x0001000000000000, UL) +#define LPCR_VRMA_LP1 _AC(0x0000800000000000, UL) +#define LPCR_RMLS 0x1C000000 /* Implementation dependent RMO limit sel */ +#define LPCR_RMLS_SH 26 +#define LPCR_HAIL _AC(0x0000000004000000, UL) /* HV AIL (ISAv3.1) */ +#define LPCR_ILE _AC(0x0000000002000000, UL) /* !HV irqs set MSR:LE */ +#define LPCR_AIL _AC(0x0000000001800000, UL) /* Alternate interrupt location */ +#define LPCR_AIL_0 _AC(0x0000000000000000, UL) /* MMU off exception offset 0x0 */ +#define LPCR_AIL_3 _AC(0x0000000001800000, UL) /* MMU on exception offset 0xc00...4xxx */ +#define LPCR_ONL _AC(0x0000000000040000, UL) /* online - PURR/SPURR count */ +#define LPCR_LD _AC(0x0000000000020000, UL) /* large decremeter */ +#define LPCR_PECE _AC(0x000000000001f000, UL) /* powersave exit cause enable */ +#define LPCR_PECEDP _AC(0x0000000000010000, UL) /* directed priv dbells cause exit */ +#define LPCR_PECEDH _AC(0x0000000000008000, UL) /* directed hyp dbells cause exit */ +#define LPCR_PECE0 _AC(0x0000000000004000, UL) /* ext. exceptions can cause exit */ +#define LPCR_PECE1 _AC(0x0000000000002000, UL) /* decrementer can cause exit */ +#define LPCR_PECE2 _AC(0x0000000000001000, UL) /* machine check etc can cause exit */ +#define LPCR_PECE_HVEE _AC(0x0000400000000000, UL) /* P9 Wakeup on HV interrupts */ +#define LPCR_MER _AC(0x0000000000000800, UL) /* Mediated External Exception */ +#define LPCR_MER_SH 11 +#define LPCR_GTSE _AC(0x0000000000000400, UL) /* Guest Translation Shootdown Enable */ +#define LPCR_TC _AC(0x0000000000000200, UL) /* Translation control */ +#define LPCR_HEIC _AC(0x0000000000000010, UL) /* Hypervisor External Interrupt Control */ +#define LPCR_LPES 0x0000000c +#define LPCR_LPES0 _AC(0x0000000000000008, UL) /* LPAR Env selector 0 */ +#define LPCR_LPES1 _AC(0x0000000000000004, UL) /* LPAR Env selector 1 */ +#define LPCR_LPES_SH 2 +#define LPCR_RMI _AC(0x0000000000000002, UL) /* real mode is cache inhibit */ +#define LPCR_HVICE _AC(0x0000000000000002, UL) /* P9: HV interrupt enable */ +#define LPCR_HDICE _AC(0x0000000000000001, UL) /* Hyp Decr enable (HV,PR,EE) */ +#define LPCR_UPRT _AC(0x0000000000400000, UL) /* Use Process Table (ISA 3) */ +#define LPCR_HR _AC(0x0000000000100000, UL) + +#endif /* _ASM_REG_DEFS_H_ */ diff --git a/xen/arch/ppc/include/asm/types.h b/xen/arch/ppc/include/asm/types.h index b62ae0e7ae..ffaf378a4d 100644 --- a/xen/arch/ppc/include/asm/types.h +++ b/xen/arch/ppc/include/asm/types.h @@ -4,6 +4,7 @@ #define _ASM_PPC_TYPES_H typedef unsigned long paddr_t; +typedef unsigned long vaddr_t; #define INVALID_PADDR (~0UL) #define PRIpaddr "016lx" diff --git a/xen/arch/ppc/mm-radix.c b/xen/arch/ppc/mm-radix.c new file mode 100644 index 0000000000..3feeb90ebc --- /dev/null +++ b/xen/arch/ppc/mm-radix.c @@ -0,0 +1,267 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +void enable_mmu(void); + +#define INITIAL_LVL1_PD_COUNT 1 +#define INITIAL_LVL2_LVL3_PD_COUNT 2 +#define INITIAL_LVL4_PT_COUNT 256 + +static size_t __initdata initial_lvl1_pd_pool_used; +static struct lvl1_pd initial_lvl1_pd_pool[INITIAL_LVL1_PD_COUNT]; + +static size_t __initdata initial_lvl2_lvl3_pd_pool_used; +static struct lvl2_pd initial_lvl2_lvl3_pd_pool[INITIAL_LVL2_LVL3_PD_COUNT]; + +static size_t __initdata initial_lvl4_pt_pool_used; +static struct lvl4_pt initial_lvl4_pt_pool[INITIAL_LVL4_PT_COUNT]; + +/* Only reserve minimum Partition and Process tables */ +#define PATB_SIZE_LOG2 16 /* Only supported partition table size on POWER9 */ +#define PATB_SIZE (1UL << PATB_SIZE_LOG2) +#define PRTB_SIZE_LOG2 12 +#define PRTB_SIZE (1UL << PRTB_SIZE_LOG2) + +static struct patb_entry + __aligned(PATB_SIZE) initial_patb[PATB_SIZE / sizeof(struct patb_entry)]; + +static struct prtb_entry + __aligned(PRTB_SIZE) initial_prtb[PRTB_SIZE / sizeof(struct prtb_entry)]; + +static __init struct lvl1_pd *lvl1_pd_pool_alloc(void) +{ + if ( initial_lvl1_pd_pool_used >= INITIAL_LVL1_PD_COUNT ) + { + early_printk("Ran out of space for LVL1 PD!\n"); + die(); + } + + return &initial_lvl1_pd_pool[initial_lvl1_pd_pool_used++]; +} + +static __init struct lvl2_pd *lvl2_pd_pool_alloc(void) +{ + if ( initial_lvl2_lvl3_pd_pool_used >= INITIAL_LVL2_LVL3_PD_COUNT ) + { + early_printk("Ran out of space for LVL2/3 PD!\n"); + die(); + } + + return &initial_lvl2_lvl3_pd_pool[initial_lvl2_lvl3_pd_pool_used++]; +} + +static __init struct lvl3_pd *lvl3_pd_pool_alloc(void) +{ + BUILD_BUG_ON(sizeof(struct lvl3_pd) != sizeof(struct lvl2_pd)); + + return (struct lvl3_pd *) lvl2_pd_pool_alloc(); +} + +static __init struct lvl4_pt *lvl4_pt_pool_alloc(void) +{ + if ( initial_lvl4_pt_pool_used >= INITIAL_LVL4_PT_COUNT ) + { + early_printk("Ran out of space for LVL4 PT!\n"); + die(); + } + + return &initial_lvl4_pt_pool[initial_lvl4_pt_pool_used++]; +} + +#ifndef NDEBUG +/* TODO: Remove once we get common/ building */ +static char *__init itoa64_hex(uint64_t val, char *out_buf, size_t buf_len) +{ + uint64_t cur; + size_t i = buf_len - 1; + + /* Null terminate buffer */ + out_buf[i] = '\0'; + + /* Add digits in reverse */ + cur = val; + while ( cur && i > 0 ) + { + out_buf[--i] = "0123456789ABCDEF"[cur % 16]; + cur /= 16; + } + + /* Pad to 16 digits */ + while ( i > 0 ) + out_buf[--i] = '0'; + + return out_buf + i; +} +#endif + +static void __init radix_dprint(uint64_t addr, const char *msg) +{ +#ifndef NDEBUG + char buf[sizeof("DEADBEEFCAFEBABA")]; + char *addr_s = itoa64_hex(addr, buf, sizeof(buf)); + + early_printk("(0x"); + early_printk(addr_s); + early_printk(") "); + early_printk(msg); +#endif +} + +static void __init setup_initial_mapping(struct lvl1_pd *lvl1, + vaddr_t map_start, + vaddr_t map_end, + paddr_t phys_base) +{ + uint64_t page_addr; + + if ( map_start & ~PAGE_MASK ) + { + early_printk("Xen _start be aligned to 64k (PAGE_SIZE) boundary\n"); + die(); + } + + if ( phys_base & ~PAGE_MASK ) + { + early_printk("Xen should be loaded at 64k (PAGE_SIZE) boundary\n"); + die(); + } + + for ( page_addr = map_start; page_addr < map_end; page_addr += PAGE_SIZE ) + { + struct lvl2_pd *lvl2; + struct lvl3_pd *lvl3; + struct lvl4_pt *lvl4; + pde_t *pde; + pte_t *pte; + + /* Allocate LVL 2 PD if necessary */ + pde = pt_entry(lvl1, page_addr); + if ( !pde_is_valid(*pde) ) + { + lvl2 = lvl2_pd_pool_alloc(); + *pde = paddr_to_pde(__pa(lvl2), PDE_VALID, + XEN_PT_ENTRIES_LOG2_LVL_2); + } + else + lvl2 = __va(pde_to_paddr(*pde)); + + /* Allocate LVL 3 PD if necessary */ + pde = pt_entry(lvl2, page_addr); + if ( !pde_is_valid(*pde) ) + { + lvl3 = lvl3_pd_pool_alloc(); + *pde = paddr_to_pde(__pa(lvl3), PDE_VALID, + XEN_PT_ENTRIES_LOG2_LVL_3); + } + else + lvl3 = __va(pde_to_paddr(*pde)); + + /* Allocate LVL 4 PT if necessary */ + pde = pt_entry(lvl3, page_addr); + if ( !pde_is_valid(*pde) ) + { + lvl4 = lvl4_pt_pool_alloc(); + *pde = paddr_to_pde(__pa(lvl4), PDE_VALID, + XEN_PT_ENTRIES_LOG2_LVL_4); + } + else + lvl4 = __va(pde_to_paddr(*pde)); + + /* Finally, create PTE in LVL 4 PT */ + pte = pt_entry(lvl4, page_addr); + if ( !pte_is_valid(*pte) ) + { + unsigned long paddr = (page_addr - map_start) + phys_base; + unsigned long flags; + + radix_dprint(paddr, "being mapped to "); + radix_dprint(page_addr, "!\n"); + if ( is_kernel_text(page_addr) || is_kernel_inittext(page_addr) ) + { + radix_dprint(page_addr, "being marked as TEXT (RX)\n"); + flags = PTE_XEN_RX; + } + else if ( is_kernel_rodata(page_addr) ) + { + radix_dprint(page_addr, "being marked as RODATA (RO)\n"); + flags = PTE_XEN_RO; + } + else + { + radix_dprint(page_addr, "being marked as DEFAULT (RW)\n"); + flags = PTE_XEN_RW; + } + + *pte = paddr_to_pte(paddr, flags); + radix_dprint(paddr_to_pte(paddr, flags).pte, + "is result of PTE map!\n"); + } + else + { + early_printk("BUG: Tried to create PTE for already-mapped page!"); + die(); + } + } +} + +static void __init setup_partition_table(struct lvl1_pd *root) +{ + unsigned long ptcr; + + /* Configure entry for LPID 0 to enable Radix and point to root PD */ + uint64_t patb0 = RTS_FIELD | __pa(root) | XEN_PT_ENTRIES_LOG2_LVL_1 | + PATB0_HR; + uint64_t patb1 = __pa(initial_prtb) | (PRTB_SIZE_LOG2 - 12) | PATB1_GR; + + initial_patb[0].patb0 = cpu_to_be64(patb0); + initial_patb[0].patb1 = cpu_to_be64(patb1); + + ptcr = __pa(initial_patb) | (PATB_SIZE_LOG2 - 12); + mtspr(SPRN_PTCR, ptcr); +} + +static void __init setup_process_table(struct lvl1_pd *root) +{ + /* Configure entry for PID 0 to point to root PD */ + uint64_t prtb0 = RTS_FIELD | __pa(root) | XEN_PT_ENTRIES_LOG2_LVL_1; + + initial_prtb[0].prtb0 = cpu_to_be64(prtb0); +} + +void __init setup_initial_pagetables(void) +{ + struct lvl1_pd *root = lvl1_pd_pool_alloc(); + unsigned long lpcr; + + setup_initial_mapping(root, (vaddr_t)_start, (vaddr_t)_end, __pa(_start)); + + /* Enable Radix mode in LPCR */ + lpcr = mfspr(SPRN_LPCR); + mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR); + early_printk("Enabled radix in LPCR\n"); + + /* Set up initial process table */ + setup_process_table(root); + + /* Set up initial partition table */ + setup_partition_table(root); + + /* Flush TLB */ + tlbie_all(); + early_printk("Flushed TLB\n"); + + /* Turn on the MMU */ + enable_mmu(); +} diff --git a/xen/arch/ppc/ppc64/head.S b/xen/arch/ppc/ppc64/head.S index a149339ad0..e600ddb05f 100644 --- a/xen/arch/ppc/ppc64/head.S +++ b/xen/arch/ppc/ppc64/head.S @@ -2,6 +2,7 @@ #include #include +#include .section .text.header, "ax", %progbits @@ -66,3 +67,17 @@ ENTRY(start) .size start, . - start .type start, %function + +ENTRY(enable_mmu) + mflr %r3 + mfmsr %r4 + + /* enable instruction and data relocation (MMU) */ + ori %r4, %r4, (MSR_IR | MSR_DR) + + mtsrr0 %r3 /* return to caller after MMU enable */ + mtsrr1 %r4 + rfid + + .size enable_mmu, . - enable_mmu + .type enable_mmu, %function diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c index 8ab7bc19ee..0106e9c9da 100644 --- a/xen/arch/ppc/setup.c +++ b/xen/arch/ppc/setup.c @@ -2,6 +2,7 @@ #include #include #include +#include #include /* Xen stack for bringing up the first CPU. */ @@ -27,6 +28,8 @@ void __init noreturn start_xen(unsigned long r3, unsigned long r4, boot_opal_init((void *)r3); } + setup_initial_pagetables(); + early_printk("Hello, ppc64le!\n"); for ( ; ; ) diff --git a/xen/arch/ppc/tlb-radix.c b/xen/arch/ppc/tlb-radix.c new file mode 100644 index 0000000000..3dde102c62 --- /dev/null +++ b/xen/arch/ppc/tlb-radix.c @@ -0,0 +1,96 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Based on arch/powerpc/mm/book3s64/radix_tlb.c from Linux with the following + * copyright notice: + * + * Copyright 2015-2016, Aneesh Kumar K.V, IBM Corporation. + */ +#include + +#include +#include +#include + +/* TLB flush actions. Used as argument to tlbiel_flush() */ +enum +{ + TLB_INVAL_SCOPE_LPID, /* invalidate TLBs for current LPID */ + TLB_INVAL_SCOPE_GLOBAL, /* invalidate all TLBs */ +}; + +#define POWER9_TLB_SETS_RADIX 128 /* # sets in POWER9 TLB Radix mode */ + +#define RIC_FLUSH_TLB 0 +#define RIC_FLUSH_PWC 1 +#define RIC_FLUSH_ALL 2 + +static void tlbiel_radix_set_isa300(unsigned int set, unsigned int is, + unsigned int pid, unsigned int ric, + unsigned int prs) +{ + unsigned long rb; + unsigned long rs; + + rb = (set << PPC_BITLSHIFT(51)) | (is << PPC_BITLSHIFT(53)); + rs = ((unsigned long) pid << PPC_BITLSHIFT(31)); + + asm volatile ( "tlbiel %0, %1, %2, %3, 1" + :: "r" (rb), "r" (rs), "i" (ric), "i" (prs) + : "memory" ); +} + +static void tlbiel_all_isa300(unsigned int num_sets, unsigned int is) +{ + unsigned int set; + + asm volatile ( "ptesync" : : : "memory" ); + + /* + * Flush the first set of the TLB, and the entire Page Walk Cache + * and partition table entries. Then flush the remaining sets of the + * TLB. + */ + + if ( mfmsr() & MSR_HV ) + { + /* MSR[HV] should flush partition scope translations first. */ + tlbiel_radix_set_isa300(0, is, 0, RIC_FLUSH_ALL, 0); + + for ( set = 1; set < num_sets; set++ ) + tlbiel_radix_set_isa300(set, is, 0, RIC_FLUSH_TLB, 0); + } + + /* Flush process scoped entries. */ + tlbiel_radix_set_isa300(0, is, 0, RIC_FLUSH_ALL, 1); + + for ( set = 1; set < num_sets; set++ ) + tlbiel_radix_set_isa300(set, is, 0, RIC_FLUSH_TLB, 1); + + asm volatile ( "ptesync" : : : "memory" ); +} + +void radix__tlbiel_all(unsigned int action) +{ + unsigned int is; + + switch ( action ) + { + case TLB_INVAL_SCOPE_GLOBAL: + is = 3; + break; + case TLB_INVAL_SCOPE_LPID: + is = 2; + break; + default: + die(); + } + + tlbiel_all_isa300(POWER9_TLB_SETS_RADIX, is); + + asm volatile ( "slbia 7; isync" : : : "memory" ); +} + +void tlbie_all(void) +{ + radix__tlbiel_all(TLB_INVAL_SCOPE_GLOBAL); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 06 15:55:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Sep 2023 15:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.596698.930683 (Exim 4.92) (envelope-from ) id 1qdurv-0003Ym-Sj; Wed, 06 Sep 2023 15:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 596698.930683; Wed, 06 Sep 2023 15:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qdurv-0003Ye-Q3; Wed, 06 Sep 2023 15:55:03 +0000 Received: by outflank-mailman (input) for mailman id 596698; Wed, 06 Sep 2023 15:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qduru-0003YY-9x for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 15:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qduru-00024i-5A for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 15:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qduru-0004mP-2c for xen-changelog@lists.xenproject.org; Wed, 06 Sep 2023 15: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=LyP2K0EF/n0S/ivpu9pzRS11kXkrewvATff4sh+pxwY=; b=0h/7S/OhP//R4RIS74EKxLHjBf ktgpQI5erKw0j65ATIStA2e1jN9MrfEXnQ2BY9QPA6TbPwX4OjUhll2nZj3rxS7yZOuu9LTNUtkCe 1btScCG/N7Coc3yH+mPxpSsWbckahjFTNAqGF7fQuv/JrIyfctoD63yjIbpucLTRgSXU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] xen/arm: page: Handle cache flush of an element at the top of the address space Message-Id: Date: Wed, 06 Sep 2023 15:55:02 +0000 commit d720c2310a7ac8878c01fe9d9fdc13f43cb266b3 Author: Stefano Stabellini AuthorDate: Tue Sep 5 14:34:28 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 14:34:28 2023 +0200 xen/arm: page: Handle cache flush of an element at the top of the address space The region that needs to be cleaned/invalidated may be at the top of the address space. This means that 'end' (i.e. 'p + size') will be 0 and therefore nothing will be cleaned/invalidated as the check in the loop will always be false. On Arm64, we only support we only support up to 48-bit Virtual address space. So this is not a concern there. However, for 32-bit, the mapcache is using the last 2GB of the address space. Therefore we may not clean/invalidate properly some pages. This could lead to memory corruption or data leakage (the scrubbed value may still sit in the cache when the guest could read directly the memory and therefore read the old content). Rework invalidate_dcache_va_range(), clean_dcache_va_range(), clean_and_invalidate_dcache_va_range() to handle a cache flush with an element at the top of the address space. This is CVE-2023-34321 / XSA-437. Reported-by: Julien Grall Signed-off-by: Stefano Stabellini Signed-off-by: Julien Grall Acked-by: Bertrand Marquis master commit: 9a216e92de9f9011097e4f1fb55ff67ba0a21704 master date: 2023-09-05 14:30:08 +0200 --- xen/include/asm-arm/page.h | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index c6f9fb0d4e..eff5883ef8 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -152,26 +152,25 @@ static inline size_t read_dcache_line_bytes(void) static inline int invalidate_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; size_t cacheline_mask = dcache_line_bytes - 1; dsb(sy); /* So the CPU issues all writes to the range */ if ( (uintptr_t)p & cacheline_mask ) { + size -= dcache_line_bytes - ((uintptr_t)p & cacheline_mask); p = (void *)((uintptr_t)p & ~cacheline_mask); asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); p += dcache_line_bytes; } - if ( (uintptr_t)end & cacheline_mask ) - { - end = (void *)((uintptr_t)end & ~cacheline_mask); - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (end)); - } - for ( ; p < end; p += dcache_line_bytes ) + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__invalidate_dcache_one(0) : : "r" (p)); + if ( size > 0 ) + asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); + dsb(sy); /* So we know the flushes happen before continuing */ return 0; @@ -179,10 +178,14 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) static inline int clean_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ @@ -192,10 +195,14 @@ static inline int clean_dcache_va_range(const void *p, unsigned long size) static inline int clean_and_invalidate_dcache_va_range (const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 07 04:00:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Sep 2023 04:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597083.931260 (Exim 4.92) (envelope-from ) id 1qe6BW-0002UP-W2; Thu, 07 Sep 2023 04:00:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597083.931260; Thu, 07 Sep 2023 04:00: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 1qe6BW-0002UH-Sw; Thu, 07 Sep 2023 04:00:02 +0000 Received: by outflank-mailman (input) for mailman id 597083; Thu, 07 Sep 2023 04:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qe6BV-00027H-Jr for xen-changelog@lists.xenproject.org; Thu, 07 Sep 2023 04:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qe6BV-0004zN-H8 for xen-changelog@lists.xenproject.org; Thu, 07 Sep 2023 04:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qe6BV-0006PO-G8 for xen-changelog@lists.xenproject.org; Thu, 07 Sep 2023 04: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=S7DMLT7RwZEHdLyB7DasFY+MBB62Cqy9/gZgNCTBg30=; b=bf6Ds6jUiFSR12FDL5TfqHoegy C7E0M70NffFUENdPlvFyzPbrJXYi6W/YRZlpSGCH1pLbYufImMNhZsOGKdP85qYtHMgnpWyX5FHC7 uPDVUJu/Dbb7k1c/DE3SemfbWbaP+IXlWvN1CBTZj13LK8hNCtFuDV4aKuyhEfY5ZTTE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] xen/arm: page: Handle cache flush of an element at the top of the address space Message-Id: Date: Thu, 07 Sep 2023 04:00:01 +0000 commit 0517763e771f2e2582bc492fafa42a86400ab957 Author: Stefano Stabellini AuthorDate: Tue Sep 5 14:34:46 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 5 14:34:46 2023 +0200 xen/arm: page: Handle cache flush of an element at the top of the address space The region that needs to be cleaned/invalidated may be at the top of the address space. This means that 'end' (i.e. 'p + size') will be 0 and therefore nothing will be cleaned/invalidated as the check in the loop will always be false. On Arm64, we only support we only support up to 48-bit Virtual address space. So this is not a concern there. However, for 32-bit, the mapcache is using the last 2GB of the address space. Therefore we may not clean/invalidate properly some pages. This could lead to memory corruption or data leakage (the scrubbed value may still sit in the cache when the guest could read directly the memory and therefore read the old content). Rework invalidate_dcache_va_range(), clean_dcache_va_range(), clean_and_invalidate_dcache_va_range() to handle a cache flush with an element at the top of the address space. This is CVE-2023-34321 / XSA-437. Reported-by: Julien Grall Signed-off-by: Stefano Stabellini Signed-off-by: Julien Grall Acked-by: Bertrand Marquis master commit: 9a216e92de9f9011097e4f1fb55ff67ba0a21704 master date: 2023-09-05 14:30:08 +0200 --- xen/include/asm-arm/page.h | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 131507a517..05e347f8d1 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -152,26 +152,25 @@ static inline size_t read_dcache_line_bytes(void) static inline int invalidate_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; size_t cacheline_mask = dcache_line_bytes - 1; dsb(sy); /* So the CPU issues all writes to the range */ if ( (uintptr_t)p & cacheline_mask ) { + size -= dcache_line_bytes - ((uintptr_t)p & cacheline_mask); p = (void *)((uintptr_t)p & ~cacheline_mask); asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); p += dcache_line_bytes; } - if ( (uintptr_t)end & cacheline_mask ) - { - end = (void *)((uintptr_t)end & ~cacheline_mask); - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (end)); - } - for ( ; p < end; p += dcache_line_bytes ) + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__invalidate_dcache_one(0) : : "r" (p)); + if ( size > 0 ) + asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); + dsb(sy); /* So we know the flushes happen before continuing */ return 0; @@ -179,10 +178,14 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) static inline int clean_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ @@ -192,10 +195,14 @@ static inline int clean_dcache_va_range(const void *p, unsigned long size) static inline int clean_and_invalidate_dcache_va_range (const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Thu Sep 07 07:55:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Sep 2023 07:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597174.931370 (Exim 4.92) (envelope-from ) id 1qe9qy-00027b-5r; Thu, 07 Sep 2023 07:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597174.931370; Thu, 07 Sep 2023 07: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 1qe9qy-00027T-3C; Thu, 07 Sep 2023 07:55:04 +0000 Received: by outflank-mailman (input) for mailman id 597174; Thu, 07 Sep 2023 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 1qe9qw-00027N-6q for xen-changelog@lists.xenproject.org; Thu, 07 Sep 2023 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 1qe9qw-0002Gs-5z for xen-changelog@lists.xenproject.org; Thu, 07 Sep 2023 07:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qe9qw-0008QD-4w for xen-changelog@lists.xenproject.org; Thu, 07 Sep 2023 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=8YLbQx8d1ufZnVe7TObYD8NMzWDvxU5dWWMB8nxBdOI=; b=hsZtL9r2OWJDj9KZDHYnnimd06 Gw7vfUdRyxrh6xuZJEqIS8IOlwwqHKlKl1pvBJxzmQbOpb9YM05c1z+/WBW4QBGac7KeRExWwc29A gL4SmciiEJFx+q8myXWVxHGKRqNGlRN2xfNW4xxYnXIpH8trnO5iRlnMVv09Xat/EXUc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: page: Handle cache flush of an element at the top of the address space Message-Id: Date: Thu, 07 Sep 2023 07:55:02 +0000 commit 9a216e92de9f9011097e4f1fb55ff67ba0a21704 Author: Stefano Stabellini AuthorDate: Thu Aug 17 13:41:35 2023 +0100 Commit: Jan Beulich CommitDate: Tue Sep 5 14:30:08 2023 +0200 xen/arm: page: Handle cache flush of an element at the top of the address space The region that needs to be cleaned/invalidated may be at the top of the address space. This means that 'end' (i.e. 'p + size') will be 0 and therefore nothing will be cleaned/invalidated as the check in the loop will always be false. On Arm64, we only support we only support up to 48-bit Virtual address space. So this is not a concern there. However, for 32-bit, the mapcache is using the last 2GB of the address space. Therefore we may not clean/invalidate properly some pages. This could lead to memory corruption or data leakage (the scrubbed value may still sit in the cache when the guest could read directly the memory and therefore read the old content). Rework invalidate_dcache_va_range(), clean_dcache_va_range(), clean_and_invalidate_dcache_va_range() to handle a cache flush with an element at the top of the address space. This is CVE-2023-34321 / XSA-437. Reported-by: Julien Grall Signed-off-by: Stefano Stabellini Signed-off-by: Julien Grall Acked-by: Bertrand Marquis --- xen/arch/arm/include/asm/page.h | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/include/asm/page.h b/xen/arch/arm/include/asm/page.h index 657c4b33db..aa0080e8d7 100644 --- a/xen/arch/arm/include/asm/page.h +++ b/xen/arch/arm/include/asm/page.h @@ -161,26 +161,25 @@ static inline size_t read_dcache_line_bytes(void) static inline int invalidate_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; size_t cacheline_mask = dcache_line_bytes - 1; dsb(sy); /* So the CPU issues all writes to the range */ if ( (uintptr_t)p & cacheline_mask ) { + size -= dcache_line_bytes - ((uintptr_t)p & cacheline_mask); p = (void *)((uintptr_t)p & ~cacheline_mask); asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); p += dcache_line_bytes; } - if ( (uintptr_t)end & cacheline_mask ) - { - end = (void *)((uintptr_t)end & ~cacheline_mask); - asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (end)); - } - for ( ; p < end; p += dcache_line_bytes ) + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__invalidate_dcache_one(0) : : "r" (p)); + if ( size > 0 ) + asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); + dsb(sy); /* So we know the flushes happen before continuing */ return 0; @@ -188,10 +187,14 @@ static inline int invalidate_dcache_va_range(const void *p, unsigned long size) static inline int clean_dcache_va_range(const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ @@ -201,10 +204,14 @@ static inline int clean_dcache_va_range(const void *p, unsigned long size) static inline int clean_and_invalidate_dcache_va_range (const void *p, unsigned long size) { - const void *end = p + size; + size_t cacheline_mask = dcache_line_bytes - 1; + dsb(sy); /* So the CPU issues all writes to the range */ - p = (void *)((uintptr_t)p & ~(dcache_line_bytes - 1)); - for ( ; p < end; p += dcache_line_bytes ) + size += (uintptr_t)p & cacheline_mask; + size = (size + cacheline_mask) & ~cacheline_mask; + p = (void *)((uintptr_t)p & ~cacheline_mask); + for ( ; size >= dcache_line_bytes; + p += dcache_line_bytes, size -= dcache_line_bytes ) asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ /* ARM callers assume that dcache_* functions cannot fail. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597701.931951 (Exim 4.92) (envelope-from ) id 1qePQl-0003g7-5W; Fri, 08 Sep 2023 00:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597701.931951; Fri, 08 Sep 2023 00:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePQl-0003fy-2Y; Fri, 08 Sep 2023 00:33:03 +0000 Received: by outflank-mailman (input) for mailman id 597701; Fri, 08 Sep 2023 00:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePQj-0003fs-WC for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePQj-0000jY-SZ for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePQj-0004Ac-RW for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6wmKYQh8CaB04W3JptsPmeeAvBLqGnonXrV/FAmeGqo=; b=2Xli00kJxZpJOqN4smhGaUBTWE 7C7/Evv2AIQwAKGYcKmxbLUOQQlzNIIeRT0StclAHLFEyv/gStcUItuuDb428Yt3xKYTh/HH5Box1 AboMTotCVUHdQQGiDUjY7e2lR3bUsBd9nQu2niHNyv2nAN/HlIaM87yIWr4O72GVxk6s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common/device_tree: handle memory allocation failure in __unflatten_device_tree() Message-Id: Date: Fri, 08 Sep 2023 00:33:01 +0000 commit 502c3af88dd908a08a2d1d9e35ca8e5d85522770 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:11 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:24:14 2023 -0700 common/device_tree: handle memory allocation failure in __unflatten_device_tree() Change __unflatten_device_tree() return type to integer so it can propagate memory allocation failure. Add panic() in dt_unflatten_host_device_tree() for memory allocation failure during boot. Fixes: fb97eb614acf ("xen/arm: Create a hierarchical device tree") Signed-off-by: Vikram Garhwal Reviewed-by: Henry Wang Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/common/device_tree.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 0522fdf976..7c6b41c3b4 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -2091,9 +2091,11 @@ static unsigned long __init unflatten_dt_node(const void *fdt, * can be used. * @fdt: The fdt to expand * @mynodes: The device_node tree created by the call + * + * Returns 0 on success and a negative number on error */ -static void __init __unflatten_device_tree(const void *fdt, - struct dt_device_node **mynodes) +static int __init __unflatten_device_tree(const void *fdt, + struct dt_device_node **mynodes) { unsigned long start, mem, size; struct dt_device_node **allnextp = mynodes; @@ -2114,6 +2116,8 @@ static void __init __unflatten_device_tree(const void *fdt, /* Allocate memory for the expanded device tree */ mem = (unsigned long)_xmalloc (size + 4, __alignof__(struct dt_device_node)); + if ( !mem ) + return -ENOMEM; ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeefU); @@ -2131,6 +2135,8 @@ static void __init __unflatten_device_tree(const void *fdt, *allnextp = NULL; dt_dprintk(" <- unflatten_device_tree()\n"); + + return 0; } static void dt_alias_add(struct dt_alias_prop *ap, @@ -2215,7 +2221,11 @@ dt_find_interrupt_controller(const struct dt_device_match *matches) void __init dt_unflatten_host_device_tree(void) { - __unflatten_device_tree(device_tree_flattened, &dt_host); + int error = __unflatten_device_tree(device_tree_flattened, &dt_host); + + if ( error ) + panic("__unflatten_device_tree failed with error %d\n", error); + dt_alias_scan(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597702.931954 (Exim 4.92) (envelope-from ) id 1qePQv-0003hl-6P; Fri, 08 Sep 2023 00:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597702.931954; Fri, 08 Sep 2023 00:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePQv-0003he-3z; Fri, 08 Sep 2023 00:33:13 +0000 Received: by outflank-mailman (input) for mailman id 597702; Fri, 08 Sep 2023 00:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePQu-0003hW-0C for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePQt-0000jg-Vd for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePQt-0004B5-Uo for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0bfyvGLef4+YhfsiLZYaa+rSITMf/1NsfQUPrhaEWSY=; b=Fn/IsqOAH48+RBrsGbLFfKdnzU nlDNT3e2cqPZ6mXXjAJ+DM5A24iHbOorWIO/RGdSf6FFjekjjO4mJqbyoVVOZ8z1teCgWwBYbneID 00XLWvmC6tGVd2xPgYcXFfYq+pmO4x/bt3GaQm6THblzrqczgqtq/Rc+WSVL86TqT/1k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common/device_tree.c: unflatten_device_tree() propagate errors Message-Id: Date: Fri, 08 Sep 2023 00:33:11 +0000 commit 3ec9528a8262dd461718881d251fba01d3e662fa Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:12 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:24:20 2023 -0700 common/device_tree.c: unflatten_device_tree() propagate errors This will be useful in dynamic node programming when new dt nodes are unflattend during runtime. Invalid device tree node related errors should be propagated back to the caller. Signed-off-by: Vikram Garhwal Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/common/device_tree.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 7c6b41c3b4..b6d9f018c6 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -2110,6 +2110,9 @@ static int __init __unflatten_device_tree(const void *fdt, /* First pass, scan for size */ start = ((unsigned long)fdt) + fdt_off_dt_struct(fdt); size = unflatten_dt_node(fdt, 0, &start, NULL, NULL, 0); + if ( !size ) + return -EINVAL; + size = (size | 3) + 1; dt_dprintk(" size is %#lx allocating...\n", size); @@ -2127,11 +2130,21 @@ static int __init __unflatten_device_tree(const void *fdt, start = ((unsigned long)fdt) + fdt_off_dt_struct(fdt); unflatten_dt_node(fdt, mem, &start, NULL, &allnextp, 0); if ( be32_to_cpup((__be32 *)start) != FDT_END ) - printk(XENLOG_WARNING "Weird tag at end of tree: %08x\n", + { + printk(XENLOG_ERR "Weird tag at end of tree: %08x\n", *((u32 *)start)); + xfree((void *)mem); + return -EINVAL; + } + if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeefU ) - printk(XENLOG_WARNING "End of tree marker overwritten: %08x\n", + { + printk(XENLOG_ERR "End of tree marker overwritten: %08x\n", be32_to_cpu(((__be32 *)mem)[size / 4])); + xfree((void *)mem); + return -EINVAL; + } + *allnextp = NULL; dt_dprintk(" <- unflatten_device_tree()\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:33:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597703.931959 (Exim 4.92) (envelope-from ) id 1qePR5-0003jz-8k; Fri, 08 Sep 2023 00:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597703.931959; Fri, 08 Sep 2023 00:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePR5-0003jr-5T; Fri, 08 Sep 2023 00:33:23 +0000 Received: by outflank-mailman (input) for mailman id 597703; Fri, 08 Sep 2023 00:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePR4-0003ji-3S for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePR4-0000jp-2c for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePR4-0004BU-1n for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KoEYQTUVeau9E2wmwxxuUcE1RWt5v29CPUUwOailkig=; b=6MHLcVp5kydJ+ODJJact6ZRtTm pZ9tGJRfzR1ZjBNWB61LbMChc9u/CoLBaExuIeUFKg/oivlUMhqgbFPLkAE7JTVh2OS0BYTDuh7ZR dmT8KH/XH+sbU+4Fob/xYDPxLpWxnDpt8ftL6qQq5VzADe5ZxTEy+Nx/MkCJrGn4ZORM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm/device: Remove __init from function type Message-Id: Date: Fri, 08 Sep 2023 00:33:22 +0000 commit 9e9d2c079dc4d607930e3c86bfda214a66ad1695 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:13 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:24:27 2023 -0700 xen/arm/device: Remove __init from function type Remove __init from following function to access during runtime: 1. map_irq_to_domain() 2. handle_device_interrupts() 3. map_range_to_domain() 4. unflatten_dt_node() 5. handle_device() 6. map_device_children() 7. map_dt_irq_to_domain() Move map_irq_to_domain() prototype from domain_build.h to setup.h. Above changes will create an error on build as non-init function are still in domain_build.c file. So, to avoid build fails, following changes are done: 1. Move map_irq_to_domain(), handle_device_interrupts(), map_range_to_domain(), handle_device(), map_device_children() and map_dt_irq_to_domain() to device.c. After removing __init type, these functions are not specific to domain building, so moving them out of domain_build.c to device.c. 2. Remove static type from handle_device_interrupts(). Also, renamed handle_device_interrupts() to map_device_irqs_to_domain(). Overall, these changes are done to support the dynamic programming of a nodes where an overlay node will be added to fdt and unflattened node will be added to dt_host. Furthermore, IRQ and mmio mapping will be done for the added node. Signed-off-by: Vikram Garhwal Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/arch/arm/device.c | 294 +++++++++++++++++++++++++++++++ xen/arch/arm/domain_build.c | 295 +------------------------------- xen/arch/arm/include/asm/domain_build.h | 2 - xen/arch/arm/include/asm/setup.h | 9 + xen/common/device_tree.c | 12 +- 5 files changed, 310 insertions(+), 302 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index ca8539dee5..327e4d24fb 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -9,8 +9,10 @@ */ #include +#include #include #include +#include #include extern const struct device_desc _sdevice[], _edevice[]; @@ -75,6 +77,298 @@ enum device_class device_get_class(const struct dt_device_node *dev) return DEVICE_UNKNOWN; } +int map_irq_to_domain(struct domain *d, unsigned int irq, + bool need_mapping, const char *devname) +{ + int res; + + res = irq_permit_access(d, irq); + if ( res ) + { + printk(XENLOG_ERR "Unable to permit to %pd access to IRQ %u\n", d, irq); + return res; + } + + if ( need_mapping ) + { + /* + * Checking the return of vgic_reserve_virq is not + * necessary. It should not fail except when we try to map + * the IRQ twice. This can legitimately happen if the IRQ is shared + */ + vgic_reserve_virq(d, irq); + + res = route_irq_to_guest(d, irq, irq, devname); + if ( res < 0 ) + { + printk(XENLOG_ERR "Unable to map IRQ%u to %pd\n", irq, d); + return res; + } + } + + dt_dprintk(" - IRQ: %u\n", irq); + return 0; +} + +int map_range_to_domain(const struct dt_device_node *dev, + uint64_t addr, uint64_t len, void *data) +{ + struct map_range_data *mr_data = data; + struct domain *d = mr_data->d; + int res; + + if ( (addr != (paddr_t)addr) || (((paddr_t)~0 - addr) < len) ) + { + printk(XENLOG_ERR "%s: [0x%"PRIx64", 0x%"PRIx64"] exceeds the maximum allowed PA width (%u bits)", + dt_node_full_name(dev), addr, (addr + len), PADDR_BITS); + return -ERANGE; + } + + /* + * reserved-memory regions are RAM carved out for a special purpose. + * They are not MMIO and therefore a domain should not be able to + * manage them via the IOMEM interface. + */ + if ( strncasecmp(dt_node_full_name(dev), "/reserved-memory/", + strlen("/reserved-memory/")) != 0 ) + { + res = iomem_permit_access(d, paddr_to_pfn(addr), + paddr_to_pfn(PAGE_ALIGN(addr + len - 1))); + if ( res ) + { + printk(XENLOG_ERR "Unable to permit to dom%d access to" + " 0x%"PRIx64" - 0x%"PRIx64"\n", + d->domain_id, + addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1); + return res; + } + } + + if ( !mr_data->skip_mapping ) + { + res = map_regions_p2mt(d, + gaddr_to_gfn(addr), + PFN_UP(len), + maddr_to_mfn(addr), + mr_data->p2mt); + + if ( res < 0 ) + { + printk(XENLOG_ERR "Unable to map 0x%"PRIx64 + " - 0x%"PRIx64" in domain %d\n", + addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1, + d->domain_id); + return res; + } + } + + dt_dprintk(" - MMIO: %010"PRIx64" - %010"PRIx64" P2MType=%x\n", + addr, addr + len, mr_data->p2mt); + + return 0; +} + +/* + * map_device_irqs_to_domain retrieves the interrupts configuration from + * a device tree node and maps those interrupts to the target domain. + * + * Returns: + * < 0 error + * 0 success + */ +int map_device_irqs_to_domain(struct domain *d, + struct dt_device_node *dev, + bool need_mapping) +{ + unsigned int i, nirq; + int res; + struct dt_raw_irq rirq; + + nirq = dt_number_of_irq(dev); + + /* Give permission and map IRQs */ + for ( i = 0; i < nirq; i++ ) + { + res = dt_device_get_raw_irq(dev, i, &rirq); + if ( res ) + { + printk(XENLOG_ERR "Unable to retrieve irq %u for %s\n", + i, dt_node_full_name(dev)); + return res; + } + + /* + * Don't map IRQ that have no physical meaning + * ie: IRQ whose controller is not the GIC + */ + if ( rirq.controller != dt_interrupt_controller ) + { + dt_dprintk("irq %u not connected to primary controller. Connected to %s\n", + i, dt_node_full_name(rirq.controller)); + continue; + } + + res = platform_get_irq(dev, i); + if ( res < 0 ) + { + printk(XENLOG_ERR "Unable to get irq %u for %s\n", + i, dt_node_full_name(dev)); + return res; + } + + res = map_irq_to_domain(d, res, need_mapping, dt_node_name(dev)); + if ( res ) + return res; + } + + return 0; +} + +static int map_dt_irq_to_domain(const struct dt_device_node *dev, + const struct dt_irq *dt_irq, + void *data) +{ + struct map_range_data *mr_data = data; + struct domain *d = mr_data->d; + unsigned int irq = dt_irq->irq; + int res; + + if ( irq < NR_LOCAL_IRQS ) + { + printk(XENLOG_ERR "%s: IRQ%u is not a SPI\n", dt_node_name(dev), irq); + return -EINVAL; + } + + /* Setup the IRQ type */ + res = irq_set_spi_type(irq, dt_irq->type); + if ( res ) + { + printk(XENLOG_ERR "%s: Unable to setup IRQ%u to %pd\n", + dt_node_name(dev), irq, d); + return res; + } + + res = map_irq_to_domain(d, irq, !mr_data->skip_mapping, dt_node_name(dev)); + + return res; +} + +/* + * For a node which describes a discoverable bus (such as a PCI bus) + * then we may need to perform additional mappings in order to make + * the child resources available to domain 0. + */ +static int map_device_children(const struct dt_device_node *dev, + struct map_range_data *mr_data) +{ + if ( dt_device_type_is_equal(dev, "pci") ) + { + int ret; + + dt_dprintk("Mapping children of %s to guest\n", + dt_node_full_name(dev)); + + ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, mr_data); + if ( ret < 0 ) + return ret; + + ret = dt_for_each_range(dev, &map_range_to_domain, mr_data); + if ( ret < 0 ) + return ret; + } + + return 0; +} + +/* + * For a given device node: + * - Give permission to the guest to manage IRQ and MMIO range + * - Retrieve the IRQ configuration (i.e edge/level) from device tree + * When the device is not marked for guest passthrough: + * - Try to call iommu_add_dt_device to protect the device by an IOMMU + * - Assign the device to the guest if it's protected by an IOMMU + * - Map the IRQs and iomem regions to DOM0 + */ +int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt) +{ + unsigned int naddr; + unsigned int i; + int res; + paddr_t addr, size; + bool own_device = !dt_device_for_passthrough(dev); + /* + * We want to avoid mapping the MMIO in dom0 for the following cases: + * - The device is owned by dom0 (i.e. it has been flagged for + * passthrough). + * - PCI host bridges with driver in Xen. They will later be mapped by + * pci_host_bridge_mappings(). + */ + struct map_range_data mr_data = { + .d = d, + .p2mt = p2mt, + .skip_mapping = !own_device || + (is_pci_passthrough_enabled() && + (device_get_class(dev) == DEVICE_PCI_HOSTBRIDGE)) + }; + + naddr = dt_number_of_address(dev); + + dt_dprintk("%s passthrough = %d naddr = %u\n", + dt_node_full_name(dev), own_device, naddr); + + if ( own_device ) + { + dt_dprintk("Check if %s is behind the IOMMU and add it\n", + dt_node_full_name(dev)); + + res = iommu_add_dt_device(dev); + if ( res < 0 ) + { + printk(XENLOG_ERR "Failed to add %s to the IOMMU\n", + dt_node_full_name(dev)); + return res; + } + + if ( dt_device_is_protected(dev) ) + { + dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); + res = iommu_assign_dt_device(d, dev); + if ( res ) + { + printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", + dt_node_full_name(dev)); + return res; + } + } + } + + res = map_device_irqs_to_domain(d, dev, own_device); + if ( res < 0 ) + return res; + + /* Give permission and map MMIOs */ + for ( i = 0; i < naddr; i++ ) + { + res = dt_device_get_paddr(dev, i, &addr, &size); + if ( res ) + { + printk(XENLOG_ERR "Unable to retrieve address %u for %s\n", + i, dt_node_full_name(dev)); + return res; + } + + res = map_range_to_domain(dev, addr, size, &mr_data); + if ( res ) + return res; + } + + res = map_device_children(dev, &mr_data); + if ( res ) + return res; + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 54bf5623c8..ff4fc30769 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2293,299 +2293,6 @@ int __init make_chosen_node(const struct kernel_info *kinfo) return res; } -int __init map_irq_to_domain(struct domain *d, unsigned int irq, - bool need_mapping, const char *devname) -{ - int res; - - res = irq_permit_access(d, irq); - if ( res ) - { - printk(XENLOG_ERR "Unable to permit to %pd access to IRQ %u\n", d, irq); - return res; - } - - if ( need_mapping ) - { - /* - * Checking the return of vgic_reserve_virq is not - * necessary. It should not fail except when we try to map - * the IRQ twice. This can legitimately happen if the IRQ is shared - */ - vgic_reserve_virq(d, irq); - - res = route_irq_to_guest(d, irq, irq, devname); - if ( res < 0 ) - { - printk(XENLOG_ERR "Unable to map IRQ%u to %pd\n", irq, d); - return res; - } - } - - dt_dprintk(" - IRQ: %u\n", irq); - return 0; -} - -static int __init map_dt_irq_to_domain(const struct dt_device_node *dev, - const struct dt_irq *dt_irq, - void *data) -{ - struct map_range_data *mr_data = data; - struct domain *d = mr_data->d; - unsigned int irq = dt_irq->irq; - int res; - - if ( irq < NR_LOCAL_IRQS ) - { - printk(XENLOG_ERR "%s: IRQ%u is not a SPI\n", dt_node_name(dev), irq); - return -EINVAL; - } - - /* Setup the IRQ type */ - res = irq_set_spi_type(irq, dt_irq->type); - if ( res ) - { - printk(XENLOG_ERR "%s: Unable to setup IRQ%u to %pd\n", - dt_node_name(dev), irq, d); - return res; - } - - res = map_irq_to_domain(d, irq, !mr_data->skip_mapping, dt_node_name(dev)); - - return res; -} - -int __init map_range_to_domain(const struct dt_device_node *dev, - uint64_t addr, uint64_t len, void *data) -{ - struct map_range_data *mr_data = data; - struct domain *d = mr_data->d; - int res; - - if ( (addr != (paddr_t)addr) || (((paddr_t)~0 - addr) < len) ) - { - printk(XENLOG_ERR "%s: [0x%"PRIx64", 0x%"PRIx64"] exceeds the maximum allowed PA width (%u bits)", - dt_node_full_name(dev), addr, (addr + len), PADDR_BITS); - return -ERANGE; - } - - /* - * reserved-memory regions are RAM carved out for a special purpose. - * They are not MMIO and therefore a domain should not be able to - * manage them via the IOMEM interface. - */ - if ( strncasecmp(dt_node_full_name(dev), "/reserved-memory/", - strlen("/reserved-memory/")) != 0 ) - { - res = iomem_permit_access(d, paddr_to_pfn(addr), - paddr_to_pfn(PAGE_ALIGN(addr + len - 1))); - if ( res ) - { - printk(XENLOG_ERR "Unable to permit to dom%d access to" - " 0x%"PRIx64" - 0x%"PRIx64"\n", - d->domain_id, - addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1); - return res; - } - } - - if ( !mr_data->skip_mapping ) - { - res = map_regions_p2mt(d, - gaddr_to_gfn(addr), - PFN_UP(len), - maddr_to_mfn(addr), - mr_data->p2mt); - - if ( res < 0 ) - { - printk(XENLOG_ERR "Unable to map 0x%"PRIx64 - " - 0x%"PRIx64" in domain %d\n", - addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1, - d->domain_id); - return res; - } - } - - dt_dprintk(" - MMIO: %010"PRIx64" - %010"PRIx64" P2MType=%x\n", - addr, addr + len, mr_data->p2mt); - - return 0; -} - -/* - * For a node which describes a discoverable bus (such as a PCI bus) - * then we may need to perform additional mappings in order to make - * the child resources available to domain 0. - */ -static int __init map_device_children(const struct dt_device_node *dev, - struct map_range_data *mr_data) -{ - if ( dt_device_type_is_equal(dev, "pci") ) - { - int ret; - - dt_dprintk("Mapping children of %s to guest\n", - dt_node_full_name(dev)); - - ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, mr_data); - if ( ret < 0 ) - return ret; - - ret = dt_for_each_range(dev, &map_range_to_domain, mr_data); - if ( ret < 0 ) - return ret; - } - - return 0; -} - -/* - * handle_device_interrupts retrieves the interrupts configuration from - * a device tree node and maps those interrupts to the target domain. - * - * Returns: - * < 0 error - * 0 success - */ -static int __init handle_device_interrupts(struct domain *d, - struct dt_device_node *dev, - bool need_mapping) -{ - unsigned int i, nirq; - int res; - struct dt_raw_irq rirq; - - nirq = dt_number_of_irq(dev); - - /* Give permission and map IRQs */ - for ( i = 0; i < nirq; i++ ) - { - res = dt_device_get_raw_irq(dev, i, &rirq); - if ( res ) - { - printk(XENLOG_ERR "Unable to retrieve irq %u for %s\n", - i, dt_node_full_name(dev)); - return res; - } - - /* - * Don't map IRQ that have no physical meaning - * ie: IRQ whose controller is not the GIC - */ - if ( rirq.controller != dt_interrupt_controller ) - { - dt_dprintk("irq %u not connected to primary controller. Connected to %s\n", - i, dt_node_full_name(rirq.controller)); - continue; - } - - res = platform_get_irq(dev, i); - if ( res < 0 ) - { - printk(XENLOG_ERR "Unable to get irq %u for %s\n", - i, dt_node_full_name(dev)); - return res; - } - - res = map_irq_to_domain(d, res, need_mapping, dt_node_name(dev)); - if ( res ) - return res; - } - - return 0; -} - -/* - * For a given device node: - * - Give permission to the guest to manage IRQ and MMIO range - * - Retrieve the IRQ configuration (i.e edge/level) from device tree - * When the device is not marked for guest passthrough: - * - Try to call iommu_add_dt_device to protect the device by an IOMMU - * - Assign the device to the guest if it's protected by an IOMMU - * - Map the IRQs and iomem regions to DOM0 - */ -static int __init handle_device(struct domain *d, struct dt_device_node *dev, - p2m_type_t p2mt) -{ - unsigned int naddr; - unsigned int i; - int res; - paddr_t addr, size; - bool own_device = !dt_device_for_passthrough(dev); - /* - * We want to avoid mapping the MMIO in dom0 for the following cases: - * - The device is owned by dom0 (i.e. it has been flagged for - * passthrough). - * - PCI host bridges with driver in Xen. They will later be mapped by - * pci_host_bridge_mappings(). - */ - struct map_range_data mr_data = { - .d = d, - .p2mt = p2mt, - .skip_mapping = !own_device || - (is_pci_passthrough_enabled() && - (device_get_class(dev) == DEVICE_PCI_HOSTBRIDGE)) - }; - - naddr = dt_number_of_address(dev); - - dt_dprintk("%s passthrough = %d naddr = %u\n", - dt_node_full_name(dev), own_device, naddr); - - if ( own_device ) - { - dt_dprintk("Check if %s is behind the IOMMU and add it\n", - dt_node_full_name(dev)); - - res = iommu_add_dt_device(dev); - if ( res < 0 ) - { - printk(XENLOG_ERR "Failed to add %s to the IOMMU\n", - dt_node_full_name(dev)); - return res; - } - - if ( dt_device_is_protected(dev) ) - { - dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); - res = iommu_assign_dt_device(d, dev); - if ( res ) - { - printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", - dt_node_full_name(dev)); - return res; - } - } - } - - res = handle_device_interrupts(d, dev, own_device); - if ( res < 0 ) - return res; - - /* Give permission and map MMIOs */ - for ( i = 0; i < naddr; i++ ) - { - res = dt_device_get_paddr(dev, i, &addr, &size); - if ( res ) - { - printk(XENLOG_ERR "Unable to retrieve address %u for %s\n", - i, dt_node_full_name(dev)); - return res; - } - - res = map_range_to_domain(dev, addr, size, &mr_data); - if ( res ) - return res; - } - - res = map_device_children(dev, &mr_data); - if ( res ) - return res; - - return 0; -} - static int __init handle_node(struct domain *d, struct kernel_info *kinfo, struct dt_device_node *node, p2m_type_t p2mt) @@ -3038,7 +2745,7 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, return -EINVAL; } - res = handle_device_interrupts(kinfo->d, node, true); + res = map_device_irqs_to_domain(kinfo->d, node, true); if ( res < 0 ) return res; diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 34ceddc995..b9329c9ee0 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -4,8 +4,6 @@ #include #include -int map_irq_to_domain(struct domain *d, unsigned int irq, - bool need_mapping, const char *devname); int make_chosen_node(const struct kernel_info *kinfo); void evtchn_allocate(struct domain *d); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 19dc637d55..6cda3e4039 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -165,6 +165,15 @@ void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, u32 dflt); +int handle_device(struct domain *d, struct dt_device_node *dev, + p2m_type_t p2mt); + +int map_device_irqs_to_domain(struct domain *d, struct dt_device_node *dev, + bool need_mapping); + +int map_irq_to_domain(struct domain *d, unsigned int irq, + bool need_mapping, const char *devname); + int map_range_to_domain(const struct dt_device_node *dev, uint64_t addr, uint64_t len, void *data); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index b6d9f018c6..fccf98f94e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1847,12 +1847,12 @@ int dt_count_phandle_with_args(const struct dt_device_node *np, * @allnextpp: pointer to ->allnext from last allocated device_node * @fpsize: Size of the node path up at the current depth. */ -static unsigned long __init unflatten_dt_node(const void *fdt, - unsigned long mem, - unsigned long *p, - struct dt_device_node *dad, - struct dt_device_node ***allnextpp, - unsigned long fpsize) +static unsigned long unflatten_dt_node(const void *fdt, + unsigned long mem, + unsigned long *p, + struct dt_device_node *dad, + struct dt_device_node ***allnextpp, + unsigned long fpsize) { struct dt_device_node *np; struct dt_property *pp, **prev_pp = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:33:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597704.931963 (Exim 4.92) (envelope-from ) id 1qePRF-0003nA-Ba; Fri, 08 Sep 2023 00:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597704.931963; Fri, 08 Sep 2023 00:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRF-0003n2-8t; Fri, 08 Sep 2023 00:33:33 +0000 Received: by outflank-mailman (input) for mailman id 597704; Fri, 08 Sep 2023 00:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRE-0003mc-6h for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRE-0000lT-5s for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePRE-0004Bv-52 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=M3ZvC1SVD0QZRq/1evyZxOk6cuFvkFdJsFLyc4EKGx8=; b=wwvwPOrWz/9d0ggyM1hmtrtdBy rfSNWxiQdAy9nJPJfVnqufI8GhuHPkAisZMTwb4y6ZOVt82yzvrH+gLK8q+QMelJmfz64xKwrOjCb 9i1YAWgzXMJMG1TercfZ+/s46JI7l2e2zyzWP2EneR+uHkvJJzJT1jUaBgIAPjzVtlvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common/device_tree: Export __unflatten_device_tree() Message-Id: Date: Fri, 08 Sep 2023 00:33:32 +0000 commit 8c614471f62f785ff9fd7d0b4d7a0d66e2bfc434 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:14 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:24:55 2023 -0700 common/device_tree: Export __unflatten_device_tree() Following changes are done to __unflatten_device_tree(): 1. __unflatten_device_tree() is renamed to unflatten_device_tree(). 2. Remove __init and static function type. The changes are done to make this function useable for dynamic node programming where new device tree overlay nodes are added to fdt and further unflattend to update xen device tree during runtime. Signed-off-by: Vikram Garhwal Acked-by: Julien Grall --- xen/common/device_tree.c | 19 +++---------------- xen/include/xen/device_tree.h | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index fccf98f94e..b8ef1c7ae2 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -2082,20 +2082,7 @@ static unsigned long unflatten_dt_node(const void *fdt, return mem; } -/** - * __unflatten_device_tree - create tree of device_nodes from flat blob - * - * unflattens a device-tree, creating the - * tree of struct device_node. It also fills the "name" and "type" - * pointers of the nodes so the normal device-tree walking functions - * can be used. - * @fdt: The fdt to expand - * @mynodes: The device_node tree created by the call - * - * Returns 0 on success and a negative number on error - */ -static int __init __unflatten_device_tree(const void *fdt, - struct dt_device_node **mynodes) +int unflatten_device_tree(const void *fdt, struct dt_device_node **mynodes) { unsigned long start, mem, size; struct dt_device_node **allnextp = mynodes; @@ -2234,10 +2221,10 @@ dt_find_interrupt_controller(const struct dt_device_match *matches) void __init dt_unflatten_host_device_tree(void) { - int error = __unflatten_device_tree(device_tree_flattened, &dt_host); + int error = unflatten_device_tree(device_tree_flattened, &dt_host); if ( error ) - panic("__unflatten_device_tree failed with error %d\n", error); + panic("unflatten_device_tree failed with error %d\n", error); dt_alias_scan(); } diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 1d79e23b28..a518310a62 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -178,6 +178,20 @@ int device_tree_for_each_node(const void *fdt, int node, */ void dt_unflatten_host_device_tree(void); +/** + * unflatten_device_tree - create tree of device_nodes from flat blob + * + * unflattens a device-tree, creating the + * tree of struct device_node. It also fills the "name" and "type" + * pointers of the nodes so the normal device-tree walking functions + * can be used. + * @fdt: The fdt to expand + * @mynodes: The device_node tree created by the call + * + * Returns 0 on success and a negative number on error + */ +int unflatten_device_tree(const void *fdt, struct dt_device_node **mynodes); + /** * IRQ translation callback * TODO: For the moment we assume that we only have ONE -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:33:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597705.931966 (Exim 4.92) (envelope-from ) id 1qePRP-0003q1-Cq; Fri, 08 Sep 2023 00:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597705.931966; Fri, 08 Sep 2023 00:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRP-0003ps-AK; Fri, 08 Sep 2023 00:33:43 +0000 Received: by outflank-mailman (input) for mailman id 597705; Fri, 08 Sep 2023 00:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRO-0003pi-A8 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRO-0000lt-9Q for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePRO-0004Dt-87 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IsiQCehDEXMKMxI/FyRLbsmwI5JjxeXAyYxOotYNLkA=; b=1EWwQvKmOJLmuUexQsu3Q8l2VZ EMAJFCY89bqwu9mSsHw8dCju+PgdN1/R48iu3+CNxP/GTzKD9k1XK1cTtzDMcFs9dIw3IZfSEYPQX IH6cYb1en+8+satwLCTNrYE2PXWRJEH4VdB7cl+QNJ7QnOqaXkCM5R6UQDu6BgqrVM14=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add CONFIG_OVERLAY_DTB Message-Id: Date: Fri, 08 Sep 2023 00:33:42 +0000 commit 427b6a571cd275015c201abd5b6a7843452d95a0 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:15 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:25:03 2023 -0700 xen/arm: Add CONFIG_OVERLAY_DTB Introduce a config option where the user can enable support for adding/removing device tree nodes using a device tree binary overlay. Update SUPPORT.md and CHANGELOG.md to state the Device Tree Overlays support for Arm. Signed-off-by: Vikram Garhwal Acked-by: Henry Wang Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- CHANGELOG.md | 2 ++ SUPPORT.md | 6 ++++++ xen/arch/arm/Kconfig | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2516526589..24636b8eaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - On Arm, add suport for Firmware Framework for Arm A-profile (FF-A) Mediator (Tech Preview) - Add Intel Hardware P-States (HWP) cpufreq driver. + - On Arm, experimental support for dynamic addition/removal of Xen device tree + nodes using a device tree overlay binary (.dtbo). ### Removed - On x86, the "pku" command line option has been removed. It has never diff --git a/SUPPORT.md b/SUPPORT.md index 6ce0ec29b0..3461f5cf2f 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -855,6 +855,12 @@ xen/arch/arm/tee/ffa.c for limitations. Status: Supported +### Device Tree Overlays + +Add/Remove device tree nodes using a device tree overlay binary (.dtbo). + + Status, ARM: Experimental + ### ARM: Guest ACPI support Status: Supported diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 57bd1d01d7..650aca99ac 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -92,6 +92,11 @@ config HAS_ITS bool "GICv3 ITS MSI controller support (UNSUPPORTED)" if UNSUPPORTED depends on GICV3 && !NEW_VGIC && !ARM_32 +config OVERLAY_DTB + bool "DTB overlay support (UNSUPPORTED)" if UNSUPPORTED + help + Dynamic addition/removal of Xen device tree nodes using a dtbo. + config HVM def_bool y -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:33:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597706.931970 (Exim 4.92) (envelope-from ) id 1qePRZ-0003sT-EK; Fri, 08 Sep 2023 00:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597706.931970; Fri, 08 Sep 2023 00: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 1qePRZ-0003sM-Bo; Fri, 08 Sep 2023 00:33:53 +0000 Received: by outflank-mailman (input) for mailman id 597706; Fri, 08 Sep 2023 00:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRY-0003sD-D7 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRY-0000m0-CQ for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePRY-0004EM-BW for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00: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=OdawoHEOAVHsLIj9pVWSVl8d2m4EBJpwpmNKKIlLhWY=; b=KVS/IsQXZDprBaJHsjdNvoLH8C 9an0jgmandtgTPu576+ceG4XrEaRzr+5lJuVNhRTvUi1PGA0SzraV0e6In49HhRj4Zco8UDOYebOu TLlZsTGTS35Yzm5NtrSrtDrsreF7PL2c1dsK14xva4ckmkpf9IutlX14wKj0Ppl3Wt1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libfdt: Keep fdt functions after init for CONFIG_OVERLAY_DTB. Message-Id: Date: Fri, 08 Sep 2023 00:33:52 +0000 commit 6235b83ebaa230f1804631d1dd109e2ed7db7d73 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:16 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:25:14 2023 -0700 libfdt: Keep fdt functions after init for CONFIG_OVERLAY_DTB. This is done to access fdt library function which are required for adding device tree overlay nodes for dynamic programming of nodes. Signed-off-by: Vikram Garhwal Acked-by: Julien Grall --- xen/common/libfdt/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile index 75aaefa2e3..d50487aa6e 100644 --- a/xen/common/libfdt/Makefile +++ b/xen/common/libfdt/Makefile @@ -1,7 +1,11 @@ include $(src)/Makefile.libfdt SECTIONS := text data $(SPECIAL_DATA_SECTIONS) + +# For CONFIG_OVERLAY_DTB, libfdt functionalities will be needed during runtime. +ifneq ($(CONFIG_OVERLAY_DTB),y) OBJCOPYFLAGS := $(foreach s,$(SECTIONS),--rename-section .$(s)=.init.$(s)) +endif obj-y += libfdt.o nocov-y += libfdt.o -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:34:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597707.931975 (Exim 4.92) (envelope-from ) id 1qePRj-0003vZ-Fx; Fri, 08 Sep 2023 00:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597707.931975; Fri, 08 Sep 2023 00: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 1qePRj-0003vR-DH; Fri, 08 Sep 2023 00:34:03 +0000 Received: by outflank-mailman (input) for mailman id 597707; Fri, 08 Sep 2023 00:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRi-0003vG-Gn for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRi-0000mK-G5 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePRi-0004Eu-Ee for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00: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=zWPbusNdr+1zaeoWFb1Em2H058nnbY5Mh+Le8kCvKD4=; b=i1NJxR7NrXfFK0gNmobSUlcVAX R+RHzqsB3kCSWAGnEzfYWO/sOE85r7AagRxd5a2xsYKaf1fjYFaz3R7Mft2CYikXnFtkopHkOO//c XpewevJAbKnw4H7DZlSwo25r0oGieF2Ri0N5/t0x8rYIVBOALlK4yIKZVpaiGcpq+4Io=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libfdt: overlay: change overlay_get_target() Message-Id: Date: Fri, 08 Sep 2023 00:34:02 +0000 commit d434dc4ac182a69ca83156cae129dc3f2a092fdf Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:17 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:25:25 2023 -0700 libfdt: overlay: change overlay_get_target() Rename overlay_get_target() to fdt_overlay_target_offset() and remove static function type. This is done to get the target path for the overlay nodes which is very useful in many cases. For example, Xen hypervisor needs it when applying overlays because Xen needs to do further processing of the overlay nodes, e.g. mapping of resources(IRQs and IOMMUs) to other VMs, creation of SMMU pagetables, etc. Signed-off-by: Vikram Garhwal Message-Id: <1637204036-382159-2-git-send-email-fnu.vikram@xilinx.com> Signed-off-by: David Gibson Origin: git://git.kernel.org/pub/scm/utils/dtc/dtc.git 45f3d1a095dd Signed-off-by: Vikram Garhwal Reviewed-by: Michal Orzel Reviewed-by: Henry Wang Acked-by: Juline Grall --- xen/common/libfdt/fdt_overlay.c | 29 +++++++---------------------- xen/common/libfdt/version.lds | 1 + xen/include/xen/libfdt/libfdt.h | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/xen/common/libfdt/fdt_overlay.c b/xen/common/libfdt/fdt_overlay.c index 7b95e2b639..acf0c4c2a6 100644 --- a/xen/common/libfdt/fdt_overlay.c +++ b/xen/common/libfdt/fdt_overlay.c @@ -41,37 +41,22 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment) return fdt32_to_cpu(*val); } -/** - * overlay_get_target - retrieves the offset of a fragment's target - * @fdt: Base device tree blob - * @fdto: Device tree overlay blob - * @fragment: node offset of the fragment in the overlay - * @pathp: pointer which receives the path of the target (or NULL) - * - * overlay_get_target() retrieves the target offset in the base - * device tree of a fragment, no matter how the actual targeting is - * done (through a phandle or a path) - * - * returns: - * the targeted node offset in the base device tree - * Negative error code on error - */ -static int overlay_get_target(const void *fdt, const void *fdto, - int fragment, char const **pathp) +int fdt_overlay_target_offset(const void *fdt, const void *fdto, + int fragment_offset, char const **pathp) { uint32_t phandle; const char *path = NULL; int path_len = 0, ret; /* Try first to do a phandle based lookup */ - phandle = overlay_get_target_phandle(fdto, fragment); + phandle = overlay_get_target_phandle(fdto, fragment_offset); if (phandle == (uint32_t)-1) return -FDT_ERR_BADPHANDLE; /* no phandle, try path */ if (!phandle) { /* And then a path based lookup */ - path = fdt_getprop(fdto, fragment, "target-path", &path_len); + path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len); if (path) ret = fdt_path_offset(fdt, path); else @@ -638,7 +623,7 @@ static int overlay_merge(void *fdt, void *fdto) if (overlay < 0) return overlay; - target = overlay_get_target(fdt, fdto, fragment, NULL); + target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL); if (target < 0) return target; @@ -781,7 +766,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) return -FDT_ERR_BADOVERLAY; /* get the target of the fragment */ - ret = overlay_get_target(fdt, fdto, fragment, &target_path); + ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path); if (ret < 0) return ret; target = ret; @@ -803,7 +788,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) if (!target_path) { /* again in case setprop_placeholder changed it */ - ret = overlay_get_target(fdt, fdto, fragment, &target_path); + ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path); if (ret < 0) return ret; target = ret; diff --git a/xen/common/libfdt/version.lds b/xen/common/libfdt/version.lds index 7ab85f1d9d..cbce5d4a8b 100644 --- a/xen/common/libfdt/version.lds +++ b/xen/common/libfdt/version.lds @@ -77,6 +77,7 @@ LIBFDT_1.2 { fdt_appendprop_addrrange; fdt_setprop_inplace_namelen_partial; fdt_create_with_flags; + fdt_overlay_target_offset; local: *; }; diff --git a/xen/include/xen/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h index c71689e2be..fabddbee8c 100644 --- a/xen/include/xen/libfdt/libfdt.h +++ b/xen/include/xen/libfdt/libfdt.h @@ -2109,6 +2109,24 @@ int fdt_del_node(void *fdt, int nodeoffset); */ int fdt_overlay_apply(void *fdt, void *fdto); +/** + * fdt_overlay_target_offset - retrieves the offset of a fragment's target + * @fdt: Base device tree blob + * @fdto: Device tree overlay blob + * @fragment_offset: node offset of the fragment in the overlay + * @pathp: pointer which receives the path of the target (or NULL) + * + * fdt_overlay_target_offset() retrieves the target offset in the base + * device tree of a fragment, no matter how the actual targeting is + * done (through a phandle or a path) + * + * returns: + * the targeted node offset in the base device tree + * Negative error code on error + */ +int fdt_overlay_target_offset(const void *fdt, const void *fdto, + int fragment_offset, char const **pathp); + /**********************************************************************/ /* Debugging / informational functions */ /**********************************************************************/ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:34:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:34:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597708.931979 (Exim 4.92) (envelope-from ) id 1qePRu-0003yT-HY; Fri, 08 Sep 2023 00:34:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597708.931979; Fri, 08 Sep 2023 00: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 1qePRu-0003yM-Ej; Fri, 08 Sep 2023 00:34:14 +0000 Received: by outflank-mailman (input) for mailman id 597708; Fri, 08 Sep 2023 00:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRs-0003y3-K2 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePRs-0000mW-JJ for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePRs-0004Fh-II for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00: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=vQZKUY5kHq0R9v7d0ugfS3w4ChE6ct59qvSrLEOR05M=; b=wt3QDKKUtfEGWxvIM2OBmjItYN r53xHE+9VTbB8q4Ow5LZFpIUM6xyoAH6u90ccmYc0r0WFyvtQ+TM7f9n7Mp35gGUP5Pyirqi6sS5/ VyTw36CDlI5bTlNYAM1b+D4l+nSZdkXmXRQkzKDuHhdd9Jhwlq8WK/eCWz23zVXoYBoQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/device-tree: Add dt_find_node_by_path_from() to find nodes in device tree Message-Id: Date: Fri, 08 Sep 2023 00:34:12 +0000 commit 25141fed24e0e1a23fa3fef6195d640318c21e64 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:18 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:25:44 2023 -0700 xen/device-tree: Add dt_find_node_by_path_from() to find nodes in device tree Add dt_find_node_by_path_from() to find a matching node with path for a dt_device_node. Reason behind this function: Each time overlay nodes are added using .dtbo, a new fdt (memcpy of device_tree_flattened) is created and updated with overlay nodes. This updated fdt is further unflattened to a dt_host_new. Next, we need to find the overlay nodes in dt_host_new, find the overlay node's parent in dt_host and add the nodes as child under their parent in the dt_host. Thus we need this function to search for node in different unflattened device trees. Also, make dt_find_node_by_path() static inline. Signed-off-by: Vikram Garhwal Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/common/device_tree.c | 5 +++-- xen/include/xen/device_tree.h | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index b8ef1c7ae2..f38f51ec0b 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -358,11 +358,12 @@ struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from, return np; } -struct dt_device_node *dt_find_node_by_path(const char *path) +struct dt_device_node *dt_find_node_by_path_from(struct dt_device_node *from, + const char *path) { struct dt_device_node *np; - dt_for_each_device_node(dt_host, np) + dt_for_each_device_node(from, np) if ( np->full_name && (dt_node_cmp(np->full_name, path) == 0) ) break; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index a518310a62..44d315c8ba 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -570,13 +570,26 @@ struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from, struct dt_device_node *dt_find_node_by_alias(const char *alias); /** - * dt_find_node_by_path - Find a node matching a full DT path + * dt_find_node_by_path_from - Generic function to find a node matching the + * full DT path for any given unflatten device tree + * @from: The device tree node to start searching from * @path: The full path to match * * Returns a node pointer. */ -struct dt_device_node *dt_find_node_by_path(const char *path); +struct dt_device_node *dt_find_node_by_path_from(struct dt_device_node *from, + const char *path); +/** + * dt_find_node_by_path - Find a node matching a full DT path in dt_host + * @path: The full path to match + * + * Returns a node pointer. + */ +static inline struct dt_device_node *dt_find_node_by_path(const char *path) +{ + return dt_find_node_by_path_from(dt_host, path); +} /** * dt_find_node_by_gpath - Same as dt_find_node_by_path but retrieve the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:34:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:34:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597710.931982 (Exim 4.92) (envelope-from ) id 1qePS4-000414-J2; Fri, 08 Sep 2023 00:34:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597710.931982; Fri, 08 Sep 2023 00: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 1qePS4-00040x-GW; Fri, 08 Sep 2023 00:34:24 +0000 Received: by outflank-mailman (input) for mailman id 597710; Fri, 08 Sep 2023 00:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePS2-00040j-N3 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePS2-0000md-MK for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePS2-0004GW-LU for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00: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=24B8wtB2psxlMk3svG7lMPpRfRPA2pQ190azE2XfjLI=; b=24HqcRBt7hkxYj7LrQDLxlUwFt VUNAkf5G+nVzA539nviM6lZd96HerncXhmJNkHRSINp8s+olEDdJzJJBml9R5joatFqA18VNuzFDO BfiSud706Jj9z8gsCzHbXTWmOzqbSWd/8Unp524M8HaVz13+HMXRQXFDfWlkrH60Crv8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/iommu: Move spin_lock from iommu_dt_device_is_assigned to caller Message-Id: Date: Fri, 08 Sep 2023 00:34:22 +0000 commit bd4ce8f7e054d537e128bd02f57cbf7347bca91a Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:19 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:25:56 2023 -0700 xen/iommu: Move spin_lock from iommu_dt_device_is_assigned to caller Rename iommu_dt_device_is_assigned() to iommu_dt_device_is_assigned_locked(). Moving spin_lock to caller was done to prevent the concurrent access to iommu_dt_device_is_assigned while doing add/remove/assign/deassign. Follow-up patches in this series introduces node add/remove feature. Signed-off-by: Vikram Garhwal Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/drivers/passthrough/device_tree.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 3c0322c797..a7d86a20a0 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -83,16 +83,16 @@ fail: return rc; } -static bool iommu_dt_device_is_assigned(const struct dt_device_node *dev) +static bool iommu_dt_device_is_assigned_locked(const struct dt_device_node *dev) { bool assigned = false; + ASSERT(spin_is_locked(&dtdevs_lock)); + if ( !dt_device_is_protected(dev) ) return 0; - spin_lock(&dtdevs_lock); assigned = !list_empty(&dev->domain_list); - spin_unlock(&dtdevs_lock); return assigned; } @@ -225,12 +225,16 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, if ( domctl->cmd == XEN_DOMCTL_test_assign_device ) { - if ( iommu_dt_device_is_assigned(dev) ) + spin_lock(&dtdevs_lock); + + if ( iommu_dt_device_is_assigned_locked(dev) ) { printk(XENLOG_G_ERR "%s already assigned.\n", dt_node_full_name(dev)); ret = -EINVAL; } + + spin_unlock(&dtdevs_lock); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:34:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:34:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597711.931987 (Exim 4.92) (envelope-from ) id 1qePSE-000444-MT; Fri, 08 Sep 2023 00:34:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597711.931987; Fri, 08 Sep 2023 00: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 1qePSE-00043x-Jf; Fri, 08 Sep 2023 00:34:34 +0000 Received: by outflank-mailman (input) for mailman id 597711; Fri, 08 Sep 2023 00:34:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSC-00043p-Q9 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSC-0000mm-PN for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePSC-0004HU-OV for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00: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=2iu+4YHM90v+J+V9Zp/xLEG/wjq3FgzBHr66sp4No7k=; b=3wiEUhcslWaQy+vKwf8ruansxb Dv+slX8H9TmP8HYiKacnILjq+wLFgGy3+qZ8ysOCxS3W8d2fjg90YApWIWMioL3ksTBV2pEJOjaoo /nPhRWY6g/J7plVEHiMAz5zA9lGPnyMAiP4Kggspp/rLzk9MuQicq7DdCLhLPCbUT0to=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/iommu: protect iommu_add_dt_device() with dtdevs_lock Message-Id: Date: Fri, 08 Sep 2023 00:34:32 +0000 commit 6b0e3b74cb4cc245c3b7fa2019fc40c5212e1ce4 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:20 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:26:07 2023 -0700 xen/iommu: protect iommu_add_dt_device() with dtdevs_lock Protect iommu_add_dt_device() with dtdevs_lock to prevent concurrent access to add/remove/assign/deassign. With addition of dynamic programming feature(follow-up patches in this series), this function can be concurrently accessed by dynamic node add/remove using device tree overlays. Signed-off-by: Vikram Garhwal Reviewed-by: Luca Fancellu Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/drivers/passthrough/device_tree.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index a7d86a20a0..687c61e7da 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -147,6 +147,8 @@ int iommu_add_dt_device(struct dt_device_node *np) if ( dev_iommu_fwspec_get(dev) ) return 0; + spin_lock(&dtdevs_lock); + /* * According to the Documentation/devicetree/bindings/iommu/iommu.txt * from Linux. @@ -159,7 +161,10 @@ int iommu_add_dt_device(struct dt_device_node *np) * these callback implemented. */ if ( !ops->add_device || !ops->dt_xlate ) - return -EINVAL; + { + rc = -EINVAL; + goto fail; + } if ( !dt_device_is_available(iommu_spec.np) ) break; @@ -190,6 +195,8 @@ int iommu_add_dt_device(struct dt_device_node *np) if ( rc < 0 ) iommu_fwspec_free(dev); + fail: + spin_unlock(&dtdevs_lock); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:34:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:34:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597712.931991 (Exim 4.92) (envelope-from ) id 1qePSO-00046s-O0; Fri, 08 Sep 2023 00:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597712.931991; Fri, 08 Sep 2023 00: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 1qePSO-00046j-LD; Fri, 08 Sep 2023 00:34:44 +0000 Received: by outflank-mailman (input) for mailman id 597712; Fri, 08 Sep 2023 00:34:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSM-00046S-T3 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSM-0000nA-SN for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePSM-0004IF-RX for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00: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=YAfASsmu6WXO2d91TDHzt9z56G+ElmjQY33Zz/adjVU=; b=LhUjhd9P1dwnDmhwkW3ZdeAPae +MO1IDKC8gnk2fUxdESESRpsUmXWPaHQFwXxLEr8dRCFfU+4rM1tmu+d01ZuGYbG5p4OG74ffVLNs z2e3H/nU7fjQgch+4N1cySNHnZ/B8N7BqSeMq4xGpQw3kE0WrjmmtEWGrOOcLju/v7PM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/iommu: Introduce iommu_remove_dt_device() Message-Id: Date: Fri, 08 Sep 2023 00:34:42 +0000 commit de898338578b70a6d4b5e208b5ecd5472c6a8c26 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:21 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:26:57 2023 -0700 xen/iommu: Introduce iommu_remove_dt_device() Remove master device from the IOMMU. This will be helpful when removing the overlay nodes using dynamic programming during run time. Signed-off-by: Vikram Garhwal Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/drivers/passthrough/device_tree.c | 43 +++++++++++++++++++++++++++++++++++ xen/include/xen/iommu.h | 10 ++++++++ 2 files changed, 53 insertions(+) diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 687c61e7da..80f6efc606 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -127,6 +127,49 @@ int iommu_release_dt_devices(struct domain *d) return 0; } +int iommu_remove_dt_device(struct dt_device_node *np) +{ + const struct iommu_ops *ops = iommu_get_ops(); + struct device *dev = dt_to_dev(np); + int rc; + + if ( !iommu_enabled ) + return 1; + + if ( !ops ) + return -EOPNOTSUPP; + + spin_lock(&dtdevs_lock); + + if ( iommu_dt_device_is_assigned_locked(np) ) + { + rc = -EBUSY; + goto fail; + } + + if ( !ops->remove_device ) + { + rc = -EOPNOTSUPP; + goto fail; + } + + /* + * De-register the device from the IOMMU driver. + * The driver is responsible for removing is_protected flag. + */ + rc = ops->remove_device(0, dev); + + if ( !rc ) + { + ASSERT(!dt_device_is_protected(np)); + iommu_fwspec_free(dev); + } + + fail: + spin_unlock(&dtdevs_lock); + return rc; +} + int iommu_add_dt_device(struct dt_device_node *np) { const struct iommu_ops *ops = iommu_get_ops(); diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index a18b68e247..0e747b0bbc 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -235,6 +235,16 @@ int iommu_add_dt_device(struct dt_device_node *np); int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); +/* + * Helper to remove master device from the IOMMU. + * + * Return values: + * 0 : device is de-registered from IOMMU. + * <0 : error while removing the device from IOMMU. + * >0 : IOMMU is not enabled/present. + */ +int iommu_remove_dt_device(struct dt_device_node *np); + #endif /* HAS_DEVICE_TREE */ struct page_info; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:34:55 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:34:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597713.931995 (Exim 4.92) (envelope-from ) id 1qePSY-00049R-PN; Fri, 08 Sep 2023 00:34:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597713.931995; Fri, 08 Sep 2023 00: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 1qePSY-00049J-Md; Fri, 08 Sep 2023 00:34:54 +0000 Received: by outflank-mailman (input) for mailman id 597713; Fri, 08 Sep 2023 00:34:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSW-000495-W7 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSW-0000nH-VO for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePSW-0004J3-Uj for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:34: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=WppE9gaEn+FdVpiMUqyZlAsvFjCAM0FfpAVYAGSjsDw=; b=FRAAfKI1sx+1UmfewSdKGFCevK iWIpkvY3v423zvzn/2PpBMvh+kRHEIDb8kWaidA1W7u0stXfuuxDHO7woAgvCIOatrvHDqGcqttvX aOCbmKqSVbGdGLNEb9YfkHXqV71Nddj9xQDDTGpW7wlM1zYiom0j4x1E91q/R/VU6/xU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/smmu: Add remove_device callback for smmu_iommu ops Message-Id: Date: Fri, 08 Sep 2023 00:34:52 +0000 commit 3b27fff436394762b9bc71fbddf075d276fcceb5 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:22 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:33:42 2023 -0700 xen/smmu: Add remove_device callback for smmu_iommu ops Add remove_device callback for removing the device entry from smmu-master using following steps: 1. Find if SMMU master exists for the device node. 2. Check if device is currently in use. 3. Remove the SMMU master. Signed-off-by: Vikram Garhwal Reviewed-by: Luca Fancellu Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu.c | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index c37fa9af13..71799064f8 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -815,6 +815,19 @@ static int insert_smmu_master(struct arm_smmu_device *smmu, return 0; } +static int remove_smmu_master(struct arm_smmu_device *smmu, + struct arm_smmu_master *master) +{ + if (!smmu->masters.rb_node) { + ASSERT_UNREACHABLE(); + return -ENOENT; + } + + rb_erase(&master->node, &smmu->masters); + + return 0; +} + static int arm_smmu_dt_add_device_legacy(struct arm_smmu_device *smmu, struct device *dev, struct iommu_fwspec *fwspec) @@ -852,6 +865,32 @@ static int arm_smmu_dt_add_device_legacy(struct arm_smmu_device *smmu, return insert_smmu_master(smmu, master); } +static int arm_smmu_dt_remove_device_legacy(struct arm_smmu_device *smmu, + struct device *dev) +{ + struct arm_smmu_master *master; + struct device_node *dev_node = dev_get_dev_node(dev); + int ret; + + master = find_smmu_master(smmu, dev_node); + if (master == NULL) { + dev_err(dev, + "No registrations found for master device %s\n", + dev_node->name); + return -EINVAL; + } + + ret = remove_smmu_master(smmu, master); + if (ret) + return ret; + + /* Protected by dt_host_lock and dtdevs_lock as caller holds these locks. */ + dev_node->is_protected = false; + + kfree(master); + return 0; +} + static int register_smmu_master(struct arm_smmu_device *smmu, struct device *dev, struct of_phandle_args *masterspec) @@ -875,6 +914,26 @@ static int register_smmu_master(struct arm_smmu_device *smmu, fwspec); } +/* + * The driver which supports generic IOMMU DT bindings must have this + * callback implemented. + */ +static int arm_smmu_dt_remove_device_generic(u8 devfn, struct device *dev) +{ + struct arm_smmu_device *smmu; + struct iommu_fwspec *fwspec; + + fwspec = dev_iommu_fwspec_get(dev); + if (fwspec == NULL) + return -ENXIO; + + smmu = find_smmu(fwspec->iommu_dev); + if (smmu == NULL) + return -ENXIO; + + return arm_smmu_dt_remove_device_legacy(smmu, dev); +} + static int arm_smmu_dt_add_device_generic(u8 devfn, struct device *dev) { struct arm_smmu_device *smmu; @@ -2859,6 +2918,7 @@ static const struct iommu_ops arm_smmu_iommu_ops = { .init = arm_smmu_iommu_domain_init, .hwdom_init = arch_iommu_hwdom_init, .add_device = arm_smmu_dt_add_device_generic, + .remove_device = arm_smmu_dt_remove_device_generic, .teardown = arm_smmu_iommu_domain_teardown, .iotlb_flush = arm_smmu_iotlb_flush, .assign_device = arm_smmu_assign_dev, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:35:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:35:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597714.931999 (Exim 4.92) (envelope-from ) id 1qePSi-0004CH-R0; Fri, 08 Sep 2023 00:35:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597714.931999; Fri, 08 Sep 2023 00: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 1qePSi-0004CA-O9; Fri, 08 Sep 2023 00:35:04 +0000 Received: by outflank-mailman (input) for mailman id 597714; Fri, 08 Sep 2023 00:35:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSh-0004Bw-3F for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSh-0000nb-2P for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePSh-0004KB-1T for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HSL2Q5LKXy7H4q639QMniFsSDJ85Vx+RXSPPAzPOeXA=; b=MVClCdi/RHTbMTp3xhSSDWBiEc HQFPlffkEdKVi4K+IuD0EsoEnnbc/KZDjV6k+zr118cFFFIYpYwDYzwiIpsUqsTE7DvWWSt2NnYE3 l+7w2TOoWJWF5RAv+NS6mPQPktSPiVw6hRkGX79+HNkNjR6dv/oa57j/iHHb6ET32d68=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] asm/smp.h: Fix circular dependency for device_tree.h and rwlock.h Message-Id: Date: Fri, 08 Sep 2023 00:35:03 +0000 commit f07bfa2e34e3e965c6acf73a943b76e2e9663776 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:23 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:33:58 2023 -0700 asm/smp.h: Fix circular dependency for device_tree.h and rwlock.h Dynamic programming ops will modify the dt_host and there might be other function which are browsing the dt_host at the same time. To avoid the race conditions, we will need to add a rwlock to protect access to the dt_host. However, adding rwlock in device_tree.h causes following circular dependency: device_tree.h->rwlock.h->smp.h->asm/smp.h->device_tree.h To fix this, removed the "#include and forward declared "struct dt_device_node". Signed-off-by: Vikram Garhwal Reviewed-by: Henry Wang Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/include/asm/smp.h | 4 +++- xen/arch/arm/smpboot.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/include/asm/smp.h b/xen/arch/arm/include/asm/smp.h index a37ca55bff..4fabdf5310 100644 --- a/xen/arch/arm/include/asm/smp.h +++ b/xen/arch/arm/include/asm/smp.h @@ -3,7 +3,6 @@ #ifndef __ASSEMBLY__ #include -#include #include #endif @@ -23,6 +22,9 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); extern void noreturn stop_cpu(void); extern int arch_smp_init(void); + +struct dt_device_node; + extern int arch_cpu_init(int cpu, struct dt_device_node *dn); extern int arch_cpu_up(int cpu); extern void arch_cpu_up_finish(void); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index e107b86b7b..eeb76cd551 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:35:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:35:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597715.932003 (Exim 4.92) (envelope-from ) id 1qePSs-0004Eh-SI; Fri, 08 Sep 2023 00:35:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597715.932003; Fri, 08 Sep 2023 00: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 1qePSs-0004EZ-Pd; Fri, 08 Sep 2023 00:35:14 +0000 Received: by outflank-mailman (input) for mailman id 597715; Fri, 08 Sep 2023 00:35:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSr-0004ET-7u for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePSr-0000ni-5k for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePSr-0004LJ-4n for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WTKHjqsQlA7A5fDzcFuyaj+IvliD9rdzPYqu4pdU9zE=; b=LATZXtu/EFI6RCtALHl9XNla1+ babt3hq8XVIej0zesjwfnh+nYznd0/BjMLrMSxHLmsWmZqOB+FtpnYwemqcOYQ02frJKUC0PeEXII ZrBhyLYgtRvatEAlgvHvsundePQMpIGMkxiwzyGWHBSovjBxhb6c1ZFtCQ/BVXz1cSck=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common/device_tree: Add rwlock for dt_host Message-Id: Date: Fri, 08 Sep 2023 00:35:13 +0000 commit b8de00ff7a4bbf7a9fd480d6d7db458db3020f6d Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:24 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:33:58 2023 -0700 common/device_tree: Add rwlock for dt_host Dynamic programming ops will modify the dt_host and there might be other functions which are browsing the dt_host at the same time. To avoid the race conditions, adding rwlock for browsing the dt_host during runtime. dt_host writer will be added in the follow-up patch for device tree overlay functionalities. Reason behind adding rwlock instead of spinlock: For now, dynamic programming is the sole modifier of dt_host in Xen during run time. All other access functions like iommu_release_dt_device() are just reading the dt_host during run-time. So, there is a need to protect others from browsing the dt_host while dynamic programming is modifying it. rwlock is better suitable for this task as spinlock won't be able to differentiate between read and write access. Signed-off-by: Vikram Garhwal Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- xen/common/device_tree.c | 1 + xen/drivers/passthrough/device_tree.c | 28 ++++++++++++++++++++++++++-- xen/include/xen/device_tree.h | 7 +++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f38f51ec0b..b1c2952951 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -31,6 +31,7 @@ dt_irq_xlate_func dt_irq_xlate; struct dt_device_node *dt_host; /* Interrupt controller node*/ const struct dt_device_node *dt_interrupt_controller; +DEFINE_RWLOCK(dt_host_lock); /** * struct dt_alias_prop - Alias property in 'aliases' node diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 80f6efc606..075fb25a37 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -31,6 +31,8 @@ int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev) int rc = -EBUSY; struct domain_iommu *hd = dom_iommu(d); + ASSERT(system_state < SYS_STATE_active || rw_is_locked(&dt_host_lock)); + if ( !is_iommu_enabled(d) ) return -EINVAL; @@ -62,6 +64,8 @@ int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev) const struct domain_iommu *hd = dom_iommu(d); int rc; + ASSERT(rw_is_locked(&dt_host_lock)); + if ( !is_iommu_enabled(d) ) return -EINVAL; @@ -113,6 +117,8 @@ int iommu_release_dt_devices(struct domain *d) if ( !is_iommu_enabled(d) ) return 0; + read_lock(&dt_host_lock); + list_for_each_entry_safe(dev, _dev, &hd->dt_devices, domain_list) { rc = iommu_deassign_dt_device(d, dev); @@ -120,10 +126,14 @@ int iommu_release_dt_devices(struct domain *d) { dprintk(XENLOG_ERR, "Failed to deassign %s in domain %u\n", dt_node_full_name(dev), d->domain_id); + read_unlock(&dt_host_lock); + return rc; } } + read_unlock(&dt_host_lock); + return 0; } @@ -133,6 +143,8 @@ int iommu_remove_dt_device(struct dt_device_node *np) struct device *dev = dt_to_dev(np); int rc; + ASSERT(rw_is_locked(&dt_host_lock)); + if ( !iommu_enabled ) return 1; @@ -177,6 +189,8 @@ int iommu_add_dt_device(struct dt_device_node *np) struct device *dev = dt_to_dev(np); int rc = 1, index = 0; + ASSERT(system_state < SYS_STATE_active || rw_is_locked(&dt_host_lock)); + if ( !iommu_enabled ) return 1; @@ -249,6 +263,8 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, int ret; struct dt_device_node *dev; + read_lock(&dt_host_lock); + switch ( domctl->cmd ) { case XEN_DOMCTL_assign_device: @@ -289,7 +305,10 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, } if ( d == dom_io ) - return -EINVAL; + { + ret = -EINVAL; + break; + } ret = iommu_add_dt_device(dev); if ( ret < 0 ) @@ -327,7 +346,10 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, break; if ( d == dom_io ) - return -EINVAL; + { + ret = -EINVAL; + break; + } ret = iommu_deassign_dt_device(d, dev); @@ -342,5 +364,7 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, break; } + read_unlock(&dt_host_lock); + return ret; } diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 44d315c8ba..a262bba2ed 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -18,6 +18,7 @@ #include #include #include +#include #define DEVICE_TREE_MAX_DEPTH 16 @@ -218,6 +219,12 @@ extern struct dt_device_node *dt_host; */ extern const struct dt_device_node *dt_interrupt_controller; +/* + * Lock that protects r/w updates to unflattened device tree i.e. dt_host during + * runtime. Lock may not be taken for boot only code. + */ +extern rwlock_t dt_host_lock; + /** * Find the interrupt controller * For the moment we handle only one interrupt controller: the first -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:35:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:35:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597716.932007 (Exim 4.92) (envelope-from ) id 1qePT2-0004HN-Tz; Fri, 08 Sep 2023 00:35:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597716.932007; Fri, 08 Sep 2023 00: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 1qePT2-0004HF-R6; Fri, 08 Sep 2023 00:35:24 +0000 Received: by outflank-mailman (input) for mailman id 597716; Fri, 08 Sep 2023 00:35:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePT1-0004H0-9w for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePT1-0000nw-9E for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePT1-0004MB-8D for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0EVO+ZG6zIce1S0BJfI7inHQPxkQHD0fyLe7av/btuM=; b=02V801P9sEd7bQSvzvvS4lejYx jAd0EgO9okA1B+etgnaXbOYpBfOMTeWvJ8t/Q0M73pVPC1DH62FtRo0FdzqhtGUiyILieyLMflseL RS4Gu+ZyraTzXtY5AuM6e0L3HCAjRGb6ktHJLseYLj/8kICFB7DrhYG2WImSPOpHwAnU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/asm/setup.h: Update struct map_range_data to add rangeset. Message-Id: Date: Fri, 08 Sep 2023 00:35:23 +0000 commit 57d4d7d4e8f3b100bf8f9f81374bca0e78933be2 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:25 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:33:58 2023 -0700 arm/asm/setup.h: Update struct map_range_data to add rangeset. Add rangesets for IRQs and IOMEMs. This was done to accommodate dynamic overlay node addition/removal operations. With overlay operations, new IRQs and IOMEMs are added in dt_host and routed. While removing overlay nodes, nodes are removed from dt_host and their IRQs and IOMEMs routing is also removed. Storing IRQs and IOMEMs in the rangeset will avoid re-parsing the device tree nodes to get the IOMEM and IRQ ranges for overlay remove ops. Dynamic overlay node add/remove will be introduced in follow-up patches. Signed-off-by: Vikram Garhwal Acked-by: Stefano Stabellini --- xen/arch/arm/device.c | 43 +++++++++++++++++++++++++++++++--------- xen/arch/arm/domain_build.c | 4 ++-- xen/arch/arm/include/asm/setup.h | 9 ++++++--- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index 327e4d24fb..1f631d3274 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -165,6 +165,15 @@ int map_range_to_domain(const struct dt_device_node *dev, dt_dprintk(" - MMIO: %010"PRIx64" - %010"PRIx64" P2MType=%x\n", addr, addr + len, mr_data->p2mt); + if ( mr_data->iomem_ranges ) + { + res = rangeset_add_range(mr_data->iomem_ranges, + paddr_to_pfn(addr), + paddr_to_pfn_aligned(addr + len - 1)); + if ( res ) + return res; + } + return 0; } @@ -178,10 +187,11 @@ int map_range_to_domain(const struct dt_device_node *dev, */ int map_device_irqs_to_domain(struct domain *d, struct dt_device_node *dev, - bool need_mapping) + bool need_mapping, + struct rangeset *irq_ranges) { unsigned int i, nirq; - int res; + int res, irq; struct dt_raw_irq rirq; nirq = dt_number_of_irq(dev); @@ -208,17 +218,24 @@ int map_device_irqs_to_domain(struct domain *d, continue; } - res = platform_get_irq(dev, i); - if ( res < 0 ) + irq = platform_get_irq(dev, i); + if ( irq < 0 ) { printk(XENLOG_ERR "Unable to get irq %u for %s\n", i, dt_node_full_name(dev)); - return res; + return irq; } - res = map_irq_to_domain(d, res, need_mapping, dt_node_name(dev)); + res = map_irq_to_domain(d, irq, need_mapping, dt_node_name(dev)); if ( res ) return res; + + if ( irq_ranges ) + { + res = rangeset_add_singleton(irq_ranges, irq); + if ( res ) + return res; + } } return 0; @@ -249,6 +266,11 @@ static int map_dt_irq_to_domain(const struct dt_device_node *dev, } res = map_irq_to_domain(d, irq, !mr_data->skip_mapping, dt_node_name(dev)); + if ( res ) + return res; + + if ( mr_data->irq_ranges ) + res = rangeset_add_singleton(mr_data->irq_ranges, irq); return res; } @@ -289,7 +311,8 @@ static int map_device_children(const struct dt_device_node *dev, * - Assign the device to the guest if it's protected by an IOMMU * - Map the IRQs and iomem regions to DOM0 */ -int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt) +int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt, + struct rangeset *iomem_ranges, struct rangeset *irq_ranges) { unsigned int naddr; unsigned int i; @@ -308,7 +331,9 @@ int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt) .p2mt = p2mt, .skip_mapping = !own_device || (is_pci_passthrough_enabled() && - (device_get_class(dev) == DEVICE_PCI_HOSTBRIDGE)) + (device_get_class(dev) == DEVICE_PCI_HOSTBRIDGE)), + .iomem_ranges = iomem_ranges, + .irq_ranges = irq_ranges }; naddr = dt_number_of_address(dev); @@ -342,7 +367,7 @@ int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt) } } - res = map_device_irqs_to_domain(d, dev, own_device); + res = map_device_irqs_to_domain(d, dev, own_device, irq_ranges); if ( res < 0 ) return res; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index ff4fc30769..29dcbb8a2e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2402,7 +2402,7 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, "WARNING: Path %s is reserved, skip the node as we may re-use the path.\n", path); - res = handle_device(d, node, p2mt); + res = handle_device(d, node, p2mt, NULL, NULL); if ( res) return res; @@ -2745,7 +2745,7 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, return -EINVAL; } - res = map_device_irqs_to_domain(kinfo->d, node, true); + res = map_device_irqs_to_domain(kinfo->d, node, true, NULL); if ( res < 0 ) return res; diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 6cda3e4039..b8866c20f4 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -113,6 +113,9 @@ struct map_range_data p2m_type_t p2mt; /* Set if mapping of the memory ranges must be skipped. */ bool skip_mapping; + /* Rangeset to store IRQs and IOMEM for overlay nodes. */ + struct rangeset *iomem_ranges; + struct rangeset *irq_ranges; }; extern struct bootinfo bootinfo; @@ -165,11 +168,11 @@ void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, u32 dflt); -int handle_device(struct domain *d, struct dt_device_node *dev, - p2m_type_t p2mt); +int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt, + struct rangeset *iomem_ranges, struct rangeset *irq_ranges); int map_device_irqs_to_domain(struct domain *d, struct dt_device_node *dev, - bool need_mapping); + bool need_mapping, struct rangeset *irq_ranges); int map_irq_to_domain(struct domain *d, unsigned int irq, bool need_mapping, const char *devname); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:35:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:35:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597717.932010 (Exim 4.92) (envelope-from ) id 1qePTC-0004Kq-1S; Fri, 08 Sep 2023 00:35:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597717.932010; Fri, 08 Sep 2023 00:35: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 1qePTB-0004Kj-VC; Fri, 08 Sep 2023 00:35:33 +0000 Received: by outflank-mailman (input) for mailman id 597717; Fri, 08 Sep 2023 00:35:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTB-0004KV-DE for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTB-0000o3-CQ for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePTB-0004Mw-Bc for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00: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=JexgJV3Lrlv+jXIYq3ZBbUrDX3gAOl2fCUQ36GpySUs=; b=jpNyWUb656keE0RQ3TvphOOZyE LX4C+SR0R1Pk+q+ddF1EmWUOzDfTC97361EfSYc/g0HC21RNsk/PM1rnmCHpIeQyg5ZzGWpWTo6wv l/PuIPtEeCxezbsgrxAFiTcCRdHLEfHrd2pJ7cSeSF8Ymn6krJga9AXgRJ6pTSz7LI0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Implement device tree node removal functionalities Message-Id: Date: Fri, 08 Sep 2023 00:35:33 +0000 commit 7e5c4a8b86f12942de0566b1d61f71d15774364b Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:26 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:33:58 2023 -0700 xen/arm: Implement device tree node removal functionalities Introduce sysctl XEN_SYSCTL_dt_overlay to remove device-tree nodes added using device tree overlay. xl dt-overlay remove file.dtbo: Removes all the nodes in a given dtbo. First, removes IRQ permissions and MMIO accesses. Next, it finds the nodes in dt_host and delete the device node entries from dt_host. The nodes get removed only if it is not used by any of dom0 or domio. Also, added overlay_track struct to keep the track of added node through device tree overlay. overlay_track has dt_host_new which is unflattened form of updated fdt and name of overlay nodes. When a node is removed, we also free the memory used by overlay_track for the particular overlay node. Nested overlay removal is supported in sequential manner only i.e. if overlay_child nests under overlay_parent, it is assumed that user first removes overlay_child and then removes overlay_parent. Also, this is an experimental feature so it is expected from user to make sure correct device tree overlays are used when adding nodes and making sure devices are not being used by other domain before removing them from Xen tree. Partially added/removed i.e. failures while removing the overlay may cause other failures and might need a system reboot. Signed-off-by: Vikram Garhwal Reviewed-by: Stefano Stabellini --- MAINTAINERS | 1 + xen/arch/arm/sysctl.c | 16 +- xen/common/Makefile | 1 + xen/common/dt-overlay.c | 406 +++++++++++++++++++++++++++++++++++++++++++ xen/include/public/sysctl.h | 24 +++ xen/include/xen/dt-overlay.h | 63 +++++++ 6 files changed, 510 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 59103dbac0..0e1d1b7655 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -301,6 +301,7 @@ M: Julien Grall S: Supported F: xen/common/libfdt/ F: xen/common/device_tree.c +F: xen/common/dt-overlay.c F: xen/include/xen/libfdt/ F: xen/include/xen/device_tree.h F: xen/drivers/passthrough/device_tree.c diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index e9a0661146..5cda0dc674 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -25,7 +26,20 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) long arch_do_sysctl(struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) { - return -ENOSYS; + long ret; + + switch ( sysctl->cmd ) + { + case XEN_SYSCTL_dt_overlay: + ret = dt_overlay_sysctl(&sysctl->u.dt_overlay); + break; + + default: + ret = -ENOSYS; + break; + } + + return ret; } /* diff --git a/xen/common/Makefile b/xen/common/Makefile index 46049eac35..e7e96b1087 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o obj-$(CONFIG_IOREQ_SERVER) += dm.o obj-y += domain.o +obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += event_2l.o obj-y += event_channel.o obj-y += event_fifo.o diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c new file mode 100644 index 0000000000..7b7224c29a --- /dev/null +++ b/xen/common/dt-overlay.c @@ -0,0 +1,406 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * xen/common/dt-overlay.c + * + * Device tree overlay support in Xen. + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. All Rights Reserved. + * Written by Vikram Garhwal + * + */ +#include +#include +#include +#include +#include +#include + +static LIST_HEAD(overlay_tracker); +static DEFINE_SPINLOCK(overlay_lock); + +/* Find last descendants of the device_node. */ +static struct dt_device_node * +find_last_descendants_node(const struct dt_device_node *device_node) +{ + struct dt_device_node *child_node; + + for ( child_node = device_node->child; child_node->sibling != NULL; + child_node = child_node->sibling ); + + /* If last child_node also have children. */ + if ( child_node->child ) + child_node = find_last_descendants_node(child_node); + + return child_node; +} + +static int dt_overlay_remove_node(struct dt_device_node *device_node) +{ + struct dt_device_node *np; + struct dt_device_node *parent_node; + struct dt_device_node *last_descendant = device_node->child; + + parent_node = device_node->parent; + + /* Check if we are trying to remove "/" i.e. root node. */ + if ( parent_node == NULL ) + { + dt_dprintk("%s's parent node not found\n", device_node->name); + return -EFAULT; + } + + /* Sanity check for linking between parent and child node. */ + np = parent_node->child; + if ( np == NULL ) + { + dt_dprintk("parent node %s's not found\n", parent_node->name); + return -EFAULT; + } + + /* If node to be removed is only child node or first child. */ + if ( !dt_node_cmp(np->full_name, device_node->full_name) ) + { + parent_node->child = np->sibling; + + /* + * Iterate over all child nodes of device_node. Given that we are + * removing a node, we need to remove all it's descendants too. + * Reason behind finding last_descendant: + * If device_node has multiple children, device_node->allnext will point + * to first_child and first_child->allnext will be a sibling. When the + * device_node and it's all children are removed, parent_node->allnext + * should point to node next to last children. + */ + if ( last_descendant ) + { + last_descendant = find_last_descendants_node(device_node); + parent_node->allnext = last_descendant->allnext; + } + else + parent_node->allnext = np->allnext; + + return 0; + } + + for ( np = parent_node->child; np->sibling != NULL; np = np->sibling ) + { + if ( !dt_node_cmp(np->sibling->full_name, device_node->full_name) ) + { + /* Found the node. Now we remove it. */ + np->sibling = np->sibling->sibling; + + if ( np->child ) + np = find_last_descendants_node(np); + + /* + * Iterate over all child nodes of device_node. Given that we are + * removing parent node, we need to remove all it's descendants too. + */ + if ( last_descendant ) + last_descendant = find_last_descendants_node(device_node); + + if ( last_descendant ) + np->allnext = last_descendant->allnext; + else + np->allnext = np->allnext->allnext; + + break; + } + } + + return 0; +} + +/* Basic sanity check for the dtbo tool stack provided to Xen. */ +static int check_overlay_fdt(const void *overlay_fdt, uint32_t overlay_fdt_size) +{ + if ( (fdt_totalsize(overlay_fdt) != overlay_fdt_size) || + fdt_check_header(overlay_fdt) ) + { + printk(XENLOG_ERR "The overlay FDT is not a valid Flat Device Tree\n"); + return -EINVAL; + } + + return 0; +} + +static int irq_remove_cb(unsigned long s, unsigned long e, void *dom, + unsigned long *c) +{ + int rc; + struct domain *d = dom; + + /* + * TODO: We don't handle shared IRQs for now. So, it is assumed that + * the IRQs was not shared with another devices. + * TODO: Undo the IRQ routing. + */ + rc = irq_deny_access(d, s); + if ( rc ) + { + printk(XENLOG_ERR "unable to revoke access for irq %lu\n", s); + } + else + *c += e - s + 1; + + return rc; + +} + +static int iomem_remove_cb(unsigned long s, unsigned long e, void *dom, + unsigned long *c) +{ + int rc; + struct domain *d = dom; + + /* + * Remove mmio access. + * TODO: Support for remove/add the mapping in P2M. + */ + rc = iomem_deny_access(d, s, e); + if ( rc ) + { + printk(XENLOG_ERR "Unable to remove dom%d access to" + " 0x%"PRIx64" - 0x%"PRIx64"\n", + d->domain_id, + s & PAGE_MASK, PAGE_ALIGN(e) - 1); + } + else + *c += e - s + 1; + + return rc; +} + +/* Check if node itself can be removed and remove node from IOMMU. */ +static int remove_node_resources(struct dt_device_node *device_node) +{ + int rc = 0; + unsigned int len; + domid_t domid; + + domid = dt_device_used_by(device_node); + + dt_dprintk("Checking if node %s is used by any domain\n", + device_node->full_name); + + /* Remove the node if only it's assigned to hardware domain or domain io. */ + if ( domid != hardware_domain->domain_id && domid != DOMID_IO ) + { + printk(XENLOG_ERR "Device %s is being used by domain %u. Removing nodes failed\n", + device_node->full_name, domid); + return -EINVAL; + } + + /* Check if iommu property exists. */ + if ( dt_get_property(device_node, "iommus", &len) ) + { + if ( dt_device_is_protected(device_node) ) + { + rc = iommu_remove_dt_device(device_node); + if ( rc < 0 ) + return rc; + } + } + + return rc; +} + +/* Remove all descendants from IOMMU. */ +static int +remove_descendant_nodes_resources(const struct dt_device_node *device_node) +{ + int rc = 0; + struct dt_device_node *child_node; + + for ( child_node = device_node->child; child_node != NULL; + child_node = child_node->sibling ) + { + if ( child_node->child ) + { + rc = remove_descendant_nodes_resources(child_node); + if ( rc ) + return rc; + } + + rc = remove_node_resources(child_node); + if ( rc ) + return rc; + } + + return rc; +} + +/* Remove nodes from dt_host. */ +static int remove_nodes(const struct overlay_track *tracker) +{ + int rc = 0; + struct dt_device_node *overlay_node; + unsigned int j; + struct domain *d = hardware_domain; + + for ( j = 0; j < tracker->num_nodes; j++ ) + { + overlay_node = (struct dt_device_node *)tracker->nodes_address[j]; + if ( overlay_node == NULL ) + { + printk(XENLOG_ERR "Device %s is not present in the tree. Removing nodes failed\n", + overlay_node->full_name); + return -EINVAL; + } + + rc = remove_descendant_nodes_resources(overlay_node); + if ( rc ) + return rc; + + rc = remove_node_resources(overlay_node); + if ( rc ) + return rc; + + dt_dprintk("Removing node: %s\n", overlay_node->full_name); + + write_lock(&dt_host_lock); + + rc = dt_overlay_remove_node(overlay_node); + if ( rc ) + { + write_unlock(&dt_host_lock); + return rc; + } + + write_unlock(&dt_host_lock); + } + + /* Remove IRQ access. */ + if ( tracker->irq_ranges ) + { + rc = rangeset_consume_ranges(tracker->irq_ranges, irq_remove_cb, d); + if ( rc ) + return rc; + } + + /* Remove mmio access. */ + if ( tracker->iomem_ranges ) + { + rc = rangeset_consume_ranges(tracker->iomem_ranges, iomem_remove_cb, d); + if ( rc ) + return rc; + } + + return rc; +} + +/* + * First finds the device node to remove. Check if the device is being used by + * any dom and finally remove it from dt_host. IOMMU is already being taken care + * while destroying the domain. + */ +static long handle_remove_overlay_nodes(const void *overlay_fdt, + uint32_t overlay_fdt_size) +{ + int rc; + struct overlay_track *entry, *temp, *track; + bool found_entry = false; + + rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size); + if ( rc ) + return rc; + + spin_lock(&overlay_lock); + + /* + * First check if dtbo is correct i.e. it should one of the dtbo which was + * used when dynamically adding the node. + * Limitation: Cases with same node names but different property are not + * supported currently. We are relying on user to provide the same dtbo + * as it was used when adding the nodes. + */ + list_for_each_entry_safe( entry, temp, &overlay_tracker, entry ) + { + if ( memcmp(entry->overlay_fdt, overlay_fdt, overlay_fdt_size) == 0 ) + { + track = entry; + found_entry = true; + break; + } + } + + if ( !found_entry ) + { + rc = -EINVAL; + + printk(XENLOG_ERR "Cannot find any matching tracker with input dtbo." + " Removing nodes is supported only for prior added dtbo.\n"); + goto out; + + } + + rc = remove_nodes(entry); + if ( rc ) + { + printk(XENLOG_ERR "Removing node failed\n"); + goto out; + } + + list_del(&entry->entry); + + xfree(entry->dt_host_new); + xfree(entry->fdt); + xfree(entry->overlay_fdt); + + xfree(entry->nodes_address); + + rangeset_destroy(entry->irq_ranges); + rangeset_destroy(entry->iomem_ranges); + + xfree(entry); + + out: + spin_unlock(&overlay_lock); + return rc; +} + +long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) +{ + long ret; + void *overlay_fdt; + + if ( op->overlay_op != XEN_SYSCTL_DT_OVERLAY_ADD && + op->overlay_op != XEN_SYSCTL_DT_OVERLAY_REMOVE ) + return -EOPNOTSUPP; + + if ( op->overlay_fdt_size == 0 || op->overlay_fdt_size > KB(500) ) + return -EINVAL; + + if ( op->pad[0] || op->pad[1] || op->pad[2] ) + return -EINVAL; + + overlay_fdt = xmalloc_bytes(op->overlay_fdt_size); + + if ( overlay_fdt == NULL ) + return -ENOMEM; + + ret = copy_from_guest(overlay_fdt, op->overlay_fdt, op->overlay_fdt_size); + if ( ret ) + { + gprintk(XENLOG_ERR, "copy from guest failed\n"); + xfree(overlay_fdt); + + return -EFAULT; + } + + if ( op->overlay_op == XEN_SYSCTL_DT_OVERLAY_REMOVE ) + ret = handle_remove_overlay_nodes(overlay_fdt, op->overlay_fdt_size); + + xfree(overlay_fdt); + + return ret; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 3975050248..f1eba78405 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -1185,6 +1185,25 @@ typedef struct xen_sysctl_cpu_policy xen_sysctl_cpu_policy_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpu_policy_t); #endif +#if defined(__arm__) || defined (__aarch64__) +/* + * XEN_SYSCTL_dt_overlay + * Performs addition/removal of device tree nodes under parent node using dtbo. + * This does in three steps: + * - Adds/Removes the nodes from dt_host. + * - Adds/Removes IRQ permission for the nodes. + * - Adds/Removes MMIO accesses. + */ +struct xen_sysctl_dt_overlay { + XEN_GUEST_HANDLE_64(const_void) overlay_fdt; /* IN: overlay fdt. */ + uint32_t overlay_fdt_size; /* IN: Overlay dtb size. */ +#define XEN_SYSCTL_DT_OVERLAY_ADD 1 +#define XEN_SYSCTL_DT_OVERLAY_REMOVE 2 + uint8_t overlay_op; /* IN: Add or remove. */ + uint8_t pad[3]; /* IN: Must be zero. */ +}; +#endif + struct xen_sysctl { uint32_t cmd; #define XEN_SYSCTL_readconsole 1 @@ -1215,6 +1234,7 @@ struct xen_sysctl { #define XEN_SYSCTL_livepatch_op 27 /* #define XEN_SYSCTL_set_parameter 28 */ #define XEN_SYSCTL_get_cpu_policy 29 +#define XEN_SYSCTL_dt_overlay 30 uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */ union { struct xen_sysctl_readconsole readconsole; @@ -1245,6 +1265,10 @@ struct xen_sysctl { #if defined(__i386__) || defined(__x86_64__) struct xen_sysctl_cpu_policy cpu_policy; #endif + +#if defined(__arm__) || defined (__aarch64__) + struct xen_sysctl_dt_overlay dt_overlay; +#endif uint8_t pad[128]; } u; }; diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h new file mode 100644 index 0000000000..c0567741ee --- /dev/null +++ b/xen/include/xen/dt-overlay.h @@ -0,0 +1,63 @@ + /* SPDX-License-Identifier: GPL-2.0-only */ + /* + * xen/dt-overlay.h + * + * Device tree overlay support in Xen. + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. All Rights Reserved. + * Written by Vikram Garhwal + * + */ +#ifndef __XEN_DT_OVERLAY_H__ +#define __XEN_DT_OVERLAY_H__ + +#include +#include +#include + +/* + * overlay_track describes information about added nodes through dtbo. + * @entry: List pointer. + * @dt_host_new: Pointer to the updated dt_host_new which is unflattened from + the 'updated fdt'. + * @fdt: Stores the fdt. + * @overlay_fdt: Stores a copy of input overlay_fdt. + * @nodes_address: Stores each overlay_node's address. + * @num_nodes: Total number of nodes in overlay dtb. + * @iomem_ranges: Range set to keep track of all IOMEMs. + * @irq_ranges: Range set to keep track of all added IRQs. + */ +struct overlay_track { + struct list_head entry; + struct dt_device_node *dt_host_new; + void *fdt; + void *overlay_fdt; + unsigned long *nodes_address; + unsigned int num_nodes; + struct rangeset *iomem_ranges; + struct rangeset *irq_ranges; +}; + +struct xen_sysctl_dt_overlay; + +#ifdef CONFIG_OVERLAY_DTB +long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op); +#else +#include +static inline long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) +{ + return -EOPNOTSUPP; +} +#endif + +#endif /* __XEN_DT_OVERLAY_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:35:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:35:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597718.932014 (Exim 4.92) (envelope-from ) id 1qePTM-0004NO-3H; Fri, 08 Sep 2023 00:35:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597718.932014; Fri, 08 Sep 2023 00:35: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 1qePTM-0004NH-0Z; Fri, 08 Sep 2023 00:35:44 +0000 Received: by outflank-mailman (input) for mailman id 597718; Fri, 08 Sep 2023 00:35:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTL-0004N7-GK for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTL-0000oT-FQ for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePTL-0004Nj-Ed for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35: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=xBQuCQEZwJRvdCvLicKuhkvdDiyQZAOqdPt0pxPZgiM=; b=u28yEpo8j6C3CjapKcNMPbDp3z G8Vwsw/Idnkc+u0bEQPhYMo76H4Recq7qSoMgskU0OoIfk7iiq+8LQ3hzEujkF6ba4ZsuOCuZqOw4 fOQxd/QdUxyFhjwfufcMnzobbvbv0B0FUBVqOpiBjiNOLgGy9KdrZfu5qCqvXE7nz+T4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Implement device tree node addition functionalities Message-Id: Date: Fri, 08 Sep 2023 00:35:43 +0000 commit 0c0facdab6f50ad9d5b385117a667cd72246c2db Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:27 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:34:18 2023 -0700 xen/arm: Implement device tree node addition functionalities Update sysctl XEN_SYSCTL_dt_overlay to enable support for dtbo nodes addition using device tree overlay. xl dt-overlay add file.dtbo: Each time overlay nodes are added using .dtbo, a new fdt(memcpy of device_tree_flattened) is created and updated with overlay nodes. This updated fdt is further unflattened to a dt_host_new. Next, it checks if any of the overlay nodes already exists in the dt_host. If overlay nodes doesn't exist then find the overlay nodes in dt_host_new, find the overlay node's parent in dt_host and add the nodes as child under their parent in the dt_host. The node is attached as the last node under target parent. Finally, add IRQs, add device to IOMMUs, set permissions and map MMIO for the overlay node. When a node is added using overlay, a new entry is allocated in the overlay_track to keep the track of memory allocation due to addition of overlay node. This is helpful for freeing the memory allocated when a device tree node is removed. The main purpose of this to address first part of dynamic programming i.e. making xen aware of new device tree node which means updating the dt_host with overlay node information. Here we are adding/removing node from dt_host, and checking/setting IOMMU and IRQ permission but never mapping them to any domain. Right now, mapping/Un-mapping will happen only when a new domU is created/destroyed using "xl create". Signed-off-by: Vikram Garhwal Reviewed-by: Stefano Stabellini --- xen/common/dt-overlay.c | 495 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 495 insertions(+) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index 7b7224c29a..b07a6128dc 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -34,6 +34,25 @@ find_last_descendants_node(const struct dt_device_node *device_node) return child_node; } +/* + * Returns next node to the input node. If node has children then return + * last descendant's next node. +*/ +static struct dt_device_node * +dt_find_next_node(struct dt_device_node *dt, const struct dt_device_node *node) +{ + struct dt_device_node *np; + + dt_for_each_device_node(dt, np) + if ( np == node ) + break; + + if ( np->child ) + np = find_last_descendants_node(np); + + return np->allnext; +} + static int dt_overlay_remove_node(struct dt_device_node *device_node) { struct dt_device_node *np; @@ -111,6 +130,78 @@ static int dt_overlay_remove_node(struct dt_device_node *device_node) return 0; } +static int dt_overlay_add_node(struct dt_device_node *device_node, + const char *parent_node_path) +{ + struct dt_device_node *parent_node; + struct dt_device_node *next_node; + + parent_node = dt_find_node_by_path(parent_node_path); + + if ( parent_node == NULL ) + { + dt_dprintk("Parent node %s not found. Overlay node will not be added\n", + parent_node_path); + return -EINVAL; + } + + /* If parent has no child. */ + if ( parent_node->child == NULL ) + { + next_node = parent_node->allnext; + device_node->parent = parent_node; + parent_node->allnext = device_node; + parent_node->child = device_node; + } + else + { + struct dt_device_node *np; + /* + * If parent has at least one child node. + * Iterate to the last child node of parent. + */ + for ( np = parent_node->child; np->sibling != NULL; np = np->sibling ); + + /* Iterate over all child nodes of np node. */ + if ( np->child ) + { + struct dt_device_node *np_last_descendant; + + np_last_descendant = find_last_descendants_node(np); + + next_node = np_last_descendant->allnext; + np_last_descendant->allnext = device_node; + } + else + { + next_node = np->allnext; + np->allnext = device_node; + } + + device_node->parent = parent_node; + np->sibling = device_node; + np->sibling->sibling = NULL; + } + + /* Iterate over all child nodes of device_node to add children too. */ + if ( device_node->child ) + { + struct dt_device_node *device_node_last_descendant; + + device_node_last_descendant = find_last_descendants_node(device_node); + + /* Plug next_node at the end of last children of device_node. */ + device_node_last_descendant->allnext = next_node; + } + else + { + /* Now plug next_node at the end of device_node. */ + device_node->allnext = next_node; + } + + return 0; +} + /* Basic sanity check for the dtbo tool stack provided to Xen. */ static int check_overlay_fdt(const void *overlay_fdt, uint32_t overlay_fdt_size) { @@ -171,6 +262,102 @@ static int iomem_remove_cb(unsigned long s, unsigned long e, void *dom, return rc; } +/* Count number of nodes till one level of __overlay__ tag. */ +static unsigned int overlay_node_count(const void *overlay_fdt) +{ + unsigned int num_overlay_nodes = 0; + int fragment; + + fdt_for_each_subnode(fragment, overlay_fdt, 0) + { + int subnode; + int overlay; + + overlay = fdt_subnode_offset(overlay_fdt, fragment, "__overlay__"); + + /* + * overlay value can be < 0. But fdt_for_each_subnode() loop checks for + * overlay >= 0. So, no need for a overlay>=0 check here. + */ + fdt_for_each_subnode(subnode, overlay_fdt, overlay) + { + num_overlay_nodes++; + } + } + + return num_overlay_nodes; +} + +/* + * overlay_get_nodes_info gets full name with path for all the nodes which + * are in one level of __overlay__ tag. This is useful when checking node for + * duplication i.e. dtbo tries to add nodes which already exists in device tree. + */ +static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) +{ + int fragment; + unsigned int node_num = 0; + + fdt_for_each_subnode(fragment, fdto, 0) + { + int target; + int overlay; + int subnode; + const char *target_path; + + target = fdt_overlay_target_offset(device_tree_flattened, fdto, + fragment, &target_path); + if ( target < 0 ) + return target; + + if ( target_path == NULL ) + return -EINVAL; + + overlay = fdt_subnode_offset(fdto, fragment, "__overlay__"); + + /* + * overlay value can be < 0. But fdt_for_each_subnode() loop checks for + * overlay >= 0. So, no need for a overlay>=0 check here. + */ + fdt_for_each_subnode(subnode, fdto, overlay) + { + const char *node_name = NULL; + int node_name_len; + unsigned int target_path_len = strlen(target_path); + unsigned int node_full_name_len; + + node_name = fdt_get_name(fdto, subnode, &node_name_len); + + if ( node_name == NULL ) + return node_name_len; + + /* + * Magic number 2 is for adding '/' and '\0'. This is done to keep + * the node_full_path in the correct full node name format. + */ + node_full_name_len = target_path_len + node_name_len + 2; + + nodes_full_path[node_num] = xmalloc_bytes(node_full_name_len); + + if ( nodes_full_path[node_num] == NULL ) + return -ENOMEM; + + memcpy(nodes_full_path[node_num], target_path, target_path_len); + + nodes_full_path[node_num][target_path_len] = '/'; + + memcpy(nodes_full_path[node_num] + target_path_len + 1, + node_name, node_name_len); + + nodes_full_path[node_num][node_full_name_len - 1] = '\0'; + + node_num++; + } + } + + return 0; +} + /* Check if node itself can be removed and remove node from IOMMU. */ static int remove_node_resources(struct dt_device_node *device_node) { @@ -359,6 +546,312 @@ static long handle_remove_overlay_nodes(const void *overlay_fdt, return rc; } +static void free_nodes_full_path(unsigned int num_nodes, char **nodes_full_path) +{ + unsigned int i; + + if ( nodes_full_path == NULL ) + return; + + for ( i = 0; i < num_nodes && nodes_full_path[i] != NULL; i++ ) + { + xfree(nodes_full_path[i]); + } + + xfree(nodes_full_path); +} + +static long add_nodes(struct overlay_track *tr, char **nodes_full_path) + +{ + int rc; + unsigned int j; + struct dt_device_node *overlay_node; + + for ( j = 0; j < tr->num_nodes; j++ ) + { + struct dt_device_node *prev_node, *next_node; + + dt_dprintk("Adding node: %s\n", nodes_full_path[j]); + + /* Find the newly added node in tr->dt_host_new by it's full path. */ + overlay_node = dt_find_node_by_path_from(tr->dt_host_new, + nodes_full_path[j]); + if ( overlay_node == NULL ) + { + /* Sanity check. But code will never come here. */ + ASSERT_UNREACHABLE(); + return -EFAULT; + } + + /* + * Find previous and next node to overlay_node in dt_host_new. We will + * need these nodes to fix the dt_host_new mapping. When overlay_node is + * take out of dt_host_new tree and added to dt_host, link between + * previous node and next_node is broken. We will need to refresh + * dt_host_new with correct linking for any other overlay nodes + * extraction in future. + */ + dt_for_each_device_node(tr->dt_host_new, prev_node) + if ( prev_node->allnext == overlay_node ) + break; + + next_node = dt_find_next_node(tr->dt_host_new, overlay_node); + + write_lock(&dt_host_lock); + + /* Add the node to dt_host. */ + rc = dt_overlay_add_node(overlay_node, overlay_node->parent->full_name); + if ( rc ) + { + write_unlock(&dt_host_lock); + + /* Node not added in dt_host. */ + return rc; + } + + write_unlock(&dt_host_lock); + + prev_node->allnext = next_node; + + overlay_node = dt_find_node_by_path(overlay_node->full_name); + if ( overlay_node == NULL ) + { + /* Sanity check. But code will never come here. */ + ASSERT_UNREACHABLE(); + return -EFAULT; + } + + rc = handle_device(hardware_domain, overlay_node, p2m_mmio_direct_c, + tr->iomem_ranges, + tr->irq_ranges); + if ( rc ) + { + printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n"); + return rc; + } + + /* Keep overlay_node address in tracker. */ + tr->nodes_address[j] = (unsigned long)overlay_node; + } + + return 0; +} +/* + * Adds device tree nodes under target node. + * We use tr->dt_host_new to unflatten the updated device_tree_flattened. This + * is done to avoid the removal of device_tree generation, iomem regions mapping + * to hardware domain done by handle_node(). + */ +static long handle_add_overlay_nodes(void *overlay_fdt, + uint32_t overlay_fdt_size) +{ + int rc; + unsigned int j; + struct dt_device_node *overlay_node; + struct overlay_track *tr = NULL; + char **nodes_full_path = NULL; + unsigned int new_fdt_size; + + tr = xzalloc(struct overlay_track); + if ( tr == NULL ) + return -ENOMEM; + + new_fdt_size = fdt_totalsize(device_tree_flattened) + + fdt_totalsize(overlay_fdt); + + tr->fdt = xzalloc_bytes(new_fdt_size); + if ( tr->fdt == NULL ) + { + xfree(tr); + return -ENOMEM; + } + + tr->num_nodes = overlay_node_count(overlay_fdt); + if ( tr->num_nodes == 0 ) + { + xfree(tr->fdt); + xfree(tr); + return -ENOMEM; + } + + tr->nodes_address = xzalloc_bytes(tr->num_nodes * sizeof(unsigned long)); + if ( tr->nodes_address == NULL ) + { + xfree(tr->fdt); + xfree(tr); + return -ENOMEM; + } + + rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size); + if ( rc ) + { + xfree(tr->nodes_address); + xfree(tr->fdt); + xfree(tr); + return rc; + } + + /* + * Keep a copy of overlay_fdt as fdt_overlay_apply will change the input + * overlay's content(magic) when applying overlay. + */ + tr->overlay_fdt = xzalloc_bytes(overlay_fdt_size); + if ( tr->overlay_fdt == NULL ) + { + xfree(tr->nodes_address); + xfree(tr->fdt); + xfree(tr); + return -ENOMEM; + } + + memcpy(tr->overlay_fdt, overlay_fdt, overlay_fdt_size); + + spin_lock(&overlay_lock); + + memcpy(tr->fdt, device_tree_flattened, + fdt_totalsize(device_tree_flattened)); + + /* Open tr->fdt with more space to accommodate the overlay_fdt. */ + rc = fdt_open_into(tr->fdt, tr->fdt, new_fdt_size); + if ( rc ) + { + printk(XENLOG_ERR "Increasing fdt size to accommodate overlay_fdt failed with error %d\n", + rc); + goto err; + } + + nodes_full_path = xzalloc_bytes(tr->num_nodes * sizeof(char *)); + if ( nodes_full_path == NULL ) + { + rc = -ENOMEM; + goto err; + } + + /* + * overlay_get_nodes_info is called to get the node information from dtbo. + * This is done before fdt_overlay_apply() because the overlay apply will + * erase the magic of overlay_fdt. + */ + rc = overlay_get_nodes_info(overlay_fdt, nodes_full_path); + if ( rc ) + { + printk(XENLOG_ERR "Getting nodes information failed with error %d\n", + rc); + goto err; + } + + rc = fdt_overlay_apply(tr->fdt, overlay_fdt); + if ( rc ) + { + printk(XENLOG_ERR "Adding overlay node failed with error %d\n", rc); + goto err; + } + + /* + * Check if any of the node already exists in dt_host. If node already exits + * we can return here as this overlay_fdt is not suitable for overlay ops. + */ + for ( j = 0; j < tr->num_nodes; j++ ) + { + overlay_node = dt_find_node_by_path(nodes_full_path[j]); + if ( overlay_node != NULL ) + { + printk(XENLOG_ERR "node %s exists in device tree\n", + nodes_full_path[j]); + rc = -EINVAL; + goto err; + } + } + + /* + * Unflatten the tr->fdt into a new dt_host. + * TODO: Check and add alias_scan() if it's needed for overlay in future. + */ + rc = unflatten_device_tree(tr->fdt, &tr->dt_host_new); + if ( rc ) + { + printk(XENLOG_ERR "unflatten_device_tree failed with error %d\n", rc); + goto err; + } + + tr->irq_ranges = rangeset_new(hardware_domain, "Overlays: Interrupts", 0); + if (tr->irq_ranges == NULL) + { + printk(XENLOG_ERR "Creating IRQ rangeset failed"); + goto err; + } + + tr->iomem_ranges = rangeset_new(hardware_domain, "Overlay: I/O Memory", 0); + if (tr->iomem_ranges == NULL) + { + printk(XENLOG_ERR "Creating IOMMU rangeset failed"); + goto err; + } + + rc = add_nodes(tr, nodes_full_path); + if ( rc ) + { + printk(XENLOG_ERR "Adding nodes failed. Removing the partially added nodes.\n"); + goto remove_node; + } + + INIT_LIST_HEAD(&tr->entry); + list_add_tail(&tr->entry, &overlay_tracker); + + spin_unlock(&overlay_lock); + + free_nodes_full_path(tr->num_nodes, nodes_full_path); + + return rc; + +/* + * Failure case. We need to remove the nodes, free tracker(if tr exists) and + * tr->dt_host_new. + */ + remove_node: + tr->num_nodes = j; + rc = remove_nodes(tr); + + if ( rc ) + { + /* + * User needs to provide right overlay. Incorrect node information + * example parent node doesn't exist in dt_host etc can cause memory + * leaks as removing_nodes() will fail and this means nodes memory is + * not freed from tracker. Which may cause memory leaks. Ideally, these + * device tree related mistakes will be caught by fdt_overlay_apply() + * but given that we don't manage that code keeping this warning message + * is better here. + */ + printk(XENLOG_ERR "Removing node failed.\n"); + spin_unlock(&overlay_lock); + + free_nodes_full_path(tr->num_nodes, nodes_full_path); + + return rc; + } + + err: + spin_unlock(&overlay_lock); + + if ( tr->dt_host_new ) + xfree(tr->dt_host_new); + + free_nodes_full_path(tr->num_nodes, nodes_full_path); + + xfree(tr->overlay_fdt); + xfree(tr->nodes_address); + xfree(tr->fdt); + + rangeset_destroy(tr->irq_ranges); + rangeset_destroy(tr->iomem_ranges); + + xfree(tr); + + return rc; +} + long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) { long ret; @@ -390,6 +883,8 @@ long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) if ( op->overlay_op == XEN_SYSCTL_DT_OVERLAY_REMOVE ) ret = handle_remove_overlay_nodes(overlay_fdt, op->overlay_fdt_size); + else + ret = handle_add_overlay_nodes(overlay_fdt, op->overlay_fdt_size); xfree(overlay_fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:35:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:35:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597719.932019 (Exim 4.92) (envelope-from ) id 1qePTW-0004QT-6o; Fri, 08 Sep 2023 00:35:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597719.932019; Fri, 08 Sep 2023 00:35:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTW-0004QL-42; Fri, 08 Sep 2023 00:35:54 +0000 Received: by outflank-mailman (input) for mailman id 597719; Fri, 08 Sep 2023 00:35:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTV-0004QF-J3 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTV-0000ob-IJ for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePTV-0004OW-Hg for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:35: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=Q0Y2dZ9xK8VUHhGfie6zrWOTTxBX1M+7PRGzJh/2QwQ=; b=OVi2Odsn+Di3SSTAt1DcUCX+9L hrgs9biTofV+4Jvr+35KPVQCe9pH9DoQYRg2tS3yepu6UoDQpRRGhMVf3eaLe6524OnaOqABvsmOa taSVSbhd+56Hw2SWyHePs+AkOwTAjfeaJ+jNfX96nTgo6mYhC7nP1vkLUYzf5+sGMmfM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/ctrl: Implement new xc interfaces for dt overlay Message-Id: Date: Fri, 08 Sep 2023 00:35:53 +0000 commit f61243530e2a1e10f9414653d37d99df61fd88ad Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:28 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:34:18 2023 -0700 tools/libs/ctrl: Implement new xc interfaces for dt overlay xc_dt_overlay() sends the device tree binary overlay, size of .dtbo and overlay operation type i.e. add or remove to xen. Signed-off-by: Vikram Garhwal Reviewed-by: Anthony PERARD --- tools/include/xenctrl.h | 5 +++++ tools/libs/ctrl/Makefile.common | 1 + tools/libs/ctrl/xc_dt_overlay.c | 50 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 12dca13b69..2ef8b4e054 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -2653,6 +2653,11 @@ int xc_livepatch_replace(xc_interface *xch, char *name, uint32_t timeout, uint32 int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, xen_pfn_t start_pfn, xen_pfn_t nr_pfns); +#if defined(__arm__) || defined(__aarch64__) +int xc_dt_overlay(xc_interface *xch, void *overlay_fdt, + uint32_t overlay_fdt_size, uint8_t overlay_op); +#endif + /* Compat shims */ #include "xenctrl_compat.h" diff --git a/tools/libs/ctrl/Makefile.common b/tools/libs/ctrl/Makefile.common index 0a09c28fd3..247afbe5f9 100644 --- a/tools/libs/ctrl/Makefile.common +++ b/tools/libs/ctrl/Makefile.common @@ -24,6 +24,7 @@ OBJS-y += xc_hcall_buf.o OBJS-y += xc_foreign_memory.o OBJS-y += xc_kexec.o OBJS-y += xc_resource.o +OBJS-$(CONFIG_ARM) += xc_dt_overlay.o OBJS-$(CONFIG_X86) += xc_psr.o OBJS-$(CONFIG_X86) += xc_pagetab.o OBJS-$(CONFIG_Linux) += xc_linux.o diff --git a/tools/libs/ctrl/xc_dt_overlay.c b/tools/libs/ctrl/xc_dt_overlay.c new file mode 100644 index 0000000000..c2224c4d15 --- /dev/null +++ b/tools/libs/ctrl/xc_dt_overlay.c @@ -0,0 +1,50 @@ +/* + * + * Device Tree Overlay functions. + * Copyright (C) 2021 Xilinx Inc. + * Author Vikram Garhwal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xc_private.h" + +int xc_dt_overlay(xc_interface *xch, void *overlay_fdt, + uint32_t overlay_fdt_size, uint8_t overlay_op) +{ + int err; + struct xen_sysctl sysctl = { + .cmd = XEN_SYSCTL_dt_overlay, + .u.dt_overlay = { + .overlay_op = overlay_op, + .overlay_fdt_size = overlay_fdt_size, + } + }; + + DECLARE_HYPERCALL_BOUNCE(overlay_fdt, overlay_fdt_size, + XC_HYPERCALL_BUFFER_BOUNCE_IN); + + if ( (err = xc_hypercall_bounce_pre(xch, overlay_fdt)) ) + goto err; + + set_xen_guest_handle(sysctl.u.dt_overlay.overlay_fdt, overlay_fdt); + + if ( (err = do_sysctl(xch, &sysctl)) != 0 ) + PERROR("%s failed", __func__); + +err: + xc_hypercall_bounce_post(xch, overlay_fdt); + + return err; +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:36:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:36:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597720.932024 (Exim 4.92) (envelope-from ) id 1qePTg-0004TJ-8a; Fri, 08 Sep 2023 00:36:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597720.932024; Fri, 08 Sep 2023 00:36:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTg-0004TB-5R; Fri, 08 Sep 2023 00:36:04 +0000 Received: by outflank-mailman (input) for mailman id 597720; Fri, 08 Sep 2023 00:36:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTf-0004T0-Lx for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTf-0000ov-LJ for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePTf-0004Pe-KY for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36: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=28tZi781Cb2ELQ+l8Il2c4Yvp5ajydA9vVJa/xU9TLc=; b=fFazJXFXyNZ3SqPSIFcGK5MnKk 3T9Y3YDi50JxnDmnuEy3va6D2u68hGUmYArleJB6puAC2rowoJO1ea1U/Yez90dDV7fzxBclpKhbv n9vToWtNbTcBuamfii9je79PdackzGv3qLaOYVBekoDP/GrYdyZrhnpZFCCHyVZKW3ec=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/light: Implement new libxl functions for device tree overlay ops Message-Id: Date: Fri, 08 Sep 2023 00:36:03 +0000 commit aa7354beb1238e68126815e060f7d5ccda48fcb8 Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:29 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:34:18 2023 -0700 tools/libs/light: Implement new libxl functions for device tree overlay ops Signed-off-by: Vikram Garhwal Reviewed-by: Anthony PERARD --- tools/include/libxl.h | 11 ++++++ tools/libs/light/Makefile | 3 ++ tools/libs/light/libxl_dt_overlay.c | 71 +++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 82b764ff57..abc5fd52da 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -259,6 +259,12 @@ */ #define LIBXL_HAVE_DEVICETREE_PASSTHROUGH 1 +#if defined(__arm__) || defined(__aarch64__) +/** + * This means Device Tree Overlay is supported. + */ +#define LIBXL_HAVE_DT_OVERLAY 1 +#endif /* * libxl_domain_build_info has device_model_user to specify the user to * run the device model with. See docs/misc/qemu-deprivilege.txt. @@ -2498,6 +2504,11 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num); void libxl_device_pci_list_free(libxl_device_pci* list, int num); +#if defined(__arm__) || defined(__aarch64__) +int libxl_dt_overlay(libxl_ctx *ctx, void *overlay, + uint32_t overlay_size, uint8_t overlay_op); +#endif + /* * Turns the current process into a backend device service daemon * for a driver domain. diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 5d7ff94b05..ba4c1b7933 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -112,6 +112,9 @@ OBJS-y += _libxl_types.o OBJS-y += libxl_flask.o OBJS-y += _libxl_types_internal.o +# Device tree overlay is enabled only for ARM architecture. +OBJS-$(CONFIG_ARM) += libxl_dt_overlay.o + ifeq ($(CONFIG_LIBNL),y) CFLAGS_LIBXL += $(LIBNL3_CFLAGS) endif diff --git a/tools/libs/light/libxl_dt_overlay.c b/tools/libs/light/libxl_dt_overlay.c new file mode 100644 index 0000000000..a6c709a6dc --- /dev/null +++ b/tools/libs/light/libxl_dt_overlay.c @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2021 Xilinx Inc. + * Author Vikram Garhwal + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ +#include "libxl_internal.h" +#include +#include + +static int check_overlay_fdt(libxl__gc *gc, void *fdt, size_t size) +{ + int r; + + if (fdt_magic(fdt) != FDT_MAGIC) { + LOG(ERROR, "Overlay FDT is not a valid Flat Device Tree"); + return ERROR_FAIL; + } + + r = fdt_check_header(fdt); + if (r) { + LOG(ERROR, "Failed to check the overlay FDT (%d)", r); + return ERROR_FAIL; + } + + if (fdt_totalsize(fdt) > size) { + LOG(ERROR, "Overlay FDT totalsize is too big"); + return ERROR_FAIL; + } + + return 0; +} + +int libxl_dt_overlay(libxl_ctx *ctx, void *overlay_dt, uint32_t overlay_dt_size, + uint8_t overlay_op) +{ + int rc; + int r; + GC_INIT(ctx); + + if (check_overlay_fdt(gc, overlay_dt, overlay_dt_size)) { + LOG(ERROR, "Overlay DTB check failed"); + rc = ERROR_FAIL; + goto out; + } else { + LOG(DEBUG, "Overlay DTB check passed"); + rc = 0; + } + + r = xc_dt_overlay(ctx->xch, overlay_dt, overlay_dt_size, overlay_op); + + if (r) { + LOG(ERROR, "%s: Adding/Removing overlay dtb failed.", __func__); + rc = ERROR_FAIL; + } + +out: + GC_FREE; + return rc; +} + -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:36:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:36:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597721.932027 (Exim 4.92) (envelope-from ) id 1qePTq-0004Wk-A4; Fri, 08 Sep 2023 00:36:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597721.932027; Fri, 08 Sep 2023 00:36: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 1qePTq-0004Wc-6u; Fri, 08 Sep 2023 00:36:14 +0000 Received: by outflank-mailman (input) for mailman id 597721; Fri, 08 Sep 2023 00:36:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTp-0004WQ-Oo for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTp-0000p2-O9 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePTp-0004QT-NT for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36: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=wVqWoMlLtcrtJf7/ZyIDGwH7pdtm8bz2JOtyWDTZFwU=; b=sQuQokNdDjfidnIn2IlNEEwioK CYEM3aZhRKroP8Q4cFdpcUUizN76QaQywfqjilbJYkMmsLey6UdQ90lry1Ok2sbnkbG0jQLdZ0TQc qw82wOR56U5hMq5gCOxaCSGUXzAHBmg4IDngYasoAUAQo9fuL7/WTVo+LK1HbFLvXAVg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: Add new xl command overlay for device tree overlay support Message-Id: Date: Fri, 08 Sep 2023 00:36:13 +0000 commit 61765a07e3d8a4dabbb8323b55f13ee75c80e54a Author: Vikram Garhwal AuthorDate: Tue Sep 5 18:16:30 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Sep 5 18:34:18 2023 -0700 tools/xl: Add new xl command overlay for device tree overlay support Signed-off-by: Vikram Garhwal Reviewed-by: Anthony PERARD --- tools/xl/xl.h | 1 + tools/xl/xl_cmdtable.c | 6 ++++++ tools/xl/xl_vmcontrol.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index 72538d6a81..a923daccd3 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -138,6 +138,7 @@ int main_shutdown(int argc, char **argv); int main_reboot(int argc, char **argv); int main_list(int argc, char **argv); int main_vm_list(int argc, char **argv); +int main_dt_overlay(int argc, char **argv); int main_create(int argc, char **argv); int main_config_update(int argc, char **argv); int main_button_press(int argc, char **argv); diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 67604e9536..2463521156 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -631,6 +631,12 @@ const struct cmd_spec cmd_table[] = { "Issue a qemu monitor command to the device model of a domain", " ", }, + { "dt-overlay", + &main_dt_overlay, 0, 1, + "Add/Remove a device tree overlay", + "add/remove <.dtbo>" + "-h print this help\n" + }, }; const int cmdtable_len = ARRAY_SIZE(cmd_table); diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 03971927e9..cea5b4a88e 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1265,6 +1265,58 @@ int main_create(int argc, char **argv) return 0; } +int main_dt_overlay(int argc, char **argv) +{ + const char *overlay_ops = NULL; + const char *overlay_config_file = NULL; + void *overlay_dtb = NULL; + int rc; + uint8_t op; + int overlay_dtb_size = 0; + const int overlay_add_op = 1; + const int overlay_remove_op = 2; + + if (argc < 2) { + help("dt_overlay"); + return EXIT_FAILURE; + } + + overlay_ops = argv[1]; + overlay_config_file = argv[2]; + + if (strcmp(overlay_ops, "add") == 0) + op = overlay_add_op; + else if (strcmp(overlay_ops, "remove") == 0) + op = overlay_remove_op; + else { + fprintf(stderr, "Invalid dt overlay operation\n"); + return EXIT_FAILURE; + } + + if (overlay_config_file) { + rc = libxl_read_file_contents(ctx, overlay_config_file, + &overlay_dtb, &overlay_dtb_size); + + if (rc) { + fprintf(stderr, "failed to read the overlay device tree file %s\n", + overlay_config_file); + free(overlay_dtb); + return ERROR_FAIL; + } + } else { + fprintf(stderr, "overlay dtbo file not provided\n"); + return ERROR_FAIL; + } + + rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op); + + free(overlay_dtb); + + if (rc) + return EXIT_FAILURE; + + return rc; +} /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:36:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:36:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597723.932031 (Exim 4.92) (envelope-from ) id 1qePU0-0004ZO-Bc; Fri, 08 Sep 2023 00:36:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597723.932031; Fri, 08 Sep 2023 00:36: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 1qePU0-0004ZE-8P; Fri, 08 Sep 2023 00:36:24 +0000 Received: by outflank-mailman (input) for mailman id 597723; Fri, 08 Sep 2023 00:36:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTz-0004Z3-Rs for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePTz-0000pB-R8 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePTz-0004RP-QN for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36: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=tYJNKeWqnkk82Sny4l/tCP/dFMN/uOkarXOx020alIY=; b=i4v+zTCdWxRr7tacTyyjEteglB 1FilOdnYl7lm0Ww2S5uCb80cED8AuBAaMWObGNCkJAvxGJrVxT/1UyYLsaYrwwgyQQ7aMNZBhS5Fw LZ7GIxi15v804GwsHdaJj+3ki+x/U+Ri1pPIHU6AMV7XYxba5R9nju9FQdXJJPDchOOI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: update PCI_STATUS_* constants Message-Id: Date: Fri, 08 Sep 2023 00:36:23 +0000 commit 72af797b7fdf9b82a45039d0f08fb20ac05fd992 Author: Stewart Hildebrand AuthorDate: Wed Sep 6 14:54:04 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 6 14:54:04 2023 +0200 xen/pci: update PCI_STATUS_* constants Interrupt status introduced in PCI 2.3 Immediate readiness introduced in PCIe 4.0 Signed-off-by: Stewart Hildebrand Reviewed-by: Jan Beulich --- xen/include/xen/pci_regs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index a90aff1712..84b18736a8 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -50,6 +50,8 @@ #define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */ #define PCI_STATUS 0x06 /* 16 bits */ +#define PCI_STATUS_IMM_READY 0x01 /* Immediate Readiness */ +#define PCI_STATUS_INTERRUPT 0x08 /* Interrupt status */ #define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ #define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ #define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:36:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:36:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597726.932034 (Exim 4.92) (envelope-from ) id 1qePUB-0004dA-Eu; Fri, 08 Sep 2023 00:36:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597726.932034; Fri, 08 Sep 2023 00:36:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUB-0004d3-CS; Fri, 08 Sep 2023 00:36:35 +0000 Received: by outflank-mailman (input) for mailman id 597726; Fri, 08 Sep 2023 00:36:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePU9-0004cp-Ui for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePU9-0000pJ-U3 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePU9-0004S1-TF for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36: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=wxJiAN7//6ro/V8DZqE/fiw8Q9QHKcGD18UqnGI2CXQ=; b=pYNFLmioCs7rNzviR+eI1oxdDu cdyAFbtsBFfVZUrlK2no8XkHCMtHBTzBq09/xrXTUzwGZyf+tdQzNTrPgO5Ey6FjcLCozU0S9kXYg jOkfJoMcqjaStVxtFFcrM0+RKkUMJaH3xFDNb73spb0VWc27qzaU1FLYmlCtM/P5r0I4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Add missing U for shifted constant Message-Id: Date: Fri, 08 Sep 2023 00:36:33 +0000 commit 05a01367610316ccb49e7ab6af79f5d3cc12a986 Author: Michal Orzel AuthorDate: Wed Sep 6 14:54:22 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 6 14:54:22 2023 +0200 xen/arm: smmuv3: Add missing U for shifted constant When running with SMMUv3 and UBSAN enabled, the following is printed: (XEN) UBSAN: Undefined behaviour in drivers/passthrough/arm/smmu-v3.c:297:12 (XEN) left shift of 1 by 31 places cannot be represented in type 'int' This refers to shift in Q_OVERFLOW_FLAG that is missing 'U' suffix. While there, also fix the same in GBPA_UPDATE. This should address MISRA Rule 7.2: A "u" or "U" suffix shall be applied to all integer constants that are represented in an unsigned type Signed-off-by: Michal Orzel Reviewed-by: Bertrand Marquis --- xen/drivers/passthrough/arm/smmu-v3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.h b/xen/drivers/passthrough/arm/smmu-v3.h index b381ad3738..05f6b1fb7e 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.h +++ b/xen/drivers/passthrough/arm/smmu-v3.h @@ -87,7 +87,7 @@ #define CR2_E2H (1 << 0) #define ARM_SMMU_GBPA 0x44 -#define GBPA_UPDATE (1 << 31) +#define GBPA_UPDATE (1U << 31) #define GBPA_ABORT (1 << 20) #define ARM_SMMU_IRQ_CTRL 0x50 @@ -159,7 +159,7 @@ #define Q_IDX(llq, p) ((p) & ((1 << (llq)->max_n_shift) - 1)) #define Q_WRP(llq, p) ((p) & (1 << (llq)->max_n_shift)) -#define Q_OVERFLOW_FLAG (1 << 31) +#define Q_OVERFLOW_FLAG (1U << 31) #define Q_OVF(p) ((p) & Q_OVERFLOW_FLAG) #define Q_ENT(q, p) ((q)->base + \ Q_IDX(&((q)->llq), p) * \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:36:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:36:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597727.932039 (Exim 4.92) (envelope-from ) id 1qePUL-0004fV-GV; Fri, 08 Sep 2023 00:36:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597727.932039; Fri, 08 Sep 2023 00:36:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUL-0004fN-Dt; Fri, 08 Sep 2023 00:36:45 +0000 Received: by outflank-mailman (input) for mailman id 597727; Fri, 08 Sep 2023 00:36:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUK-0004fC-1D for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUK-0000ph-0Y for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePUJ-0004Sm-W7 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36: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=K6bzy70TbO5Fsrfw5MANZznrMDnlA7CA6/oqfBYP7X4=; b=nHzVR/hrtGv1/1whwaU8CE916c qOGQ+sHYWQ/3qcuRndNoCUIoX4n913SzuaI668flNFYCxPCaJd1cBHxDooFvtEWlbmfR3ddcjaJzG FI3Lof9VNW0aLPaQEfd4q8y/OQ/gVM6i7x8kUPxivVvysu7UlS1LdysePBD7zpqrdiK0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Change parameter of generic_{fls,ffs}() to unsigned int Message-Id: Date: Fri, 08 Sep 2023 00:36:43 +0000 commit c0291d6b5c84de104b931111d1f81da323feb67f Author: Michal Orzel AuthorDate: Wed Sep 6 14:54:48 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 6 14:54:48 2023 +0200 xen: Change parameter of generic_{fls,ffs}() to unsigned int When running with SMMUv3 and UBSAN enabled on arm64, there are a lot of warnings printed related to shifting into sign bit in generic_fls() as it takes parameter of type int. Example: (XEN) UBSAN: Undefined behaviour in ./include/xen/bitops.h:69:11 (XEN) left shift of 134217728 by 4 places cannot be represented in type 'int' It does not make a lot of sense to ask for the last set bit of a negative value. We don't have a direct user of this helper and all the wrappers pass value of type unsigned {int,long}. Linux did the same as part of commit: 3fc2579e6f16 ("fls: change parameter to unsigned int") To keep consistency between the helpers, take the opportunity to: - replace __inline__ with inline, - modify generic_ffs() to take parameter of type unsigned int as well (currently no user and the only wrapper generic_ffsl() passes unsigned long). Signed-off-by: Michal Orzel Reviewed-by: Jan Beulich Reviewed-by: Henry Wang --- xen/include/xen/bitops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 654f525fb4..edd6817d53 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -18,7 +18,7 @@ * differs in spirit from the above ffz (man ffs). */ -static inline int generic_ffs(int x) +static inline int generic_ffs(unsigned int x) { int r = 1; @@ -51,7 +51,7 @@ static inline int generic_ffs(int x) * fls: find last bit set. */ -static __inline__ int generic_fls(int x) +static inline int generic_fls(unsigned int x) { int r = 32; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:36:55 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:36:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597728.932042 (Exim 4.92) (envelope-from ) id 1qePUV-0004iF-IJ; Fri, 08 Sep 2023 00:36:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597728.932042; Fri, 08 Sep 2023 00:36:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUV-0004i7-FM; Fri, 08 Sep 2023 00:36:55 +0000 Received: by outflank-mailman (input) for mailman id 597728; Fri, 08 Sep 2023 00:36:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUU-0004hz-4S for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUU-0000pq-3g for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePUU-0004TY-2v for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:36:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YOStgeFBtgLRlno1f8opmjuZWIGJjtE5pcr/rr4vhXw=; b=HMtpssaSzmi0xZyBfkamtkhsiI L/gTZcvMxjXvb+E8joHnbmvpn+NQs/sDsRg+Es7+BC0qEKwoW4WWUSIr9eARH8P0y1ns+kNu7DLch ALgLSu1yNBlhp8DCaRDmorF0po9viwWC8qeCCc2+v+Lq1xwv7PAVxFtEiSBeMmWh8nYM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: Guard main_dt_overlay() with LIBXL_HAVE_DT_OVERLAY Message-Id: Date: Fri, 08 Sep 2023 00:36:54 +0000 commit d8c3ff585b9fd10200b05aca77139de2789d0517 Author: Michal Orzel AuthorDate: Wed Sep 6 14:56:09 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 6 14:56:09 2023 +0200 tools/xl: Guard main_dt_overlay() with LIBXL_HAVE_DT_OVERLAY main_dt_overlay() makes a call to libxl_dt_overlay() which is for now only compiled for Arm. This causes the build failure as reported by gitlab CI and OSSTEST. Fix it by guarding the function, prototype and entry in cmd_table[] using LIBXL_HAVE_DT_OVERLAY. This has an advantage over regular Arm guard so that the code will not need to be modified again if other architecture gain support for this feature. Fixes: 61765a07e3d8 ("tools/xl: Add new xl command overlay for device tree overlay support") Reported-by: Jan Beulich Signed-off-by: Michal Orzel Reviewed-by: Jan Beulich Reviewed-by: Anthony PERARD --- tools/xl/xl.h | 2 ++ tools/xl/xl_cmdtable.c | 2 ++ tools/xl/xl_vmcontrol.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index a923daccd3..3045b5a8e3 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -138,7 +138,9 @@ int main_shutdown(int argc, char **argv); int main_reboot(int argc, char **argv); int main_list(int argc, char **argv); int main_vm_list(int argc, char **argv); +#ifdef LIBXL_HAVE_DT_OVERLAY int main_dt_overlay(int argc, char **argv); +#endif int main_create(int argc, char **argv); int main_config_update(int argc, char **argv); int main_button_press(int argc, char **argv); diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 2463521156..62bdb2aeaa 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -631,12 +631,14 @@ const struct cmd_spec cmd_table[] = { "Issue a qemu monitor command to the device model of a domain", " ", }, +#ifdef LIBXL_HAVE_DT_OVERLAY { "dt-overlay", &main_dt_overlay, 0, 1, "Add/Remove a device tree overlay", "add/remove <.dtbo>" "-h print this help\n" }, +#endif }; const int cmdtable_len = ARRAY_SIZE(cmd_table); diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index cea5b4a88e..98f6bd2e76 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1265,6 +1265,7 @@ int main_create(int argc, char **argv) return 0; } +#ifdef LIBXL_HAVE_DT_OVERLAY int main_dt_overlay(int argc, char **argv) { const char *overlay_ops = NULL; @@ -1317,6 +1318,8 @@ int main_dt_overlay(int argc, char **argv) return rc; } +#endif + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:37:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:37:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597729.932047 (Exim 4.92) (envelope-from ) id 1qePUf-0004lW-LN; Fri, 08 Sep 2023 00:37:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597729.932047; Fri, 08 Sep 2023 00:37: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 1qePUf-0004lO-Ig; Fri, 08 Sep 2023 00:37:05 +0000 Received: by outflank-mailman (input) for mailman id 597729; Fri, 08 Sep 2023 00:37:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUe-0004lE-7Q for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:37:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUe-0000qA-6g for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:37:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePUe-0004UX-60 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:37:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=K3sMXudapyKj7KMybIfrS+wS//gvYA8vuBxKy7SWj0s=; b=geIthTmt+jn0z2JZvqW/N+Oj5H 7pVFMdNKeSf5AOQn8F7tTr4fiR+N2d0FWNPvmFa1JoY+SxnChDEmNpoIFCE5IvWI+SfxRWSxycOT3 sl7uwrIaKxlyVMsMJUu92G8Ax1U9kgICX/dSEAXXhkYh4PAf5xBj6KvC2asvba0aeu40=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: fix guest map RX/TX error code Message-Id: Date: Fri, 08 Sep 2023 00:37:04 +0000 commit 6242d1b74538c904ac28116b07a22d9cc6bf2542 Author: Jens Wiklander AuthorDate: Mon Sep 4 16:58:14 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Sep 6 17:36:50 2023 -0700 xen/arm: ffa: fix guest map RX/TX error code FFA_RXTX_MAP is currently limited to mapping only one 4k page for each RX and TX buffer. If a guest tries to map more than one page, an error is returned. Until this patch, we have been using FFA_RET_NOT_SUPPORTED. However, that error code is reserved in the FF-A specification to report that the function is not implemented. Of all the other defined error codes, the least bad is FFA_RET_INVALID_PARAMETERS, so use that instead. Fixes: 38d81e7ccb11 ("xen/arm: ffa: support mapping guest RX/TX buffers") Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 802b2dbb1d..183528d133 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -706,7 +706,7 @@ static uint32_t handle_rxtx_map(uint32_t fid, register_t tx_addr, { printk(XENLOG_ERR "ffa: RXTX_MAP: error: %u pages requested (limit %u)\n", page_count, FFA_MAX_RXTX_PAGE_COUNT); - return FFA_RET_NOT_SUPPORTED; + return FFA_RET_INVALID_PARAMETERS; } /* Already mapped */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 08 00:37:15 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Sep 2023 00:37:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.597730.932051 (Exim 4.92) (envelope-from ) id 1qePUp-0004o8-Mi; Fri, 08 Sep 2023 00:37:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 597730.932051; Fri, 08 Sep 2023 00:37: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 1qePUp-0004o0-K6; Fri, 08 Sep 2023 00:37:15 +0000 Received: by outflank-mailman (input) for mailman id 597730; Fri, 08 Sep 2023 00:37:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUo-0004ns-A9 for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:37:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qePUo-0000qK-9R for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:37:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qePUo-0004VE-8m for xen-changelog@lists.xenproject.org; Fri, 08 Sep 2023 00:37:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sVuyZZw4wlSNGn5LFNdR4956cTb+K7Hg1a2SwHCUtAM=; b=s0lRi//rjxA1Ayqq+yBmqxsPyU 0cqZSLWnQ6SK7/sKv2uvX/npOvonqTAvh6MfMxHPx16ocFmMM/UwaxfQjqn4vtRt98wvI3Bw7dRlD hC/MaCINhOKVmCx8nQvS96CIKg7eNcuf68j7h01zrT/g+d6M42mFW7L1+mSrkhY+3mdg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Fix printk specifiers and arguments in iomem_remove_cb() Message-Id: Date: Fri, 08 Sep 2023 00:37:14 +0000 commit b2dd946ece74e2b6e0601f28caef72f4f9950102 Author: Michal Orzel AuthorDate: Wed Sep 6 12:30:14 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Sep 6 17:37:19 2023 -0700 xen/arm: Fix printk specifiers and arguments in iomem_remove_cb() When building Xen for arm32 with CONFIG_DTB_OVERLAY, the following error is printed: common/dt-overlay.c: In function ‘iomem_remove_cb’: ././include/xen/config.h:55:24: error: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘long unsigned int’ [-Werror=format=] Function parameters s and e (denoting MMIO region) are of type unsigned long and indicate frame numbers and not addresses. This also means that the arguments passed to printk() are incorrect (using PAGE_ALIGN() or PAGE_MASK ANDed with a frame number results in unwanted output). Fix it. Take the opportunity to switch to %pd specifier to print domain id in a consolidated way. Fixes: 7e5c4a8b86f1 ("xen/arm: Implement device tree node removal functionalities") Signed-off-by: Michal Orzel Reviewed-by: Vikram Garhwal Acked-by: Stefano Stabellini --- xen/common/dt-overlay.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index b07a6128dc..5663a049e9 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -251,10 +251,8 @@ static int iomem_remove_cb(unsigned long s, unsigned long e, void *dom, rc = iomem_deny_access(d, s, e); if ( rc ) { - printk(XENLOG_ERR "Unable to remove dom%d access to" - " 0x%"PRIx64" - 0x%"PRIx64"\n", - d->domain_id, - s & PAGE_MASK, PAGE_ALIGN(e) - 1); + printk(XENLOG_ERR "Unable to remove %pd access to %#lx - %#lx\n", + d, s, e); } else *c += e - s + 1; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:22:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598307.932985 (Exim 4.92) (envelope-from ) id 1qeljf-0003Ph-SW; Sat, 09 Sep 2023 00:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598307.932985; Sat, 09 Sep 2023 00:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeljf-0003PZ-Pt; Sat, 09 Sep 2023 00:22:03 +0000 Received: by outflank-mailman (input) for mailman id 598307; Sat, 09 Sep 2023 00:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelje-0003PR-7N for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelje-0003L8-5b for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qelje-0008Sp-4C for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00: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=LTFhmy5IjZn6JaH3Lp2w8DU3qysYrHyKsdCVE4ioJBk=; b=dJR5KAmAIsbYNbgX2PL/F2ksxd vPeTtJPPBJVth5x5YCy6VBdOH5Y/ceoHxSYXHHnds5bhvaFlUTDwPAZGGaWKS5NcJpMAsiej4RN4F qQ92GpRutmKwXkui+Se171L13Wi15reSpCGRlsaMLQcgUW/qqj+hSrqwcQtDGMu1ONl0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "MAINTAINERS: consolidate vm-event/monitor entry" Message-Id: Date: Sat, 09 Sep 2023 00:22:02 +0000 commit e18ca23f5f7dcd5130dadbecf8567beccb824623 Author: Jan Beulich AuthorDate: Thu Sep 7 09:21:02 2023 +0200 Commit: Jan Beulich CommitDate: Thu Sep 7 09:21:02 2023 +0200 Revert "MAINTAINERS: consolidate vm-event/monitor entry" This reverts commit f805cf3e9b87584e16b03b5059b1163fd22bf5a0. It was based on wrong assumptions about get_maintainers.pl behavior. --- MAINTAINERS | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0e1d1b7655..d320233538 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -559,9 +559,20 @@ R: Alexandru Isaila R: Petre Pircalabu S: Supported F: tools/misc/xen-access.c -F: xen/*/mem_access.[ch] -F: xen/*/monitor.[ch] -F: xen/*/vm_event.[ch] +F: xen/arch/*/monitor.c +F: xen/arch/*/vm_event.c +F: xen/arch/arm/mem_access.c +F: xen/arch/x86/include/asm/hvm/monitor.h +F: xen/arch/x86/include/asm/hvm/vm_event.h +F: xen/arch/x86/mm/mem_access.c +F: xen/arch/x86/hvm/monitor.c +F: xen/arch/x86/hvm/vm_event.c +F: xen/common/mem_access.c +F: xen/common/monitor.c +F: xen/common/vm_event.c +F: xen/include/*/mem_access.h +F: xen/include/*/monitor.h +F: xen/include/*/vm_event.h VPCI M: Roger Pau Monné -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598308.932990 (Exim 4.92) (envelope-from ) id 1qeljp-0003Rg-VF; Sat, 09 Sep 2023 00:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598308.932990; Sat, 09 Sep 2023 00: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 1qeljp-0003RY-RI; Sat, 09 Sep 2023 00:22:13 +0000 Received: by outflank-mailman (input) for mailman id 598308; Sat, 09 Sep 2023 00:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeljo-0003RI-9Z for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeljo-0003LJ-8o for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qeljo-0008TF-7p for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00: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=ocVrMI5cQ0fqyP9K86EaNRDvtZvMzlnSHUywVgz/GY0=; b=KYXVNDUy7Hmm8NmA/IId3TpCqK 5c8bY09Ovx1KwG4fCdtGrcmF5zmtiyjKXI2kBeXwxIhrwbuSkH1QI58tLK4vWxUUSih4noOwBR6Qw CInvOdYo0LZv2iiG4lUEpiMWrLTPakF6OdsTw5NRQJPk4Ywo8NNFOvxan0f+MjDPVgwE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Arm: constrain {,u}int64_aligned_t in public header Message-Id: Date: Sat, 09 Sep 2023 00:22:12 +0000 commit f4b8a520349c59e6def7d2aa3ef5b524abecec58 Author: Jan Beulich AuthorDate: Thu Sep 7 09:22:40 2023 +0200 Commit: Jan Beulich CommitDate: Thu Sep 7 09:22:40 2023 +0200 Arm: constrain {,u}int64_aligned_t in public header For using a GNU extension, it may not be exposed in general, just like is done on x86 (except that here we need to also work around not all of the tool stack actually defining __XEN_TOOLS__). External consumers (not using gcc or a compatible compiler) need to make this type available up front (just like we expect {,u}int_t to be supplied) - unlike on x86 the type is actually needed outside of tools-only interfaces, because guest handle definitions use it. While there also add underscores around "aligned". Signed-off-by: Jan Beulich Tested-by: Henry Wang Reviewed-by: Stefano Stabellini --- xen/include/public/arch-arm.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 492819ad22..6a4467e8f5 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -152,8 +152,10 @@ #define XEN_HYPERCALL_TAG 0XEA1 -#define int64_aligned_t int64_t __attribute__((aligned(8))) -#define uint64_aligned_t uint64_t __attribute__((aligned(8))) +#if defined(__XEN__) || defined(__XEN_TOOLS__) || defined(__GNUC__) +#define int64_aligned_t int64_t __attribute__((__aligned__(8))) +#define uint64_aligned_t uint64_t __attribute__((__aligned__(8))) +#endif #ifndef __ASSEMBLY__ #define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:22:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598309.932993 (Exim 4.92) (envelope-from ) id 1qeljy-0003UI-VQ; Sat, 09 Sep 2023 00:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598309.932993; Sat, 09 Sep 2023 00:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeljy-0003UA-Ss; Sat, 09 Sep 2023 00:22:22 +0000 Received: by outflank-mailman (input) for mailman id 598309; Sat, 09 Sep 2023 00:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeljy-0003U2-Eu for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeljy-0003LQ-CV for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qeljy-0008Te-BU for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LyRV+i5r5/McnvxFfd1Mdk6rPrc4fiBARrv4XZagDys=; b=ZTSgFXmEEJxsVBue9UgaTBGJ29 GBLhuuldX2J75HiSwaQ9X3c/DCuA4A0mrPMyVHUlNfa/x0b2mpcpemYLrgzOXrX1WGCoioP/deY98 nVbkhS/8sGoTKyePXxYYtSIHj6j94kFiaVuud4b6iA5vQpJdmAd+gJSGCbofapHpx5ug=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: apply deviation for Rule 8.4 (asm-only definitions) Message-Id: Date: Sat, 09 Sep 2023 00:22:22 +0000 commit 5a415ef2b24d578d29479e38abda3d5285b9afed Author: Nicola Vetrini AuthorDate: Thu Sep 7 09:23:50 2023 +0200 Commit: Jan Beulich CommitDate: Thu Sep 7 09:23:50 2023 +0200 xen: apply deviation for Rule 8.4 (asm-only definitions) As stated in 'docs/misra/rules.rst' the functions that are used only by asm modules do not need to conform to MISRA C:2012 Rule 8.4. The deviations are carried out with a SAF comment. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misra/safe.json | 8 ++++++++ xen/arch/arm/cpuerrata.c | 1 + xen/arch/arm/setup.c | 1 + xen/arch/arm/smpboot.c | 1 + xen/arch/arm/traps.c | 7 +++++++ xen/arch/x86/boot/cmdline.c | 1 + xen/arch/x86/boot/reloc.c | 1 + xen/arch/x86/extable.c | 4 ++-- xen/arch/x86/setup.c | 1 + xen/arch/x86/traps.c | 9 +++++++++ xen/common/efi/boot.c | 5 +++-- 11 files changed, 35 insertions(+), 4 deletions(-) diff --git a/docs/misra/safe.json b/docs/misra/safe.json index e3c8a1d8eb..39c5c056c7 100644 --- a/docs/misra/safe.json +++ b/docs/misra/safe.json @@ -12,6 +12,14 @@ }, { "id": "SAF-1-safe", + "analyser": { + "eclair": "MC3R1.R8.4" + }, + "name": "Rule 8.4: asm-only definition", + "text": "Functions and variables used only by asm modules do not need to have a visible declaration prior to their definition." + }, + { + "id": "SAF-2-safe", "analyser": {}, "name": "Sentinel", "text": "Next ID to be used" diff --git a/xen/arch/arm/cpuerrata.c b/xen/arch/arm/cpuerrata.c index fcf32892a7..9137958fb6 100644 --- a/xen/arch/arm/cpuerrata.c +++ b/xen/arch/arm/cpuerrata.c @@ -370,6 +370,7 @@ custom_param("spec-ctrl", parse_spec_ctrl); /* Arm64 only for now as for Arm32 the workaround is currently handled in C. */ #ifdef CONFIG_ARM_64 +/* SAF-1-safe */ void __init arm_enable_wa2_handling(const struct alt_instr *alt, const uint32_t *origptr, uint32_t *updptr, int nr_inst) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 44ccea03ca..db748839d3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -1077,6 +1077,7 @@ static bool __init is_dom0less_mode(void) size_t __read_mostly dcache_line_bytes; /* C entry point for boot CPU */ +/* SAF-1-safe */ void __init start_xen(unsigned long boot_phys_offset, unsigned long fdt_paddr) { diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index eeb76cd551..ec76de3cac 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -303,6 +303,7 @@ smp_prepare_cpus(void) } /* Boot the current CPU */ +/* SAF-1-safe */ void start_secondary(void) { unsigned int cpuid = init_data.cpuid; diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 46c9a4031b..ce89f16404 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -161,6 +161,7 @@ void init_traps(void) isb(); } +/* SAF-1-safe */ void __div0(void) { printk("Division by zero in hypervisor.\n"); @@ -1954,6 +1955,7 @@ static inline bool needs_ssbd_flip(struct vcpu *v) * Actions that needs to be done after entering the hypervisor from the * guest and before the interrupts are unmasked. */ +/* SAF-1-safe */ void enter_hypervisor_from_guest_preirq(void) { struct vcpu *v = current; @@ -1968,6 +1970,7 @@ void enter_hypervisor_from_guest_preirq(void) * guest and before we handle any request. Depending on the exception trap, * this may be called with interrupts unmasked. */ +/* SAF-1-safe */ void enter_hypervisor_from_guest(void) { struct vcpu *v = current; @@ -1996,6 +1999,7 @@ void enter_hypervisor_from_guest(void) vgic_sync_from_lrs(v); } +/* SAF-1-safe */ void do_trap_guest_sync(struct cpu_user_regs *regs) { const union hsr hsr = { .bits = regs->hsr }; @@ -2191,11 +2195,13 @@ void do_trap_guest_serror(struct cpu_user_regs *regs) __do_trap_serror(regs, true); } +/* SAF-1-safe */ void do_trap_irq(struct cpu_user_regs *regs) { gic_interrupt(regs, 0); } +/* SAF-1-safe */ void do_trap_fiq(struct cpu_user_regs *regs) { gic_interrupt(regs, 1); @@ -2269,6 +2275,7 @@ static bool check_for_vcpu_work(void) * * The function will return with IRQ masked. */ +/* SAF-1-safe */ void leave_hypervisor_to_guest(void) { local_irq_disable(); diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index 74997703b3..f9eee756aa 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -340,6 +340,7 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo) } #endif +/* SAF-1-safe */ void __stdcall cmdline_parse_early(const char *cmdline, early_boot_opts_t *ebo) { if ( !cmdline ) diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index e22bb974bf..609b02cb73 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -347,6 +347,7 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out) return mbi_out; } +/* SAF-1-safe */ void *__stdcall reloc(uint32_t magic, uint32_t in, uint32_t trampoline, uint32_t video_info) { diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index c3771c2e39..74b14246e9 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -194,8 +194,8 @@ static int __init cf_check stub_selftest(void) __initcall(stub_selftest); #endif -unsigned long -search_pre_exception_table(struct cpu_user_regs *regs) +/* SAF-1-safe */ +unsigned long search_pre_exception_table(struct cpu_user_regs *regs) { unsigned long addr = regs->rip; unsigned long fixup = search_one_extable( diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 3358d9a0ff..08ba1f95d6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -968,6 +968,7 @@ static struct domain *__init create_dom0(const module_t *image, /* How much of the directmap is prebuilt at compile time. */ #define PREBUILT_MAP_LIMIT (1 << L2_PAGETABLE_SHIFT) +/* SAF-1-safe */ void __init noreturn __start_xen(unsigned long mbi_p) { const char *memmap_type = NULL; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index a898e1f2d7..dead728ce3 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -833,6 +833,7 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } +/* SAF-1-safe */ void do_unhandled_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector; @@ -920,6 +921,7 @@ static bool extable_fixup(struct cpu_user_regs *regs, bool print) return true; } +/* SAF-1-safe */ void do_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector; @@ -1152,6 +1154,7 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf, } } +/* SAF-1-safe */ void do_invalid_op(struct cpu_user_regs *regs) { u8 bug_insn[2]; @@ -1197,6 +1200,7 @@ void do_invalid_op(struct cpu_user_regs *regs) panic("FATAL TRAP: vector = %d (invalid opcode)\n", X86_EXC_UD); } +/* SAF-1-safe */ void do_int3(struct cpu_user_regs *regs) { struct vcpu *curr = current; @@ -1564,6 +1568,7 @@ static int fixup_page_fault(unsigned long addr, struct cpu_user_regs *regs) return 0; } +/* SAF-1-safe */ void do_page_fault(struct cpu_user_regs *regs) { unsigned long addr; @@ -1641,6 +1646,7 @@ void do_page_fault(struct cpu_user_regs *regs) * during early boot (an issue was seen once, but was most likely a hardware * problem). */ +/* SAF-1-safe */ void __init do_early_page_fault(struct cpu_user_regs *regs) { static unsigned int __initdata stuck; @@ -1841,6 +1847,7 @@ void trigger_nmi_continuation(void) apic_wait_icr_idle(); } +/* SAF-1-safe */ void do_device_not_available(struct cpu_user_regs *regs) { #ifdef CONFIG_PV @@ -1877,6 +1884,7 @@ void do_device_not_available(struct cpu_user_regs *regs) #endif } +/* SAF-1-safe */ void do_debug(struct cpu_user_regs *regs) { unsigned long dr6; @@ -2002,6 +2010,7 @@ void do_debug(struct cpu_user_regs *regs) pv_inject_hw_exception(X86_EXC_DB, X86_EVENT_NO_EC); } +/* SAF-1-safe */ void do_entry_CP(struct cpu_user_regs *regs) { static const char errors[][10] = { diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 79a654af69..99cb033e2a 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1253,8 +1253,9 @@ static void __init efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *Syste efi_fw_vendor = (void *)efi_fw_vendor + DIRECTMAP_VIRT_START; } -void EFIAPI __init noreturn -efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) +/* SAF-1-safe */ +void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, + EFI_SYSTEM_TABLE *SystemTable) { static EFI_GUID __initdata loaded_image_guid = LOADED_IMAGE_PROTOCOL; static EFI_GUID __initdata shim_lock_guid = SHIM_LOCK_PROTOCOL_GUID; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598310.932996 (Exim 4.92) (envelope-from ) id 1qelk9-0003Wu-0Z; Sat, 09 Sep 2023 00:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598310.932996; Sat, 09 Sep 2023 00:22:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelk8-0003Wn-UK; Sat, 09 Sep 2023 00:22:32 +0000 Received: by outflank-mailman (input) for mailman id 598310; Sat, 09 Sep 2023 00:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelk8-0003WX-G8 for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelk8-0003LX-FJ for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qelk8-0008U3-Ea for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hecESHYZBJlCxRTrBsNObtgMmKiZ9JEmyAFzS7tAHcw=; b=DYxqgAbSZqqQTHhdTyseXPegX0 1AVeP9+AcuB7kPgL3PahohfsPYGrCeddXMiUtRDjLqm3ZEw8PTyOgn+1wnHUnnv9ja8c2Xh7xu1Wi HyL7ruPUCC1XJbNosdyNDFFeYPV8BLXANnsR8rU5ebgZjpddSMtv0c3CQiitNm+t2dP0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: execute SAF translation before the analysis with ECLAIR Message-Id: Date: Sat, 09 Sep 2023 00:22:32 +0000 commit 03f64b54a1d14893e7851a60ba4855fb75abf30a Author: Nicola Vetrini AuthorDate: Thu Sep 7 09:24:41 2023 +0200 Commit: Jan Beulich CommitDate: Thu Sep 7 09:24:41 2023 +0200 automation: execute SAF translation before the analysis with ECLAIR This allows local MISRA deviation comments to be translated into the format recognized by ECLAIR. Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/prepare.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/automation/eclair_analysis/prepare.sh b/automation/eclair_analysis/prepare.sh index 275a1a3f51..0cac5eba00 100755 --- a/automation/eclair_analysis/prepare.sh +++ b/automation/eclair_analysis/prepare.sh @@ -38,5 +38,8 @@ fi cd xen cp "${CONFIG_FILE}" .config make clean + find . -type f -name "*.safparse" -print -delete make -f ${script_dir}/Makefile.prepare prepare + # Translate the /* SAF-n-safe */ comments into ECLAIR CBTs + scripts/xen-analysis.py --run-eclair --no-build --no-clean ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:22:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598311.933001 (Exim 4.92) (envelope-from ) id 1qelkJ-0003a2-2B; Sat, 09 Sep 2023 00:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598311.933001; Sat, 09 Sep 2023 00:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkI-0003Zu-Vm; Sat, 09 Sep 2023 00:22:42 +0000 Received: by outflank-mailman (input) for mailman id 598311; Sat, 09 Sep 2023 00:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkI-0003Zn-J8 for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkI-0003Le-IJ for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qelkI-0008US-HS for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XOTVhrA1Vvvch5XqbOHzQ5ynBiB1WUEcMBQR543qcPg=; b=yCTsKwHw51Xv70jTQdJ0PKl6MC dVCPBXsSYY4HyvYUxup+ePGjVQD6Ubk/HYdbSPRj/1MWrz1I5Z1DImtchtVgUDyphd6hSmLtU7qj4 5oXEzkYRIgMBKfTW1OeFl2a1ohbgkdGoQezkWOCJZP35Ej6bNCy4XBQcIOU/10olW/ow=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/genapic: address a violation of MISRA C:2012 Rule 8.3 Message-Id: Date: Sat, 09 Sep 2023 00:22:42 +0000 commit 92c6c3cba1518e07a75188f4cabd3e81e1316a86 Author: Federico Serafini AuthorDate: Thu Sep 7 15:45:51 2023 +0200 Commit: Jan Beulich CommitDate: Thu Sep 7 15:45:51 2023 +0200 x86/genapic: address a violation of MISRA C:2012 Rule 8.3 Make function delcaration consistent with the corresponding definition. No functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/arch/x86/include/asm/genapic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/genapic.h b/xen/arch/x86/include/asm/genapic.h index beeaddf19d..970df8ffe0 100644 --- a/xen/arch/x86/include/asm/genapic.h +++ b/xen/arch/x86/include/asm/genapic.h @@ -43,7 +43,7 @@ void cf_check send_IPI_self_legacy(uint8_t vector); void cf_check init_apic_ldr_flat(void); unsigned int cf_check cpu_mask_to_apicid_flat(const cpumask_t *cpumask); -void cf_check send_IPI_mask_flat(const cpumask_t *mask, int vector); +void cf_check send_IPI_mask_flat(const cpumask_t *cpumask, int vector); const cpumask_t *cf_check vector_allocation_cpumask_flat(int cpu); #define GENAPIC_FLAT \ .int_delivery_mode = dest_LowestPrio, \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:22:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598312.933006 (Exim 4.92) (envelope-from ) id 1qelkT-0003dI-3y; Sat, 09 Sep 2023 00:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598312.933006; Sat, 09 Sep 2023 00:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkT-0003dA-0v; Sat, 09 Sep 2023 00:22:53 +0000 Received: by outflank-mailman (input) for mailman id 598312; Sat, 09 Sep 2023 00:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkS-0003d4-MB for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkS-0003M5-LP for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qelkS-0008Ut-Kg for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lFX0KVjPyE9f8LyTMXTRoNGQpXx1DC5oPnwBjnj0LNA=; b=CDGRjKYEqBJPcphgr9p7a4w6qV IH7IfAnRZ9jp+gkzC0WN8sCot15f1MamXFtA8PAAr5F+RTBnvV2jinIcFAYODYKet08AcA26VVYqK CAdDX5tRlsp/wZGKhhoXYeKxVTuy3Vac/DK/uv/T7cxQCuk3x7sgfhFJQkUpgbVPnrOU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/io: address violations of MISRA C:2012 Rule 8.3 Message-Id: Date: Sat, 09 Sep 2023 00:22:52 +0000 commit 49caa971435de729c6a6457de736b7f448ba6edf Author: Federico Serafini AuthorDate: Thu Sep 7 15:46:10 2023 +0200 Commit: Jan Beulich CommitDate: Thu Sep 7 15:46:10 2023 +0200 x86/io: address violations of MISRA C:2012 Rule 8.3 Make declarations consistent, no functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/arch/x86/include/asm/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/io.h b/xen/arch/x86/include/asm/io.h index 92b784a861..8c8a15bd06 100644 --- a/xen/arch/x86/include/asm/io.h +++ b/xen/arch/x86/include/asm/io.h @@ -51,6 +51,6 @@ __OUT(l,,int) #define IOEMUL_QUIRK_STUB_BYTES 9 struct cpu_user_regs; extern unsigned int (*ioemul_handle_quirk)( - u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); + uint8_t opcode, char *io_emul_stub, struct cpu_user_regs *regs); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:23:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598313.933009 (Exim 4.92) (envelope-from ) id 1qelkd-0003hH-4r; Sat, 09 Sep 2023 00:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598313.933009; Sat, 09 Sep 2023 00:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkd-0003hA-2J; Sat, 09 Sep 2023 00:23:03 +0000 Received: by outflank-mailman (input) for mailman id 598313; Sat, 09 Sep 2023 00:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkc-0003h4-PB for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkc-0003Ma-OL for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qelkc-0008VY-NY for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Am2/PY6UlKzRx6u0AKnu8HLUQaAtYU5u2cYmbMQw/pA=; b=YaarhsF8quiP0TZrE88sTl+gYu ZfRNQI+s5hdxLCm1Q0t0x3eZzS1jW8QJFpqryfMfNhga+zJSdGFUqONT/qaO9fk+81PMsx5K8gsWB RK80d6k+QMhskHDHsrhGFW3lzUZ4b76jWqWZfAcsDWpMl90oYvkmnQhj8LE9AmZ6j7bo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/io_apic: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Sat, 09 Sep 2023 00:23:02 +0000 commit 1f79fce10a75f88d2c2a6ace469a4046bc1b9cb5 Author: Federico Serafini AuthorDate: Thu Sep 7 15:46:24 2023 +0200 Commit: Jan Beulich CommitDate: Thu Sep 7 15:46:24 2023 +0200 x86/io_apic: address violations of MISRA C:2012 Rules 8.2 and 8.3 Add missing parameter names and make function declarations and definitions consistent. No functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/arch/x86/include/asm/io_apic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/io_apic.h b/xen/arch/x86/include/asm/io_apic.h index 9165da2281..a7e4c9e146 100644 --- a/xen/arch/x86/include/asm/io_apic.h +++ b/xen/arch/x86/include/asm/io_apic.h @@ -199,7 +199,7 @@ extern struct IO_APIC_route_entry __ioapic_read_entry( unsigned int apic, unsigned int pin, bool raw); void __ioapic_write_entry( unsigned int apic, unsigned int pin, bool raw, - struct IO_APIC_route_entry); + struct IO_APIC_route_entry e); extern struct IO_APIC_route_entry **alloc_ioapic_entries(void); extern void free_ioapic_entries(struct IO_APIC_route_entry **ioapic_entries); @@ -211,6 +211,6 @@ extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries, unsigned highest_gsi(void); int ioapic_guest_read( unsigned long physbase, unsigned int reg, u32 *pval); -int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 pval); +int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:23:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598314.933012 (Exim 4.92) (envelope-from ) id 1qelko-0003kV-7i; Sat, 09 Sep 2023 00:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598314.933012; Sat, 09 Sep 2023 00: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 1qelko-0003kN-57; Sat, 09 Sep 2023 00:23:14 +0000 Received: by outflank-mailman (input) for mailman id 598314; Sat, 09 Sep 2023 00:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkm-0003k8-SA for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkm-0003Mh-RS for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qelkm-0008Vz-QS for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eQ0NS/SaFdhE9fetk5x3mQSZSFYnpCNzq4fQixG0AE4=; b=fsLqksJH08NJXVjYZr8vUJIPke Csorvs4LyPcRtCWhvaTRj7OE2ydfKMvw8GtwjbfrwtackVeGo8Jl9H7f1dv8mYGGaTJiC5G0t4b/o Y05liGHsb5vhwsHsf5OVrD43b6pcN5jmjaY26yFZm1C+igtbIjuGJ3vlcgQmPMV+wNyk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: add awk to opensuse images Message-Id: Date: Sat, 09 Sep 2023 00:23:12 +0000 commit 0dc838d6ae96b0fe7da7534cc666ea3223623268 Author: Olaf Hering AuthorDate: Mon Sep 4 09:50:08 2023 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 7 17:27:45 2023 -0700 automation: add awk to opensuse images Some awk binary is used in many places during build, make sure it is part of the image. Signed-off-by: Olaf Hering Acked-by: Stefano Stabellini --- automation/build/suse/opensuse-leap.dockerfile | 1 + automation/build/suse/opensuse-tumbleweed.dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile index 79de83ac20..98ee42970d 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -21,6 +21,7 @@ RUN zypper install -y --no-recommends \ diffutils \ discount \ flex \ + gawk \ gcc \ gcc-c++ \ git \ diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile index abb25c8c84..aed81f0240 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -21,6 +21,7 @@ RUN zypper install -y --no-recommends \ diffutils \ discount \ flex \ + gawk \ gcc \ gcc-c++ \ git \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:23:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598315.933017 (Exim 4.92) (envelope-from ) id 1qelky-0003nC-9S; Sat, 09 Sep 2023 00:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598315.933017; Sat, 09 Sep 2023 00: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 1qelky-0003n3-6b; Sat, 09 Sep 2023 00:23:24 +0000 Received: by outflank-mailman (input) for mailman id 598315; Sat, 09 Sep 2023 00:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkw-0003mp-VM for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qelkw-0003Mq-UU for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qelkw-0008WQ-Tf for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6BuXO25DJJcb1XwiAD/it4WubQoDbXqld1Jp3ES3afg=; b=FqbdjH4I5jTFX65dr++9u0+FgB zNjy6i7GUr5sbiAeCB2560JimT+3EfMa1INW88elG6odRsQW5EEZWvfCMP4QdRCMYv6nWwggOd5Pj F4p9+mNOhipKv9chPzu5W6nkG6adrGoRlqXZa1VGpEkgSbBc0UineTWz8fJVsHzbCLUo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Switch ppc64le tests to PowerNV machine type Message-Id: Date: Sat, 09 Sep 2023 00:23:22 +0000 commit 2ed144aff13c7f961de14e5c23fe822062a40692 Author: Shawn Anastasio AuthorDate: Thu Sep 7 14:40:47 2023 -0500 Commit: Stefano Stabellini CommitDate: Thu Sep 7 17:37:34 2023 -0700 automation: Switch ppc64le tests to PowerNV machine type Run ppc64le tests with the PowerNV machine type (bare metal) instead of the paravirtualized pseries machine. This requires a more modern version of QEMU than is present in debian bullseye's repository, so update the dockerfile to build QEMU from source. Support for booting on pseries was broken by 74b725a64d80 ('xen/ppc: Implement initial Radix MMU support') which resulted in CI failures. In preparation for removing pseries support entirely, switch the CI infrastructure to the PowerNV machine type. Signed-off-by: Shawn Anastasio Reviewed-by: Stefano Stabellini --- .../build/debian/bullseye-ppc64le.dockerfile | 5 +-- automation/gitlab-ci/build.yaml | 14 ++++++++ automation/gitlab-ci/test.yaml | 5 +-- automation/scripts/qemu-smoke-ppc64le.sh | 3 +- .../qemu-system-ppc64/8.1.0-ppc64.dockerfile | 37 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile index 8fad26e903..4de8458445 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -22,8 +22,9 @@ RUN apt-get update && \ gcc-powerpc64le-linux-gnu \ make \ python3-minimal \ - # for test phase - qemu-system-ppc \ + # QEMU runtime dependencies for test phase + libglib2.0-0 \ + libpixman-1-0 \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index b633facff4..1619e9a558 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -306,6 +306,20 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 +# ppc64 test artifacts + +qemu-system-ppc64-8.1.0-ppc64-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-ppc64:8.1.0-ppc64 + script: + - mkdir binaries && cp /qemu-system-ppc64 /skiboot.lid binaries/ + artifacts: + paths: + - binaries/qemu-system-ppc64 + - binaries/skiboot.lid + tags: + - x86_64 + # x86_64 test artifacts alpine-3.18-rootfs-export: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9aa8deabea..4b836bf047 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -454,9 +454,10 @@ qemu-smoke-riscv64-gcc: needs: - archlinux-current-gcc-riscv64-debug -qemu-smoke-ppc64le-pseries-gcc: +qemu-smoke-ppc64le-powernv9-gcc: extends: .qemu-ppc64le script: - - ./automation/scripts/qemu-smoke-ppc64le.sh pseries-5.2 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOGFILE} needs: + - qemu-system-ppc64-8.1.0-ppc64-export - debian-bullseye-gcc-ppc64le-debug diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh index eb55221221..2adbdac87e 100755 --- a/automation/scripts/qemu-smoke-ppc64le.sh +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -12,7 +12,8 @@ set +e touch smoke.serial timeout -k 1 20 \ -qemu-system-ppc64 \ +binaries/qemu-system-ppc64 \ + -bios binaries/skiboot.lid \ -M $machine \ -m 2g \ -smp 1 \ diff --git a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile new file mode 100644 index 0000000000..7376ca46ff --- /dev/null +++ b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile @@ -0,0 +1,37 @@ +FROM debian:bullseye-slim +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV QEMU_VERSION=8.1.0 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + curl \ + python3 \ + python3-pip \ + python3-elementpath \ + ninja-build \ + pkg-config \ + libglib2.0-dev \ + libpixman-1-dev \ + && \ + \ + curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ + tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ + cd qemu-"$QEMU_VERSION" && \ + ./configure --target-list=ppc64-softmmu && \ + make -j$(nproc) && \ + cp ./build/qemu-system-ppc64 / && \ + cp ./build/qemu-bundle/usr/local/share/qemu/skiboot.lid / && \ + cd /build && \ + rm -rf qemu-"$QEMU_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:23:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598316.933021 (Exim 4.92) (envelope-from ) id 1qell8-0003q2-BA; Sat, 09 Sep 2023 00:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598316.933021; Sat, 09 Sep 2023 00: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 1qell8-0003pu-8E; Sat, 09 Sep 2023 00:23:34 +0000 Received: by outflank-mailman (input) for mailman id 598316; Sat, 09 Sep 2023 00:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qell7-0003pk-1o for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qell7-0003OU-13 for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qell7-00005z-0L for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00: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=RLsAHTIfgTG7jr6HpFyT9KZI0Eyw20fuyJ1J+HgdaB0=; b=wwUw1niD5p2p5o3viRW0Qvdq1j LhbKpfYr5hnADkMJ5KihMpI0pt/d2rqav/sEXRPa91Uk2ikLXf2fyfRr0i8wfDRZOkEqZz3goghzB 4E6+cQ6gK6q22HaCMheoEnKq5V5i6lbPKIAwGWCFsLndprLgLmgprN0AqtdcyLoulcPY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Drop support for pseries/OpenFirmware Message-Id: Date: Sat, 09 Sep 2023 00:23:33 +0000 commit 1b715dbeb2d6b9aa535d93926a7945acf166972c Author: Shawn Anastasio AuthorDate: Thu Sep 7 14:40:48 2023 -0500 Commit: Stefano Stabellini CommitDate: Thu Sep 7 17:44:45 2023 -0700 xen/ppc: Drop support for pseries/OpenFirmware Since QEMU's PowerNV support has matured to the point where it is now suitable for development, drop support for booting on the paravirtualized pseries machine type and its associated interfaces. Support for booting on pseries was broken by 74b725a64d80 ('xen/ppc: Implement initial Radix MMU support'), and since there is little practical value in continuing to support pseries as a target, just drop support for it entirely. Fixes: 74b725a64d80 ('xen/ppc: Implement initial Radix MMU support') Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/Makefile | 1 - xen/arch/ppc/boot-of.c | 113 ---------------------------------------- xen/arch/ppc/include/asm/boot.h | 19 ------- xen/arch/ppc/ppc64/Makefile | 1 - xen/arch/ppc/ppc64/of-call.S | 83 ----------------------------- xen/arch/ppc/setup.c | 11 ++-- 6 files changed, 3 insertions(+), 225 deletions(-) diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile index a059ac4c0a..b3205b8f7a 100644 --- a/xen/arch/ppc/Makefile +++ b/xen/arch/ppc/Makefile @@ -1,6 +1,5 @@ obj-$(CONFIG_PPC64) += ppc64/ -obj-y += boot-of.init.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.init.o obj-y += mm-radix.o obj-y += opal.o diff --git a/xen/arch/ppc/boot-of.c b/xen/arch/ppc/boot-of.c deleted file mode 100644 index d6755ccc8e..0000000000 --- a/xen/arch/ppc/boot-of.c +++ /dev/null @@ -1,113 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * This file was derived from Xen 3.2's xen/arch/powerpc/boot_of.c, - * originally licensed under GPL version 2 or later. - * - * Copyright IBM Corp. 2005, 2006, 2007 - * Copyright Raptor Engineering, LLC - * - * Authors: Jimi Xenidis - * Hollis Blanchard - * Shawn Anastasio - */ - -#include -#include -#include -#include -#include -#include -#include - -/* - * The Open Firmware client interface is called in 32-bit mode with the MMU off, - * so any addresses passed to it must be physical addresses under 4GB. - * - * Since the client interface is only used during early boot before the MMU is on - * and Xen itself was loaded by Open Firmware (and therefore resides below 4GB), - * we can achieve the desired result with a simple cast to uint32_t. - */ -#define ADDR(x) ((uint32_t)(unsigned long)(x)) - -/* OF entrypoint*/ -static unsigned long __initdata of_vec; - -static int __initdata of_out; - -static int __init of_call(const char *service, uint32_t nargs, uint32_t nrets, - int32_t rets[], ...) -{ - int rc; - va_list args; - unsigned int i; - struct of_service s; - - s.ofs_service = cpu_to_be32(ADDR(service)); - s.ofs_nargs = cpu_to_be32(nargs); - s.ofs_nrets = cpu_to_be32(nrets); - - /* Copy all the params into the args array */ - va_start(args, rets); - - for ( i = 0; i < nargs; i++ ) - s.ofs_args[i] = cpu_to_be32(va_arg(args, uint32_t)); - - va_end(args); - - rc = enter_of(&s, of_vec); - - /* Copy all return values to the output rets array */ - for ( i = 0; i < nrets; i++ ) - rets[i] = be32_to_cpu(s.ofs_args[i + nargs]); - - return rc; -} - -static int __init of_finddevice(const char *devspec) -{ - int32_t rets[1] = { OF_FAILURE }; - - of_call("finddevice", 1, ARRAY_SIZE(rets), rets, ADDR(devspec)); - return rets[0]; -} - -static int __init of_getprop(int ph, const char *name, void *buf, uint32_t buflen) -{ - int32_t rets[1] = { OF_FAILURE }; - - of_call("getprop", 4, ARRAY_SIZE(rets), rets, ph, ADDR(name), ADDR(buf), - buflen); - return rets[0]; -} - -int __init of_write(int ih, const char *addr, uint32_t len) -{ - int32_t rets[1] = { OF_FAILURE }; - - of_call("write", 3, ARRAY_SIZE(rets), rets, ih, ADDR(addr), len); - return rets[0]; -} - -static void __init of_putchar(char c) -{ - if ( c == '\n' ) - { - char buf = '\r'; - of_write(of_out, &buf, 1); - } - of_write(of_out, &c, 1); -} - -void __init boot_of_init(unsigned long vec) -{ - int bof_chosen; - - of_vec = vec; - - /* Get a handle to the default console */ - bof_chosen = of_finddevice("/chosen"); - of_getprop(bof_chosen, "stdout", &of_out, sizeof(of_out)); - of_out = be32_to_cpu(of_out); - - early_printk_init(of_putchar); -} diff --git a/xen/arch/ppc/include/asm/boot.h b/xen/arch/ppc/include/asm/boot.h index 296539cd9e..d62c3ff6e0 100644 --- a/xen/arch/ppc/include/asm/boot.h +++ b/xen/arch/ppc/include/asm/boot.h @@ -4,25 +4,6 @@ #include -/* - * OpenFirmware boot interfaces - */ - -enum { - OF_FAILURE = -1, - OF_SUCCESS = 0, -}; - -struct of_service { - __be32 ofs_service; - __be32 ofs_nargs; - __be32 ofs_nrets; - __be32 ofs_args[10]; -}; - -int enter_of(struct of_service *args, unsigned long entry); -void boot_of_init(unsigned long vec); - /* * OPAL boot interfaces */ diff --git a/xen/arch/ppc/ppc64/Makefile b/xen/arch/ppc/ppc64/Makefile index b9a91dc15f..5b88355bb2 100644 --- a/xen/arch/ppc/ppc64/Makefile +++ b/xen/arch/ppc/ppc64/Makefile @@ -1,3 +1,2 @@ obj-y += head.o -obj-y += of-call.o obj-y += opal-calls.o diff --git a/xen/arch/ppc/ppc64/of-call.S b/xen/arch/ppc/ppc64/of-call.S deleted file mode 100644 index 2a2e308f6b..0000000000 --- a/xen/arch/ppc/ppc64/of-call.S +++ /dev/null @@ -1,83 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Adapted from Linux's arch/powerpc/kernel/entry_64.S, with the - * following copyright notice: - * - * PowerPC version - * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) - * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP - * Copyright (C) 1996 Cort Dougan - * Adapted for Power Macintosh by Paul Mackerras. - * Low-level exception handlers and MMU support - * rewritten by Paul Mackerras. - * Copyright (C) 1996 Paul Mackerras. - * MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net). - */ - -#include -#include -#include - -/* size of minimum stack frame that can hold an entire cpu_user_regs struct */ -#define STACK_SWITCH_FRAME_SIZE UREGS_sizeof - - .section .init.text, "ax", @progbits - -ENTRY(enter_of) - mflr %r0 - std %r0, 16(%r1) - stdu %r1, -STACK_SWITCH_FRAME_SIZE(%r1) /* Save SP and create stack space */ - - /* - * Because PROM is running in 32b mode, it clobbers the high order half - * of all registers that it saves. We therefore save those registers - * PROM might touch to the stack. (%r0, %r3-%r13 are caller saved) - */ - SAVE_GPR(2, %r1) - SAVE_GPR(13, %r1) - SAVE_NVGPRS(%r1) - mfcr %r10 - mfmsr %r11 - std %r10, UREGS_cr(%r1) - std %r11, UREGS_msr(%r1) - - /* Put PROM address in SRR0 */ - mtsrr0 %r4 - - /* Setup our trampoline return addr in LR */ - bcl 20, 31, .+4 -0: mflr %r4 - addi %r4, %r4, 1f - 0b - mtlr %r4 - - /* Prepare a 32-bit mode big endian MSR */ - LOAD_IMM64(%r12, MSR_SF | MSR_LE) - andc %r11, %r11, %r12 - mtsrr1 %r11 - rfid - -1: /* Return from OF */ - FIXUP_ENDIAN - - /* Just make sure that %r1 top 32 bits didn't get corrupt by OF */ - rldicl %r1, %r1, 0, 32 - - /* Restore the MSR (back to 64 bits) */ - ld %r0, UREGS_msr(%r1) - mtmsrd %r0 - isync - - /* Restore other registers */ - REST_GPR(2, %r1) - REST_GPR(13, %r1) - REST_NVGPRS(%r1) - ld %r4, UREGS_cr(%r1) - mtcr %r4 - - addi %r1, %r1, STACK_SWITCH_FRAME_SIZE - ld %r0, 16(%r1) - mtlr %r0 - blr - - .size enter_of, . - enter_of - .type enter_of, %function diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c index 0106e9c9da..3fc7705d9b 100644 --- a/xen/arch/ppc/setup.c +++ b/xen/arch/ppc/setup.c @@ -14,17 +14,12 @@ void __init noreturn start_xen(unsigned long r3, unsigned long r4, { if ( r5 ) { - /* OpenFirmware boot protocol */ - boot_of_init(r5); + /* Unsupported OpenFirmware boot protocol */ + __builtin_trap(); } else { - /* - * kexec boot protocol - * - * TODO: This currently assumes an OPAL/PowerNV system, but it's also - * possible to be kexec'd on an OF system. - */ + /* kexec boot protocol */ boot_opal_init((void *)r3); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 00:23:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 00:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598317.933024 (Exim 4.92) (envelope-from ) id 1qellI-0003sL-CL; Sat, 09 Sep 2023 00:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598317.933024; Sat, 09 Sep 2023 00:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qellI-0003sD-9l; Sat, 09 Sep 2023 00:23:44 +0000 Received: by outflank-mailman (input) for mailman id 598317; Sat, 09 Sep 2023 00:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qellH-0003s1-4f for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qellH-0003Oc-3u for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qellH-00007F-38 for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 00: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=jUtvZMp3OUh18iEPnoDTZaFXmBrs1fAW1cTNb1v9iD0=; b=bFoh1cdSGmLl2eW6lsaMkc5XZq scvm77YGG2jEwKbvzJAfF3lNoZK9VeJBfCrQXQ4e10JRamat9L8XxXMyC3AEBWBdrFLrB0aE2++nI fYXeqLnrRTnyyqLriWp2CdD7Ec0mWIRjeNA08BNIs1kWw6CuUjBCEEC/JaTwmxXLsH6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ioreq: add header for 'handle_ioserv' and 'try_fwd_ioserv' Message-Id: Date: Sat, 09 Sep 2023 00:23:43 +0000 commit cba6d44a13d5e25334d164e27cb1b1d7674aa05e Author: Nicola Vetrini AuthorDate: Mon Sep 4 17:36:06 2023 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 7 17:58:12 2023 -0700 xen/arm: ioreq: add header for 'handle_ioserv' and 'try_fwd_ioserv' The functions referenced by this patch should have had a compatible declaration visible prior to their definition. This is achieved by including the arch-specific header in 'xen/arch/arm/ioreq.c' Fixes: cb9953d2f2bc ("arm/ioreq: Introduce arch specific bits for IOREQ/DM features") Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini --- xen/arch/arm/ioreq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/ioreq.c b/xen/arch/arm/ioreq.c index 5585457189..3bed0a14c0 100644 --- a/xen/arch/arm/ioreq.c +++ b/xen/arch/arm/ioreq.c @@ -9,6 +9,7 @@ #include #include +#include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 12:44:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 12:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598544.933424 (Exim 4.92) (envelope-from ) id 1qexJj-0000yb-VQ; Sat, 09 Sep 2023 12:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598544.933424; Sat, 09 Sep 2023 12:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexJj-0000yT-So; Sat, 09 Sep 2023 12:44:03 +0000 Received: by outflank-mailman (input) for mailman id 598544; Sat, 09 Sep 2023 12:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexJi-0000yJ-CZ for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexJi-0006dg-Bm for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qexJi-0003cp-6v for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=p6EAqrsZLn/n+iqNa7yivMcrTybHd24EAUikjXVzRf8=; b=GnMDgGjDCBRq2KaXrjoadwEEDl PVj9qLi0l/AmnMVfkh9PIc3c28UIPrMfehE5+GXowOA7LizsQzrCEEDpikGA4CApwIdHMYEaLv/ov tW7+fEpedHRrkWwCvg9WmPTN6xw3bAE8Qis1qYWqdsOC6l5O4ZkC4kVnHiRW8UBlk2LM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head.S: Introduce enable_{boot,secondary}_cpu_mm() Message-Id: Date: Sat, 09 Sep 2023 12:44:02 +0000 commit d2f8df5b3ede709f39498227f766574c241f3ee6 Author: Wei Chen AuthorDate: Mon Aug 28 09:32:12 2023 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 8 15:07:19 2023 -0700 xen/arm64: head.S: Introduce enable_{boot,secondary}_cpu_mm() At the moment, on MMU system, enable_mmu() will return to an address in the 1:1 mapping, then each path is responsible to switch to virtual runtime mapping. Then remove_identity_mapping() is called on the boot CPU to remove all 1:1 mapping. Since remove_identity_mapping() is not necessary on Non-MMU system, and we also avoid creating empty function for Non-MMU system, trying to keep only one codeflow in arm64/head.S, we move path switch and remove_identity_mapping() in enable_mmu() on MMU system. As the remove_identity_mapping should only be called for the boot CPU only, so we introduce enable_boot_cpu_mm() for boot CPU and enable_secondary_cpu_mm() for secondary CPUs in this patch. Signed-off-by: Wei Chen Signed-off-by: Penny Zheng Signed-off-by: Henry Wang Reviewed-by: Julien Grall Reviewed-by: Ayan Kumar Halder --- xen/arch/arm/arm64/head.S | 83 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 5029013a14..f25a41d36c 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -325,21 +325,11 @@ real_start_efi: bl check_cpu_mode bl cpu_init - bl create_page_tables - load_paddr x0, boot_pgtable - bl enable_mmu - /* We are still in the 1:1 mapping. Jump to the runtime Virtual Address. */ - ldr x0, =primary_switched - br x0 + ldr lr, =primary_switched + b enable_boot_cpu_mm + primary_switched: - /* - * The 1:1 map may clash with other parts of the Xen virtual memory - * layout. As it is not used anymore, remove it completely to - * avoid having to worry about replacing existing mapping - * afterwards. - */ - bl remove_identity_mapping bl setup_fixmap #ifdef CONFIG_EARLY_PRINTK /* Use a virtual address to access the UART. */ @@ -384,13 +374,10 @@ GLOBAL(init_secondary) #endif bl check_cpu_mode bl cpu_init - load_paddr x0, init_ttbr - ldr x0, [x0] - bl enable_mmu - /* We are still in the 1:1 mapping. Jump to the runtime Virtual Address. */ - ldr x0, =secondary_switched - br x0 + ldr lr, =secondary_switched + b enable_secondary_cpu_mm + secondary_switched: #ifdef CONFIG_EARLY_PRINTK /* Use a virtual address to access the UART. */ @@ -748,6 +735,64 @@ enable_mmu: ret ENDPROC(enable_mmu) +/* + * Enable mm (turn on the data cache and the MMU) for secondary CPUs. + * The function will return to the virtual address provided in LR (e.g. the + * runtime mapping). + * + * Inputs: + * lr : Virtual address to return to. + * + * Clobbers x0 - x5 + */ +enable_secondary_cpu_mm: + mov x5, lr + + load_paddr x0, init_ttbr + ldr x0, [x0] + + bl enable_mmu + mov lr, x5 + + /* Return to the virtual address requested by the caller. */ + ret +ENDPROC(enable_secondary_cpu_mm) + +/* + * Enable mm (turn on the data cache and the MMU) for the boot CPU. + * The function will return to the virtual address provided in LR (e.g. the + * runtime mapping). + * + * Inputs: + * lr : Virtual address to return to. + * + * Clobbers x0 - x5 + */ +enable_boot_cpu_mm: + mov x5, lr + + bl create_page_tables + load_paddr x0, boot_pgtable + + bl enable_mmu + + /* + * The MMU is turned on and we are in the 1:1 mapping. Switch + * to the runtime mapping. + */ + ldr x0, =1f + br x0 +1: + mov lr, x5 + /* + * The 1:1 map may clash with other parts of the Xen virtual memory + * layout. As it is not used anymore, remove it completely to avoid + * having to worry about replacing existing mapping afterwards. + * Function will return to the virtual address requested by the caller. + */ + b remove_identity_mapping +ENDPROC(enable_boot_cpu_mm) + /* * Remove the 1:1 map from the page-tables. It is not easy to keep track * where the 1:1 map was mapped, so we will look for the top-level entry -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 12:44:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 12:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598546.933428 (Exim 4.92) (envelope-from ) id 1qexJu-000128-0h; Sat, 09 Sep 2023 12:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598546.933428; Sat, 09 Sep 2023 12:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexJt-000120-UG; Sat, 09 Sep 2023 12:44:13 +0000 Received: by outflank-mailman (input) for mailman id 598546; Sat, 09 Sep 2023 12:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexJs-00011o-GH for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexJs-0006du-FQ for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qexJs-0003dO-E2 for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=npmErqftymOrKgkhhtbWEzb1LeraicmXrrs0zSf/MD4=; b=cbC7RoIW2qKDlY/dPUtjVMfJU1 rMH62MARq0yFCBwrmYC9kRnurBMoVmcOstomPcwkVeE9Zk+QwoIDCQrams9Wc2RJ+J37CDD0ABax7 TytC8IL3beUV/ImqEVojNsIBky3lgXAmxEj63oxLjNfAtIsxPxA8XrZfxvp+Pnn/w8PM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Introduce CONFIG_MMU Kconfig option Message-Id: Date: Sat, 09 Sep 2023 12:44:12 +0000 commit d52e9afe50686dfbf097af1067fd01633c217bd3 Author: Henry Wang AuthorDate: Mon Aug 28 09:32:13 2023 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 8 15:07:25 2023 -0700 xen/arm: Introduce CONFIG_MMU Kconfig option There are two types of memory system architectures available for Arm-based systems, namely the Virtual Memory System Architecture (VMSA) and the Protected Memory System Architecture (PMSA). According to ARM DDI 0487G.a, A VMSA provides a Memory Management Unit (MMU) that controls address translation, access permissions, and memory attribute determination and checking, for memory accesses made by the PE. And refer to ARM DDI 0600A.c, the PMSA supports a unified memory protection scheme where an Memory Protection Unit (MPU) manages instruction and data access. Currently, Xen only supports VMSA. Introduce a Kconfig option CONFIG_MMU, which is currently default set to y and unselectable because currently only VMSA is supported. CONFIG_MMU will be used in follow-up patches. Suggested-by: Julien Grall Signed-off-by: Henry Wang Acked-by: Julien Grall --- xen/arch/arm/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 650aca99ac..632dd9792e 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -59,6 +59,9 @@ config PADDR_BITS default 40 if ARM_PA_BITS_40 default 48 if ARM_64 +config MMU + def_bool y + source "arch/Kconfig" config ACPI -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 12:44:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 12:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598547.933431 (Exim 4.92) (envelope-from ) id 1qexK4-00016O-25; Sat, 09 Sep 2023 12:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598547.933431; Sat, 09 Sep 2023 12:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexK3-00016H-Vl; Sat, 09 Sep 2023 12:44:23 +0000 Received: by outflank-mailman (input) for mailman id 598547; Sat, 09 Sep 2023 12:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexK2-000167-JL for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexK2-0006e2-IU for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qexK2-0003dt-Hd for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gJmfTP1s9Uy7GurKocvrFqVrbDEDtiRWPGCZj/WRpJU=; b=jUDlOMIjElg95eXZv+MhbURfl6 DnsvGgIaPvjdQHE9wmgqmzXBJCajkzXh2xTVXHiKFVCj7frdjjN04CWW3R4mX1s23fLpQoWItKdZs Yh9qSStH0EoDWPkjAiLm+Az9SG9oaAS9CFQTq/eoKwwQJh3JTv1hCgbkCSNGCu5z6diE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: Split and move MMU-specific head.S to mmu/head.S Message-Id: Date: Sat, 09 Sep 2023 12:44:22 +0000 commit 6734327d76be38d20f280ecc96392e385fbc1d8b Author: Henry Wang AuthorDate: Mon Aug 28 09:32:14 2023 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 8 15:07:30 2023 -0700 xen/arm64: Split and move MMU-specific head.S to mmu/head.S The MMU specific code in head.S will not be used on MPU systems. Instead of introducing more #ifdefs which will bring complexity to the code, move MMU related code to mmu/head.S and keep common code in head.S. Two notes while moving: - As "fail" in original head.S is very simple and this name is too easy to be conflicted, duplicate it in mmu/head.S instead of exporting it. - Use ENTRY() for enable_secondary_cpu_mm, enable_boot_cpu_mm and setup_fixmap as they will be used externally. Also move the assembly macros shared by head.S and mmu/head.S to macros.h. Note that, only the first 4KB of Xen image will be mapped as identity (PA == VA). At the moment, Xen guarantees this by having everything that needs to be used in the identity mapping in .text.header section of head.S, and the size will be checked by _idmap_start and _idmap_end at link time if this fits in 4KB. Since we are introducing a new head.S in this patch, although we can add .text.header to the new file to guarantee all identity map code still in the first 4KB. However, the order of these two files on this 4KB depends on the build toolchains. Hence, introduce a new section named .text.idmap in the region between _idmap_start and _idmap_end. And in Xen linker script, we force the .text.idmap contents to linked after .text.header. This will ensure code of head.S always be at the top of Xen binary. Signed-off-by: Henry Wang Signed-off-by: Wei Chen Reviewed-by: Julien Grall --- xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/head.S | 492 +------------------------------- xen/arch/arm/arm64/mmu/Makefile | 1 + xen/arch/arm/arm64/mmu/head.S | 488 +++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/arm64/macros.h | 36 +++ xen/arch/arm/xen.lds.S | 1 + 6 files changed, 528 insertions(+), 491 deletions(-) diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 54ad55c75c..f89d5fb4fb 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -1,4 +1,5 @@ obj-y += lib/ +obj-$(CONFIG_MMU) += mmu/ obj-y += cache.o obj-y += cpufeature.o diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index f25a41d36c..3c8a12eda7 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -28,17 +28,6 @@ #include #endif -#define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ -#define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */ -#define PT_MEM_L3 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ -#define PT_DEV 0xe71 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=0 P=1 */ -#define PT_DEV_L3 0xe73 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=1 P=1 */ - -/* Convenience defines to get slot used by Xen mapping. */ -#define XEN_ZEROETH_SLOT zeroeth_table_offset(XEN_VIRT_START) -#define XEN_FIRST_SLOT first_table_offset(XEN_VIRT_START) -#define XEN_SECOND_SLOT second_table_offset(XEN_VIRT_START) - #define __HEAD_FLAG_PAGE_SIZE ((PAGE_SHIFT - 10) / 2) #define __HEAD_FLAG_PHYS_BASE 1 @@ -85,19 +74,7 @@ * x30 - lr */ -#ifdef CONFIG_EARLY_PRINTK -/* - * Macro to print a string to the UART, if there is one. - * - * Clobbers x0 - x3 - */ -#define PRINT(_s) \ - mov x3, lr ; \ - adr_l x0, 98f ; \ - bl asm_puts ; \ - mov lr, x3 ; \ - RODATA_STR(98, _s) - + #ifdef CONFIG_EARLY_PRINTK /* * Macro to print the value of register \xb * @@ -111,43 +88,11 @@ .endm #else /* CONFIG_EARLY_PRINTK */ -#define PRINT(s) - .macro print_reg xb .endm #endif /* !CONFIG_EARLY_PRINTK */ -/* - * Pseudo-op for PC relative adr , where is - * within the range +/- 4GB of the PC. - * - * @dst: destination register (64 bit wide) - * @sym: name of the symbol - */ -.macro adr_l, dst, sym - adrp \dst, \sym - add \dst, \dst, :lo12:\sym -.endm - -/* Load the physical address of a symbol into xb */ -.macro load_paddr xb, sym - ldr \xb, =\sym - add \xb, \xb, x20 -.endm - -/* - * Flush local TLBs - * - * See asm/arm64/flushtlb.h for the explanation of the sequence. - */ -.macro flush_xen_tlb_local - dsb nshst - tlbi alle2 - dsb nsh - isb -.endm - .section .text.header, "ax", %progbits /*.aarch64*/ @@ -484,402 +429,6 @@ cpu_init: ret ENDPROC(cpu_init) -/* - * Macro to find the slot number at a given page-table level - * - * slot: slot computed - * virt: virtual address - * lvl: page-table level - */ -.macro get_table_slot, slot, virt, lvl - ubfx \slot, \virt, #XEN_PT_LEVEL_SHIFT(\lvl), #XEN_PT_LPAE_SHIFT -.endm - -/* - * Macro to create a page table entry in \ptbl to \tbl - * ptbl: table symbol where the entry will be created - * tbl: physical address of the table to point to - * virt: virtual address - * lvl: page-table level - * tmp1: scratch register - * tmp2: scratch register - * - * Preserves \virt - * Clobbers \tbl, \tmp1, \tmp2 - * - * Note that all parameters using registers should be distinct. - */ -.macro create_table_entry_from_paddr, ptbl, tbl, virt, lvl, tmp1, tmp2 - get_table_slot \tmp1, \virt, \lvl /* \tmp1 := slot in \tbl */ - - mov \tmp2, #PT_PT /* \tmp2 := right for linear PT */ - orr \tmp2, \tmp2, \tbl /* + \tbl */ - - adr_l \tbl, \ptbl /* \tbl := address(\ptbl) */ - - str \tmp2, [\tbl, \tmp1, lsl #3] -.endm - -/* - * Macro to create a page table entry in \ptbl to \tbl - * - * ptbl: table symbol where the entry will be created - * tbl: table symbol to point to - * virt: virtual address - * lvl: page-table level - * tmp1: scratch register - * tmp2: scratch register - * tmp3: scratch register - * - * Preserves \virt - * Clobbers \tmp1, \tmp2, \tmp3 - * - * Also use x20 for the phys offset. - * - * Note that all parameters using registers should be distinct. - */ -.macro create_table_entry, ptbl, tbl, virt, lvl, tmp1, tmp2, tmp3 - load_paddr \tmp1, \tbl - create_table_entry_from_paddr \ptbl, \tmp1, \virt, \lvl, \tmp2, \tmp3 -.endm - -/* - * Macro to create a mapping entry in \tbl to \phys. Only mapping in 3rd - * level table (i.e page granularity) is supported. - * - * ptbl: table symbol where the entry will be created - * virt: virtual address - * phys: physical address (should be page aligned) - * tmp1: scratch register - * tmp2: scratch register - * tmp3: scratch register - * type: mapping type. If not specified it will be normal memory (PT_MEM_L3) - * - * Preserves \virt, \phys - * Clobbers \tmp1, \tmp2, \tmp3 - * - * Note that all parameters using registers should be distinct. - */ -.macro create_mapping_entry, ptbl, virt, phys, tmp1, tmp2, tmp3, type=PT_MEM_L3 - and \tmp3, \phys, #THIRD_MASK /* \tmp3 := PAGE_ALIGNED(phys) */ - - get_table_slot \tmp1, \virt, 3 /* \tmp1 := slot in \tlb */ - - mov \tmp2, #\type /* \tmp2 := right for section PT */ - orr \tmp2, \tmp2, \tmp3 /* + PAGE_ALIGNED(phys) */ - - adr_l \tmp3, \ptbl - - str \tmp2, [\tmp3, \tmp1, lsl #3] -.endm - -/* - * Rebuild the boot pagetable's first-level entries. The structure - * is described in mm.c. - * - * After the CPU enables paging it will add the fixmap mapping - * to these page tables, however this may clash with the 1:1 - * mapping. So each CPU must rebuild the page tables here with - * the 1:1 in place. - * - * Inputs: - * x19: paddr(start) - * x20: phys offset - * - * Clobbers x0 - x4 - */ -create_page_tables: - /* Prepare the page-tables for mapping Xen */ - ldr x0, =XEN_VIRT_START - create_table_entry boot_pgtable, boot_first, x0, 0, x1, x2, x3 - create_table_entry boot_first, boot_second, x0, 1, x1, x2, x3 - - /* - * We need to use a stash register because - * create_table_entry_paddr() will clobber the register storing - * the physical address of the table to point to. - */ - load_paddr x4, boot_third - ldr x1, =XEN_VIRT_START -.rept XEN_NR_ENTRIES(2) - mov x0, x4 /* x0 := paddr(l3 table) */ - create_table_entry_from_paddr boot_second, x0, x1, 2, x2, x3 - add x1, x1, #XEN_PT_LEVEL_SIZE(2) /* x1 := Next vaddr */ - add x4, x4, #PAGE_SIZE /* x4 := Next table */ -.endr - - /* - * Find the size of Xen in pages and multiply by the size of a - * PTE. This will then be compared in the mapping loop below. - * - * Note the multiplication is just to avoid using an extra - * register/instruction per iteration. - */ - ldr x0, =_start /* x0 := vaddr(_start) */ - ldr x1, =_end /* x1 := vaddr(_end) */ - sub x0, x1, x0 /* x0 := effective size of Xen */ - lsr x0, x0, #PAGE_SHIFT /* x0 := Number of pages for Xen */ - lsl x0, x0, #3 /* x0 := Number of pages * PTE size */ - - /* Map Xen */ - adr_l x4, boot_third - - lsr x2, x19, #THIRD_SHIFT /* Base address for 4K mapping */ - lsl x2, x2, #THIRD_SHIFT - mov x3, #PT_MEM_L3 /* x2 := Section map */ - orr x2, x2, x3 - - /* ... map of vaddr(start) in boot_third */ - mov x1, xzr -1: str x2, [x4, x1] /* Map vaddr(start) */ - add x2, x2, #PAGE_SIZE /* Next page */ - add x1, x1, #8 /* Next slot */ - cmp x1, x0 /* Loop until we map all of Xen */ - b.lt 1b - - /* - * If Xen is loaded at exactly XEN_VIRT_START then we don't - * need an additional 1:1 mapping, the virtual mapping will - * suffice. - */ - ldr x0, =XEN_VIRT_START - cmp x19, x0 - bne 1f - ret -1: - /* - * Setup the 1:1 mapping so we can turn the MMU on. Note that - * only the first page of Xen will be part of the 1:1 mapping. - */ - - /* - * Find the zeroeth slot used. If the slot is not - * XEN_ZEROETH_SLOT, then the 1:1 mapping will use its own set of - * page-tables from the first level. - */ - get_table_slot x0, x19, 0 /* x0 := zeroeth slot */ - cmp x0, #XEN_ZEROETH_SLOT - beq 1f - create_table_entry boot_pgtable, boot_first_id, x19, 0, x0, x1, x2 - b link_from_first_id - -1: - /* - * Find the first slot used. If the slot is not XEN_FIRST_SLOT, - * then the 1:1 mapping will use its own set of page-tables from - * the second level. - */ - get_table_slot x0, x19, 1 /* x0 := first slot */ - cmp x0, #XEN_FIRST_SLOT - beq 1f - create_table_entry boot_first, boot_second_id, x19, 1, x0, x1, x2 - b link_from_second_id - -1: - /* - * Find the second slot used. If the slot is XEN_SECOND_SLOT, then the - * 1:1 mapping will use its own set of page-tables from the - * third level. For slot XEN_SECOND_SLOT, Xen is not yet able to handle - * it. - */ - get_table_slot x0, x19, 2 /* x0 := second slot */ - cmp x0, #XEN_SECOND_SLOT - beq virtphys_clash - create_table_entry boot_second, boot_third_id, x19, 2, x0, x1, x2 - b link_from_third_id - -link_from_first_id: - create_table_entry boot_first_id, boot_second_id, x19, 1, x0, x1, x2 -link_from_second_id: - create_table_entry boot_second_id, boot_third_id, x19, 2, x0, x1, x2 -link_from_third_id: - create_mapping_entry boot_third_id, x19, x19, x0, x1, x2 - ret - -virtphys_clash: - /* Identity map clashes with boot_third, which we cannot handle yet */ - PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") - b fail -ENDPROC(create_page_tables) - -/* - * Turn on the Data Cache and the MMU. The function will return on the 1:1 - * mapping. In other word, the caller is responsible to switch to the runtime - * mapping. - * - * Inputs: - * x0 : Physical address of the page tables. - * - * Clobbers x0 - x4 - */ -enable_mmu: - mov x4, x0 - PRINT("- Turning on paging -\r\n") - - /* - * The state of the TLBs is unknown before turning on the MMU. - * Flush them to avoid stale one. - */ - flush_xen_tlb_local - - /* Write Xen's PT's paddr into TTBR0_EL2 */ - msr TTBR0_EL2, x4 - isb - - mrs x0, SCTLR_EL2 - orr x0, x0, #SCTLR_Axx_ELx_M /* Enable MMU */ - orr x0, x0, #SCTLR_Axx_ELx_C /* Enable D-cache */ - dsb sy /* Flush PTE writes and finish reads */ - msr SCTLR_EL2, x0 /* now paging is enabled */ - isb /* Now, flush the icache */ - ret -ENDPROC(enable_mmu) - -/* - * Enable mm (turn on the data cache and the MMU) for secondary CPUs. - * The function will return to the virtual address provided in LR (e.g. the - * runtime mapping). - * - * Inputs: - * lr : Virtual address to return to. - * - * Clobbers x0 - x5 - */ -enable_secondary_cpu_mm: - mov x5, lr - - load_paddr x0, init_ttbr - ldr x0, [x0] - - bl enable_mmu - mov lr, x5 - - /* Return to the virtual address requested by the caller. */ - ret -ENDPROC(enable_secondary_cpu_mm) - -/* - * Enable mm (turn on the data cache and the MMU) for the boot CPU. - * The function will return to the virtual address provided in LR (e.g. the - * runtime mapping). - * - * Inputs: - * lr : Virtual address to return to. - * - * Clobbers x0 - x5 - */ -enable_boot_cpu_mm: - mov x5, lr - - bl create_page_tables - load_paddr x0, boot_pgtable - - bl enable_mmu - - /* - * The MMU is turned on and we are in the 1:1 mapping. Switch - * to the runtime mapping. - */ - ldr x0, =1f - br x0 -1: - mov lr, x5 - /* - * The 1:1 map may clash with other parts of the Xen virtual memory - * layout. As it is not used anymore, remove it completely to avoid - * having to worry about replacing existing mapping afterwards. - * Function will return to the virtual address requested by the caller. - */ - b remove_identity_mapping -ENDPROC(enable_boot_cpu_mm) - -/* - * Remove the 1:1 map from the page-tables. It is not easy to keep track - * where the 1:1 map was mapped, so we will look for the top-level entry - * exclusive to the 1:1 map and remove it. - * - * Inputs: - * x19: paddr(start) - * - * Clobbers x0 - x1 - */ -remove_identity_mapping: - /* - * Find the zeroeth slot used. Remove the entry from zeroeth - * table if the slot is not XEN_ZEROETH_SLOT. - */ - get_table_slot x1, x19, 0 /* x1 := zeroeth slot */ - cmp x1, #XEN_ZEROETH_SLOT - beq 1f - /* It is not in slot XEN_ZEROETH_SLOT, remove the entry. */ - ldr x0, =boot_pgtable /* x0 := root table */ - str xzr, [x0, x1, lsl #3] - b identity_mapping_removed - -1: - /* - * Find the first slot used. Remove the entry for the first - * table if the slot is not XEN_FIRST_SLOT. - */ - get_table_slot x1, x19, 1 /* x1 := first slot */ - cmp x1, #XEN_FIRST_SLOT - beq 1f - /* It is not in slot XEN_FIRST_SLOT, remove the entry. */ - ldr x0, =boot_first /* x0 := first table */ - str xzr, [x0, x1, lsl #3] - b identity_mapping_removed - -1: - /* - * Find the second slot used. Remove the entry for the first - * table if the slot is not XEN_SECOND_SLOT. - */ - get_table_slot x1, x19, 2 /* x1 := second slot */ - cmp x1, #XEN_SECOND_SLOT - beq identity_mapping_removed - /* It is not in slot 1, remove the entry */ - ldr x0, =boot_second /* x0 := second table */ - str xzr, [x0, x1, lsl #3] - -identity_mapping_removed: - flush_xen_tlb_local - - ret -ENDPROC(remove_identity_mapping) - -/* - * Map the UART in the fixmap (when earlyprintk is used) and hook the - * fixmap table in the page tables. - * - * The fixmap cannot be mapped in create_page_tables because it may - * clash with the 1:1 mapping. - * - * Inputs: - * x20: Physical offset - * x23: Early UART base physical address - * - * Clobbers x0 - x3 - */ -setup_fixmap: -#ifdef CONFIG_EARLY_PRINTK - /* Add UART to the fixmap table */ - ldr x0, =EARLY_UART_VIRTUAL_ADDRESS - create_mapping_entry xen_fixmap, x0, x23, x1, x2, x3, type=PT_DEV_L3 -#endif - /* Map fixmap into boot_second */ - ldr x0, =FIXMAP_ADDR(0) - create_table_entry boot_second, xen_fixmap, x0, 2, x1, x2, x3 - /* Ensure any page table updates made above have occurred. */ - dsb nshst - /* - * The fixmap area will be used soon after. So ensure no hardware - * translation happens before the dsb completes. - */ - isb - - ret -ENDPROC(setup_fixmap) - /* * Setup the initial stack and jump to the C world * @@ -908,45 +457,6 @@ fail: PRINT("- Boot failed -\r\n") b 1b ENDPROC(fail) -/* - * Switch TTBR - * - * x0 ttbr - */ -ENTRY(switch_ttbr_id) - /* 1) Ensure any previous read/write have completed */ - dsb ish - isb - - /* 2) Turn off MMU */ - mrs x1, SCTLR_EL2 - bic x1, x1, #SCTLR_Axx_ELx_M - msr SCTLR_EL2, x1 - isb - - /* 3) Flush the TLBs */ - flush_xen_tlb_local - - /* 4) Update the TTBR */ - msr TTBR0_EL2, x0 - isb - - /* - * 5) Flush I-cache - * This should not be necessary but it is kept for safety. - */ - ic iallu - isb - - /* 6) Turn on the MMU */ - mrs x1, SCTLR_EL2 - orr x1, x1, #SCTLR_Axx_ELx_M /* Enable MMU */ - msr SCTLR_EL2, x1 - isb - - ret -ENDPROC(switch_ttbr_id) - #ifdef CONFIG_EARLY_PRINTK /* * Initialize the UART. Should only be called on the boot CPU. diff --git a/xen/arch/arm/arm64/mmu/Makefile b/xen/arch/arm/arm64/mmu/Makefile new file mode 100644 index 0000000000..3340058c08 --- /dev/null +++ b/xen/arch/arm/arm64/mmu/Makefile @@ -0,0 +1 @@ +obj-y += head.o diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S new file mode 100644 index 0000000000..d71fdc69a5 --- /dev/null +++ b/xen/arch/arm/arm64/mmu/head.S @@ -0,0 +1,488 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * xen/arch/arm/arm64/mmu/head.S + * + * Arm64 MMU specific start-of-day code. + */ + +#include +#include + +#define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ +#define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */ +#define PT_MEM_L3 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ +#define PT_DEV 0xe71 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=0 P=1 */ +#define PT_DEV_L3 0xe73 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=1 P=1 */ + +/* Convenience defines to get slot used by Xen mapping. */ +#define XEN_ZEROETH_SLOT zeroeth_table_offset(XEN_VIRT_START) +#define XEN_FIRST_SLOT first_table_offset(XEN_VIRT_START) +#define XEN_SECOND_SLOT second_table_offset(XEN_VIRT_START) + +/* + * Flush local TLBs + * + * See asm/arm64/flushtlb.h for the explanation of the sequence. + */ +.macro flush_xen_tlb_local + dsb nshst + tlbi alle2 + dsb nsh + isb +.endm + +/* + * Macro to find the slot number at a given page-table level + * + * slot: slot computed + * virt: virtual address + * lvl: page-table level + */ +.macro get_table_slot, slot, virt, lvl + ubfx \slot, \virt, #XEN_PT_LEVEL_SHIFT(\lvl), #XEN_PT_LPAE_SHIFT +.endm + +/* + * Macro to create a page table entry in \ptbl to \tbl + * ptbl: table symbol where the entry will be created + * tbl: physical address of the table to point to + * virt: virtual address + * lvl: page-table level + * tmp1: scratch register + * tmp2: scratch register + * + * Preserves \virt + * Clobbers \tbl, \tmp1, \tmp2 + * + * Note that all parameters using registers should be distinct. + */ +.macro create_table_entry_from_paddr, ptbl, tbl, virt, lvl, tmp1, tmp2 + get_table_slot \tmp1, \virt, \lvl /* \tmp1 := slot in \tbl */ + + mov \tmp2, #PT_PT /* \tmp2 := right for linear PT */ + orr \tmp2, \tmp2, \tbl /* + \tbl */ + + adr_l \tbl, \ptbl /* \tbl := address(\ptbl) */ + + str \tmp2, [\tbl, \tmp1, lsl #3] +.endm + +/* + * Macro to create a page table entry in \ptbl to \tbl + * + * ptbl: table symbol where the entry will be created + * tbl: table symbol to point to + * virt: virtual address + * lvl: page-table level + * tmp1: scratch register + * tmp2: scratch register + * tmp3: scratch register + * + * Preserves \virt + * Clobbers \tmp1, \tmp2, \tmp3 + * + * Also use x20 for the phys offset. + * + * Note that all parameters using registers should be distinct. + */ +.macro create_table_entry, ptbl, tbl, virt, lvl, tmp1, tmp2, tmp3 + load_paddr \tmp1, \tbl + create_table_entry_from_paddr \ptbl, \tmp1, \virt, \lvl, \tmp2, \tmp3 +.endm + +/* + * Macro to create a mapping entry in \tbl to \phys. Only mapping in 3rd + * level table (i.e page granularity) is supported. + * + * ptbl: table symbol where the entry will be created + * virt: virtual address + * phys: physical address (should be page aligned) + * tmp1: scratch register + * tmp2: scratch register + * tmp3: scratch register + * type: mapping type. If not specified it will be normal memory (PT_MEM_L3) + * + * Preserves \virt, \phys + * Clobbers \tmp1, \tmp2, \tmp3 + * + * Note that all parameters using registers should be distinct. + */ +.macro create_mapping_entry, ptbl, virt, phys, tmp1, tmp2, tmp3, type=PT_MEM_L3 + and \tmp3, \phys, #THIRD_MASK /* \tmp3 := PAGE_ALIGNED(phys) */ + + get_table_slot \tmp1, \virt, 3 /* \tmp1 := slot in \tlb */ + + mov \tmp2, #\type /* \tmp2 := right for section PT */ + orr \tmp2, \tmp2, \tmp3 /* + PAGE_ALIGNED(phys) */ + + adr_l \tmp3, \ptbl + + str \tmp2, [\tmp3, \tmp1, lsl #3] +.endm + +.section .text.idmap, "ax", %progbits + +/* + * Rebuild the boot pagetable's first-level entries. The structure + * is described in mm.c. + * + * After the CPU enables paging it will add the fixmap mapping + * to these page tables, however this may clash with the 1:1 + * mapping. So each CPU must rebuild the page tables here with + * the 1:1 in place. + * + * Inputs: + * x19: paddr(start) + * x20: phys offset + * + * Clobbers x0 - x4 + */ +create_page_tables: + /* Prepare the page-tables for mapping Xen */ + ldr x0, =XEN_VIRT_START + create_table_entry boot_pgtable, boot_first, x0, 0, x1, x2, x3 + create_table_entry boot_first, boot_second, x0, 1, x1, x2, x3 + + /* + * We need to use a stash register because + * create_table_entry_paddr() will clobber the register storing + * the physical address of the table to point to. + */ + load_paddr x4, boot_third + ldr x1, =XEN_VIRT_START +.rept XEN_NR_ENTRIES(2) + mov x0, x4 /* x0 := paddr(l3 table) */ + create_table_entry_from_paddr boot_second, x0, x1, 2, x2, x3 + add x1, x1, #XEN_PT_LEVEL_SIZE(2) /* x1 := Next vaddr */ + add x4, x4, #PAGE_SIZE /* x4 := Next table */ +.endr + + /* + * Find the size of Xen in pages and multiply by the size of a + * PTE. This will then be compared in the mapping loop below. + * + * Note the multiplication is just to avoid using an extra + * register/instruction per iteration. + */ + ldr x0, =_start /* x0 := vaddr(_start) */ + ldr x1, =_end /* x1 := vaddr(_end) */ + sub x0, x1, x0 /* x0 := effective size of Xen */ + lsr x0, x0, #PAGE_SHIFT /* x0 := Number of pages for Xen */ + lsl x0, x0, #3 /* x0 := Number of pages * PTE size */ + + /* Map Xen */ + adr_l x4, boot_third + + lsr x2, x19, #THIRD_SHIFT /* Base address for 4K mapping */ + lsl x2, x2, #THIRD_SHIFT + mov x3, #PT_MEM_L3 /* x2 := Section map */ + orr x2, x2, x3 + + /* ... map of vaddr(start) in boot_third */ + mov x1, xzr +1: str x2, [x4, x1] /* Map vaddr(start) */ + add x2, x2, #PAGE_SIZE /* Next page */ + add x1, x1, #8 /* Next slot */ + cmp x1, x0 /* Loop until we map all of Xen */ + b.lt 1b + + /* + * If Xen is loaded at exactly XEN_VIRT_START then we don't + * need an additional 1:1 mapping, the virtual mapping will + * suffice. + */ + ldr x0, =XEN_VIRT_START + cmp x19, x0 + bne 1f + ret +1: + /* + * Setup the 1:1 mapping so we can turn the MMU on. Note that + * only the first page of Xen will be part of the 1:1 mapping. + */ + + /* + * Find the zeroeth slot used. If the slot is not + * XEN_ZEROETH_SLOT, then the 1:1 mapping will use its own set of + * page-tables from the first level. + */ + get_table_slot x0, x19, 0 /* x0 := zeroeth slot */ + cmp x0, #XEN_ZEROETH_SLOT + beq 1f + create_table_entry boot_pgtable, boot_first_id, x19, 0, x0, x1, x2 + b link_from_first_id + +1: + /* + * Find the first slot used. If the slot is not XEN_FIRST_SLOT, + * then the 1:1 mapping will use its own set of page-tables from + * the second level. + */ + get_table_slot x0, x19, 1 /* x0 := first slot */ + cmp x0, #XEN_FIRST_SLOT + beq 1f + create_table_entry boot_first, boot_second_id, x19, 1, x0, x1, x2 + b link_from_second_id + +1: + /* + * Find the second slot used. If the slot is XEN_SECOND_SLOT, then the + * 1:1 mapping will use its own set of page-tables from the + * third level. For slot XEN_SECOND_SLOT, Xen is not yet able to handle + * it. + */ + get_table_slot x0, x19, 2 /* x0 := second slot */ + cmp x0, #XEN_SECOND_SLOT + beq virtphys_clash + create_table_entry boot_second, boot_third_id, x19, 2, x0, x1, x2 + b link_from_third_id + +link_from_first_id: + create_table_entry boot_first_id, boot_second_id, x19, 1, x0, x1, x2 +link_from_second_id: + create_table_entry boot_second_id, boot_third_id, x19, 2, x0, x1, x2 +link_from_third_id: + create_mapping_entry boot_third_id, x19, x19, x0, x1, x2 + ret + +virtphys_clash: + /* Identity map clashes with boot_third, which we cannot handle yet */ + PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") + b fail +ENDPROC(create_page_tables) + +/* + * Turn on the Data Cache and the MMU. The function will return on the 1:1 + * mapping. In other word, the caller is responsible to switch to the runtime + * mapping. + * + * Inputs: + * x0 : Physical address of the page tables. + * + * Clobbers x0 - x4 + */ +enable_mmu: + mov x4, x0 + PRINT("- Turning on paging -\r\n") + + /* + * The state of the TLBs is unknown before turning on the MMU. + * Flush them to avoid stale one. + */ + flush_xen_tlb_local + + /* Write Xen's PT's paddr into TTBR0_EL2 */ + msr TTBR0_EL2, x4 + isb + + mrs x0, SCTLR_EL2 + orr x0, x0, #SCTLR_Axx_ELx_M /* Enable MMU */ + orr x0, x0, #SCTLR_Axx_ELx_C /* Enable D-cache */ + dsb sy /* Flush PTE writes and finish reads */ + msr SCTLR_EL2, x0 /* now paging is enabled */ + isb /* Now, flush the icache */ + ret +ENDPROC(enable_mmu) + +/* + * Enable mm (turn on the data cache and the MMU) for secondary CPUs. + * The function will return to the virtual address provided in LR (e.g. the + * runtime mapping). + * + * Inputs: + * lr : Virtual address to return to. + * + * Clobbers x0 - x5 + */ +ENTRY(enable_secondary_cpu_mm) + mov x5, lr + + load_paddr x0, init_ttbr + ldr x0, [x0] + + bl enable_mmu + mov lr, x5 + + /* Return to the virtual address requested by the caller. */ + ret +ENDPROC(enable_secondary_cpu_mm) + +/* + * Enable mm (turn on the data cache and the MMU) for the boot CPU. + * The function will return to the virtual address provided in LR (e.g. the + * runtime mapping). + * + * Inputs: + * lr : Virtual address to return to. + * + * Clobbers x0 - x5 + */ +ENTRY(enable_boot_cpu_mm) + mov x5, lr + + bl create_page_tables + load_paddr x0, boot_pgtable + + bl enable_mmu + mov lr, x5 + + /* + * The MMU is turned on and we are in the 1:1 mapping. Switch + * to the runtime mapping. + */ + ldr x0, =1f + br x0 +1: + /* + * The 1:1 map may clash with other parts of the Xen virtual memory + * layout. As it is not used anymore, remove it completely to + * avoid having to worry about replacing existing mapping + * afterwards. Function will return to primary_switched. + */ + b remove_identity_mapping + + /* + * Below is supposed to be unreachable code, as "ret" in + * remove_identity_mapping will use the return address in LR in advance. + */ + b fail +ENDPROC(enable_boot_cpu_mm) + +/* + * Remove the 1:1 map from the page-tables. It is not easy to keep track + * where the 1:1 map was mapped, so we will look for the top-level entry + * exclusive to the 1:1 map and remove it. + * + * Inputs: + * x19: paddr(start) + * + * Clobbers x0 - x1 + */ +remove_identity_mapping: + /* + * Find the zeroeth slot used. Remove the entry from zeroeth + * table if the slot is not XEN_ZEROETH_SLOT. + */ + get_table_slot x1, x19, 0 /* x1 := zeroeth slot */ + cmp x1, #XEN_ZEROETH_SLOT + beq 1f + /* It is not in slot XEN_ZEROETH_SLOT, remove the entry. */ + ldr x0, =boot_pgtable /* x0 := root table */ + str xzr, [x0, x1, lsl #3] + b identity_mapping_removed + +1: + /* + * Find the first slot used. Remove the entry for the first + * table if the slot is not XEN_FIRST_SLOT. + */ + get_table_slot x1, x19, 1 /* x1 := first slot */ + cmp x1, #XEN_FIRST_SLOT + beq 1f + /* It is not in slot XEN_FIRST_SLOT, remove the entry. */ + ldr x0, =boot_first /* x0 := first table */ + str xzr, [x0, x1, lsl #3] + b identity_mapping_removed + +1: + /* + * Find the second slot used. Remove the entry for the first + * table if the slot is not XEN_SECOND_SLOT. + */ + get_table_slot x1, x19, 2 /* x1 := second slot */ + cmp x1, #XEN_SECOND_SLOT + beq identity_mapping_removed + /* It is not in slot 1, remove the entry */ + ldr x0, =boot_second /* x0 := second table */ + str xzr, [x0, x1, lsl #3] + +identity_mapping_removed: + flush_xen_tlb_local + + ret +ENDPROC(remove_identity_mapping) + +/* + * Map the UART in the fixmap (when earlyprintk is used) and hook the + * fixmap table in the page tables. + * + * The fixmap cannot be mapped in create_page_tables because it may + * clash with the 1:1 mapping. + * + * Inputs: + * x20: Physical offset + * x23: Early UART base physical address + * + * Clobbers x0 - x3 + */ +ENTRY(setup_fixmap) +#ifdef CONFIG_EARLY_PRINTK + /* Add UART to the fixmap table */ + ldr x0, =EARLY_UART_VIRTUAL_ADDRESS + create_mapping_entry xen_fixmap, x0, x23, x1, x2, x3, type=PT_DEV_L3 +#endif + /* Map fixmap into boot_second */ + ldr x0, =FIXMAP_ADDR(0) + create_table_entry boot_second, xen_fixmap, x0, 2, x1, x2, x3 + /* Ensure any page table updates made above have occurred. */ + dsb nshst + /* + * The fixmap area will be used soon after. So ensure no hardware + * translation happens before the dsb completes. + */ + isb + + ret +ENDPROC(setup_fixmap) + +/* Fail-stop */ +fail: PRINT("- Boot failed -\r\n") +1: wfe + b 1b +ENDPROC(fail) + +/* + * Switch TTBR + * + * x0 ttbr + */ +ENTRY(switch_ttbr_id) + /* 1) Ensure any previous read/write have completed */ + dsb ish + isb + + /* 2) Turn off MMU */ + mrs x1, SCTLR_EL2 + bic x1, x1, #SCTLR_Axx_ELx_M + msr SCTLR_EL2, x1 + isb + + /* 3) Flush the TLBs */ + flush_xen_tlb_local + + /* 4) Update the TTBR */ + msr TTBR0_EL2, x0 + isb + + /* + * 5) Flush I-cache + * This should not be necessary but it is kept for safety. + */ + ic iallu + isb + + /* 6) Turn on the MMU */ + mrs x1, SCTLR_EL2 + orr x1, x1, #SCTLR_Axx_ELx_M /* Enable MMU */ + msr SCTLR_EL2, x1 + isb + + ret +ENDPROC(switch_ttbr_id) + +/* + * Local variables: + * mode: ASM + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/macros.h b/xen/arch/arm/include/asm/arm64/macros.h index 140e223b4c..99c401fcaf 100644 --- a/xen/arch/arm/include/asm/arm64/macros.h +++ b/xen/arch/arm/include/asm/arm64/macros.h @@ -32,6 +32,42 @@ hint #22 .endm +#ifdef CONFIG_EARLY_PRINTK +/* + * Macro to print a string to the UART, if there is one. + * + * Clobbers x0 - x3 + */ +#define PRINT(_s) \ + mov x3, lr ; \ + adr_l x0, 98f ; \ + bl asm_puts ; \ + mov lr, x3 ; \ + RODATA_STR(98, _s) + +#else /* CONFIG_EARLY_PRINTK */ +#define PRINT(s) + +#endif /* !CONFIG_EARLY_PRINTK */ + +/* + * Pseudo-op for PC relative adr , where is + * within the range +/- 4GB of the PC. + * + * @dst: destination register (64 bit wide) + * @sym: name of the symbol + */ +.macro adr_l, dst, sym + adrp \dst, \sym + add \dst, \dst, :lo12:\sym +.endm + +/* Load the physical address of a symbol into xb */ +.macro load_paddr xb, sym + ldr \xb, =\sym + add \xb, \xb, x20 +.endm + /* * Register aliases. */ diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index a3c90ca823..59b80d122f 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -34,6 +34,7 @@ SECTIONS _stext = .; /* Text section */ _idmap_start = .; *(.text.header) + *(.text.idmap) _idmap_end = .; *(.text.cold) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 12:44:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 12:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598548.933436 (Exim 4.92) (envelope-from ) id 1qexKE-00019O-5m; Sat, 09 Sep 2023 12:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598548.933436; Sat, 09 Sep 2023 12:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexKE-00019H-36; Sat, 09 Sep 2023 12:44:34 +0000 Received: by outflank-mailman (input) for mailman id 598548; Sat, 09 Sep 2023 12:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexKC-000192-NM for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexKC-0006eB-M5 for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qexKC-0003eR-Kh for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bx5xQC9wMhbn4Wi6rPbWrdGvXBcpUSbPHMLdUMM6OfM=; b=5EWiKTfdCm9Dp9X4BQVAIVd/+3 Kq3j103/AVmdStduicsbRgJvzxKEnwo7lK8C0U2cbwjseaibK7Kl1IhBiIMJqqZYpfsoBid01SwuW +O/XIs/NCt8Z4fP6yARiYRbe7FJmGsiqO5yzeCQmVjfaX+glyjcQS3ksyBQACh07Azm4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Move MMU related definitions from config.h to mmu/layout.h Message-Id: Date: Sat, 09 Sep 2023 12:44:32 +0000 commit db5ad6d10f7b1bb9e7236f9dd81ab07ec2506f5d Author: Wei Chen AuthorDate: Mon Aug 28 09:32:15 2023 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 8 15:07:36 2023 -0700 xen/arm: Move MMU related definitions from config.h to mmu/layout.h Xen defines some global configuration macros for Arm in config.h. However there are some address layout related definitions that are defined for MMU systems only, and these definitions could not be used by MPU systems. Adding ifdefs to differentiate the MPU from MMU layout will result in a messy and hard-to-read/maintain code. So move all memory layout definitions to a new file, i.e. mmu/layout.h to avoid spreading "#ifdef" everywhere. Signed-off-by: Wei Chen Signed-off-by: Penny Zheng Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/config.h | 132 +----------------------------- xen/arch/arm/include/asm/mmu/layout.h | 146 ++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 129 deletions(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 83cbf6b0cb..e1dcec4dd7 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -71,136 +71,10 @@ #include #include -/* - * ARM32 layout: - * 0 - 2M Unmapped - * 2M - 10M Xen text, data, bss - * 10M - 12M Fixmap: special-purpose 4K mapping slots - * 12M - 16M Early boot mapping of FDT - * 16M - 18M Livepatch vmap (if compiled in) - * - * 32M - 128M Frametable: 32 bytes per page for 12GB of RAM - * 256M - 1G VMAP: ioremap and early_ioremap use this virtual address - * space - * - * 1G - 2G Xenheap: always-mapped memory - * 2G - 4G Domheap: on-demand-mapped - * - * ARM64 layout: - * 0x0000000000000000 - 0x000001ffffffffff (2TB, L0 slots [0..3]) - * - * Reserved to identity map Xen - * - * 0x0000020000000000 - 0x0000027fffffffff (512GB, L0 slot [4]) - * (Relative offsets) - * 0 - 2M Unmapped - * 2M - 10M Xen text, data, bss - * 10M - 12M Fixmap: special-purpose 4K mapping slots - * 12M - 16M Early boot mapping of FDT - * 16M - 18M Livepatch vmap (if compiled in) - * - * 1G - 2G VMAP: ioremap and early_ioremap - * - * 32G - 64G Frametable: 56 bytes per page for 2TB of RAM - * - * 0x0000028000000000 - 0x00007fffffffffff (125TB, L0 slots [5..255]) - * Unused - * - * 0x0000800000000000 - 0x000084ffffffffff (5TB, L0 slots [256..265]) - * 1:1 mapping of RAM - * - * 0x0000850000000000 - 0x0000ffffffffffff (123TB, L0 slots [266..511]) - * Unused - */ - -#ifdef CONFIG_ARM_32 -#define XEN_VIRT_START _AT(vaddr_t, MB(2)) +#ifdef CONFIG_MMU +#include #else - -#define SLOT0_ENTRY_BITS 39 -#define SLOT0(slot) (_AT(vaddr_t,slot) << SLOT0_ENTRY_BITS) -#define SLOT0_ENTRY_SIZE SLOT0(1) - -#define XEN_VIRT_START (SLOT0(4) + _AT(vaddr_t, MB(2))) -#endif - -/* - * Reserve enough space so both UBSAN and GCOV can be enabled together - * plus some slack for future growth. - */ -#define XEN_VIRT_SIZE _AT(vaddr_t, MB(8)) -#define XEN_NR_ENTRIES(lvl) (XEN_VIRT_SIZE / XEN_PT_LEVEL_SIZE(lvl)) - -#define FIXMAP_VIRT_START (XEN_VIRT_START + XEN_VIRT_SIZE) -#define FIXMAP_VIRT_SIZE _AT(vaddr_t, MB(2)) - -#define FIXMAP_ADDR(n) (FIXMAP_VIRT_START + (n) * PAGE_SIZE) - -#define BOOT_FDT_VIRT_START (FIXMAP_VIRT_START + FIXMAP_VIRT_SIZE) -#define BOOT_FDT_VIRT_SIZE _AT(vaddr_t, MB(4)) - -#ifdef CONFIG_LIVEPATCH -#define LIVEPATCH_VMAP_START (BOOT_FDT_VIRT_START + BOOT_FDT_VIRT_SIZE) -#define LIVEPATCH_VMAP_SIZE _AT(vaddr_t, MB(2)) -#endif - -#define HYPERVISOR_VIRT_START XEN_VIRT_START - -#ifdef CONFIG_ARM_32 - -#define CONFIG_SEPARATE_XENHEAP 1 - -#define FRAMETABLE_VIRT_START _AT(vaddr_t, MB(32)) -#define FRAMETABLE_SIZE MB(128-32) -#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) - -#define VMAP_VIRT_START _AT(vaddr_t, MB(256)) -#define VMAP_VIRT_SIZE _AT(vaddr_t, GB(1) - MB(256)) - -#define XENHEAP_VIRT_START _AT(vaddr_t, GB(1)) -#define XENHEAP_VIRT_SIZE _AT(vaddr_t, GB(1)) - -#define DOMHEAP_VIRT_START _AT(vaddr_t, GB(2)) -#define DOMHEAP_VIRT_SIZE _AT(vaddr_t, GB(2)) - -#define DOMHEAP_ENTRIES 1024 /* 1024 2MB mapping slots */ - -/* Number of domheap pagetable pages required at the second level (2MB mappings) */ -#define DOMHEAP_SECOND_PAGES (DOMHEAP_VIRT_SIZE >> FIRST_SHIFT) - -/* - * The temporary area is overlapping with the domheap area. This may - * be used to create an alias of the first slot containing Xen mappings - * when turning on/off the MMU. - */ -#define TEMPORARY_AREA_FIRST_SLOT (first_table_offset(DOMHEAP_VIRT_START)) - -/* Calculate the address in the temporary area */ -#define TEMPORARY_AREA_ADDR(addr) \ - (((addr) & ~XEN_PT_LEVEL_MASK(1)) | \ - (TEMPORARY_AREA_FIRST_SLOT << XEN_PT_LEVEL_SHIFT(1))) - -#define TEMPORARY_XEN_VIRT_START TEMPORARY_AREA_ADDR(XEN_VIRT_START) - -#else /* ARM_64 */ - -#define IDENTITY_MAPPING_AREA_NR_L0 4 - -#define VMAP_VIRT_START (SLOT0(4) + GB(1)) -#define VMAP_VIRT_SIZE GB(1) - -#define FRAMETABLE_VIRT_START (SLOT0(4) + GB(32)) -#define FRAMETABLE_SIZE GB(32) -#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) - -#define DIRECTMAP_VIRT_START SLOT0(256) -#define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (266 - 256)) -#define DIRECTMAP_VIRT_END (DIRECTMAP_VIRT_START + DIRECTMAP_SIZE - 1) - -#define XENHEAP_VIRT_START directmap_virt_start - -#define HYPERVISOR_VIRT_END DIRECTMAP_VIRT_END - +# error "Unknown memory management layout" #endif #define NR_hypercalls 64 diff --git a/xen/arch/arm/include/asm/mmu/layout.h b/xen/arch/arm/include/asm/mmu/layout.h new file mode 100644 index 0000000000..da6be276ac --- /dev/null +++ b/xen/arch/arm/include/asm/mmu/layout.h @@ -0,0 +1,146 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ARM_MMU_LAYOUT_H__ +#define __ARM_MMU_LAYOUT_H__ + +/* + * ARM32 layout: + * 0 - 2M Unmapped + * 2M - 10M Xen text, data, bss + * 10M - 12M Fixmap: special-purpose 4K mapping slots + * 12M - 16M Early boot mapping of FDT + * 16M - 18M Livepatch vmap (if compiled in) + * + * 32M - 128M Frametable: 32 bytes per page for 12GB of RAM + * 256M - 1G VMAP: ioremap and early_ioremap use this virtual address + * space + * + * 1G - 2G Xenheap: always-mapped memory + * 2G - 4G Domheap: on-demand-mapped + * + * ARM64 layout: + * 0x0000000000000000 - 0x000001ffffffffff (2TB, L0 slots [0..3]) + * + * Reserved to identity map Xen + * + * 0x0000020000000000 - 0x0000027fffffffff (512GB, L0 slot [4]) + * (Relative offsets) + * 0 - 2M Unmapped + * 2M - 10M Xen text, data, bss + * 10M - 12M Fixmap: special-purpose 4K mapping slots + * 12M - 16M Early boot mapping of FDT + * 16M - 18M Livepatch vmap (if compiled in) + * + * 1G - 2G VMAP: ioremap and early_ioremap + * + * 32G - 64G Frametable: 56 bytes per page for 2TB of RAM + * + * 0x0000028000000000 - 0x00007fffffffffff (125TB, L0 slots [5..255]) + * Unused + * + * 0x0000800000000000 - 0x000084ffffffffff (5TB, L0 slots [256..265]) + * 1:1 mapping of RAM + * + * 0x0000850000000000 - 0x0000ffffffffffff (123TB, L0 slots [266..511]) + * Unused + */ + +#ifdef CONFIG_ARM_32 +#define XEN_VIRT_START _AT(vaddr_t, MB(2)) +#else + +#define SLOT0_ENTRY_BITS 39 +#define SLOT0(slot) (_AT(vaddr_t,slot) << SLOT0_ENTRY_BITS) +#define SLOT0_ENTRY_SIZE SLOT0(1) + +#define XEN_VIRT_START (SLOT0(4) + _AT(vaddr_t, MB(2))) +#endif + +/* + * Reserve enough space so both UBSAN and GCOV can be enabled together + * plus some slack for future growth. + */ +#define XEN_VIRT_SIZE _AT(vaddr_t, MB(8)) +#define XEN_NR_ENTRIES(lvl) (XEN_VIRT_SIZE / XEN_PT_LEVEL_SIZE(lvl)) + +#define FIXMAP_VIRT_START (XEN_VIRT_START + XEN_VIRT_SIZE) +#define FIXMAP_VIRT_SIZE _AT(vaddr_t, MB(2)) + +#define FIXMAP_ADDR(n) (FIXMAP_VIRT_START + (n) * PAGE_SIZE) + +#define BOOT_FDT_VIRT_START (FIXMAP_VIRT_START + FIXMAP_VIRT_SIZE) +#define BOOT_FDT_VIRT_SIZE _AT(vaddr_t, MB(4)) + +#ifdef CONFIG_LIVEPATCH +#define LIVEPATCH_VMAP_START (BOOT_FDT_VIRT_START + BOOT_FDT_VIRT_SIZE) +#define LIVEPATCH_VMAP_SIZE _AT(vaddr_t, MB(2)) +#endif + +#define HYPERVISOR_VIRT_START XEN_VIRT_START + +#ifdef CONFIG_ARM_32 + +#define CONFIG_SEPARATE_XENHEAP 1 + +#define FRAMETABLE_VIRT_START _AT(vaddr_t, MB(32)) +#define FRAMETABLE_SIZE MB(128-32) +#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) + +#define VMAP_VIRT_START _AT(vaddr_t, MB(256)) +#define VMAP_VIRT_SIZE _AT(vaddr_t, GB(1) - MB(256)) + +#define XENHEAP_VIRT_START _AT(vaddr_t, GB(1)) +#define XENHEAP_VIRT_SIZE _AT(vaddr_t, GB(1)) + +#define DOMHEAP_VIRT_START _AT(vaddr_t, GB(2)) +#define DOMHEAP_VIRT_SIZE _AT(vaddr_t, GB(2)) + +#define DOMHEAP_ENTRIES 1024 /* 1024 2MB mapping slots */ + +/* Number of domheap pagetable pages required at the second level (2MB mappings) */ +#define DOMHEAP_SECOND_PAGES (DOMHEAP_VIRT_SIZE >> FIRST_SHIFT) + +/* + * The temporary area is overlapping with the domheap area. This may + * be used to create an alias of the first slot containing Xen mappings + * when turning on/off the MMU. + */ +#define TEMPORARY_AREA_FIRST_SLOT (first_table_offset(DOMHEAP_VIRT_START)) + +/* Calculate the address in the temporary area */ +#define TEMPORARY_AREA_ADDR(addr) \ + (((addr) & ~XEN_PT_LEVEL_MASK(1)) | \ + (TEMPORARY_AREA_FIRST_SLOT << XEN_PT_LEVEL_SHIFT(1))) + +#define TEMPORARY_XEN_VIRT_START TEMPORARY_AREA_ADDR(XEN_VIRT_START) + +#else /* ARM_64 */ + +#define IDENTITY_MAPPING_AREA_NR_L0 4 + +#define VMAP_VIRT_START (SLOT0(4) + GB(1)) +#define VMAP_VIRT_SIZE GB(1) + +#define FRAMETABLE_VIRT_START (SLOT0(4) + GB(32)) +#define FRAMETABLE_SIZE GB(32) +#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) + +#define DIRECTMAP_VIRT_START SLOT0(256) +#define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (266 - 256)) +#define DIRECTMAP_VIRT_END (DIRECTMAP_VIRT_START + DIRECTMAP_SIZE - 1) + +#define XENHEAP_VIRT_START directmap_virt_start + +#define HYPERVISOR_VIRT_END DIRECTMAP_VIRT_END + +#endif + +#endif /* __ARM_MMU_LAYOUT_H__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 09 12:44:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Sep 2023 12:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.598550.933439 (Exim 4.92) (envelope-from ) id 1qexKO-0001Cz-7F; Sat, 09 Sep 2023 12:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 598550.933439; Sat, 09 Sep 2023 12:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexKO-0001Cr-4b; Sat, 09 Sep 2023 12:44:44 +0000 Received: by outflank-mailman (input) for mailman id 598550; Sat, 09 Sep 2023 12:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexKM-0001CO-Q0 for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qexKM-0006eI-PD for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qexKM-0003es-OG for xen-changelog@lists.xenproject.org; Sat, 09 Sep 2023 12:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bYLWlm34H/kmgRWmbaUjhvPo2LlNMXZxcv1iK8btJAE=; b=nzGDPaWIT6NSW7PFQxWBTveY08 bMzOw7mrIxe8aIKJgdSYvvOsvSVGRjD6SzUke7IfqQY28jbaJjVK9iFYm78T9KjXIV2L4aOtqiAzP sikPGeh6y5MwPuj6jS1Aq1pP8Zy0Dgh9a9D4iPp0TIucHs2bMHLMPXEYw29eOXvHoFwY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: Fold setup_fixmap() to create_page_tables() Message-Id: Date: Sat, 09 Sep 2023 12:44:42 +0000 commit 49b2d6a529122f10e17a17f807d8d51154b5ba14 Author: Henry Wang AuthorDate: Mon Aug 28 09:32:16 2023 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 8 15:07:40 2023 -0700 xen/arm64: Fold setup_fixmap() to create_page_tables() The original assembly setup_fixmap() is actually doing two seperate tasks, one is enabling the early UART when earlyprintk on, and the other is to set up the fixmap (even when earlyprintk is off). Per discussion in [1], since commit 9d267c049d92 ("xen/arm64: Rework the memory layout"), there is no chance that the fixmap and the mapping of early UART will clash with the 1:1 mapping. Therefore the mapping of both the fixmap and the early UART can be moved to the end of create_pagetables(). [1] https://lore.kernel.org/xen-devel/78862bb8-fd7f-5a51-a7ae-3c5b5998ed80@xen.org/ Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- xen/arch/arm/arm64/head.S | 1 - xen/arch/arm/arm64/mmu/head.S | 48 +++++++++---------------------------------- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 3c8a12eda7..4ad85dcf58 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -275,7 +275,6 @@ real_start_efi: b enable_boot_cpu_mm primary_switched: - bl setup_fixmap #ifdef CONFIG_EARLY_PRINTK /* Use a virtual address to access the UART. */ ldr x23, =EARLY_UART_VIRTUAL_ADDRESS diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index d71fdc69a5..a5271e3880 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -126,11 +126,6 @@ * Rebuild the boot pagetable's first-level entries. The structure * is described in mm.c. * - * After the CPU enables paging it will add the fixmap mapping - * to these page tables, however this may clash with the 1:1 - * mapping. So each CPU must rebuild the page tables here with - * the 1:1 in place. - * * Inputs: * x19: paddr(start) * x20: phys offset @@ -243,6 +238,16 @@ link_from_second_id: create_table_entry boot_second_id, boot_third_id, x19, 2, x0, x1, x2 link_from_third_id: create_mapping_entry boot_third_id, x19, x19, x0, x1, x2 + +#ifdef CONFIG_EARLY_PRINTK + /* Add UART to the fixmap table */ + ldr x0, =EARLY_UART_VIRTUAL_ADDRESS + /* x23: Early UART base physical address */ + create_mapping_entry xen_fixmap, x0, x23, x1, x2, x3, type=PT_DEV_L3 +#endif + /* Map fixmap into boot_second */ + ldr x0, =FIXMAP_ADDR(0) + create_table_entry boot_second, xen_fixmap, x0, 2, x1, x2, x3 ret virtphys_clash: @@ -402,39 +407,6 @@ identity_mapping_removed: ret ENDPROC(remove_identity_mapping) -/* - * Map the UART in the fixmap (when earlyprintk is used) and hook the - * fixmap table in the page tables. - * - * The fixmap cannot be mapped in create_page_tables because it may - * clash with the 1:1 mapping. - * - * Inputs: - * x20: Physical offset - * x23: Early UART base physical address - * - * Clobbers x0 - x3 - */ -ENTRY(setup_fixmap) -#ifdef CONFIG_EARLY_PRINTK - /* Add UART to the fixmap table */ - ldr x0, =EARLY_UART_VIRTUAL_ADDRESS - create_mapping_entry xen_fixmap, x0, x23, x1, x2, x3, type=PT_DEV_L3 -#endif - /* Map fixmap into boot_second */ - ldr x0, =FIXMAP_ADDR(0) - create_table_entry boot_second, xen_fixmap, x0, 2, x1, x2, x3 - /* Ensure any page table updates made above have occurred. */ - dsb nshst - /* - * The fixmap area will be used soon after. So ensure no hardware - * translation happens before the dsb completes. - */ - isb - - ret -ENDPROC(setup_fixmap) - /* Fail-stop */ fail: PRINT("- Boot failed -\r\n") 1: wfe -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:55:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600508.936158 (Exim 4.92) (envelope-from ) id 1qg3r5-0003Bq-I0; Tue, 12 Sep 2023 13:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600508.936158; Tue, 12 Sep 2023 13: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 1qg3r5-0003Bi-FJ; Tue, 12 Sep 2023 13:55:03 +0000 Received: by outflank-mailman (input) for mailman id 600508; Tue, 12 Sep 2023 13:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3r4-0003Bc-FD for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3r4-0007k2-Ab for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3r4-0003sr-9d for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13: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=yIz5Q6c8Kp0o51kHRtKir/Z6XMiYk4bEkigVDqcje/Q=; b=aKnj8u8t1WZwjUv0qBdhedt9dw 8dma3K5ZbB5RgLxwKt28QDHw3r8KQ2mNKaH0TzNiTbhjlO27EUyECFZoXPtt2DhmkKZ+exisE4LCC 6bxgilja0GQ1bZcLmLNFKrGaW0P6lkyYNVfaMZ17zQQYseqMJv/B6RUf93QnkhNY48uY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: generalize vm-event/monitor entry Message-Id: Date: Tue, 12 Sep 2023 13:55:02 +0000 commit bd31678c843785323d74d82fde55047a03e53e38 Author: Jan Beulich AuthorDate: Mon Sep 11 09:34:12 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 09:34:12 2023 +0200 MAINTAINERS: generalize vm-event/monitor entry Replace Arm- and x86-specific lines with wildcard ones, thus covering all architectures. Uniformly permit an extra sub-directory level to be used, as is already the case for xen/include/. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD Acked-by: Tamas K Lengyel --- MAINTAINERS | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d320233538..0f227a2f5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -559,14 +559,18 @@ R: Alexandru Isaila R: Petre Pircalabu S: Supported F: tools/misc/xen-access.c +F: xen/arch/*/*/mem_access.c +F: xen/arch/*/*/monitor.c +F: xen/arch/*/*/vm_event.c +F: xen/arch/*/include/asm/*/mem_access.h +F: xen/arch/*/include/asm/*/monitor.h +F: xen/arch/*/include/asm/*/vm_event.h +F: xen/arch/*/include/asm/mem_access.h +F: xen/arch/*/include/asm/monitor.h +F: xen/arch/*/include/asm/vm_event.h +F: xen/arch/*/mem_access.c F: xen/arch/*/monitor.c F: xen/arch/*/vm_event.c -F: xen/arch/arm/mem_access.c -F: xen/arch/x86/include/asm/hvm/monitor.h -F: xen/arch/x86/include/asm/hvm/vm_event.h -F: xen/arch/x86/mm/mem_access.c -F: xen/arch/x86/hvm/monitor.c -F: xen/arch/x86/hvm/vm_event.c F: xen/common/mem_access.c F: xen/common/monitor.c F: xen/common/vm_event.c -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:55:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600509.936161 (Exim 4.92) (envelope-from ) id 1qg3rF-0003Df-JQ; Tue, 12 Sep 2023 13:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600509.936161; Tue, 12 Sep 2023 13: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 1qg3rF-0003DY-Gi; Tue, 12 Sep 2023 13:55:13 +0000 Received: by outflank-mailman (input) for mailman id 600509; Tue, 12 Sep 2023 13:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rE-0003DP-GO for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rE-0007kA-Ff for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3rE-0003tU-Ct for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13: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=RVQQYXcoAriufGMvUWiJIJdNQKTV4bHx/vAIQ5MuGVc=; b=rD95e1NVUe8zPItRJD13dU+iM0 eWZXzdiEn86m3TxgxzFAnr2CYucwP4DrHDbkhRbwjGqvIZIj4b9IYvjFvQyC3ldep7/zgYQG9sIj1 Uxb6S1YEXziaKcwkpN+1uizppKKi7IWBWCmtHINMnxcJNFoT7hC523NVnZBPO2Opplic=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: asm-generic support Message-Id: Date: Tue, 12 Sep 2023 13:55:12 +0000 commit 56a9e44e7d1469af7ec552a4e4fb7bba9856519f Author: Oleksii Kurochko AuthorDate: Mon Sep 11 09:37:33 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 09:37:33 2023 +0200 xen: asm-generic support Some headers are shared between individual architectures or are empty. To avoid duplication of these headers, asm-generic is introduced. With the following patch, an architecture uses generic headers mentioned in the file arch/$(ARCH)/include/asm/Makefile To use a generic header is needed to add to arch/$(ARCH)/include/asm/Makefile : generic-y += For each mentioned header in arch/$(ARCH)/include/asm/Makefile, the necessary wrapper in arch/$(ARCH)/include/generated/asm will be generated. As the base Makefile.asm-generic from Linux kernel was taken. ( 06c2afb862f9da8 "Linux 6.5-rc1" ). Signed-off-by: Oleksii Kurochko Reviewed-by: Anthony PERARD Acked-by: Jan Beulich --- .gitignore | 1 + xen/Makefile | 9 ++++++- xen/scripts/Kbuild.include | 6 +++++ xen/scripts/Makefile.asm-generic | 53 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 50273adb8d..287166f8fc 100644 --- a/.gitignore +++ b/.gitignore @@ -267,6 +267,7 @@ xen/arch/*/efi/efi.h xen/arch/*/efi/pe.c xen/arch/*/efi/runtime.c xen/arch/*/include/asm/asm-offsets.h +xen/arch/*/include/generated xen/build-dir-cppcheck/ xen/common/config_data.S xen/common/config.gz diff --git a/xen/Makefile b/xen/Makefile index f57e5a596c..2dc5e3526d 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -438,6 +438,7 @@ ifdef building_out_of_srctree endif CFLAGS += -I$(srctree)/include CFLAGS += -I$(srctree)/arch/$(SRCARCH)/include +CFLAGS += -I$(objtree)/arch/$(SRCARCH)/include/generated # Note that link order matters! ALL_OBJS-y := common/built_in.o @@ -580,16 +581,22 @@ _clean: rm -f $(TARGET).efi $(TARGET).efi.map $(TARGET).efi.elf $(TARGET).efi.stripped rm -f asm-offsets.s arch/*/include/asm/asm-offsets.h rm -f .banner .allconfig.tmp include/xen/compile.h + rm -rf $(objtree)/arch/*/include/generated .PHONY: _distclean _distclean: clean rm -f tags TAGS cscope.files cscope.in.out cscope.out cscope.po.out GTAGS GPATH GRTAGS GSYMS .config source +# Support for using generic headers in asm-generic +PHONY += asm-generic +asm-generic: + $(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm + $(TARGET).gz: $(TARGET) gzip -n -f -9 < $< > $@.new mv $@.new $@ -$(TARGET): outputmakefile FORCE +$(TARGET): outputmakefile asm-generic FORCE $(Q)$(MAKE) $(build)=tools $(Q)$(MAKE) $(build)=. include/xen/compile.h $(Q)$(MAKE) $(build)=include all diff --git a/xen/scripts/Kbuild.include b/xen/scripts/Kbuild.include index 785a32c32e..c2bd8498e1 100644 --- a/xen/scripts/Kbuild.include +++ b/xen/scripts/Kbuild.include @@ -91,6 +91,12 @@ cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || e clang-ifversion = $(shell [ $(CONFIG_CLANG_VERSION)0 $(1) $(2)000 ] && echo $(3) || echo $(4)) +### +# Shorthand for $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic obj +# Usage: +# $(Q)$(MAKE) $(asm-generic)=dir +asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj + ### # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj= # Usage: diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-generic new file mode 100644 index 0000000000..b0d356bfa3 --- /dev/null +++ b/xen/scripts/Makefile.asm-generic @@ -0,0 +1,53 @@ +# SPDX-License-Identifier: GPL-2.0-only +# include/asm-generic contains a lot of files that are used +# verbatim by several architectures. +# +# This Makefile reads the file arch/$(SRCARCH)/include/asm/Makefile +# and for each file listed in this file with generic-y creates +# a small wrapper file in arch/$(SRCARCH)/include/generated/asm. + +PHONY := all +all: + +src := $(subst /generated,,$(obj)) + +include $(srctree)/scripts/Kbuild.include +-include $(src)/Makefile + +redundant := $(filter $(mandatory-y) $(generated-y), $(generic-y)) +redundant += $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src)/$(f)),$(f))) +redundant := $(sort $(redundant)) +$(if $(redundant),\ + $(warning redundant generic-y found in $(src)/Makefile: $(redundant))) + +# If arch does not implement mandatory headers, fallback to asm-generic ones. +mandatory-y := $(filter-out $(generated-y), $(mandatory-y)) +generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f))) + +generic-y := $(addprefix $(obj)/, $(generic-y)) +generated-y := $(addprefix $(obj)/, $(generated-y)) + +# Remove stale wrappers when the corresponding files are removed from generic-y +old-headers := $(wildcard $(obj)/*.h) +unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers)) + +quiet_cmd_wrap = WRAP $@ + cmd_wrap = echo "\#include " > $@ + +quiet_cmd_remove = REMOVE $(unwanted) + cmd_remove = rm -f $(unwanted) + +all: $(generic-y) + $(if $(unwanted),$(call cmd,remove)) + @: + +$(obj)/%.h: + $(call cmd,wrap) + +# Create output directory. Skip it if at least one old header exists +# since we know the output directory already exists. +ifeq ($(old-headers),) +$(shell mkdir -p $(obj)) +endif + +.PHONY: $(PHONY) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:55:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600510.936165 (Exim 4.92) (envelope-from ) id 1qg3rP-0003Gm-Kt; Tue, 12 Sep 2023 13:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600510.936165; Tue, 12 Sep 2023 13: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 1qg3rP-0003Ge-II; Tue, 12 Sep 2023 13:55:23 +0000 Received: by outflank-mailman (input) for mailman id 600510; Tue, 12 Sep 2023 13:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rO-0003GR-JO for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rO-0007lL-Ik for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3rO-0003tu-Hk for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13: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=s0rjUfkGVXqkOwWUGS4yJqHZRJHRt7Z9CIXwxxiOXEM=; b=sU/FtCUEZnNnwN8HcReXor8kp7 zqJPokwN33cnUwCe4aIgdT42n91gn0J2D2jjc6/jJLi2/5HW+AwF4XmffAdw1zbYU3dOJz3alXN8d ofRz2x8UkaGc6MgNdu/U/WsCO4/1Y5K3tmaxk0OaBxIYtZtncS4ia5zAzaHmIJ0A0vHc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: move arm/include/asm/vm_event.h to asm-generic Message-Id: Date: Tue, 12 Sep 2023 13:55:22 +0000 commit 4aca8559d614e7bc4be5ed0932214527787f4e87 Author: Oleksii Kurochko AuthorDate: Mon Sep 11 09:39:05 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 09:39:05 2023 +0200 xen: move arm/include/asm/vm_event.h to asm-generic asm/vm_event.h is common for ARM and RISC-V so it will be moved to asm-generic dir. Original asm/vm_event.h from ARM was updated: * use SPDX-License-Identifier. * update comment messages of stubs. * update #ifdef * instead of "include " -> "public/vm_event.h" As vm_event.h was moved to asm-generic then it is needed to create Makefile in arm/include/asm/ and add generated-y += vm_event.h to it. Signed-off-by: Oleksii Kurochko Acked-by: Tamas K Lengyel --- xen/arch/arm/include/asm/Makefile | 2 ++ xen/arch/arm/include/asm/vm_event.h | 66 ------------------------------------- xen/include/asm-generic/vm_event.h | 55 +++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 66 deletions(-) diff --git a/xen/arch/arm/include/asm/Makefile b/xen/arch/arm/include/asm/Makefile new file mode 100644 index 0000000000..821addb0bf --- /dev/null +++ b/xen/arch/arm/include/asm/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +generic-y += vm_event.h diff --git a/xen/arch/arm/include/asm/vm_event.h b/xen/arch/arm/include/asm/vm_event.h deleted file mode 100644 index 4d861373b3..0000000000 --- a/xen/arch/arm/include/asm/vm_event.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * vm_event.h: architecture specific vm_event handling routines - * - * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see . - */ - -#ifndef __ASM_ARM_VM_EVENT_H__ -#define __ASM_ARM_VM_EVENT_H__ - -#include -#include - -static inline int vm_event_init_domain(struct domain *d) -{ - /* Nothing to do. */ - return 0; -} - -static inline void vm_event_cleanup_domain(struct domain *d) -{ - memset(&d->monitor, 0, sizeof(d->monitor)); -} - -static inline void vm_event_toggle_singlestep(struct domain *d, struct vcpu *v, - vm_event_response_t *rsp) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *rsp) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_emulate_check(struct vcpu *v, vm_event_response_t *rsp) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_sync_event(struct vcpu *v, bool value) -{ - /* Not supported on ARM. */ -} - -static inline -void vm_event_reset_vmtrace(struct vcpu *v) -{ - /* Not supported on ARM. */ -} - -#endif /* __ASM_ARM_VM_EVENT_H__ */ diff --git a/xen/include/asm-generic/vm_event.h b/xen/include/asm-generic/vm_event.h new file mode 100644 index 0000000000..620c7b971c --- /dev/null +++ b/xen/include/asm-generic/vm_event.h @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * vm_event.h: stubs for architecture specific vm_event handling routines + * + * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) + */ + +#ifndef __ASM_GENERIC_VM_EVENT_H__ +#define __ASM_GENERIC_VM_EVENT_H__ + +#include +#include + +static inline int vm_event_init_domain(struct domain *d) +{ + /* Nothing to do. */ + return 0; +} + +static inline void vm_event_cleanup_domain(struct domain *d) +{ + memset(&d->monitor, 0, sizeof(d->monitor)); +} + +static inline void vm_event_toggle_singlestep(struct domain *d, struct vcpu *v, + vm_event_response_t *rsp) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *rsp) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_emulate_check(struct vcpu *v, vm_event_response_t *rsp) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_sync_event(struct vcpu *v, bool value) +{ + /* Nothing to do. */ +} + +static inline +void vm_event_reset_vmtrace(struct vcpu *v) +{ + /* Nothing to do. */ +} + +#endif /* __ASM_GENERIC_VM_EVENT_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600511.936170 (Exim 4.92) (envelope-from ) id 1qg3rZ-0003J9-Ml; Tue, 12 Sep 2023 13:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600511.936170; Tue, 12 Sep 2023 13: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 1qg3rZ-0003J1-Jj; Tue, 12 Sep 2023 13:55:33 +0000 Received: by outflank-mailman (input) for mailman id 600511; Tue, 12 Sep 2023 13:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rY-0003Ir-N8 for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rY-0007mK-MT for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3rY-0003uZ-Kn for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13: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=MAr3op8nxYeXlhvMxJ7EHLpraqOHrCiuhqorNUiZ230=; b=GCZYZCFdQutC0jVH7rnOJV3eEV G9to5KD3Hu4hS1IFN5PNdYY4ubwibfpitDEjnG++cA5bTfLWOuExcgtfi0iClOZRHDrIw+cOrArK2 yqtV6/s30/UgDEIKHah6+n4PXi2rbHg3h+Y0pn0kWrcLFuk3nw54DS8HssahDanci0yo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: change parameter name in {hap,shadow}_track_dirty_vram() Message-Id: Date: Tue, 12 Sep 2023 13:55:32 +0000 commit 35949b8c58cb6c835da1fdd8843ed51727e654c0 Author: Federico Serafini AuthorDate: Mon Sep 11 09:39:57 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 09:39:57 2023 +0200 x86: change parameter name in {hap,shadow}_track_dirty_vram() Make function declarations consistent with the corresponding definitions to address violations of MISRA C:2012 Rule 8.3. No functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/arch/x86/include/asm/hap.h | 2 +- xen/arch/x86/include/asm/shadow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/hap.h b/xen/arch/x86/include/asm/hap.h index 9d12327b12..05e124ad57 100644 --- a/xen/arch/x86/include/asm/hap.h +++ b/xen/arch/x86/include/asm/hap.h @@ -30,7 +30,7 @@ void hap_vcpu_init(struct vcpu *v); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned int nr_frames, - XEN_GUEST_HANDLE(void) dirty_bitmap); + XEN_GUEST_HANDLE(void) guest_dirty_bitmap); extern const struct paging_mode *hap_paging_get_mode(struct vcpu *); int hap_set_allocation(struct domain *d, unsigned int pages, bool *preempted); diff --git a/xen/arch/x86/include/asm/shadow.h b/xen/arch/x86/include/asm/shadow.h index ba2b0e170b..20df34d0a8 100644 --- a/xen/arch/x86/include/asm/shadow.h +++ b/xen/arch/x86/include/asm/shadow.h @@ -65,7 +65,7 @@ int shadow_enable(struct domain *d, u32 mode); int shadow_track_dirty_vram(struct domain *d, unsigned long first_pfn, unsigned int nr_frames, - XEN_GUEST_HANDLE(void) dirty_bitmap); + XEN_GUEST_HANDLE(void) guest_dirty_bitmap); /* Handler for shadow control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:55:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600512.936173 (Exim 4.92) (envelope-from ) id 1qg3rk-0003Le-Ny; Tue, 12 Sep 2023 13:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600512.936173; Tue, 12 Sep 2023 13:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rk-0003LW-LI; Tue, 12 Sep 2023 13:55:44 +0000 Received: by outflank-mailman (input) for mailman id 600512; Tue, 12 Sep 2023 13:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3ri-0003LI-Qw for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3ri-0007mS-QM for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3ri-0003vB-OY for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13: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=GccSFTQgVG/ZgH6Jt35UVEVHCEkk1wko1ZdbaY0VzT8=; b=H21732BNXqornYX4EfByCWq1sP /LirIp2E3fw8vnrnURhdyxXS1kPg9/6F2h+UIIZqLTKHAulnYeaMDdbzD1vf7ZegO8T+dH6qIjYVC 9Ho4WpDiB0xLca2hWMFKSCU/dZxZudywnR2ZLdwIlqX2fiM1W8sMG+GEWJF8ylJdqf9o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/misc/xencov_split: Add python 3 compatibility Message-Id: Date: Tue, 12 Sep 2023 13:55:42 +0000 commit 3e73dd889d1fe614d4ec0b017c92e7b3208e4027 Author: Javi Merino AuthorDate: Mon Sep 11 17:23:56 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 17:23:56 2023 +0200 tools/misc/xencov_split: Add python 3 compatibility Resolves: xen-project/xen#154 Signed-off-by: Javi Merino Acked-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/misc/xencov_split | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/misc/xencov_split b/tools/misc/xencov_split index e4f68ebb6e..a921e8ef44 100755 --- a/tools/misc/xencov_split +++ b/tools/misc/xencov_split @@ -1,5 +1,7 @@ #!/usr/bin/env python +from __future__ import print_function +from builtins import str import sys, os, os.path as path, struct, errno from optparse import OptionParser @@ -16,7 +18,7 @@ def xencov_split(opts): input_file = opts.args[0] - f = open(input_file) + f = open(input_file, "rb") # Magic number s = f.read(4) @@ -31,9 +33,10 @@ def xencov_split(opts): f.close() while content: - off = content.find('\x00') + off = content.find(b'\x00') fmt = bo_prefix + str(off) + 's' fn, = struct.unpack_from(fmt, content) + fn = fn.decode('utf-8') content = content[off+1:] fmt = bo_prefix + 'I' @@ -51,14 +54,14 @@ def xencov_split(opts): dir = opts.output_dir + path.dirname(fn) try: os.makedirs(dir) - except OSError, e: + except OSError as e: if e.errno == errno.EEXIST and os.path.isdir(dir): pass else: raise full_path = dir + '/' + path.basename(fn) - f = open(full_path, "w") + f = open(full_path, "wb") f.write(payload) f.close() @@ -89,8 +92,8 @@ def main(): if __name__ == "__main__": try: sys.exit(main()) - except Exception, e: - print >>sys.stderr, "Error:", e + except Exception as e: + print("Error:", e, file=sys.stderr) sys.exit(1) except KeyboardInterrupt: sys.exit(1) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:55:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600513.936177 (Exim 4.92) (envelope-from ) id 1qg3ru-0003OB-Pe; Tue, 12 Sep 2023 13:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600513.936177; Tue, 12 Sep 2023 13:55:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3ru-0003O3-Mr; Tue, 12 Sep 2023 13:55:54 +0000 Received: by outflank-mailman (input) for mailman id 600513; Tue, 12 Sep 2023 13:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rs-0003Ns-UD for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3rs-0007mZ-TX for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3rs-0003vc-Se for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13: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=aQ+e68GEuvtXOChq8Z8OS9q3kmjtCr3ZvdLYLS+pZtQ=; b=czECwijwmdRT6Gf+NzVFkyfAja SE2/bnzNzWXOTWSF567rMTOaK0sg/8cyGGHCEbdEGJwLhF8W/VVOOA6V5vFcCs6kmg1Nkz8ZX75vS +TSu82HZ+HZVo/7vfTGw/nnwLz33oYNL9CgHRiTkNxBEQFjIi0PZ8hytK8AFn2/nPahc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] cmdline: move irq-max-guests doc entry Message-Id: Date: Tue, 12 Sep 2023 13:55:52 +0000 commit 38cb6be7bcede5a22b6d7596c848e4fa40431bef Author: Jan Beulich AuthorDate: Mon Sep 11 17:24:51 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 17:24:51 2023 +0200 cmdline: move irq-max-guests doc entry ... to adhere to intended sorting. Signed-off-by: Jan Beulich Acked-by: George Dunlap --- docs/misc/xen-command-line.pandoc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index a3145983f6..f88e6a70ae 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1630,6 +1630,16 @@ wait descriptor timed out', try increasing this value. **WARNING: This command line option is deprecated, and superseded by _dom0-iommu=map-inclusive_ - using both options in combination is undefined.** +### irq-max-guests (x86) +> `= ` + +> Default: `32` + +Maximum number of guests any individual IRQ could be shared between, +i.e. a limit on the number of guests it is possible to start each having +assigned a device sharing a common interrupt line. Accepts values between +1 and 255. + ### irq_ratelimit (x86) > `= ` @@ -1914,16 +1924,6 @@ This option is ignored in **pv-shim** mode. ### nr_irqs (x86) > `= ` -### irq-max-guests (x86) -> `= ` - -> Default: `32` - -Maximum number of guests any individual IRQ could be shared between, -i.e. a limit on the number of guests it is possible to start each having -assigned a device sharing a common interrupt line. Accepts values between -1 and 255. - ### numa (x86) > `= on | off | fake= | noacpi` -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:56:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600514.936182 (Exim 4.92) (envelope-from ) id 1qg3s4-0003T6-TK; Tue, 12 Sep 2023 13:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600514.936182; Tue, 12 Sep 2023 13:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3s4-0003Sx-QW; Tue, 12 Sep 2023 13:56:04 +0000 Received: by outflank-mailman (input) for mailman id 600514; Tue, 12 Sep 2023 13:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3s3-0003Sl-1i for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3s3-0007mt-0e for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3s2-0003wL-Vh for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13: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=ChgoR2xr+QE7ZesgfPvtTp/GAOy/KL5/v9EeLvJAV/o=; b=zHNgDF90AuDWE2lXh0OqgyRzM7 CDKDmxa7Z/0DRoKyRc/x6xx/3PE4ZVe71CmeKelwkWkQdimYDHaY1q61kNJpuV2TBtLrEnU9lqNoc Tu4o838We921Zd/Pz6fbCYspkVRnMIa036EEqN3WJBIhlPDXhtQm4yG4wWRt/NXQFnT0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] coverage: simplify the logic of choosing the number of gcov counters depending on the gcc version Message-Id: Date: Tue, 12 Sep 2023 13:56:02 +0000 commit 745bf2b7de17267d40e68b910175c0ee9dbc905f Author: Javi Merino AuthorDate: Mon Sep 11 17:26:05 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 17:26:05 2023 +0200 coverage: simplify the logic of choosing the number of gcov counters depending on the gcc version The current structure of choosing the correct file based on the compiler version makes us make 33 line files just to define a constant. The changes after gcc 4.7 are minimal, just the number of counters. Fold the changes in gcc_4_9.c, gcc_5.c and gcc_7.c into gcc_4_7.c to remove a lot of the boilerplate and keep the logic of choosing the GCOV_COUNTER in gcc_4_7.c. Signed-off-by: Javi Merino Reviewed-by: Jan Beulich --- xen/common/coverage/Makefile | 6 +----- xen/common/coverage/gcc_4_7.c | 17 +++++++++-------- xen/common/coverage/gcc_4_9.c | 33 --------------------------------- xen/common/coverage/gcc_5.c | 33 --------------------------------- xen/common/coverage/gcc_7.c | 30 ------------------------------ 5 files changed, 10 insertions(+), 109 deletions(-) diff --git a/xen/common/coverage/Makefile b/xen/common/coverage/Makefile index 63f98c71d6..d729afc9c7 100644 --- a/xen/common/coverage/Makefile +++ b/xen/common/coverage/Makefile @@ -1,11 +1,7 @@ obj-y += coverage.o ifneq ($(CONFIG_CC_IS_CLANG),y) obj-y += gcov_base.o gcov.o -obj-y += $(call cc-ifversion,-lt,0407, \ - gcc_3_4.o, $(call cc-ifversion,-lt,0409, \ - gcc_4_7.o, $(call cc-ifversion,-lt,0500, \ - gcc_4_9.o, $(call cc-ifversion,-lt,0700, \ - gcc_5.o, gcc_7.o)))) +obj-y += $(call cc-ifversion,-lt,0407, gcc_3_4.o, gcc_4_7.o) else obj-y += llvm.o endif diff --git a/xen/common/coverage/gcc_4_7.c b/xen/common/coverage/gcc_4_7.c index 25b4a8bcdc..449ae8e34f 100644 --- a/xen/common/coverage/gcc_4_7.c +++ b/xen/common/coverage/gcc_4_7.c @@ -18,15 +18,16 @@ #include "gcov.h" -/* - * GCOV_COUNTERS will be defined if this file is included by other - * source files. - */ -#ifndef GCOV_COUNTERS -# if !(GCC_VERSION >= 40700 && GCC_VERSION < 40900) -# error "Wrong version of GCC used to compile gcov" -# endif +#if GCC_VERSION < 40700 +#error "Wrong version of GCC used to compile gcov" +#elif GCC_VERSION < 40900 #define GCOV_COUNTERS 8 +#elif GCC_VERSION < 50000 +#define GCOV_COUNTERS 9 +#elif GCC_VERSION < 70000 +#define GCOV_COUNTERS 10 +#else +#define GCOV_COUNTERS 9 #endif #define GCOV_TAG_FUNCTION_LENGTH 3 diff --git a/xen/common/coverage/gcc_4_9.c b/xen/common/coverage/gcc_4_9.c deleted file mode 100644 index dcea961936..0000000000 --- a/xen/common/coverage/gcc_4_9.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This code provides functions to handle gcc's profiling data format - * introduced with gcc 4.7. - * - * For a better understanding, refer to gcc source: - * gcc/gcov-io.h - * libgcc/libgcov.c - * - * Uses gcc-internal data definitions. - * - * Imported from Linux and modified for Xen by - * Wei Liu - */ - -#include "gcov.h" - -#if !(GCC_VERSION >= 40900 && GCC_VERSION < 50000) -#error "Wrong version of GCC used to compile gcov" -#endif - -#define GCOV_COUNTERS 9 - -#include "gcc_4_7.c" - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/coverage/gcc_5.c b/xen/common/coverage/gcc_5.c deleted file mode 100644 index 6e0d276f3b..0000000000 --- a/xen/common/coverage/gcc_5.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This code provides functions to handle gcc's profiling data format - * introduced with gcc 5. - * - * For a better understanding, refer to gcc source: - * gcc/gcov-io.h - * libgcc/libgcov.c - * - * Uses gcc-internal data definitions. - * - * Imported from Linux and modified for Xen by - * Wei Liu - */ - -#include "gcov.h" - -#if GCC_VERSION < 50000 || GCC_VERSION >= 70000 -#error "Wrong version of GCC used to compile gcov" -#endif - -#define GCOV_COUNTERS 10 - -#include "gcc_4_7.c" - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/coverage/gcc_7.c b/xen/common/coverage/gcc_7.c deleted file mode 100644 index 3962eb4c76..0000000000 --- a/xen/common/coverage/gcc_7.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This code provides functions to handle gcc's profiling data format - * introduced with gcc 7. - * - * For a better understanding, refer to gcc source: - * gcc/gcov-io.h - * libgcc/libgcov.c - * - * Uses gcc-internal data definitions. - */ - -#include "gcov.h" - -#if GCC_VERSION < 70000 -#error "Wrong version of GCC used to compile gcov" -#endif - -#define GCOV_COUNTERS 9 - -#include "gcc_4_7.c" - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:56:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600515.936187 (Exim 4.92) (envelope-from ) id 1qg3sE-0003bQ-V2; Tue, 12 Sep 2023 13:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600515.936187; Tue, 12 Sep 2023 13:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sE-0003bI-S1; Tue, 12 Sep 2023 13:56:14 +0000 Received: by outflank-mailman (input) for mailman id 600515; Tue, 12 Sep 2023 13:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sD-0003am-4F for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sD-0007n0-3a for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3sD-0003wr-2k for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XtgPyA0c3Ive/xqg+mGNEZIMIZ7qkkjdM2JCehZza+I=; b=f4p5BDkEdd6kia1HbMqGFafevx guzciH3m1aMYIV9awa/135TOFCw58J/6f/aCdyrX4l2En6DRb60nb9WeFRv0HlvvOTCjvnmavXyFC CUn4oXWi9f+KrXDC+7mcxs/bQm2CNzvjUysSHRCYx24OQMvQDqgR/fp4Qn4jen8d+vT4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] coverage: update gcov info for newer versions of gcc Message-Id: Date: Tue, 12 Sep 2023 13:56:13 +0000 commit 7ee3a44971ca9621f224600dda4fc45335ef86a8 Author: Javi Merino AuthorDate: Mon Sep 11 17:29:45 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 17:29:45 2023 +0200 coverage: update gcov info for newer versions of gcc Shamelessly copy changes to gcov_info structures from linux so that we can capture coverage for xen built with newer compilers. Signed-off-by: Javi Merino Acked-by: Jan Beulich --- xen/common/coverage/gcc_4_7.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/xen/common/coverage/gcc_4_7.c b/xen/common/coverage/gcc_4_7.c index 449ae8e34f..1c20e35ee5 100644 --- a/xen/common/coverage/gcc_4_7.c +++ b/xen/common/coverage/gcc_4_7.c @@ -26,12 +26,21 @@ #define GCOV_COUNTERS 9 #elif GCC_VERSION < 70000 #define GCOV_COUNTERS 10 -#else +#elif GCC_VERSION < 100000 #define GCOV_COUNTERS 9 +#else +#define GCOV_COUNTERS 8 #endif #define GCOV_TAG_FUNCTION_LENGTH 3 +#if GCC_VERSION < 120000 +#define GCOV_UNIT_SIZE 1 +#else +/* Since GCC 12, sizes are in BYTES and not in WORDS (4B). */ +#define GCOV_UNIT_SIZE 4 +#endif + static struct gcov_info *gcov_info_head; /** @@ -89,6 +98,10 @@ struct gcov_info { unsigned int version; struct gcov_info *next; unsigned int stamp; +#if GCC_VERSION >= 120000 + /* GCC 12 introduced a checksum field */ + unsigned int checksum; +#endif const char *filename; void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); unsigned int n_functions; @@ -161,13 +174,18 @@ size_t gcov_info_to_gcda(char *buffer, const struct gcov_info *info) pos += gcov_store_uint32(buffer, pos, info->version); pos += gcov_store_uint32(buffer, pos, info->stamp); +#if GCC_VERSION >= 120000 + /* Use zero as checksum of the compilation unit. */ + pos += gcov_store_uint32(buffer, pos, 0); +#endif + for ( fi_idx = 0; fi_idx < info->n_functions; fi_idx++ ) { fi_ptr = info->functions[fi_idx]; /* Function record. */ pos += gcov_store_uint32(buffer, pos, GCOV_TAG_FUNCTION); - pos += gcov_store_uint32(buffer, pos, GCOV_TAG_FUNCTION_LENGTH); + pos += gcov_store_uint32(buffer, pos, GCOV_TAG_FUNCTION_LENGTH * GCOV_UNIT_SIZE); pos += gcov_store_uint32(buffer, pos, fi_ptr->ident); pos += gcov_store_uint32(buffer, pos, fi_ptr->lineno_checksum); pos += gcov_store_uint32(buffer, pos, fi_ptr->cfg_checksum); @@ -182,7 +200,7 @@ size_t gcov_info_to_gcda(char *buffer, const struct gcov_info *info) /* Counter record. */ pos += gcov_store_uint32(buffer, pos, GCOV_TAG_FOR_COUNTER(ct_idx)); - pos += gcov_store_uint32(buffer, pos, ci_ptr->num * 2); + pos += gcov_store_uint32(buffer, pos, ci_ptr->num * 2 * GCOV_UNIT_SIZE); for ( cv_idx = 0; cv_idx < ci_ptr->num; cv_idx++ ) pos += gcov_store_uint64(buffer, pos, ci_ptr->values[cv_idx]); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:56:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:56:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600516.936190 (Exim 4.92) (envelope-from ) id 1qg3sO-0003m8-WF; Tue, 12 Sep 2023 13:56:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600516.936190; Tue, 12 Sep 2023 13:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sO-0003m0-Ta; Tue, 12 Sep 2023 13:56:24 +0000 Received: by outflank-mailman (input) for mailman id 600516; Tue, 12 Sep 2023 13:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sN-0003kC-7O for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sN-0007n8-6i for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3sN-0003xO-5d for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SNdmYG23ENWTeJzRIR3hbbcpSfM5d5bNfHpF6Hvuzvc=; b=t/GDEsozYofPacIGpUJ4ccAsdJ KrvxO37AvJn7or52TvghI7HIBNk1p4LKIizNLXZLXLtNAy2+GPLKQc0UStJTZ4/C4jANuGcEJzJUW KJQyi1U4I2uqVnky31wA5TO/TRtQwY6lFDUF/wcmzzmMOZSrLSm+CWMKnlZW7ZlBz9gI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] include: make domain_page.h's stubs properly use type-unsafe MFN <-> virt helpers Message-Id: Date: Tue, 12 Sep 2023 13:56:23 +0000 commit 9227a94e28ade35621402dc25adf86e8c7a47663 Author: Jan Beulich AuthorDate: Mon Sep 11 17:30:34 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 17:30:34 2023 +0200 include: make domain_page.h's stubs properly use type-unsafe MFN <-> virt helpers The first of the commits referenced below didn't go far enough, and the 2nd of them, while trying to close (some of) the gap, wrongly kept using the potentially type-safe variant. This is getting in the way of new ports preferably not having any type-unsafe private code (and in particular not having a need for any overrides in newly introduced files). Fixes: 41c48004d1d8 ("xen/mm: Use __virt_to_mfn in map_domain_page instead of virt_to_mfn") Fixes: f46b6197344f ("xen: Convert page_to_mfn and mfn_to_page to use typesafe MFN") Reported-by: Shawn Anastasio Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- xen/include/xen/domain_page.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/domain_page.h b/xen/include/xen/domain_page.h index c4007eac09..0ff5cdd294 100644 --- a/xen/include/xen/domain_page.h +++ b/xen/include/xen/domain_page.h @@ -56,11 +56,11 @@ static inline void *__map_domain_page_global(const struct page_info *pg) #define map_domain_page(mfn) __mfn_to_virt(mfn_x(mfn)) #define __map_domain_page(pg) page_to_virt(pg) #define unmap_domain_page(va) ((void)(va)) -#define domain_page_map_to_mfn(va) _mfn(virt_to_mfn((unsigned long)(va))) +#define domain_page_map_to_mfn(va) _mfn(__virt_to_mfn((unsigned long)(va))) static inline void *map_domain_page_global(mfn_t mfn) { - return mfn_to_virt(mfn_x(mfn)); + return __mfn_to_virt(mfn_x(mfn)); } static inline void *__map_domain_page_global(const struct page_info *pg) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:56:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:56:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600517.936193 (Exim 4.92) (envelope-from ) id 1qg3sZ-0003pt-1R; Tue, 12 Sep 2023 13:56:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600517.936193; Tue, 12 Sep 2023 13:56: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 1qg3sY-0003pj-V3; Tue, 12 Sep 2023 13:56:34 +0000 Received: by outflank-mailman (input) for mailman id 600517; Tue, 12 Sep 2023 13:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sX-0003pZ-A7 for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sX-0007nV-9V for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3sX-0003yP-8l for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=InOUNSNBy3+nnaNmyeAveYyyY7pZIsG6W9B446/LxDs=; b=FHPxFcxKwRNkGLk4dQV4VOl7hz V4gS9QZftOQsTCnpgwuzY+4WbUMHjZmkWN0lYlLkImf/XyroXbdDBSVh7GcBZIRay1cojyJqvBNq2 ZEUzk2C+mDBfDf6NxVL92whd34qeWYtgRus3hHavQsS3QLAgIMF+6JmzIuefM3kYuYUM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/PCI: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Tue, 12 Sep 2023 13:56:33 +0000 commit ab4f3e3897ab777f94d44d0450f9b0e844fad830 Author: Federico Serafini AuthorDate: Mon Sep 11 17:31:26 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 11 17:31:26 2023 +0200 xen/PCI: address violations of MISRA C:2012 Rules 8.2 and 8.3 Add missing parameter names and make function declarations and definitions consistent. No functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/include/xen/pci.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 7d8a7cd213..3ed79d15cd 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -166,14 +166,14 @@ int scan_pci_devices(void); enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn); int find_upstream_bridge(u16 seg, u8 *bus, u8 *devfn, u8 *secbus); -void setup_hwdom_pci_devices(struct domain *, - int (*)(u8 devfn, struct pci_dev *)); +void setup_hwdom_pci_devices(struct domain *d, + int (*handler)(u8 devfn, struct pci_dev *pdev)); int pci_release_devices(struct domain *d); void pci_segments_init(void); int pci_add_segment(u16 seg); const unsigned long *pci_get_ro_map(u16 seg); int pci_add_device(u16 seg, u8 bus, u8 devfn, - const struct pci_dev_info *, nodeid_t node); + const struct pci_dev_info *info, nodeid_t node); int pci_remove_device(u16 seg, u8 bus, u8 devfn); int pci_ro_device(int seg, int bus, int devfn); int pci_hide_device(unsigned int seg, unsigned int bus, unsigned int devfn); @@ -198,10 +198,11 @@ int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap); int pci_find_ext_capability(int seg, int bus, int devfn, int cap); int pci_find_next_ext_capability(int seg, int bus, int devfn, int start, int cap); -const char *parse_pci(const char *, unsigned int *seg, unsigned int *bus, - unsigned int *dev, unsigned int *func); -const char *parse_pci_seg(const char *, unsigned int *seg, unsigned int *bus, - unsigned int *dev, unsigned int *func, bool *def_seg); +const char *parse_pci(const char *s, unsigned int *seg_p, unsigned int *bus_p, + unsigned int *dev_p, unsigned int *func_p); +const char *parse_pci_seg(const char *s, unsigned int *seg_p, + unsigned int *bus_p, unsigned int *dev_p, + unsigned int *func_p, bool *def_seg); #define PCI_BAR_VF (1u << 0) #define PCI_BAR_LAST (1u << 1) @@ -210,12 +211,12 @@ unsigned int pci_size_mem_bar(pci_sbdf_t sbdf, unsigned int pos, uint64_t *paddr, uint64_t *psize, unsigned int flags); -void pci_intx(const struct pci_dev *, bool enable); -bool pcie_aer_get_firmware_first(const struct pci_dev *); +void pci_intx(const struct pci_dev *pdev, bool enable); +bool pcie_aer_get_firmware_first(const struct pci_dev *pdev); struct pirq; -int msixtbl_pt_register(struct domain *, struct pirq *, uint64_t gtable); -void msixtbl_pt_unregister(struct domain *, struct pirq *); +int msixtbl_pt_register(struct domain *d, struct pirq *pirq, uint64_t gtable); +void msixtbl_pt_unregister(struct domain *d, struct pirq *pirq); void msixtbl_pt_cleanup(struct domain *d); #ifdef CONFIG_HVM -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:56:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:56:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600518.936198 (Exim 4.92) (envelope-from ) id 1qg3sj-0003wc-3V; Tue, 12 Sep 2023 13:56:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600518.936198; Tue, 12 Sep 2023 13:56: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 1qg3sj-0003wU-0P; Tue, 12 Sep 2023 13:56:45 +0000 Received: by outflank-mailman (input) for mailman id 600518; Tue, 12 Sep 2023 13:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sh-0003wD-DL for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sh-0007nc-Cn for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3sh-0003zV-Bq for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FaFNEEu+1ewEta9/pcTgIO2ncKY7yWPj7o7V5lgKe5M=; b=cSSjHXCsn3Lnj7bKN/LmOKn1Jt OxtIvUr5innXTLpW6tncQlv4ehAhmY6JyM11ailaswpI2FsoFNJOlEC0eNGgwZyg9Zy7LnXh4TDGY /sci4XhV1qmt7RE5okaDpjkqbIV/jqycUCglgd0ezZclU+TFVb3YcZo0/Y6IperpJg0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Reject bad %dr6/%dr7 values when loading guest state Message-Id: Date: Tue, 12 Sep 2023 13:56:43 +0000 commit 15987cb03f3d2304553d7e3e84019a3b83b71546 Author: Andrew Cooper AuthorDate: Tue Aug 29 11:16:11 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 11 19:04:47 2023 +0100 x86: Reject bad %dr6/%dr7 values when loading guest state Right now, bad PV state is silently dropped and zeroed, while bad HVM state is passed directly to hardware and can trigger VMEntry/VMRUN failures. e.g. (XEN) d12v0 vmentry failure (reason 0x80000021): Invalid guest state (0) ... (XEN) RFLAGS=0x00000002 (0x00000002) DR7 = 0x4000000000000001 Furthermore, prior to c/s 30f43f4aa81e ("x86: Reorganise and rename debug register fields in struct vcpu") in Xen 4.11 where v->arch.dr6 was reduced in width, the toolstack can cause a host crash by loading a bad %dr6 value on VT-x hardware. Reject any %dr6/7 values with upper bits set. For PV guests, also audit %dr0..3 using the same logic as in set_debugreg() so they aren't silently zeroed later in the function. Leave a comment behind explaing how %dr4/5 handling changed, and why they're ignored now. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 19 +++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 8 ++++++++ 2 files changed, 27 insertions(+) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index fe86a7f853..7186c24d1e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1074,8 +1074,27 @@ int arch_set_info_guest( #endif flags = c(flags); + if ( !compat ) + { + if ( c(debugreg[6]) != (uint32_t)c(debugreg[6]) || + c(debugreg[7]) != (uint32_t)c(debugreg[7]) ) + return -EINVAL; + } + if ( is_pv_domain(d) ) { + for ( i = 0; i < ARRAY_SIZE(v->arch.dr); i++ ) + if ( !access_ok(c(debugreg[i]), sizeof(long)) ) + return -EINVAL; + /* + * Prior to Xen 4.11, dr5 was used to hold the emulated-only + * subset of dr7, and dr4 was unused. + * + * In Xen 4.11 and later, dr4/5 are written as zero, ignored for + * backwards compatibility, and dr7 emulation is handled + * internally. + */ + if ( !compat ) { if ( !is_canonical_address(c.nat->user_regs.rip) || diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3a99c0ff20..3dc2019eca 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1032,6 +1032,14 @@ static int cf_check hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } + if ( ctxt.dr6 != (uint32_t)ctxt.dr6 || + ctxt.dr7 != (uint32_t)ctxt.dr7 ) + { + printk(XENLOG_G_ERR "%pv: HVM restore: bad DR6 %#"PRIx64" or DR7 %#"PRIx64"\n", + v, ctxt.dr6, ctxt.dr7); + return -EINVAL; + } + if ( ctxt.cr3 >> d->arch.cpuid->extd.maxphysaddr ) { printk(XENLOG_G_ERR "HVM%d restore: bad CR3 %#" PRIx64 "\n", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:56:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600519.936203 (Exim 4.92) (envelope-from ) id 1qg3ss-000492-5L; Tue, 12 Sep 2023 13:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600519.936203; Tue, 12 Sep 2023 13:56:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3ss-00048u-1n; Tue, 12 Sep 2023 13:56:54 +0000 Received: by outflank-mailman (input) for mailman id 600519; Tue, 12 Sep 2023 13:56:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sr-00048i-GU for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3sr-0007nk-Fk for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3sr-00040d-Es for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:56:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6KVAOSMypti9dylsmzob+eXZNLl4Q5nKxA8t3KGZ8MA=; b=j0ty+OlgALMaSPgbzvI3DIKzsQ kAORgtSHlUmfv3guG4l4BbnEjPTq1lEM0EmPPItWnvg31Hx371gSty2iuPsQ/UMtusPND7F4L8v/r LjKxeIVb3Ep6UXuDtEfGR4tTfLFV731jqm8W6MiQLyPUUIA5uTVobG5PgajnyFZ7Mlk4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Introduce new debug.c for debug register infrastructure Message-Id: Date: Tue, 12 Sep 2023 13:56:53 +0000 commit aa39130d2b1b6c64380797b030aa5ada3b0c479c Author: Andrew Cooper AuthorDate: Tue Aug 29 12:01:49 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 11 19:04:47 2023 +0100 x86: Introduce new debug.c for debug register infrastructure Broken out of the subsequent patch for clarity. Add stub x86_adj_dr{6,7}_rsvd() functions which will be extended in the following patch to fix bugs, and adjust debugreg.h to compile with a more minimal set of includes. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/Makefile | 1 + xen/arch/x86/debug.c | 19 +++++++++++++++++++ xen/arch/x86/include/asm/debugreg.h | 11 +++++++++++ 3 files changed, 31 insertions(+) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index e642ad6c55..f3abdf9cd1 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -24,6 +24,7 @@ obj-y += cpuid.o obj-$(CONFIG_PV) += compat.o obj-$(CONFIG_PV32) += x86_64/compat.o obj-$(CONFIG_KEXEC) += crash.o +obj-y += debug.o obj-y += delay.o obj-y += desc.o obj-bin-y += dmi_scan.init.o diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c new file mode 100644 index 0000000000..9900b555d6 --- /dev/null +++ b/xen/arch/x86/debug.c @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 XenServer. + */ +#include + +#include + +#include + +unsigned int x86_adj_dr6_rsvd(const struct cpu_policy *p, unsigned int dr6) +{ + return dr6; +} + +unsigned int x86_adj_dr7_rsvd(const struct cpu_policy *p, unsigned int dr7) +{ + return dr7; +} diff --git a/xen/arch/x86/include/asm/debugreg.h b/xen/arch/x86/include/asm/debugreg.h index 86aa6d7143..74450160fd 100644 --- a/xen/arch/x86/include/asm/debugreg.h +++ b/xen/arch/x86/include/asm/debugreg.h @@ -77,7 +77,18 @@ asm volatile ( "mov %%db" #reg ",%0" : "=r" (__val) ); \ __val; \ }) + +struct vcpu; long set_debugreg(struct vcpu *, unsigned int reg, unsigned long value); void activate_debugregs(const struct vcpu *); +struct cpu_policy; + +/* + * Architecturally dr6/7 are full GPR-width, but only the bottom 32 bits may + * legally be non-zero. We avoid storing the upper bits when possible. + */ +unsigned int x86_adj_dr6_rsvd(const struct cpu_policy *p, unsigned int dr6); +unsigned int x86_adj_dr7_rsvd(const struct cpu_policy *p, unsigned int dr7); + #endif /* _X86_DEBUGREG_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:57:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600520.936206 (Exim 4.92) (envelope-from ) id 1qg3t2-0004Gs-7S; Tue, 12 Sep 2023 13:57:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600520.936206; Tue, 12 Sep 2023 13:57:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3t2-0004Gk-4Z; Tue, 12 Sep 2023 13:57:04 +0000 Received: by outflank-mailman (input) for mailman id 600520; Tue, 12 Sep 2023 13:57:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3t1-0004Gc-Ji for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:57:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3t1-0007o4-J3 for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:57:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3t1-00041f-IC for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:57:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wqpF80MpUzIid/G9LjiSspxR6d8kPsTRu8V83P2iiW0=; b=u/DW4zD46cSDq8lbOE68DWL3E6 NZ3TElMrYOGCd/YC+vgWi2AIJT4L9jpvCHZgrvrES1mAOWrUwmmEKZocLMFnZwwUm1YlQ7LLqgHt8 TtX04R1qHpg9P6EQaxYNy/97SiSdmEOGw5T+SxvtkXzyYosUoWY2MLdnNKd7PYdrJHMk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Fix calculation of %dr6/dr7 reserved bits Message-Id: Date: Tue, 12 Sep 2023 13:57:03 +0000 commit 4d6b0c2ac78f6c0b4657437902a15a31af8d5825 Author: Andrew Cooper AuthorDate: Thu May 31 16:16:37 2018 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 11 19:04:47 2023 +0100 x86: Fix calculation of %dr6/dr7 reserved bits RTM debugging and BusLock Detect have both introduced conditional behaviour into the %dr6/7 calculations which Xen's existing logic doesn't account for. Introduce the CPUID bit for BusLock Detect, so we can get the %dr6 behaviour correct from the outset. Implement x86_adj_dr{6,7}_rsvd() fully, and use them in place of the plain bitmasks. Signed-off-by: Andrew Cooper Signed-off-by: Jinoh Kang Reviewed-by: Jan Beulich --- xen/arch/x86/debug.c | 27 +++++++++++++++++++++++++++ xen/arch/x86/domain.c | 5 +++-- xen/arch/x86/hvm/hvm.c | 6 ++++-- xen/arch/x86/include/asm/debugreg.h | 4 +--- xen/arch/x86/include/asm/x86-defns.h | 21 +++++++++++++++++++-- xen/arch/x86/pv/misc-hypercalls.c | 16 ++++------------ xen/include/public/arch-x86/cpufeatureset.h | 1 + 7 files changed, 59 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 9900b555d6..127fe83021 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -10,10 +10,37 @@ unsigned int x86_adj_dr6_rsvd(const struct cpu_policy *p, unsigned int dr6) { + unsigned int ones = X86_DR6_DEFAULT; + + /* + * The i586 and later processors had most but not all reserved bits read + * as 1s. New features allocated in this space have inverted polarity, + * and don't force their respective bit to 1. + */ + if ( p->feat.rtm ) + ones &= ~X86_DR6_RTM; + if ( p->feat.bld ) + ones &= ~X86_DR6_BLD; + + dr6 |= ones; + dr6 &= ~X86_DR6_ZEROS; + return dr6; } unsigned int x86_adj_dr7_rsvd(const struct cpu_policy *p, unsigned int dr7) { + unsigned int zeros = X86_DR7_ZEROS; + + /* + * Most but not all reserved bits force to zero. Hardware lacking + * optional features force more bits to zero. + */ + if ( !p->feat.rtm ) + zeros |= X86_DR7_RTM; + + dr7 &= ~zeros; + dr7 |= X86_DR7_DEFAULT; + return dr7; } diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 7186c24d1e..645675d87d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1053,6 +1053,7 @@ int arch_set_info_guest( struct vcpu *v, vcpu_guest_context_u c) { struct domain *d = v->domain; + const struct cpu_policy *p = d->arch.cpu_policy; unsigned int i; unsigned long flags; bool compat; @@ -1186,8 +1187,8 @@ int arch_set_info_guest( { for ( i = 0; i < ARRAY_SIZE(v->arch.dr); ++i ) v->arch.dr[i] = c(debugreg[i]); - v->arch.dr6 = c(debugreg[6]); - v->arch.dr7 = c(debugreg[7]); + v->arch.dr6 = x86_adj_dr6_rsvd(p, c(debugreg[6])); + v->arch.dr7 = x86_adj_dr7_rsvd(p, c(debugreg[7])); if ( v->vcpu_id == 0 ) d->vm_assist = c.nat->vm_assist; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3dc2019eca..482eebbabf 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -985,6 +986,7 @@ unsigned long hvm_cr4_guest_valid_bits(const struct domain *d) static int cf_check hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) { + const struct cpu_policy *p = d->arch.cpu_policy; unsigned int vcpuid = hvm_load_instance(h); struct vcpu *v; struct hvm_hw_cpu ctxt; @@ -1174,8 +1176,8 @@ static int cf_check hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) v->arch.dr[1] = ctxt.dr1; v->arch.dr[2] = ctxt.dr2; v->arch.dr[3] = ctxt.dr3; - v->arch.dr6 = ctxt.dr6; - v->arch.dr7 = ctxt.dr7; + v->arch.dr6 = x86_adj_dr6_rsvd(p, ctxt.dr6); + v->arch.dr7 = x86_adj_dr7_rsvd(p, ctxt.dr7); hvmemul_cancel(v); diff --git a/xen/arch/x86/include/asm/debugreg.h b/xen/arch/x86/include/asm/debugreg.h index 74450160fd..39ba312b84 100644 --- a/xen/arch/x86/include/asm/debugreg.h +++ b/xen/arch/x86/include/asm/debugreg.h @@ -1,6 +1,7 @@ #ifndef _X86_DEBUGREG_H #define _X86_DEBUGREG_H +#include /* Indicate the register numbers for a number of the specific debug registers. Registers 0-3 contain the addresses we wish to trap on */ @@ -21,7 +22,6 @@ #define DR_STEP (0x4000) /* single-step */ #define DR_SWITCH (0x8000) /* task switch */ #define DR_NOT_RTM (0x10000) /* clear: #BP inside RTM region */ -#define DR_STATUS_RESERVED_ZERO (~0xffffefffUL) /* Reserved, read as zero */ #define DR_STATUS_RESERVED_ONE 0xffff0ff0UL /* Reserved, read as one */ /* Now define a bunch of things for manipulating the control register. @@ -61,8 +61,6 @@ We can slow the instruction pipeline for instructions coming via the gdt or the ldt if we want to. I am not sure why this is an advantage */ -#define DR_CONTROL_RESERVED_ZERO (~0xffff27ffUL) /* Reserved, read as zero */ -#define DR_CONTROL_RESERVED_ONE (0x00000400UL) /* Reserved, read as one */ #define DR_LOCAL_EXACT_ENABLE (0x00000100UL) /* Local exact enable */ #define DR_GLOBAL_EXACT_ENABLE (0x00000200UL) /* Global exact enable */ #define DR_RTM_ENABLE (0x00000800UL) /* RTM debugging enable */ diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index e350227e57..5838631ef6 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -102,13 +102,30 @@ /* * Debug status flags in DR6. + * + * For backwards compatibility, status flags which overlap with + * X86_DR6_DEFAULT have inverted polarity. */ -#define X86_DR6_DEFAULT 0xffff0ff0 /* Default %dr6 value. */ +#define X86_DR6_B0 (_AC(1, UL) << 0) /* Breakpoint 0 */ +#define X86_DR6_B1 (_AC(1, UL) << 1) /* Breakpoint 1 */ +#define X86_DR6_B2 (_AC(1, UL) << 2) /* Breakpoint 2 */ +#define X86_DR6_B3 (_AC(1, UL) << 3) /* Breakpoint 3 */ +#define X86_DR6_BLD (_AC(1, UL) << 11) /* BusLock detect (INV) */ +#define X86_DR6_BD (_AC(1, UL) << 13) /* %dr access */ +#define X86_DR6_BS (_AC(1, UL) << 14) /* Single step */ +#define X86_DR6_BT (_AC(1, UL) << 15) /* Task switch */ +#define X86_DR6_RTM (_AC(1, UL) << 16) /* #DB/#BP in RTM region (INV) */ + +#define X86_DR6_ZEROS _AC(0x00001000, UL) /* %dr6 bits forced to 0 */ +#define X86_DR6_DEFAULT _AC(0xffff0ff0, UL) /* Default %dr6 value */ /* * Debug control flags in DR7. */ -#define X86_DR7_DEFAULT 0x00000400 /* Default %dr7 value. */ +#define X86_DR7_RTM (_AC(1, UL) << 11) /* RTM debugging enable */ + +#define X86_DR7_ZEROS _AC(0x0000d000, UL) /* %dr7 bits forced to 0 */ +#define X86_DR7_DEFAULT _AC(0x00000400, UL) /* Default %dr7 value */ /* * Invalidation types for the INVPCID instruction. diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index b11bd718b7..99f5028128 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -56,6 +56,7 @@ long do_fpu_taskswitch(int set) long set_debugreg(struct vcpu *v, unsigned int reg, unsigned long value) { struct vcpu *curr = current; + const struct cpu_policy *p = curr->domain->arch.cpu_policy; switch ( reg ) { @@ -86,12 +87,7 @@ long set_debugreg(struct vcpu *v, unsigned int reg, unsigned long value) if ( value != (uint32_t)value ) return -EINVAL; - /* - * DR6: Bits 4-11,16-31 reserved (set to 1). - * Bit 12 reserved (set to 0). - */ - value &= ~DR_STATUS_RESERVED_ZERO; /* reserved bits => 0 */ - value |= DR_STATUS_RESERVED_ONE; /* reserved bits => 1 */ + value = x86_adj_dr6_rsvd(p, value); v->arch.dr6 = value; if ( v == curr ) @@ -108,12 +104,8 @@ long set_debugreg(struct vcpu *v, unsigned int reg, unsigned long value) if ( value != (uint32_t)value ) return -EINVAL; - /* - * DR7: Bit 10 reserved (set to 1). - * Bits 11-12,14-15 reserved (set to 0). - */ - value &= ~DR_CONTROL_RESERVED_ZERO; /* reserved bits => 0 */ - value |= DR_CONTROL_RESERVED_ONE; /* reserved bits => 1 */ + value = x86_adj_dr7_rsvd(p, value); + /* * Privileged bits: * GD (bit 13): must be 0. diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 50fda581f2..6b6ce2745c 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -223,6 +223,7 @@ XEN_CPUFEATURE(AVX512_VNNI, 6*32+11) /*A Vector Neural Network Instrs */ XEN_CPUFEATURE(AVX512_BITALG, 6*32+12) /*A Support for VPOPCNT[B,W] and VPSHUFBITQMB */ XEN_CPUFEATURE(AVX512_VPOPCNTDQ, 6*32+14) /*A POPCNT for vectors of DW/QW */ XEN_CPUFEATURE(RDPID, 6*32+22) /*A RDPID instruction */ +XEN_CPUFEATURE(BLD, 6*32+24) /* BusLock Detect (#DB trap) support */ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ XEN_CPUFEATURE(MOVDIRI, 6*32+27) /*a MOVDIRI instruction */ XEN_CPUFEATURE(MOVDIR64B, 6*32+28) /*a MOVDIR64B instruction */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 12 13:57:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Sep 2023 13:57:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.600522.936210 (Exim 4.92) (envelope-from ) id 1qg3tC-0004PG-8u; Tue, 12 Sep 2023 13:57:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 600522.936210; Tue, 12 Sep 2023 13:57:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3tC-0004P8-66; Tue, 12 Sep 2023 13:57:14 +0000 Received: by outflank-mailman (input) for mailman id 600522; Tue, 12 Sep 2023 13:57:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3tB-0004Oy-MO for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:57:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qg3tB-0007oI-Ln for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:57:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qg3tB-00042W-L4 for xen-changelog@lists.xenproject.org; Tue, 12 Sep 2023 13:57:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T3wLCRjaqAWhknghaZRmCXG7Kh1QmcP09QMsnuRRZA8=; b=zLeZc71pj5FpvKvf93tUwODNuT ncTrkRfOnG+Oc8Y7Wu7lMMzf60RV9aPJ24WSj0/waL0sLu5WyPolUsRi3xcZDRGR4zUki8q4BhN9m GLSKN52/Y9nN1+MAhllyKZD2qHDqGQZc+mFmoQLTXIxXEwdlmpcyzeJD2RWd3IYrEnrM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xentrace/xentrace_format: Add python 3 compatibility Message-Id: Date: Tue, 12 Sep 2023 13:57:13 +0000 commit f1546c98e06fec6c2d1e15ff8e80547d10365bc3 Author: Javi Merino AuthorDate: Mon Sep 11 17:07:02 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 11 19:04:47 2023 +0100 tools/xentrace/xentrace_format: Add python 3 compatibility Resolves: xen-project/xen#155 Signed-off-by: Javi Merino Acked-by: Andrew Cooper --- tools/xentrace/xentrace_format | 60 ++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format index 5ff85ae2e8..21be16b7e4 100644 --- a/tools/xentrace/xentrace_format +++ b/tools/xentrace/xentrace_format @@ -4,11 +4,14 @@ # Program for reformatting trace buffer output according to user-supplied rules +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from builtins import str import re, sys, string, signal, struct, os, getopt def usage(): - print >> sys.stderr, \ - "Usage: " + sys.argv[0] + """ defs-file + print("Usage: " + sys.argv[0] + """ defs-file Parses trace data in binary format, as output by Xentrace and reformats it according to the rules in a file of definitions. The rules in this file should have the format ({ and } show grouping @@ -29,7 +32,7 @@ def usage(): this script may not be able to keep up with the output of xentrace if it is piped directly. In these circumstances you should have xentrace output to a file for processing off-line. - """ + """, file=sys.stderr) sys.exit(1) def read_defs(defs_file): @@ -49,7 +52,7 @@ def read_defs(defs_file): m = reg.match(line) - if not m: print >> sys.stderr, "Bad format file" ; sys.exit(1) + if not m: print("Bad format file", file=sys.stderr) ; sys.exit(1) defs[str(eval(m.group(1)))] = m.group(2) @@ -83,8 +86,8 @@ interrupted = 0 try: defs = read_defs(arg[0]) -except IOError, exn: - print exn +except IOError as exn: + print(exn) sys.exit(1) # structure of trace record (as output by xentrace): @@ -117,12 +120,17 @@ TRC_PV_HYPERCALL_SUBCALL = 0x20100e NR_VECTORS = 256 irq_measure = [{'count':0, 'tot_cycles':0, 'max_cycles':0}] * NR_VECTORS +if sys.version_info >= (3, 0): + stdin_bytes = sys.stdin.buffer +else: + stdin_bytes = sys.stdin + i=0 while not interrupted: try: i=i+1 - line = sys.stdin.read(struct.calcsize(HDRREC)) + line = stdin_bytes.read(struct.calcsize(HDRREC)) if not line: break event = struct.unpack(HDRREC, line)[0] @@ -140,43 +148,43 @@ while not interrupted: tsc = 0 if tsc_in == 1: - line = sys.stdin.read(struct.calcsize(TSCREC)) + line = stdin_bytes.read(struct.calcsize(TSCREC)) if not line: break tsc = struct.unpack(TSCREC, line)[0] if n_data == 1: - line = sys.stdin.read(struct.calcsize(D1REC)) + line = stdin_bytes.read(struct.calcsize(D1REC)) if not line: break d1 = struct.unpack(D1REC, line)[0] if n_data == 2: - line = sys.stdin.read(struct.calcsize(D2REC)) + line = stdin_bytes.read(struct.calcsize(D2REC)) if not line: break (d1, d2) = struct.unpack(D2REC, line) if n_data == 3: - line = sys.stdin.read(struct.calcsize(D3REC)) + line = stdin_bytes.read(struct.calcsize(D3REC)) if not line: break (d1, d2, d3) = struct.unpack(D3REC, line) if n_data == 4: - line = sys.stdin.read(struct.calcsize(D4REC)) + line = stdin_bytes.read(struct.calcsize(D4REC)) if not line: break (d1, d2, d3, d4) = struct.unpack(D4REC, line) if n_data == 5: - line = sys.stdin.read(struct.calcsize(D5REC)) + line = stdin_bytes.read(struct.calcsize(D5REC)) if not line: break (d1, d2, d3, d4, d5) = struct.unpack(D5REC, line) if n_data == 6: - line = sys.stdin.read(struct.calcsize(D6REC)) + line = stdin_bytes.read(struct.calcsize(D6REC)) if not line: break (d1, d2, d3, d4, d5, d6) = struct.unpack(D6REC, line) if n_data == 7: - line = sys.stdin.read(struct.calcsize(D7REC)) + line = stdin_bytes.read(struct.calcsize(D7REC)) if not line: break (d1, d2, d3, d4, d5, d6, d7) = struct.unpack(D7REC, line) @@ -211,7 +219,7 @@ while not interrupted: if cpu >= len(last_tsc): last_tsc += [0] * (cpu - len(last_tsc) + 1) elif tsc < last_tsc[cpu] and tsc_in == 1: - print "TSC stepped backward cpu %d ! %d %d" % (cpu,tsc,last_tsc[cpu]) + print("TSC stepped backward cpu %d ! %d %d" % (cpu,tsc,last_tsc[cpu])) # provide relative TSC if last_tsc[cpu] > 0 and tsc_in == 1: @@ -239,18 +247,18 @@ while not interrupted: try: - if defs.has_key(str(event)): - print defs[str(event)] % args + if str(event) in defs: + print(defs[str(event)] % args) else: - if defs.has_key(str(0)): print defs[str(0)] % args + if str(0) in defs: print(defs[str(0)] % args) except TypeError: - if defs.has_key(str(event)): - print defs[str(event)] - print args + if str(event) in defs: + print(defs[str(event)]) + print(args) else: - if defs.has_key(str(0)): - print defs[str(0)] - print args + if str(0) in defs: + print(defs[str(0)]) + print(args) - except IOError, struct.error: sys.exit() + except (IOError, struct.error): sys.exit() -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:00:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601739.937870 (Exim 4.92) (envelope-from ) id 1qgdWX-0006fQ-C5; Thu, 14 Sep 2023 04:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601739.937870; Thu, 14 Sep 2023 04: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 1qgdWX-0006fI-9B; Thu, 14 Sep 2023 04:00:13 +0000 Received: by outflank-mailman (input) for mailman id 601739; Thu, 14 Sep 2023 04:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWW-0006fA-8t for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWW-0001yF-86 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdWW-0005sj-5o for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=AmwaPOm+HJFXZrxDFDfDkCXS/UPZumnFl6HHbAoUrj0=; b=ofgpOhiE/xdiBfrqPfaNFrV9kg 9vj/W7i+MAWKsCAvQb5dn/73q4v2EjzqERgIZbQaT++kY+e1vGWrTRFq1JIjmaiy0q1YvVLt2Vp06 6u8IpYz+jJsp4DIbIeuHr/1gcpjXDQwUP40HsRjVY0sGtpJoTlIzABcMWPVhmBakt4Cs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: restrict gcc11 workaround to versions earlier than 11.3.0 Message-Id: Date: Thu, 14 Sep 2023 04:00:12 +0000 commit 7a952cc3ecfd948272bec91218a4862418e5a321 Author: Jan Beulich AuthorDate: Tue Sep 12 11:02:16 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 12 11:02:16 2023 +0200 build: restrict gcc11 workaround to versions earlier than 11.3.0 The fix for this issue was backported to 11.3, so let's not unduly engage the workaround. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/include/xen/compiler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 7d7ae2e5e4..dd99e57308 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -146,7 +146,8 @@ __asm__ ("" : "=r"(__ptr) : "0"(ptr)); \ (typeof(ptr)) (__ptr + (off)); }) -#if CONFIG_GCC_VERSION >= 110000 /* See gcc bug 100680. */ +/* See gcc bug 100680. */ +#if CONFIG_GCC_VERSION >= 110000 && CONFIG_GCC_VERSION < 110300 # define gcc11_wrap(x) RELOC_HIDE(x, 0) #else # define gcc11_wrap(x) (x) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:00:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601738.937866 (Exim 4.92) (envelope-from ) id 1qgdWN-0006DA-Aa; Thu, 14 Sep 2023 04:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601738.937866; Thu, 14 Sep 2023 04: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 1qgdWN-0006Cr-7n; Thu, 14 Sep 2023 04:00:03 +0000 Received: by outflank-mailman (input) for mailman id 601738; Thu, 14 Sep 2023 04:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWM-00061x-82 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWM-0001uH-3b for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdWM-0005rI-2E for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=h8VDZaBiZ7OsOEQPXqbfyZKhqj0ehMrhK6xzxNLIEEk=; b=sjzVpYz6HcvMzBoEfDatWBkkeB dcr1I5P1U85jdpkSkk8lU1cAPwn0+d2o7qIi5P+xQPzNzo6JyY7YLY+4g4yTDapiCaw4yTV4OaNAD u2sr09sGN2GKQLhgHX28aDI4EBQ/zWmABAvSPWeKMjDNd0u12emm5aE3iFFQJsV8/UyA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/viridian: address violations of MISRA C:2012 Rule 7.3 Message-Id: Date: Thu, 14 Sep 2023 04:00:02 +0000 commit a22f0de322c288d26e9f29179beef1e1779ccfbd Author: Gianluca Luparini AuthorDate: Tue Sep 12 11:01:19 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 12 11:01:19 2023 +0200 x86/viridian: address violations of MISRA C:2012 Rule 7.3 The xen sources contain violations of MISRA C:2012 Rule 7.3 whose headline states: "The lowercase character 'l' shall not be used in a literal suffix". Use the "L" suffix instead of the "l" suffix, to avoid potential ambiguity. If the "u" suffix is used near "L", use the "U" suffix instead, for consistency. The changes in this patch are mechanical. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian/synic.c | 2 +- xen/arch/x86/hvm/viridian/time.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c index 83d7addfc3..8cf600cec6 100644 --- a/xen/arch/x86/hvm/viridian/synic.c +++ b/xen/arch/x86/hvm/viridian/synic.c @@ -233,7 +233,7 @@ int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val) * should be set to. Assume everything but the bottom bit * should be zero. */ - *val = 1ul; + *val = 1UL; break; case HV_X64_MSR_SIEFP: diff --git a/xen/arch/x86/hvm/viridian/time.c b/xen/arch/x86/hvm/viridian/time.c index a3ea3fa067..137577384f 100644 --- a/xen/arch/x86/hvm/viridian/time.c +++ b/xen/arch/x86/hvm/viridian/time.c @@ -66,7 +66,7 @@ static void update_reference_tsc(const struct domain *d, bool initialize) * The offset value is calculated on restore after migration and * ensures that Windows will not see a large jump in ReferenceTime. */ - p->tsc_scale = ((10000ul << 32) / d->arch.tsc_khz) << 32; + p->tsc_scale = ((10000UL << 32) / d->arch.tsc_khz) << 32; p->tsc_offset = trc->off; smp_wmb(); @@ -79,7 +79,7 @@ static uint64_t trc_val(const struct domain *d, int64_t offset) uint64_t tsc, scale; tsc = hvm_get_guest_tsc(pt_global_vcpu_target(d)); - scale = ((10000ul << 32) / d->arch.tsc_khz) << 32; + scale = ((10000UL << 32) / d->arch.tsc_khz) << 32; return hv_scale_tsc(tsc, scale, offset); } @@ -201,7 +201,7 @@ static void start_stimer(struct viridian_stimer *vs) ASSERT(expiration - now > 0); vs->expiration = expiration; - timeout = (expiration - now) * 100ull; + timeout = (expiration - now) * 100ULL; vs->started = true; clear_bit(stimerx, &vv->stimer_pending); @@ -413,14 +413,14 @@ int viridian_time_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val) if ( viridian_feature_mask(d) & HVMPV_no_freq ) return X86EMUL_EXCEPTION; - *val = (uint64_t)d->arch.tsc_khz * 1000ull; + *val = (uint64_t)d->arch.tsc_khz * 1000ULL; break; case HV_X64_MSR_APIC_FREQUENCY: if ( viridian_feature_mask(d) & HVMPV_no_freq ) return X86EMUL_EXCEPTION; - *val = 1000000000ull / APIC_BUS_CYCLE_NS; + *val = 1000000000ULL / APIC_BUS_CYCLE_NS; break; case HV_X64_MSR_REFERENCE_TSC: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:00:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601740.937873 (Exim 4.92) (envelope-from ) id 1qgdWh-0006hO-DA; Thu, 14 Sep 2023 04:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601740.937873; Thu, 14 Sep 2023 04: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 1qgdWh-0006hG-Ag; Thu, 14 Sep 2023 04:00:23 +0000 Received: by outflank-mailman (input) for mailman id 601740; Thu, 14 Sep 2023 04:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWg-0006h8-Ch for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWg-0001zG-Bn for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdWg-0005t8-AR for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=y71j5KIIO3Ss1A/Z6iSoAjTKF0A3oA7QoAtYMlvFQz0=; b=6nzh1OSRkqUNYDNDg3TpsOCALJ 9vahqSwD1fxVsIy+VAP9mGwyX035a1Zz0N6kMsMJZiw0HuP/VVkS+hxQVwwpXWBEla92L/ghAZg5X LE6Xwh2e7RwJQg9EMCjFDK3e91/0puQMZUrTPHmyP5SEtkGSH1zSpVHFw8KwbPd6BKzk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/viridian: address violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 14 Sep 2023 04:00:22 +0000 commit 5e8df433db791ba7e63ac1253e4e2a06ccd353d7 Author: Gianluca Luparini AuthorDate: Tue Sep 12 11:02:51 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 12 11:02:51 2023 +0200 x86/viridian: address violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index 7405c117bc..61171e3363 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -291,7 +291,7 @@ static void enable_hypercall_page(struct domain *d) * calling convention) to differentiate Xen and Viridian hypercalls. */ *(u8 *)(p + 0) = 0x0d; /* orl $0x80000000, %eax */ - *(u32 *)(p + 1) = 0x80000000; + *(u32 *)(p + 1) = 0x80000000U; *(u8 *)(p + 5) = 0x0f; /* vmcall/vmmcall */ *(u8 *)(p + 6) = 0x01; *(u8 *)(p + 7) = (cpu_has_vmx ? 0xc1 : 0xd9); diff --git a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h index 38f997a0c8..a6915ad731 100644 --- a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h +++ b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h @@ -471,30 +471,30 @@ typedef struct _HV_REFERENCE_TSC_PAGE { /* Define hypervisor message types. */ enum hv_message_type { - HVMSG_NONE = 0x00000000, + HVMSG_NONE = 0x00000000U, /* Memory access messages. */ - HVMSG_UNMAPPED_GPA = 0x80000000, - HVMSG_GPA_INTERCEPT = 0x80000001, + HVMSG_UNMAPPED_GPA = 0x80000000U, + HVMSG_GPA_INTERCEPT = 0x80000001U, /* Timer notification messages. */ - HVMSG_TIMER_EXPIRED = 0x80000010, + HVMSG_TIMER_EXPIRED = 0x80000010U, /* Error messages. */ - HVMSG_INVALID_VP_REGISTER_VALUE = 0x80000020, - HVMSG_UNRECOVERABLE_EXCEPTION = 0x80000021, - HVMSG_UNSUPPORTED_FEATURE = 0x80000022, + HVMSG_INVALID_VP_REGISTER_VALUE = 0x80000020U, + HVMSG_UNRECOVERABLE_EXCEPTION = 0x80000021U, + HVMSG_UNSUPPORTED_FEATURE = 0x80000022U, /* Trace buffer complete messages. */ - HVMSG_EVENTLOG_BUFFERCOMPLETE = 0x80000040, + HVMSG_EVENTLOG_BUFFERCOMPLETE = 0x80000040U, /* Platform-specific processor intercept messages. */ - HVMSG_X64_IOPORT_INTERCEPT = 0x80010000, - HVMSG_X64_MSR_INTERCEPT = 0x80010001, - HVMSG_X64_CPUID_INTERCEPT = 0x80010002, - HVMSG_X64_EXCEPTION_INTERCEPT = 0x80010003, - HVMSG_X64_APIC_EOI = 0x80010004, - HVMSG_X64_LEGACY_FP_ERROR = 0x80010005 + HVMSG_X64_IOPORT_INTERCEPT = 0x80010000U, + HVMSG_X64_MSR_INTERCEPT = 0x80010001U, + HVMSG_X64_CPUID_INTERCEPT = 0x80010002U, + HVMSG_X64_EXCEPTION_INTERCEPT = 0x80010003U, + HVMSG_X64_APIC_EOI = 0x80010004U, + HVMSG_X64_LEGACY_FP_ERROR = 0x80010005U }; /* Define synthetic interrupt controller message flags. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:00:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601742.937878 (Exim 4.92) (envelope-from ) id 1qgdWr-0006kM-F6; Thu, 14 Sep 2023 04:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601742.937878; Thu, 14 Sep 2023 04: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 1qgdWr-0006kF-CG; Thu, 14 Sep 2023 04:00:33 +0000 Received: by outflank-mailman (input) for mailman id 601742; Thu, 14 Sep 2023 04:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWq-0006k3-GP for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdWq-00020B-F5 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdWq-0005ta-ED for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=KeRaCuozqwp/YhgJieYxrtAH8QDAPWopCDl1fxuQH0E=; b=Om4kIIt4Y/vKEIWic2pxyNPnzZ SbvWmzzhehAZtHGX9BiBsUH00sX255qpxZjYErzQf0OfdKjMwSGmb4kKMB0mfCEiZKB02BO0Tz6ew o+2pPRkD0cgOtrO2Y6SgyMZ/PqlUdJMB2XOzJuW0J5xTMkf2iv9uISF8ehXiXDfx8UQQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Handle empty grant table region in find_unallocated_memory() Message-Id: Date: Thu, 14 Sep 2023 04:00:32 +0000 commit 21ec0c42267be169be6019e5a09b61cbf16d10ce Author: Michal Orzel AuthorDate: Thu Aug 24 11:06:40 2023 +0200 Commit: Julien Grall CommitDate: Tue Sep 12 14:29:14 2023 +0100 xen/arm: Handle empty grant table region in find_unallocated_memory() When creating dom0 with grant table support disabled in Xen and no IOMMU, the following assert is triggered (debug build): "Assertion 's <= e' failed at common/rangeset.c:189" (XEN) Xen call trace: (XEN) [<0000020000218568>] rangeset_remove_range+0xbc/0x2cc (PC) (XEN) [<00000200002c76bc>] domain_build.c#make_hypervisor_node+0x294/0x7c4 (LR) (XEN) [<00000200002ca240>] domain_build.c#handle_node+0x7ec/0x924 (XEN) [<00000200002ca7ac>] domain_build.c#construct_dom0+0x434/0x4d8 This is because find_unallocated_memory() (used to find memory holes for extended regions) calls rangeset_remove_range() for an empty grant table region. Fix it by checking if the size of region is not 0. Signed-off-by: Michal Orzel Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 29dcbb8a2e..6cf0450858 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1633,14 +1633,18 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, } /* Remove grant table region */ - start = kinfo->gnttab_start; - end = kinfo->gnttab_start + kinfo->gnttab_size; - res = rangeset_remove_range(unalloc_mem, PFN_DOWN(start), PFN_DOWN(end - 1)); - if ( res ) + if ( kinfo->gnttab_size ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", - start, end); - goto out; + start = kinfo->gnttab_start; + end = kinfo->gnttab_start + kinfo->gnttab_size; + res = rangeset_remove_range(unalloc_mem, PFN_DOWN(start), + PFN_DOWN(end - 1)); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", + start, end); + goto out; + } } start = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:00:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601743.937883 (Exim 4.92) (envelope-from ) id 1qgdX1-0006o6-H9; Thu, 14 Sep 2023 04:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601743.937883; Thu, 14 Sep 2023 04: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 1qgdX1-0006nu-Dr; Thu, 14 Sep 2023 04:00:43 +0000 Received: by outflank-mailman (input) for mailman id 601743; Thu, 14 Sep 2023 04:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdX0-0006nd-Iw for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdX0-00020N-I5 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdX0-0005u3-HI for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=AskGt7Qo5mezhpSYWcYfzaariJTr3moy2AN6ow+yf+Y=; b=gkHsTEJnOdEmt7R3Bd9OFnq4V7 eSwpRNpmpSPUZQ6HKkxoU6d6cEpez+ZvgawOEbCyH6YFLz3pxpS+rS01TNyRE2W5r8xBrePlCW6WJ JevPl/xlE9PIEA29pgrGdoPuGayLKVLF3x1OhsZO1jVmVpQolPtmXcKiIonDaGglar7s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ioreq: address violations of MISRA C:2012 Rule 7.3 Message-Id: Date: Thu, 14 Sep 2023 04:00:42 +0000 commit 933a71756c94271b81dcf730ccdff941ebd076fb Author: Gianluca Luparini AuthorDate: Wed Sep 13 09:43:51 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:43:51 2023 +0200 xen/ioreq: address violations of MISRA C:2012 Rule 7.3 The xen sources contain violations of MISRA C:2012 Rule 7.3 whose headline states: "The lowercase character 'l' shall not be used in a literal suffix". Use the "L" suffix instead of the "l" suffix, to avoid potential ambiguity. If the "u" suffix is used near "L", use the "U" suffix instead, for consistency. The changes in this patch are mechanical. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Paul Durrant --- xen/common/ioreq.c | 2 +- xen/include/xen/ioreq.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c index 7cb717f7a2..62b907f4c4 100644 --- a/xen/common/ioreq.c +++ b/xen/common/ioreq.c @@ -1182,7 +1182,7 @@ static int ioreq_send_buffered(struct ioreq_server *s, ioreq_t *p) * - the count field is usually used with data_is_ptr and since we don't * support data_is_ptr we do not waste space for the count field either */ - if ( (p->addr > 0xffffful) || p->data_is_ptr || (p->count != 1) ) + if ( (p->addr > 0xfffffUL) || p->data_is_ptr || (p->count != 1) ) return 0; switch ( p->size ) diff --git a/xen/include/xen/ioreq.h b/xen/include/xen/ioreq.h index a26614d331..cd399adf17 100644 --- a/xen/include/xen/ioreq.h +++ b/xen/include/xen/ioreq.h @@ -60,7 +60,7 @@ struct ioreq_server { static inline paddr_t ioreq_mmio_first_byte(const ioreq_t *p) { return unlikely(p->df) ? - p->addr - (p->count - 1ul) * p->size : + p->addr - (p->count - 1UL) * p->size : p->addr; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:00:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:00:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601744.937885 (Exim 4.92) (envelope-from ) id 1qgdXB-0006qd-I2; Thu, 14 Sep 2023 04:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601744.937885; Thu, 14 Sep 2023 04: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 1qgdXB-0006qV-FL; Thu, 14 Sep 2023 04:00:53 +0000 Received: by outflank-mailman (input) for mailman id 601744; Thu, 14 Sep 2023 04:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXA-0006qG-M3 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXA-00020m-LJ for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdXA-0005uS-KM for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=B1JA+FLHHe09ortZrB4tm2wLXWcqkVsll7DJtryX9Jw=; b=TmYHIowcylRcXujiteq5FEWq2w 7Zzwmes43kvE4Ee1WE97X6mPyljeT8BCtgtGiN2JQ/C3gQlE4YLB6aldWos+ACZwIeUTtWmEqQCJQ wX7C7DXm5GfAQedXQE56VGn+l/XsXPQW2SLcVqEQoOY+Vo6kxH5Y6HZl0FvQMRbhZvkQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: address violations of MISRA C:2012 Rule 7.3 Message-Id: Date: Thu, 14 Sep 2023 04:00:52 +0000 commit cb1c77b60787b58d6f1b88e30973aa16ccf7ea4a Author: Gianluca Luparini AuthorDate: Wed Sep 13 09:44:49 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:44:49 2023 +0200 x86/hvm: address violations of MISRA C:2012 Rule 7.3 The xen sources contain violations of MISRA C:2012 Rule 7.3 whose headline states: "The lowercase character 'l' shall not be used in a literal suffix". Use the "L" suffix instead of the "l" suffix, to avoid potential ambiguity. If the "u" suffix is used near "L", use the "U" suffix instead, for consistency. The changes in this patch are mechanical. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Paul Durrant --- xen/arch/x86/hvm/emulate.c | 2 +- xen/arch/x86/hvm/io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 9b6e4c8bc6..254716c766 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -74,7 +74,7 @@ static int cf_check null_read( const struct hvm_io_handler *io_handler, uint64_t addr, uint32_t size, uint64_t *data) { - *data = ~0ul; + *data = ~0UL; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 53de1a967d..d75af83ad0 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -400,7 +400,7 @@ static int cf_check vpci_mmcfg_read( unsigned int reg; pci_sbdf_t sbdf; - *data = ~0ul; + *data = ~0UL; read_lock(&d->arch.hvm.mmcfg_lock); mmcfg = vpci_mmcfg_find(d, addr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:01:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:01:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601745.937891 (Exim 4.92) (envelope-from ) id 1qgdXL-0006tL-KR; Thu, 14 Sep 2023 04:01:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601745.937891; Thu, 14 Sep 2023 04: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 1qgdXL-0006tC-Gv; Thu, 14 Sep 2023 04:01:03 +0000 Received: by outflank-mailman (input) for mailman id 601745; Thu, 14 Sep 2023 04:01:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXK-0006t4-Pl for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXK-000217-Op for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdXK-0005vE-O7 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=bQceGamvAC6iPwimI8k816ldlv/Gxxb+kdKRKwq6/1Y=; b=xgGVDgG5oSJxjapg/1Xg1hNHWj CI9XdVWL4UpJbEg/FNwbK6e6sfR/s/+c4TJYrL3itLv4gIR3du8RhA2ZPdTEmsm9flS8v9ZpREJkl Yu1CAB9T3qCBRRPqWZhzrL+ctC+85Gq5F7oSjbeCePEvSLVVS9pGp84P1us/NaZbMx3M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: convert pci_find_*cap* to pci_sbdf_t Message-Id: Date: Thu, 14 Sep 2023 04:01:02 +0000 commit 8e46c1ddb698d04e5fdfabae2ab9f54d04250d85 Author: Stewart Hildebrand AuthorDate: Wed Sep 13 09:47:00 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:47:00 2023 +0200 xen/pci: convert pci_find_*cap* to pci_sbdf_t Convert pci_find_*cap* functions and call sites to pci_sbdf_t, and remove some now unused local variables. Also change to more appropriate types on lines that are already being modified as a result of the pci_sbdf_t conversion. Signed-off-by: Stewart Hildebrand Reviewed-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/msi.c | 40 ++++++++---------------------- xen/drivers/char/ehci-dbgp.c | 3 ++- xen/drivers/passthrough/amd/iommu_detect.c | 2 +- xen/drivers/passthrough/ats.c | 4 +-- xen/drivers/passthrough/ats.h | 6 +++-- xen/drivers/passthrough/msi.c | 6 ++--- xen/drivers/passthrough/pci.c | 21 ++++++---------- xen/drivers/passthrough/vtd/quirks.c | 10 +++----- xen/drivers/passthrough/vtd/x86/ats.c | 3 +-- xen/drivers/pci/pci.c | 32 +++++++++++++----------- xen/drivers/vpci/msi.c | 4 +-- xen/drivers/vpci/msix.c | 4 +-- xen/include/xen/pci.h | 11 ++++---- 13 files changed, 58 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 41b82f3e87..8d4fd43b10 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -283,7 +283,7 @@ static void msi_set_enable(struct pci_dev *dev, int enable) u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + pos = pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSI); if ( pos ) __msi_set_enable(seg, bus, slot, func, pos, enable); } @@ -291,12 +291,9 @@ static void msi_set_enable(struct pci_dev *dev, int enable) static void msix_set_enable(struct pci_dev *dev, int enable) { int pos; - u16 control, seg = dev->seg; - u8 bus = dev->bus; - u8 slot = PCI_SLOT(dev->devfn); - u8 func = PCI_FUNC(dev->devfn); + uint16_t control; - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); + pos = pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSIX); if ( pos ) { control = pci_conf_read16(dev->sbdf, msix_control_reg(pos)); @@ -603,13 +600,10 @@ static int msi_capability_init(struct pci_dev *dev, struct msi_desc *entry; int pos; unsigned int i, mpos; - u16 control, seg = dev->seg; - u8 bus = dev->bus; - u8 slot = PCI_SLOT(dev->devfn); - u8 func = PCI_FUNC(dev->devfn); + uint16_t control; ASSERT(pcidevs_locked()); - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + pos = pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSI); if ( !pos ) return -ENODEV; control = pci_conf_read16(dev->sbdf, msi_control_reg(pos)); @@ -680,8 +674,8 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { struct pci_dev *pdev = pci_get_pdev(NULL, PCI_SBDF(seg, bus, slot, func)); - unsigned int pos = pci_find_ext_capability(seg, bus, - PCI_DEVFN(slot, func), + unsigned int pos = pci_find_ext_capability(PCI_SBDF(seg, bus, slot, + func), PCI_EXT_CAP_ID_SRIOV); uint16_t ctrl = pci_conf_read16(PCI_SBDF(seg, bus, slot, func), pos + PCI_SRIOV_CTRL); @@ -772,8 +766,7 @@ static int msix_capability_init(struct pci_dev *dev, u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); bool maskall = msix->host_maskall, zap_on_error = false; - unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, - PCI_CAP_ID_MSIX); + unsigned int pos = pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSIX); if ( !pos ) return -ENODEV; @@ -1097,12 +1090,7 @@ static void _pci_cleanup_msix(struct arch_msix *msix) static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev = entry->dev; - u16 seg = dev->seg; - u8 bus = dev->bus; - u8 slot = PCI_SLOT(dev->devfn); - u8 func = PCI_FUNC(dev->devfn); - unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, - PCI_CAP_ID_MSIX); + unsigned int pos = pci_find_cap_offset(dev->sbdf, PCI_CAP_ID_MSIX); u16 control = pci_conf_read16(dev->sbdf, msix_control_reg(entry->msi_attrib.pos)); bool maskall = dev->msix->host_maskall; @@ -1206,8 +1194,7 @@ void pci_cleanup_msi(struct pci_dev *pdev) int pci_reset_msix_state(struct pci_dev *pdev) { - unsigned int pos = pci_find_cap_offset(pdev->seg, pdev->bus, pdev->sbdf.dev, - pdev->sbdf.fn, PCI_CAP_ID_MSIX); + unsigned int pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); ASSERT(pos); /* @@ -1229,10 +1216,6 @@ int pci_reset_msix_state(struct pci_dev *pdev) int pci_msi_conf_write_intercept(struct pci_dev *pdev, unsigned int reg, unsigned int size, uint32_t *data) { - u16 seg = pdev->seg; - u8 bus = pdev->bus; - u8 slot = PCI_SLOT(pdev->devfn); - u8 func = PCI_FUNC(pdev->devfn); struct msi_desc *entry; unsigned int pos; @@ -1240,8 +1223,7 @@ int pci_msi_conf_write_intercept(struct pci_dev *pdev, unsigned int reg, { entry = find_msi_entry(pdev, -1, PCI_CAP_ID_MSIX); pos = entry ? entry->msi_attrib.pos - : pci_find_cap_offset(seg, bus, slot, func, - PCI_CAP_ID_MSIX); + : pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); ASSERT(pos); if ( reg >= pos && reg < msix_pba_offset_reg(pos) + 4 ) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 72be4d9cc9..00cbdd5454 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -687,7 +687,8 @@ static unsigned int __init __find_dbgp(u8 bus, u8 slot, u8 func) if ( (class >> 8) != PCI_CLASS_SERIAL_USB_EHCI ) return 0; - return pci_find_cap_offset(0, bus, slot, func, PCI_CAP_ID_EHCI_DEBUG); + return pci_find_cap_offset(PCI_SBDF(0, bus, slot, func), + PCI_CAP_ID_EHCI_DEBUG); } static unsigned int __init find_dbgp(struct ehci_dbgp *dbgp, diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index 2317fa6a7d..cede44e651 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -27,7 +27,7 @@ static int __init get_iommu_msi_capabilities( { int pos; - pos = pci_find_cap_offset(seg, bus, dev, func, PCI_CAP_ID_MSI); + pos = pci_find_cap_offset(PCI_SBDF(seg, bus, dev, func), PCI_CAP_ID_MSI); if ( !pos ) return -ENODEV; diff --git a/xen/drivers/passthrough/ats.c b/xen/drivers/passthrough/ats.c index 253f5c2e10..0da183d057 100644 --- a/xen/drivers/passthrough/ats.c +++ b/xen/drivers/passthrough/ats.c @@ -24,11 +24,9 @@ boolean_param("ats", ats_enabled); int enable_ats_device(struct pci_dev *pdev, struct list_head *ats_list) { u32 value; - u16 seg = pdev->seg; - u8 bus = pdev->bus, devfn = pdev->devfn; int pos; - pos = pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS); + pos = pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ATS); BUG_ON(!pos); if ( iommu_verbose ) diff --git a/xen/drivers/passthrough/ats.h b/xen/drivers/passthrough/ats.h index baa5f6a6dc..f5e1d254e0 100644 --- a/xen/drivers/passthrough/ats.h +++ b/xen/drivers/passthrough/ats.h @@ -32,7 +32,8 @@ static inline int pci_ats_enabled(int seg, int bus, int devfn) u32 value; int pos; - pos = pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS); + pos = pci_find_ext_capability(PCI_SBDF(seg, bus, devfn), + PCI_EXT_CAP_ID_ATS); BUG_ON(!pos); value = pci_conf_read16(PCI_SBDF(seg, bus, devfn), pos + ATS_REG_CTL); @@ -45,7 +46,8 @@ static inline int pci_ats_device(int seg, int bus, int devfn) if ( !ats_enabled ) return 0; - return pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS); + return pci_find_ext_capability(PCI_SBDF(seg, bus, devfn), + PCI_EXT_CAP_ID_ATS); } #endif /* _ATS_H_ */ diff --git a/xen/drivers/passthrough/msi.c b/xen/drivers/passthrough/msi.c index fb78e2ebe8..13d904692e 100644 --- a/xen/drivers/passthrough/msi.c +++ b/xen/drivers/passthrough/msi.c @@ -24,8 +24,7 @@ int pdev_msi_init(struct pci_dev *pdev) INIT_LIST_HEAD(&pdev->msi_list); - pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSI); + pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSI); if ( pos ) { uint16_t ctrl = pci_conf_read16(pdev->sbdf, msi_control_reg(pos)); @@ -33,8 +32,7 @@ int pdev_msi_init(struct pci_dev *pdev) pdev->msi_maxvec = multi_msi_capable(ctrl); } - pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSIX); + pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); if ( pos ) { struct arch_msix *msix = xzalloc(struct arch_msix); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index ed1f689227..04d00c7c37 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -361,8 +361,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) break; case DEV_TYPE_PCIe_ENDPOINT: - pos = pci_find_cap_offset(pseg->nr, bus, PCI_SLOT(devfn), - PCI_FUNC(devfn), PCI_CAP_ID_EXP); + pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); BUG_ON(!pos); cap = pci_conf_read16(pdev->sbdf, pos + PCI_EXP_DEVCAP); if ( cap & PCI_EXP_DEVCAP_PHANTOM ) @@ -565,13 +564,12 @@ struct pci_dev *pci_get_pdev(const struct domain *d, pci_sbdf_t sbdf) static void pci_enable_acs(struct pci_dev *pdev) { int pos; - u16 cap, ctrl, seg = pdev->seg; - u8 bus = pdev->bus; + uint16_t cap, ctrl; if ( !is_iommu_enabled(pdev->domain) ) return; - pos = pci_find_ext_capability(seg, bus, pdev->devfn, PCI_EXT_CAP_ID_ACS); + pos = pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ACS); if (!pos) return; @@ -704,7 +702,7 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, if ( !pdev->info.is_virtfn && !pdev->vf_rlen[0] ) { - unsigned int pos = pci_find_ext_capability(seg, bus, devfn, + unsigned int pos = pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_SRIOV); uint16_t ctrl = pci_conf_read16(pdev->sbdf, pos + PCI_SRIOV_CTRL); @@ -916,7 +914,8 @@ enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) { u16 class_device, creg; u8 d = PCI_SLOT(devfn), f = PCI_FUNC(devfn); - int pos = pci_find_cap_offset(seg, bus, d, f, PCI_CAP_ID_EXP); + unsigned int pos = pci_find_cap_offset(PCI_SBDF(seg, bus, devfn), + PCI_CAP_ID_EXP); class_device = pci_conf_read16(PCI_SBDF(seg, bus, d, f), PCI_CLASS_DEVICE); switch ( class_device ) @@ -1184,10 +1183,7 @@ static int hest_match_pci(const struct acpi_hest_aer_common *p, static bool hest_match_type(const struct acpi_hest_header *hest_hdr, const struct pci_dev *pdev) { - unsigned int pos = pci_find_cap_offset(pdev->seg, pdev->bus, - PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn), - PCI_CAP_ID_EXP); + unsigned int pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); u8 pcie = MASK_EXTR(pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS), PCI_EXP_FLAGS_TYPE); @@ -1258,8 +1254,7 @@ bool pcie_aer_get_firmware_first(const struct pci_dev *pdev) { struct aer_hest_parse_info info = { .pdev = pdev }; - return pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn), PCI_CAP_ID_EXP) && + return pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP) && apei_hest_parse(aer_hest_parse, &info) >= 0 && info.firmware_first; } diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 5d706a5397..5a56565ea8 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -495,8 +495,6 @@ int me_wifi_quirk(struct domain *domain, uint8_t bus, uint8_t devfn, void pci_vtd_quirk(const struct pci_dev *pdev) { - int seg = pdev->seg; - int bus = pdev->bus; int pos; bool ff; u32 val, val2; @@ -532,12 +530,10 @@ void pci_vtd_quirk(const struct pci_dev *pdev) /* Sandybridge-EP (Romley) */ case 0x3c00: /* host bridge */ case 0x3c01 ... 0x3c0b: /* root ports */ - pos = pci_find_ext_capability(seg, bus, pdev->devfn, - PCI_EXT_CAP_ID_ERR); + pos = pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ERR); if ( !pos ) { - pos = pci_find_ext_capability(seg, bus, pdev->devfn, - PCI_EXT_CAP_ID_VNDR); + pos = pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_VNDR); while ( pos ) { val = pci_conf_read32(pdev->sbdf, pos + PCI_VNDR_HEADER); @@ -546,7 +542,7 @@ void pci_vtd_quirk(const struct pci_dev *pdev) pos += PCI_VNDR_HEADER; break; } - pos = pci_find_next_ext_capability(seg, bus, pdev->devfn, pos, + pos = pci_find_next_ext_capability(pdev->sbdf, pos, PCI_EXT_CAP_ID_VNDR); } ff = 0; diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index 9de419775f..1f5913bed9 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -57,8 +57,7 @@ int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) return 0; ats_drhd = find_ats_dev_drhd(drhd->iommu); - pos = pci_find_ext_capability(pdev->seg, pdev->bus, pdev->devfn, - PCI_EXT_CAP_ID_ATS); + pos = pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_ATS); if ( pos && (ats_drhd == NULL) ) { diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index c73a8c4124..3569ccb24e 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -8,25 +8,25 @@ #include #include -int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap) +unsigned int pci_find_cap_offset(pci_sbdf_t sbdf, unsigned int cap) { u8 id; int max_cap = 48; u8 pos = PCI_CAPABILITY_LIST; u16 status; - status = pci_conf_read16(PCI_SBDF(seg, bus, dev, func), PCI_STATUS); + status = pci_conf_read16(sbdf, PCI_STATUS); if ( (status & PCI_STATUS_CAP_LIST) == 0 ) return 0; while ( max_cap-- ) { - pos = pci_conf_read8(PCI_SBDF(seg, bus, dev, func), pos); + pos = pci_conf_read8(sbdf, pos); if ( pos < 0x40 ) break; pos &= ~3; - id = pci_conf_read8(PCI_SBDF(seg, bus, dev, func), pos + PCI_CAP_LIST_ID); + id = pci_conf_read8(sbdf, pos + PCI_CAP_LIST_ID); if ( id == 0xff ) break; @@ -39,19 +39,20 @@ int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap) return 0; } -int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap) +unsigned int pci_find_next_cap(pci_sbdf_t sbdf, unsigned int pos, + unsigned int cap) { u8 id; int ttl = 48; while ( ttl-- ) { - pos = pci_conf_read8(PCI_SBDF(seg, bus, devfn), pos); + pos = pci_conf_read8(sbdf, pos); if ( pos < 0x40 ) break; pos &= ~3; - id = pci_conf_read8(PCI_SBDF(seg, bus, devfn), pos + PCI_CAP_LIST_ID); + id = pci_conf_read8(sbdf, pos + PCI_CAP_LIST_ID); if ( id == 0xff ) break; @@ -65,21 +66,21 @@ int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap) /** * pci_find_ext_capability - Find an extended capability - * @seg/@bus/@devfn: PCI device to query + * @sbdf: PCI device to query * @cap: capability code * * Returns the address of the requested extended capability structure * within the device's PCI configuration space or 0 if the device does * not support it. */ -int pci_find_ext_capability(int seg, int bus, int devfn, int cap) +unsigned int pci_find_ext_capability(pci_sbdf_t sbdf, unsigned int cap) { - return pci_find_next_ext_capability(seg, bus, devfn, 0, cap); + return pci_find_next_ext_capability(sbdf, 0, cap); } /** * pci_find_next_ext_capability - Find another extended capability - * @seg/@bus/@devfn: PCI device to query + * @sbdf: PCI device to query * @start: starting position * @cap: capability code * @@ -87,13 +88,14 @@ int pci_find_ext_capability(int seg, int bus, int devfn, int cap) * within the device's PCI configuration space or 0 if the device does * not support it. */ -int pci_find_next_ext_capability(int seg, int bus, int devfn, int start, int cap) +unsigned int pci_find_next_ext_capability(pci_sbdf_t sbdf, unsigned int start, + unsigned int cap) { u32 header; int ttl = 480; /* 3840 bytes, minimum 8 bytes per capability */ - int pos = max(start, 0x100); + unsigned int pos = max(start, 0x100U); - header = pci_conf_read32(PCI_SBDF(seg, bus, devfn), pos); + header = pci_conf_read32(sbdf, pos); /* * If we have no capabilities, this is indicated by cap ID, @@ -109,7 +111,7 @@ int pci_find_next_ext_capability(int seg, int bus, int devfn, int start, int cap pos = PCI_EXT_CAP_NEXT(header); if ( pos < 0x100 ) break; - header = pci_conf_read32(PCI_SBDF(seg, bus, devfn), pos); + header = pci_conf_read32(sbdf, pos); } return 0; } diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c index 2814b63d2b..a253ccbd7d 100644 --- a/xen/drivers/vpci/msi.c +++ b/xen/drivers/vpci/msi.c @@ -184,9 +184,7 @@ static void cf_check mask_write( static int cf_check init_msi(struct pci_dev *pdev) { - uint8_t slot = PCI_SLOT(pdev->devfn), func = PCI_FUNC(pdev->devfn); - unsigned int pos = pci_find_cap_offset(pdev->seg, pdev->bus, slot, func, - PCI_CAP_ID_MSI); + unsigned int pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSI); uint16_t control; int ret; diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 1be861343d..d1126a417d 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -659,14 +659,12 @@ int vpci_make_msix_hole(const struct pci_dev *pdev) static int cf_check init_msix(struct pci_dev *pdev) { struct domain *d = pdev->domain; - uint8_t slot = PCI_SLOT(pdev->devfn), func = PCI_FUNC(pdev->devfn); unsigned int msix_offset, i, max_entries; uint16_t control; struct vpci_msix *msix; int rc; - msix_offset = pci_find_cap_offset(pdev->seg, pdev->bus, slot, func, - PCI_CAP_ID_MSIX); + msix_offset = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_MSIX); if ( !msix_offset ) return 0; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 3ed79d15cd..251b8761a8 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -193,11 +193,12 @@ int pci_mmcfg_read(unsigned int seg, unsigned int bus, unsigned int devfn, int reg, int len, u32 *value); int pci_mmcfg_write(unsigned int seg, unsigned int bus, unsigned int devfn, int reg, int len, u32 value); -int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap); -int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap); -int pci_find_ext_capability(int seg, int bus, int devfn, int cap); -int pci_find_next_ext_capability(int seg, int bus, int devfn, int start, - int cap); +unsigned int pci_find_cap_offset(pci_sbdf_t sbdf, unsigned int cap); +unsigned int pci_find_next_cap(pci_sbdf_t sbdf, unsigned int pos, + unsigned int cap); +unsigned int pci_find_ext_capability(pci_sbdf_t sbdf, unsigned int cap); +unsigned int pci_find_next_ext_capability(pci_sbdf_t sbdf, unsigned int start, + unsigned int cap); const char *parse_pci(const char *s, unsigned int *seg_p, unsigned int *bus_p, unsigned int *dev_p, unsigned int *func_p); const char *parse_pci_seg(const char *s, unsigned int *seg_p, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:01:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:01:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601746.937894 (Exim 4.92) (envelope-from ) id 1qgdXW-0006wS-Mt; Thu, 14 Sep 2023 04:01:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601746.937894; Thu, 14 Sep 2023 04:01: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 1qgdXW-0006wK-KE; Thu, 14 Sep 2023 04:01:14 +0000 Received: by outflank-mailman (input) for mailman id 601746; Thu, 14 Sep 2023 04:01:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXU-0006w6-Si for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXU-00021F-Rz for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdXU-0005vf-R3 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=POpbw26F+zYbzODZc4hdFCOrRejeydc6/lcwvoFv8io=; b=PIqnet+Zs/ULy+FJYKX+1j1CWU 4NIwUhbU4POlnIf9+aMn5LgDlTTbx+HZdVfDV4jrBLssT1V8U9niLpSnjXULeGYJcKJe5jXdD0WFd m8U5hJsu+Q+uE1yE1DiHxTClXB8IwBg7W8BQbpqjCZ+b0aa22EAzslXS4N29Fc30uAGQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msi: rearrange read_pci_mem_bar slightly Message-Id: Date: Thu, 14 Sep 2023 04:01:12 +0000 commit e17706138d3a1c0c420cc7f7c6c64283329fd400 Author: Stewart Hildebrand AuthorDate: Wed Sep 13 09:47:36 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:47:36 2023 +0200 x86/msi: rearrange read_pci_mem_bar slightly Use pdev->sbdf instead of the PCI_SBDF macro in calls to pci_* functions where appropriate. Move NULL check earlier. Suggested-by: Jan Beulich Signed-off-by: Stewart Hildebrand Reviewed-by: Jan Beulich --- xen/arch/x86/msi.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 8d4fd43b10..a78367d7cf 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -674,19 +674,19 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { struct pci_dev *pdev = pci_get_pdev(NULL, PCI_SBDF(seg, bus, slot, func)); - unsigned int pos = pci_find_ext_capability(PCI_SBDF(seg, bus, slot, - func), - PCI_EXT_CAP_ID_SRIOV); - uint16_t ctrl = pci_conf_read16(PCI_SBDF(seg, bus, slot, func), - pos + PCI_SRIOV_CTRL); - uint16_t num_vf = pci_conf_read16(PCI_SBDF(seg, bus, slot, func), - pos + PCI_SRIOV_NUM_VF); - uint16_t offset = pci_conf_read16(PCI_SBDF(seg, bus, slot, func), - pos + PCI_SRIOV_VF_OFFSET); - uint16_t stride = pci_conf_read16(PCI_SBDF(seg, bus, slot, func), - pos + PCI_SRIOV_VF_STRIDE); - - if ( !pdev || !pos || + unsigned int pos; + uint16_t ctrl, num_vf, offset, stride; + + if ( !pdev ) + return 0; + + pos = pci_find_ext_capability(pdev->sbdf, PCI_EXT_CAP_ID_SRIOV); + ctrl = pci_conf_read16(pdev->sbdf, pos + PCI_SRIOV_CTRL); + num_vf = pci_conf_read16(pdev->sbdf, pos + PCI_SRIOV_NUM_VF); + offset = pci_conf_read16(pdev->sbdf, pos + PCI_SRIOV_VF_OFFSET); + stride = pci_conf_read16(pdev->sbdf, pos + PCI_SRIOV_VF_STRIDE); + + if ( !pos || !(ctrl & PCI_SRIOV_CTRL_VFE) || !(ctrl & PCI_SRIOV_CTRL_MSE) || !num_vf || !offset || (num_vf > 1 && !stride) || -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:01:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:01:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601747.937897 (Exim 4.92) (envelope-from ) id 1qgdXg-0006z2-O9; Thu, 14 Sep 2023 04:01:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601747.937897; Thu, 14 Sep 2023 04:01: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 1qgdXg-0006yv-Lh; Thu, 14 Sep 2023 04:01:24 +0000 Received: by outflank-mailman (input) for mailman id 601747; Thu, 14 Sep 2023 04:01:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXe-0006yi-Vp for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXe-00021O-V4 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdXe-00064d-UF for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=HSmWEkbkzhIJULGGiXP0CFbEVJn3FRi2qe6DS3QfClg=; b=f9uNDnBp2zUR3so7EuCYA92DjS HPZGE7Kpe4OYOsjmI2eXcHrAql4BZwC9unMMfr45wL1DJ9/PNl9ZTiu0TWBCDdnHirlisDxtVtput hByLrqTCRPqUKFHwhqP2wwCQxvOrwkHLep3YDMjgji2L+tNjialRh/anuM89AdJ3K1sc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/IOMMU: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Thu, 14 Sep 2023 04:01:22 +0000 commit 3667e9bbfc37afef8df940321c80cb66fac587af Author: Federico Serafini AuthorDate: Wed Sep 13 09:48:00 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:48:00 2023 +0200 xen/IOMMU: address violations of MISRA C:2012 Rules 8.2 and 8.3 Add missing parameter names and make function declarations and definitions consistent. No functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index acbaad30d5..02111d23df 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -248,7 +248,7 @@ int __must_check cf_check amd_iommu_unmap_page( struct domain *d, dfn_t dfn, unsigned int order, unsigned int *flush_flags); int __must_check amd_iommu_alloc_root(struct domain *d); -int amd_iommu_reserve_domain_unity_map(struct domain *domain, +int amd_iommu_reserve_domain_unity_map(struct domain *d, const struct ivrs_unity_map *map, unsigned int flag); int amd_iommu_reserve_domain_unity_unmap(struct domain *d, @@ -282,7 +282,7 @@ void amd_iommu_flush_all_pages(struct domain *d); void amd_iommu_flush_pages(struct domain *d, unsigned long dfn, unsigned int order); void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, - uint64_t gaddr, unsigned int order); + daddr_t daddr, unsigned int order); void amd_iommu_flush_device(struct amd_iommu *iommu, uint16_t bdf); void amd_iommu_flush_intremap(struct amd_iommu *iommu, uint16_t bdf); void amd_iommu_flush_all_caches(struct amd_iommu *iommu); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:01:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:01:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601748.937902 (Exim 4.92) (envelope-from ) id 1qgdXq-000718-Pp; Thu, 14 Sep 2023 04:01:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601748.937902; Thu, 14 Sep 2023 04:01: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 1qgdXq-000710-N8; Thu, 14 Sep 2023 04:01:34 +0000 Received: by outflank-mailman (input) for mailman id 601748; Thu, 14 Sep 2023 04:01:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXp-00070p-2V for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXp-00021W-1k for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdXp-00065K-0x for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01: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=mDUH2pBa0xQTQ4vZ4Qb7llxK5BZCk+X9pOxIYYjYYRc=; b=XMPlm0rTjwQE5DwGL2R0pK+C60 LMUz7lmm+7gfuQeS4Skx+Z/IL6AK2gskbIptR9MWi2aBc3FPBz+WiM8TL+s6Z/AXK5HWs7xTM9onT pitwu5e/gbTJ2ARaTpF8RhSnjxlzrZgKOwyKP6ifKybPT56qYdYpwOdxfSD2Ewudna8s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/lib: address violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 14 Sep 2023 04:01:33 +0000 commit 75f42e0401c4c6b10248f5e8b7530887d34bfb9c Author: Simone Ballarin AuthorDate: Wed Sep 13 09:48:25 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:48:25 2023 +0200 xen/lib: address violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type. For the sake of uniformity, the following change is made: - add the 'U' suffix to switch cases in 'cpuid.c' Signed-off-by: Simone Ballarin Signed-off-by: Gianluca Luparini Acked-by: Jan Beulich --- xen/lib/x86/cpuid.c | 8 ++++---- xen/lib/x86/policy.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/lib/x86/cpuid.c b/xen/lib/x86/cpuid.c index 2006cbaa1c..eb7698dc73 100644 --- a/xen/lib/x86/cpuid.c +++ b/xen/lib/x86/cpuid.c @@ -217,10 +217,10 @@ void x86_cpu_policy_fill_native(struct cpu_policy *p) } /* Extended leaves. */ - cpuid_leaf(0x80000000, &p->extd.raw[0]); + cpuid_leaf(0x80000000U, &p->extd.raw[0]); for ( i = 1; i <= MIN(p->extd.max_leaf & 0xffffU, ARRAY_SIZE(p->extd.raw) - 1); ++i ) - cpuid_leaf(0x80000000 + i, &p->extd.raw[i]); + cpuid_leaf(0x80000000U + i, &p->extd.raw[i]); /* Don't report leaves from possible lower level hypervisor, for now. */ p->hv_limit = 0; @@ -421,7 +421,7 @@ int x86_cpuid_copy_to_buffer(const struct cpu_policy *p, /* Extended leaves. */ for ( leaf = 0; leaf <= MIN(p->extd.max_leaf & 0xffffUL, ARRAY_SIZE(p->extd.raw) - 1); ++leaf ) - COPY_LEAF(0x80000000 | leaf, XEN_CPUID_NO_SUBLEAF, &p->extd.raw[leaf]); + COPY_LEAF(0x80000000U | leaf, XEN_CPUID_NO_SUBLEAF, &p->extd.raw[leaf]); #undef COPY_LEAF @@ -521,7 +521,7 @@ int x86_cpuid_copy_from_buffer(struct cpu_policy *p, p->hv2_limit = l.a; break; - case 0x80000000 ... 0x80000000 + ARRAY_SIZE(p->extd.raw) - 1: + case 0x80000000U ... 0x80000000U + ARRAY_SIZE(p->extd.raw) - 1: if ( data.subleaf != XEN_CPUID_NO_SUBLEAF ) goto out_of_range; diff --git a/xen/lib/x86/policy.c b/xen/lib/x86/policy.c index a9c60000af..f033d22785 100644 --- a/xen/lib/x86/policy.c +++ b/xen/lib/x86/policy.c @@ -22,7 +22,7 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy *host, FAIL_CPUID(7, 0); if ( guest->extd.max_leaf > host->extd.max_leaf ) - FAIL_CPUID(0x80000000, NA); + FAIL_CPUID(0x80000000U, NA); /* TODO: Audit more CPUID data. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:01:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:01:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601749.937907 (Exim 4.92) (envelope-from ) id 1qgdY0-000742-Rc; Thu, 14 Sep 2023 04:01:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601749.937907; Thu, 14 Sep 2023 04: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 1qgdY0-00073o-Ob; Thu, 14 Sep 2023 04:01:44 +0000 Received: by outflank-mailman (input) for mailman id 601749; Thu, 14 Sep 2023 04:01:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXz-00073i-5S for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdXz-00021g-4m for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdXz-00065p-3m for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01: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=t46kqyR5eD3FgIeFOl9zHjYGWvLwnHB0ilXXPJFOVk0=; b=apeNArY0Ls6AvbhbSmy7qvpO+m Ky0d6G9y5qxLErerV4qmsnrJrbeV2SvPgL4xV6w4icZraW/CZWb+1Mx3H39yahafZQEosbyAh1gsf OUOUv+88dGqY6/1iP8p5zmNFQpE3OI3vW43dlPda678toBnaixV4ce3rot10J0niLIK4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mcheck: address violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 14 Sep 2023 04:01:43 +0000 commit e29cb1f96f8ac541bcd91232da27dabcde4cf1c3 Author: Simone Ballarin AuthorDate: Wed Sep 13 09:48:49 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:48:49 2023 +0200 x86/mcheck: address violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type. For the sake of uniformity, the following change is made: - add the 'U' suffix to all first macro's arguments Signed-off-by: Simone Ballarin Signed-off-by: Gianluca Luparini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c b/xen/arch/x86/cpu/mcheck/mce-apei.c index 53b6735896..b895020882 100644 --- a/xen/arch/x86/cpu/mcheck/mce-apei.c +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c @@ -37,10 +37,10 @@ #include "mce.h" #define CPER_CREATOR_MCE \ - UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ + UUID_LE(0x75a574e3U, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ 0x64, 0x90, 0xb8, 0x9d) #define CPER_SECTION_TYPE_MCE \ - UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ + UUID_LE(0xfe08ffbeU, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ 0x04, 0x4a, 0x38, 0xfc) /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:01:55 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:01:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601751.937910 (Exim 4.92) (envelope-from ) id 1qgdYA-00078m-Sm; Thu, 14 Sep 2023 04:01:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601751.937910; Thu, 14 Sep 2023 04: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 1qgdYA-00078c-Q5; Thu, 14 Sep 2023 04:01:54 +0000 Received: by outflank-mailman (input) for mailman id 601751; Thu, 14 Sep 2023 04:01:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdY9-000786-8H for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdY9-000228-7X for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:01:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdY9-00066P-6v for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=llGY763syAKiitHg+dWGOYCNF/qewtlhfstjY4TYncE=; b=ycfJ7wG1Dbs0ZaLqgJm9VlHPWY MNeLbCca9guKq/lrOrNh23F/1PNkic6161Pohkz/XN8S9T8KajaKcMZ47feusYHuEsJAPNDDkIe6v V2goiIhldU2XFFempX6kDbdqdHaze4fiFp1RLiQm+zvm1eKCesr3+p0CD5HgdZE4LDNI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/efi: address violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 14 Sep 2023 04:01:53 +0000 commit 38e1da3ee48b2b89793b331944c462b48b35ad2e Author: Simone Ballarin AuthorDate: Wed Sep 13 09:49:14 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:49:14 2023 +0200 x86/efi: address violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Addi the 'U' suffix to integers literals with unsigned type. Signed-off-by: Simone Ballarin Signed-off-by: Gianluca Luparini Acked-by: Jan Beulich --- xen/arch/x86/efi/efi-boot.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 92f4cfe8bd..eebc54180b 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -740,16 +740,16 @@ static void __init efi_arch_handle_module(const struct file *file, static void __init efi_arch_cpu(void) { - uint32_t eax = cpuid_eax(0x80000000); + uint32_t eax = cpuid_eax(0x80000000U); uint32_t *caps = boot_cpu_data.x86_capability; boot_tsc_stamp = rdtsc(); caps[FEATURESET_1c] = cpuid_ecx(1); - if ( (eax >> 16) == 0x8000 && eax > 0x80000000 ) + if ( (eax >> 16) == 0x8000 && eax > 0x80000000U ) { - caps[FEATURESET_e1d] = cpuid_edx(0x80000001); + caps[FEATURESET_e1d] = cpuid_edx(0x80000001U); /* * This check purposefully doesn't use cpu_has_nx because -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 14 04:02:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Sep 2023 04:02:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.601752.937913 (Exim 4.92) (envelope-from ) id 1qgdYK-0007B5-Um; Thu, 14 Sep 2023 04:02:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 601752.937913; Thu, 14 Sep 2023 04: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 1qgdYK-0007Ax-Rb; Thu, 14 Sep 2023 04:02:04 +0000 Received: by outflank-mailman (input) for mailman id 601752; Thu, 14 Sep 2023 04:02:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdYJ-0007Ap-B8 for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:02:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qgdYJ-00022U-AL for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04:02:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qgdYJ-00066x-9Z for xen-changelog@lists.xenproject.org; Thu, 14 Sep 2023 04: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=WCIdFYNpz78Mg2T9a5Niy15rELCpB7ZWi2xdVAnXZQI=; b=f6HP42SPE+/Y9cpDgkSjUUB7DU noBbGdT1I9VWdXGUEEetoVvj2HrHeatT06G3AQp4nL2s/fkJXoPtomEKzoWEhyXsAimtRV9Cg1XYr cQ82DWUfGPK3FGrakp/jneQPZHt5HK07vSVL+AO2sX99n/f7WBh8r5cQUr/RhzIp15Qg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Implement atomic.h Message-Id: Date: Thu, 14 Sep 2023 04:02:03 +0000 commit 6aa25c32180ab59081c73bae4c568367d9133a1f Author: Shawn Anastasio AuthorDate: Wed Sep 13 09:50:07 2023 +0200 Commit: Jan Beulich CommitDate: Wed Sep 13 09:50:07 2023 +0200 xen/ppc: Implement atomic.h Implement atomic.h for PPC, based off of the original Xen 3.2 implementation. This implementation depends on some functions that are not yet defined (notably __cmpxchg), so it can't yet be used. Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/include/asm/atomic.h | 385 ++++++++++++++++++++++++++++++++++++++ xen/arch/ppc/include/asm/memory.h | 14 ++ 2 files changed, 399 insertions(+) diff --git a/xen/arch/ppc/include/asm/atomic.h b/xen/arch/ppc/include/asm/atomic.h new file mode 100644 index 0000000000..64168aa3f1 --- /dev/null +++ b/xen/arch/ppc/include/asm/atomic.h @@ -0,0 +1,385 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * PowerPC64 atomic operations + * + * Copyright (C) 2001 Paul Mackerras , IBM + * Copyright (C) 2001 Anton Blanchard , IBM + * Copyright Raptor Engineering LLC + */ + +#ifndef _ASM_PPC64_ATOMIC_H_ +#define _ASM_PPC64_ATOMIC_H_ + +#include + +#include + +static inline int atomic_read(const atomic_t *v) +{ + return *(volatile int *)&v->counter; +} + +static inline int _atomic_read(atomic_t v) +{ + return v.counter; +} + +static inline void atomic_set(atomic_t *v, int i) +{ + v->counter = i; +} + +static inline void _atomic_set(atomic_t *v, int i) +{ + v->counter = i; +} + +void __bad_atomic_read(const volatile void *p, void *res); +void __bad_atomic_size(void); + +#define build_atomic_read(name, insn, type) \ + static inline type name(const volatile type *addr) \ + { \ + type ret; \ + asm volatile ( insn "%U1%X1 %0,%1" : "=r" (ret) : "m<>" (*addr) ); \ + return ret; \ + } + +#define build_atomic_write(name, insn, type) \ + static inline void name(volatile type *addr, type val) \ + { \ + asm volatile ( insn "%U0%X0 %1,%0" : "=m<>" (*addr) : "r" (val) ); \ + } + +#define build_add_sized(name, ldinsn, stinsn, type) \ + static inline void name(volatile type *addr, type val) \ + { \ + type t; \ + asm volatile ( "1: " ldinsn " %0,0,%3\n" \ + "add%I2 %0,%0,%2\n" \ + stinsn " %0,0,%3 \n" \ + "bne- 1b\n" \ + : "=&r" (t), "+m" (*addr) \ + : "r" (val), "r" (addr) \ + : "cc" ); \ + } + +build_atomic_read(read_u8_atomic, "lbz", uint8_t) +build_atomic_read(read_u16_atomic, "lhz", uint16_t) +build_atomic_read(read_u32_atomic, "lwz", uint32_t) +build_atomic_read(read_u64_atomic, "ldz", uint64_t) + +build_atomic_write(write_u8_atomic, "stb", uint8_t) +build_atomic_write(write_u16_atomic, "sth", uint16_t) +build_atomic_write(write_u32_atomic, "stw", uint32_t) +build_atomic_write(write_u64_atomic, "std", uint64_t) + +build_add_sized(add_u8_sized, "lbarx", "stbcx.",uint8_t) +build_add_sized(add_u16_sized, "lharx", "sthcx.", uint16_t) +build_add_sized(add_u32_sized, "lwarx", "stwcx.", uint32_t) + +#undef build_atomic_read +#undef build_atomic_write +#undef build_add_sized + +static always_inline void read_atomic_size(const volatile void *p, void *res, + unsigned int size) +{ + ASSERT(IS_ALIGNED((vaddr_t)p, size)); + switch ( size ) + { + case 1: + *(uint8_t *)res = read_u8_atomic(p); + break; + case 2: + *(uint16_t *)res = read_u16_atomic(p); + break; + case 4: + *(uint32_t *)res = read_u32_atomic(p); + break; + case 8: + *(uint64_t *)res = read_u64_atomic(p); + break; + default: + __bad_atomic_read(p, res); + break; + } +} + +static always_inline void write_atomic_size(volatile void *p, const void *val, + unsigned int size) +{ + ASSERT(IS_ALIGNED((vaddr_t)p, size)); + switch ( size ) + { + case 1: + write_u8_atomic(p, *(const uint8_t *)val); + break; + case 2: + write_u16_atomic(p, *(const uint16_t *)val); + break; + case 4: + write_u32_atomic(p, *(const uint32_t *)val); + break; + case 8: + write_u64_atomic(p, *(const uint64_t *)val); + break; + default: + __bad_atomic_size(); + break; + } +} + +#define read_atomic(p) \ + ({ \ + union { \ + typeof(*(p)) val; \ + char c[sizeof(*(p))]; \ + } x_; \ + read_atomic_size(p, x_.c, sizeof(*(p))); \ + x_.val; \ + }) + +#define write_atomic(p, x) \ + do \ + { \ + typeof(*(p)) x_ = (x); \ + write_atomic_size(p, &x_, sizeof(*(p))); \ + } while ( 0 ) + +#define add_sized(p, x) \ + ({ \ + typeof(*(p)) x_ = (x); \ + switch ( sizeof(*(p)) ) \ + { \ + case 1: \ + add_u8_sized((uint8_t *)(p), x_); \ + break; \ + case 2: \ + add_u16_sized((uint16_t *)(p), x_); \ + break; \ + case 4: \ + add_u32_sized((uint32_t *)(p), x_); \ + break; \ + default: \ + __bad_atomic_size(); \ + break; \ + } \ + }) + +static inline void atomic_add(int a, atomic_t *v) +{ + int t; + + asm volatile ( "1: lwarx %0,0,%3\n" + "add %0,%2,%0\n" + "stwcx. %0,0,%3\n" + "bne- 1b" + : "=&r" (t), "+m" (v->counter) + : "r" (a), "r" (&v->counter) + : "cc" ); +} + +static inline int atomic_add_return(int a, atomic_t *v) +{ + int t; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%2\n" + "add %0,%1,%0\n" + "stwcx. %0,0,%2\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER + : "=&r" (t) + : "r" (a), "r" (&v->counter) + : "cc", "memory" ); + + return t; +} + +static inline void atomic_sub(int a, atomic_t *v) +{ + int t; + + asm volatile ( "1: lwarx %0,0,%3\n" + "subf %0,%2,%0\n" + "stwcx. %0,0,%3\n" + "bne- 1b" + : "=&r" (t), "+m" (v->counter) + : "r" (a), "r" (&v->counter) + : "cc" ); +} + +static inline int atomic_sub_return(int a, atomic_t *v) +{ + int t; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%2\n" + "subf %0,%1,%0\n" + "stwcx. %0,0,%2\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER + : "=&r" (t) + : "r" (a), "r" (&v->counter) + : "cc", "memory" ); + + return t; +} + +static inline void atomic_inc(atomic_t *v) +{ + int t; + + asm volatile ( "1: lwarx %0,0,%2\n" + "addic %0,%0,1\n" + "stwcx. %0,0,%2\n" + "bne- 1b" + : "=&r" (t), "+m" (v->counter) + : "r" (&v->counter) + : "cc" ); +} + +static inline int atomic_inc_return(atomic_t *v) +{ + int t; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%1\n" + "addic %0,%0,1\n" + "stwcx. %0,0,%1\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER + : "=&r" (t) + : "r" (&v->counter) + : "cc", "memory" ); + + return t; +} + +static inline void atomic_dec(atomic_t *v) +{ + int t; + + asm volatile ( "1: lwarx %0,0,%2\n" + "addic %0,%0,-1\n" + "stwcx. %0,0,%2\n" + "bne- 1b" + : "=&r" (t), "+m" (v->counter) + : "r" (&v->counter) + : "cc" ); +} + +static inline int atomic_dec_return(atomic_t *v) +{ + int t; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%1\n" + "addic %0,%0,-1\n" + "stwcx. %0,0,%1\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER + : "=&r" (t) + : "r" (&v->counter) + : "cc", "memory" ); + + return t; +} + +/* + * Atomically test *v and decrement if it is greater than 0. + * The function returns the old value of *v minus 1. + */ +static inline int atomic_dec_if_positive(atomic_t *v) +{ + int t; + + asm volatile( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%1 # atomic_dec_if_positive\n" + "addic. %0,%0,-1\n" + "blt- 2f\n" + "stwcx. %0,0,%1\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER + "2:" + : "=&r" (t) + : "r" (&v->counter) + : "cc", "memory" ); + + return t; +} + +static inline atomic_t atomic_compareandswap(atomic_t old, atomic_t new, + atomic_t *v) +{ + atomic_t rc; + rc.counter = __cmpxchg(&v->counter, old.counter, new.counter, + sizeof(v->counter)); + return rc; +} + +#define arch_cmpxchg(ptr, o, n) \ + ({ \ + __typeof__(*(ptr)) o_ = (o); \ + __typeof__(*(ptr)) n_ = (n); \ + (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)o_, \ + (unsigned long)n_, sizeof(*(ptr))); \ + }) + +static inline int atomic_cmpxchg(atomic_t *v, int old, int new) +{ + return arch_cmpxchg(&v->counter, old, new); +} + +#define ATOMIC_OP(op, insn, suffix, sign) \ + static inline void atomic_##op(int a, atomic_t *v) \ + { \ + int t; \ + asm volatile ( "1: lwarx %0,0,%3\n" \ + insn "%I2" suffix " %0,%0,%2\n" \ + "stwcx. %0,0,%3 \n" \ + "bne- 1b\n" \ + : "=&r" (t), "+m" (v->counter) \ + : "r" #sign (a), "r" (&v->counter) \ + : "cc" ); \ + } + +ATOMIC_OP(and, "and", ".", K) + +static inline int atomic_sub_and_test(int i, atomic_t *v) +{ + return atomic_sub_return(i, v) == 0; +} + +static inline int atomic_inc_and_test(atomic_t *v) +{ + return atomic_add_return(1, v) == 0; +} + +static inline int atomic_dec_and_test(atomic_t *v) +{ + return atomic_sub_return(1, v) == 0; +} + +static inline int atomic_add_negative(int i, atomic_t *v) +{ + return atomic_add_return(i, v) < 0; +} + +static inline int __atomic_add_unless(atomic_t *v, int a, int u) +{ + int c, old; + + c = atomic_read(v); + while (c != u && (old = atomic_cmpxchg(v, c, c + a)) != c) + c = old; + return c; +} + +static inline int atomic_add_unless(atomic_t *v, int a, int u) +{ + return __atomic_add_unless(v, a, u); +} + +#endif /* _ASM_PPC64_ATOMIC_H_ */ diff --git a/xen/arch/ppc/include/asm/memory.h b/xen/arch/ppc/include/asm/memory.h new file mode 100644 index 0000000000..57310eb690 --- /dev/null +++ b/xen/arch/ppc/include/asm/memory.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) IBM Corp. 2005 + * + * Authors: Jimi Xenidis + */ + +#ifndef _ASM_MEMORY_H_ +#define _ASM_MEMORY_H_ + +#define PPC_ATOMIC_ENTRY_BARRIER "sync\n" +#define PPC_ATOMIC_EXIT_BARRIER "sync\n" + +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 16 03:22:11 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Sep 2023 03:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.603483.940492 (Exim 4.92) (envelope-from ) id 1qhLsh-0001jY-2u; Sat, 16 Sep 2023 03:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 603483.940492; Sat, 16 Sep 2023 03: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 1qhLsg-0001jP-Vd; Sat, 16 Sep 2023 03:22:02 +0000 Received: by outflank-mailman (input) for mailman id 603483; Sat, 16 Sep 2023 03:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qhLsf-0001jJ-Mn for xen-changelog@lists.xenproject.org; Sat, 16 Sep 2023 03:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qhLsf-00081n-Kn for xen-changelog@lists.xenproject.org; Sat, 16 Sep 2023 03:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qhLsf-0006oj-Jj for xen-changelog@lists.xenproject.org; Sat, 16 Sep 2023 03: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=m7w/B9QufxVkT8YiFbCwch75RPp5yLOIKBP1gn9BwPU=; b=Cm6CCq2B24qzKe4wwyJZQOo+CM RhG/cm095xdqtxtMpfDrpeDVwInP6+fDzqzBJ972PoYLAWC7AGvumo5bjqHNcnCn9qsqmnLEBEypg cAh7dzA/qrSul+wrISYflZMDC0DP1sS94JT1TdDm4A/kOf09WlStwu2Nf1oMx7zQLYvE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: accept 11.7 and 11.8 Message-Id: Date: Sat, 16 Sep 2023 03:22:01 +0000 commit b5a601093d1f9d5e96eb74b692f1b6252a2598a2 Author: Stefano Stabellini AuthorDate: Wed Sep 13 16:16:17 2023 -0700 Commit: Stefano Stabellini CommitDate: Thu Sep 14 18:45:38 2023 -0700 docs/misra: accept 11.7 and 11.8 As per the last MISRA C group discussion, let's accept 11.7 (for which we have no violations) and 11.8. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misra/rules.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 34916e266a..8e7d17d242 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -363,6 +363,16 @@ maintainers if you want to suggest a change. CFLAGS="-Warith-conversion -Wno-error=arith-conversion" make -C xen + * - `Rule 11.7 `_ + - Required + - A cast shall not be performed between pointer to object and a noninteger arithmetic type + - + + * - `Rule 11.8 `_ + - Required + - A cast shall not remove any const or volatile qualification from the type pointed to by a pointer + - + * - `Rule 12.5 `_ - Mandatory - The sizeof operator shall not have an operand which is a function -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 17 08:33:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Sep 2023 08:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.603686.940748 (Exim 4.92) (envelope-from ) id 1qhnDE-00014O-Am; Sun, 17 Sep 2023 08:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 603686.940748; Sun, 17 Sep 2023 08: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 1qhnDE-00014G-7y; Sun, 17 Sep 2023 08:33:04 +0000 Received: by outflank-mailman (input) for mailman id 603686; Sun, 17 Sep 2023 08:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qhnDC-00014A-Ba for xen-changelog@lists.xenproject.org; Sun, 17 Sep 2023 08:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qhnDC-0001A4-34 for xen-changelog@lists.xenproject.org; Sun, 17 Sep 2023 08:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qhnDC-0004Kz-10 for xen-changelog@lists.xenproject.org; Sun, 17 Sep 2023 08:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1OwwfTJewoVXQNJEKGwyNRpYHW//1q+YboXCKSW0XaQ=; b=YuutaullpAlcaDOE51/LzKjDL/ I5kpih8ZZ6dp6EEgWj1VFvcJ3igDFco4TiuHK/GYnW2K7KijTGtzFlCVnHj+EHST/jEEbYauS6APA Wvla9e4l0g8inQ0xxPJ5feB6EepFgVQouaMfSTcSvYiQMnf5w7D+p4AnoYqsFY91rM8M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Skip Xen specific nodes/properties from hwdom /chosen node Message-Id: Date: Sun, 17 Sep 2023 08:33:02 +0000 commit 290f82375d828ef93f831a5ef028f1283aa1ea47 Author: Michal Orzel AuthorDate: Tue Sep 12 12:53:41 2023 +0200 Commit: Julien Grall CommitDate: Fri Sep 15 22:13:47 2023 +0100 xen/arm: Skip Xen specific nodes/properties from hwdom /chosen node Skip the following Xen specific host device tree nodes/properties from being included into hardware domain /chosen node: - xen,static-heap: this property informs Xen about memory regions reserved exclusively as static heap, - xen,domain-shared-memory-v1: node with this compatible informs Xen about static shared memory region for a domain. Xen exposes a different node (under /reserved-memory with compatible "xen,shared-memory-v1") to let domain know about the shared region, - xen,evtchn-v1: node with this compatible informs Xen about static event channel configuration for a domain. Xen does not expose information about static event channels to domUs and dom0 case was overlooked (by default nodes from host dt are copied to dom0 fdt unless explicitly marked to be skipped), since the author's idea was not to expose it (refer docs/misc/arm/device-tree/booting.txt, "Static Event Channel"). Even if we wanted to expose the static event channel information, the current node is in the wrong format (i.e. contains phandle to domU node not visible by dom0). Lastly, this feature is marked as tech-preview and there is no Linux dt binding in place. Signed-off-by: Michal Orzel Release-acked-by: Henry Wang Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 6cf0450858..24c9019cc4 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1149,7 +1149,7 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, * * remember xen,dom0-bootargs if we don't already have * bootargs (from module #1, above). * * remove bootargs, xen,dom0-bootargs, xen,xen-bootargs, - * linux,initrd-start and linux,initrd-end. + * xen,static-heap, linux,initrd-start and linux,initrd-end. * * remove stdout-path. * * remove bootargs, linux,uefi-system-table, * linux,uefi-mmap-start, linux,uefi-mmap-size, @@ -1158,7 +1158,8 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, */ if ( dt_node_path_is_equal(node, "/chosen") ) { - if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") || + if ( dt_property_name_is_equal(prop, "xen,static-heap") || + dt_property_name_is_equal(prop, "xen,xen-bootargs") || dt_property_name_is_equal(prop, "linux,initrd-start") || dt_property_name_is_equal(prop, "linux,initrd-end") || dt_property_name_is_equal(prop, "stdout-path") || @@ -2304,6 +2305,8 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, static const struct dt_device_match skip_matches[] __initconst = { DT_MATCH_COMPATIBLE("xen,domain"), + DT_MATCH_COMPATIBLE("xen,domain-shared-memory-v1"), + DT_MATCH_COMPATIBLE("xen,evtchn-v1"), DT_MATCH_COMPATIBLE("xen,xen"), DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("multiboot,module"), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 19 04:00:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Sep 2023 04:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.604315.941601 (Exim 4.92) (envelope-from ) id 1qiRu7-0006oS-LT; Tue, 19 Sep 2023 04:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 604315.941601; Tue, 19 Sep 2023 04: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 1qiRu7-0006o7-Io; Tue, 19 Sep 2023 04:00:03 +0000 Received: by outflank-mailman (input) for mailman id 604315; Tue, 19 Sep 2023 04:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRu6-0006bu-Mr for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRu6-0005T2-CE for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qiRu6-0003Ar-AL for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04: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=PrYAetAaFiWKRO7Z6DJZHYZQnw6k+zVfNzK64oNkEeQ=; b=wyJIphL3FzmBCLsu2XQLTnrGL1 CpYi6YFc5/DR99+O8uGeanARAi519ebYm0FcC2K/Tf8edIJ6MJKIA33xmegkqj2ICvkGyWYp1KA9l 0y11vgZJAEWmsjyqupZT8tDMMq0mNlOWG3RMECxmcSCbOrB26TWtDKH6eILNgC/XNqME=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/libelf: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Tue, 19 Sep 2023 04:00:02 +0000 commit ba78957d92b4ee122fb3a0d68fc7614f674e939b Author: Federico Serafini AuthorDate: Mon Sep 18 15:05:55 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 18 15:05:55 2023 +0200 xen/libelf: address violations of MISRA C:2012 Rules 8.2 and 8.3 Add missing parameter names and make function declarations and definitions consistent. No functional change. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- xen/include/xen/libelf.h | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index be47b0cc36..1c77e3df31 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -260,8 +260,8 @@ struct elf_binary { * str should be a HANDLE. */ -uint64_t elf_access_unsigned(struct elf_binary *elf, elf_ptrval ptr, - uint64_t offset, size_t size); +uint64_t elf_access_unsigned(struct elf_binary *elf, elf_ptrval base, + uint64_t moreoffset, size_t size); /* Reads a field at arbitrary offset and alignemnt */ uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr); @@ -272,8 +272,10 @@ const char *elf_strval(struct elf_binary *elf, elf_ptrval start); const char *elf_strfmt(struct elf_binary *elf, elf_ptrval start); /* like elf_strval but returns "(invalid)" instead of NULL */ -void elf_memcpy_safe(struct elf_binary*, elf_ptrval dst, elf_ptrval src, size_t); -void elf_memset_safe(struct elf_binary*, elf_ptrval dst, int c, size_t); +void elf_memcpy_safe(struct elf_binary *elf, elf_ptrval dst, elf_ptrval src, + size_t size); +void elf_memset_safe(struct elf_binary *elf, elf_ptrval dst, int c, + size_t size); /* * Versions of memcpy and memset which arrange never to write * outside permitted areas. @@ -324,7 +326,8 @@ ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, unsigned index const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); /* may return NULL */ elf_ptrval elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); uint64_t elf_note_numeric(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -uint64_t elf_note_numeric_array(struct elf_binary *, ELF_HANDLE_DECL(elf_note), +uint64_t elf_note_numeric_array(struct elf_binary *elf, + ELF_HANDLE_DECL(elf_note) note, unsigned int unitsz, unsigned int idx); /* @@ -346,9 +349,10 @@ bool elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr /* ------------------------------------------------------------------------ */ /* xc_libelf_loader.c */ -elf_errorstatus elf_init(struct elf_binary *elf, const char *image, size_t size); +elf_errorstatus elf_init(struct elf_binary *elf, const char *image_input, + size_t size); /* - * image and size must be correct. They will be recorded in + * image_input and size must be correct. They will be recorded in * *elf, and must remain valid while the elf is in use. */ #ifdef __XEN__ @@ -445,16 +449,16 @@ static inline int elf_xen_feature_get(int nr, uint32_t * addr) return !!(addr[nr >> 5] & (1 << (nr & 31))); } -int elf_xen_parse_features(const char *features, - uint32_t *supported, - uint32_t *required); -int elf_xen_parse_note(struct elf_binary *elf, - struct elf_dom_parms *parms, - ELF_HANDLE_DECL(elf_note) note); -int elf_xen_parse_guest_info(struct elf_binary *elf, - struct elf_dom_parms *parms); -int elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms, bool hvm); +elf_errorstatus elf_xen_parse_features(const char *features, + uint32_t *supported, + uint32_t *required); +elf_errorstatus elf_xen_parse_note(struct elf_binary *elf, + struct elf_dom_parms *parms, + ELF_HANDLE_DECL(elf_note) note); +elf_errorstatus elf_xen_parse_guest_info(struct elf_binary *elf, + struct elf_dom_parms *parms); +elf_errorstatus elf_xen_parse(struct elf_binary *elf, + struct elf_dom_parms *parms, bool hvm); static inline void *elf_memcpy_unchecked(void *dest, const void *src, size_t n) { return memcpy(dest, src, n); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 19 04:00:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Sep 2023 04:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.604316.941606 (Exim 4.92) (envelope-from ) id 1qiRuH-0007Jr-N5; Tue, 19 Sep 2023 04:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 604316.941606; Tue, 19 Sep 2023 04: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 1qiRuH-0007Jj-KL; Tue, 19 Sep 2023 04:00:13 +0000 Received: by outflank-mailman (input) for mailman id 604316; Tue, 19 Sep 2023 04:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRuG-0007Ja-GR for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRuG-0005TL-Fi for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qiRuG-0003CB-EO for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04: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=L5zTiAwcOOJInaAMwuenXdNFSKeUmd+s06egHsSGhlQ=; b=NjX0y4cFGblYkmhkXfX/zUWT2B qKMGBAOLfXwWQlfec6BYzGXEKDXCYoM1NeTYbSM7dLKHD5AWMj1pW9VvEmMiuVMecfBYDgL9/AYJ3 RR02yzwxuahDc0xdGF1NBYEBr728Gp+DXnu7W6WA+ezF+/mKzG/dGFUZjXqDL1XjfTs0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] timer: fix NR_CPUS=1 build with gcc13 Message-Id: Date: Tue, 19 Sep 2023 04:00:12 +0000 commit c890499871ccad848fd633f32fd703c5c6c137da Author: Jan Beulich AuthorDate: Mon Sep 18 15:06:59 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 18 15:06:59 2023 +0200 timer: fix NR_CPUS=1 build with gcc13 Gcc13 apparently infers from "if ( old_cpu < new_cpu )" that "new_cpu" is >= 1, and then (on x86) complains about "per_cpu(timers, new_cpu)" exceeding __per_cpu_offset[]'s bounds (being an array of 1 in such a configuration). Make the code conditional upon there being at least 2 CPUs configured (otherwise there simply is nothing to migrate [to]). Signed-off-by: Jan Beulich Acked-by: George Dunlap --- xen/common/timer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/common/timer.c b/xen/common/timer.c index a2a18b2fb2..0fddfa7487 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -357,6 +357,7 @@ bool timer_expires_before(struct timer *timer, s_time_t t) void migrate_timer(struct timer *timer, unsigned int new_cpu) { unsigned int old_cpu; +#if CONFIG_NR_CPUS > 1 bool_t active; unsigned long flags; @@ -404,6 +405,11 @@ void migrate_timer(struct timer *timer, unsigned int new_cpu) spin_unlock(&per_cpu(timers, old_cpu).lock); spin_unlock_irqrestore(&per_cpu(timers, new_cpu).lock, flags); +#else /* CONFIG_NR_CPUS == 1 */ + old_cpu = read_atomic(&timer->cpu); + if ( old_cpu != TIMER_CPU_status_killed ) + WARN_ON(new_cpu != old_cpu); +#endif /* CONFIG_NR_CPUS */ } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 19 04:00:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Sep 2023 04:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.604317.941610 (Exim 4.92) (envelope-from ) id 1qiRuR-0007MJ-OX; Tue, 19 Sep 2023 04:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 604317.941610; Tue, 19 Sep 2023 04: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 1qiRuR-0007MB-Lt; Tue, 19 Sep 2023 04:00:23 +0000 Received: by outflank-mailman (input) for mailman id 604317; Tue, 19 Sep 2023 04:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRuQ-0007Lx-OW for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRuQ-0005Um-Km for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qiRuQ-0003Cf-Hp for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04: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=9AQwwmZi4VotiBc2J1RUqVEDXi1HSGRFylQwQ22IkGI=; b=sbeV89TwfT4OU9lEnPRqqxj385 Ww6yaBCh4K0CyBwI6VxEcIhQ9ude3IxnzwSrmZoRgzZkeorWzm09B00t/c/87vbGikwvBv4sOVDF1 qycZIUMxunWNQlN8eBgF/6bSlFGIeXy0hwXaeogkRMzmOdxF+p4x5SpVavDoaS7Rx+48=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/amd: do not expose HWCR.TscFreqSel to guests Message-Id: Date: Tue, 19 Sep 2023 04:00:22 +0000 commit e4ca4e261da3fdddd541c3a9842b1e9e2ad00525 Author: Roger Pau Monné AuthorDate: Mon Sep 18 15:07:49 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 18 15:07:49 2023 +0200 x86/amd: do not expose HWCR.TscFreqSel to guests OpenBSD 7.3 will unconditionally access HWCR if the TSC is reported as Invariant, and it will then attempt to also unconditionally access PSTATE0 if HWCR.TscFreqSel is set (currently the case on Xen). The motivation for exposing HWCR.TscFreqSel was to avoid warning messages from Linux. It has been agreed that Linux should be changed instead to not complaint about missing HWCR.TscFreqSel when running virtualized. The relation between HWCR.TscFreqSel and PSTATE0 is not clearly written down in the PPR, but it's natural for OSes to attempt to fetch the P0 frequency if the TSC is stated to increment at the P0 frequency. Exposing PSTATEn (PSTATE0 at least) with all zeroes is not a suitable solution because the PstateEn bit is read-write, and OSes could legitimately attempt to set PstateEn=1 which Xen couldn't handle. Furthermore, the TscFreqSel bit is model specific and was never safe to expose like this in the first place. At a minimum it should have had a toolstack adjustment to know not to migrate such a VM. Therefore, simply remove the bit. Note the HWCR itself is an architectural register, and does need to be accessible by the guest. Since HWCR contains both architectural and non-architectural bits, going forward care must be taken to assert the exposed value is correct on newer CPU families. Reported-by: Solène Rapenne Link: https://github.com/QubesOS/qubes-issues/issues/8502 Fixes: 14b95b3b8546 ('x86/AMD: expose HWCR.TscFreqSel to guests') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 3f0450259c..c33dc78cd8 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -240,8 +240,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) case MSR_K8_HWCR: if ( !(cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) goto gp_fault; - *val = get_cpu_family(cp->basic.raw_fms, NULL, NULL) >= 0x10 - ? K8_HWCR_TSC_FREQ_SEL : 0; + *val = 0; break; case MSR_VIRT_SPEC_CTRL: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 19 04:00:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Sep 2023 04:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.604318.941614 (Exim 4.92) (envelope-from ) id 1qiRub-0007P5-QD; Tue, 19 Sep 2023 04:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 604318.941614; Tue, 19 Sep 2023 04: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 1qiRub-0007Oy-NK; Tue, 19 Sep 2023 04:00:33 +0000 Received: by outflank-mailman (input) for mailman id 604318; Tue, 19 Sep 2023 04:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRua-0007On-TK for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiRua-0005VU-Pm for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qiRua-0003DH-Mt for xen-changelog@lists.xenproject.org; Tue, 19 Sep 2023 04: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=/wwT6NDGbkhbiTxoadQgXUWq3Ft2oRnFic8q2sMSSRY=; b=AC58/swwqeOFTnP2hs11LdCBLR Pf+ivrxonHDLH1n4pL2XGaqvFJ5iKmo5WMPlTKmS+PsskQ1ElOskAtdaGrrQHv0i6U0wGLTuZI6HR 2bffN9DhEqwF3370aMRMdqU9kXkZUiDVZkasw4SnOA7zEfwZPqI3GvSyKQIuzCIhZghU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Implement bitops.h Message-Id: Date: Tue, 19 Sep 2023 04:00:32 +0000 commit 2ea38251eb67639be7aa9d7b64084b1be0230273 Author: Shawn Anastasio AuthorDate: Thu Sep 14 14:03:31 2023 -0500 Commit: Jan Beulich CommitDate: Mon Sep 18 15:10:37 2023 +0200 xen/ppc: Implement bitops.h Implement bitops.h, based on Linux's implementation as of commit 5321d1b1afb9a17302c6cec79f0cbf823eb0d3fc. Though it is based off of Linux's implementation, this code diverges significantly in a number of ways: - Bitmap entries changed to 32-bit words to match X86 and Arm on Xen - PPC32-specific code paths dropped - Formatting completely re-done to more closely line up with Xen. Including 4 space indentation. - Use GCC's __builtin_popcount* for hweight* implementation Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/include/asm/bitops.h | 332 +++++++++++++++++++++++++++++++++++++- 1 file changed, 329 insertions(+), 3 deletions(-) diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index 548e97b414..5e7f36c21d 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -1,9 +1,335 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Adapted from Linux's arch/powerpc/include/asm/bitops.h. + * + * Merged version by David Gibson . + * Based on ppc64 versions by: Dave Engebretsen, Todd Inglett, Don + * Reed, Pat McCarthy, Peter Bergner, Anton Blanchard. They + * originally took it from the ppc32 code. + */ #ifndef _ASM_PPC_BITOPS_H #define _ASM_PPC_BITOPS_H +#include + +#define __set_bit(n, p) set_bit(n, p) +#define __clear_bit(n, p) clear_bit(n, p) + +#define BITOP_BITS_PER_WORD 32 +#define BITOP_MASK(nr) (1U << ((nr) % BITOP_BITS_PER_WORD)) +#define BITOP_WORD(nr) ((nr) / BITOP_BITS_PER_WORD) +#define BITS_PER_BYTE 8 + /* PPC bit number conversion */ -#define PPC_BITLSHIFT(be) (BITS_PER_LONG - 1 - (be)) -#define PPC_BIT(bit) (1UL << PPC_BITLSHIFT(bit)) -#define PPC_BITMASK(bs, be) ((PPC_BIT(bs) - PPC_BIT(be)) | PPC_BIT(bs)) +#define PPC_BITLSHIFT(be) (BITS_PER_LONG - 1 - (be)) +#define PPC_BIT(bit) (1UL << PPC_BITLSHIFT(bit)) +#define PPC_BITMASK(bs, be) ((PPC_BIT(bs) - PPC_BIT(be)) | PPC_BIT(bs)) + +/* Macro for generating the ***_bits() functions */ +#define DEFINE_BITOP(fn, op) \ +static inline void fn(unsigned int mask, \ + volatile unsigned int *p_) \ +{ \ + unsigned int old; \ + unsigned int *p = (unsigned int *)p_; \ + asm volatile ( "1: lwarx %0,0,%3,0\n" \ + #op "%I2 %0,%0,%2\n" \ + "stwcx. %0,0,%3\n" \ + "bne- 1b\n" \ + : "=&r" (old), "+m" (*p) \ + : "rK" (mask), "r" (p) \ + : "cc", "memory" ); \ +} + +DEFINE_BITOP(set_bits, or) +DEFINE_BITOP(change_bits, xor) + +#define DEFINE_CLROP(fn) \ +static inline void fn(unsigned int mask, volatile unsigned int *p_) \ +{ \ + unsigned int old; \ + unsigned int *p = (unsigned int *)p_; \ + asm volatile ( "1: lwarx %0,0,%3,0\n" \ + "andc %0,%0,%2\n" \ + "stwcx. %0,0,%3\n" \ + "bne- 1b\n" \ + : "=&r" (old), "+m" (*p) \ + : "r" (mask), "r" (p) \ + : "cc", "memory" ); \ +} + +DEFINE_CLROP(clear_bits) + +static inline void set_bit(int nr, volatile void *addr) +{ + set_bits(BITOP_MASK(nr), (volatile unsigned int *)addr + BITOP_WORD(nr)); +} +static inline void clear_bit(int nr, volatile void *addr) +{ + clear_bits(BITOP_MASK(nr), (volatile unsigned int *)addr + BITOP_WORD(nr)); +} + +/** + * test_bit - Determine whether a bit is set + * @nr: bit number to test + * @addr: Address to start counting from + */ +static inline int test_bit(int nr, const volatile void *addr) +{ + const volatile unsigned int *p = addr; + return 1 & (p[BITOP_WORD(nr)] >> (nr & (BITOP_BITS_PER_WORD - 1))); +} + +static inline unsigned int test_and_clear_bits( + unsigned int mask, + volatile unsigned int *p) +{ + unsigned int old, t; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%3,0\n" + "andc %1,%0,%2\n" + "stwcx. %1,0,%3\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER + : "=&r" (old), "=&r" (t) + : "r" (mask), "r" (p) + : "cc", "memory" ); + + return (old & mask); +} + +static inline int test_and_clear_bit(unsigned int nr, + volatile void *addr) +{ + return test_and_clear_bits( + BITOP_MASK(nr), + (volatile unsigned int *)addr + BITOP_WORD(nr)) != 0; +} + +static inline unsigned int test_and_set_bits( + unsigned int mask, + volatile unsigned int *p) +{ + unsigned int old, t; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%3,0\n" + "or%I2 %1,%0,%2\n" + "stwcx. %1,0,%3\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER + : "=&r" (old), "=&r" (t) + : "rK" (mask), "r" (p) + : "cc", "memory" ); + + return (old & mask); +} + +static inline int test_and_set_bit(unsigned int nr, volatile void *addr) +{ + return test_and_set_bits( + BITOP_MASK(nr), + (volatile unsigned int *)addr + BITOP_WORD(nr)) != 0; +} + +/** + * __test_and_set_bit - Set a bit and return its old value + * @nr: Bit to set + * @addr: Address to count from + * + * This operation is non-atomic and can be reordered. + * If two examples of this operation race, one can appear to succeed + * but actually fail. You must protect multiple accesses with a lock. + */ +static inline int __test_and_set_bit(int nr, volatile void *addr) +{ + unsigned int mask = BITOP_MASK(nr); + volatile unsigned int *p = (volatile unsigned int *)addr + BITOP_WORD(nr); + unsigned int old = *p; + + *p = old | mask; + return (old & mask) != 0; +} + +/** + * __test_and_clear_bit - Clear a bit and return its old value + * @nr: Bit to clear + * @addr: Address to count from + * + * This operation is non-atomic and can be reordered. + * If two examples of this operation race, one can appear to succeed + * but actually fail. You must protect multiple accesses with a lock. + */ +static inline int __test_and_clear_bit(int nr, volatile void *addr) +{ + unsigned int mask = BITOP_MASK(nr); + volatile unsigned int *p = (volatile unsigned int *)addr + BITOP_WORD(nr); + unsigned int old = *p; + + *p = old & ~mask; + return (old & mask) != 0; +} + +#define flsl(x) generic_flsl(x) +#define fls(x) generic_fls(x) +#define ffs(x) ({ unsigned int t_ = (x); fls(t_ & -t_); }) +#define ffsl(x) ({ unsigned long t_ = (x); flsl(t_ & -t_); }) + +/* Based on linux/include/asm-generic/bitops/ffz.h */ +/* + * ffz - find first zero in word. + * @word: The word to search + * + * Undefined if no zero exists, so code should check against ~0UL first. + */ +#define ffz(x) __ffs(~(x)) + +/** + * hweightN - returns the hamming weight of a N-bit word + * @x: the word to weigh + * + * The Hamming Weight of a number is the total number of bits set in it. + */ +#define hweight64(x) __builtin_popcountll(x) +#define hweight32(x) __builtin_popcount(x) +#define hweight16(x) __builtin_popcount((uint16_t)(x)) +#define hweight8(x) __builtin_popcount((uint8_t)(x)) + +/* Based on linux/include/asm-generic/bitops/builtin-__ffs.h */ +/** + * __ffs - find first bit in word. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static always_inline unsigned long __ffs(unsigned long word) +{ + return __builtin_ctzl(word); +} + +/** + * 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) + +/* + * Find the first set bit in a memory region. + */ +static inline unsigned long find_first_bit(const unsigned long *addr, + unsigned long size) +{ + const unsigned long *p = addr; + unsigned long result = 0; + unsigned long tmp; + + while ( size & ~(BITS_PER_LONG - 1) ) + { + if ( (tmp = *(p++)) ) + goto found; + result += BITS_PER_LONG; + size -= BITS_PER_LONG; + } + if ( !size ) + return result; + + tmp = (*p) & (~0UL >> (BITS_PER_LONG - size)); + if ( tmp == 0UL ) /* Are any bits set? */ + return result + size; /* Nope. */ + found: + return result + __ffs(tmp); +} + +static inline unsigned long find_next_bit(const unsigned long *addr, + unsigned long size, + unsigned long offset) +{ + const unsigned long *p = addr + BITOP_WORD(offset); + unsigned long result = offset & ~(BITS_PER_LONG - 1); + unsigned long tmp; + + if ( offset >= size ) + return size; + size -= result; + offset %= BITS_PER_LONG; + if ( offset ) + { + tmp = *(p++); + tmp &= (~0UL << offset); + if ( size < BITS_PER_LONG ) + goto found_first; + if ( tmp ) + goto found_middle; + size -= BITS_PER_LONG; + result += BITS_PER_LONG; + } + while ( size & ~(BITS_PER_LONG - 1) ) + { + if ( (tmp = *(p++)) ) + goto found_middle; + result += BITS_PER_LONG; + size -= BITS_PER_LONG; + } + if ( !size ) + return result; + tmp = *p; + + found_first: + tmp &= (~0UL >> (BITS_PER_LONG - size)); + if ( tmp == 0UL ) /* Are any bits set? */ + return result + size; /* Nope. */ + found_middle: + return result + __ffs(tmp); +} + +/* + * This implementation of find_{first,next}_zero_bit was stolen from + * Linus' asm-alpha/bitops.h. + */ +static inline unsigned long find_next_zero_bit(const unsigned long *addr, + unsigned long size, + unsigned long offset) +{ + const unsigned long *p = addr + BITOP_WORD(offset); + unsigned long result = offset & ~(BITS_PER_LONG - 1); + unsigned long tmp; + + if ( offset >= size ) + return size; + size -= result; + offset %= BITS_PER_LONG; + if ( offset ) + { + tmp = *(p++); + tmp |= ~0UL >> (BITS_PER_LONG - offset); + if ( size < BITS_PER_LONG ) + goto found_first; + if ( ~tmp ) + goto found_middle; + size -= BITS_PER_LONG; + result += BITS_PER_LONG; + } + while ( size & ~(BITS_PER_LONG - 1) ) + { + if ( ~(tmp = *(p++)) ) + goto found_middle; + result += BITS_PER_LONG; + size -= BITS_PER_LONG; + } + if ( !size ) + return result; + tmp = *p; + + found_first: + tmp |= ~0UL << size; + if ( tmp == ~0UL ) /* Are any bits zero? */ + return result + size; /* Nope. */ + found_middle: + return result + ffz(tmp); +} #endif /* _ASM_PPC_BITOPS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606065.943744 (Exim 4.92) (envelope-from ) id 1qjAR5-0002l8-MK; Thu, 21 Sep 2023 03:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606065.943744; Thu, 21 Sep 2023 03:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjAR5-0002ky-JO; Thu, 21 Sep 2023 03:33:03 +0000 Received: by outflank-mailman (input) for mailman id 606065; Thu, 21 Sep 2023 03:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjAR4-0002ks-EB for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjAR4-0001K4-DS for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjAR4-0003q4-BJ for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BmHvjp02+MaZ1H6ds/Ef8crXhFBLef5gG6tCreHKGXg=; b=xcQqkg7eDHry4CehC9M/Vv3H9p OnkS/6DRT/0AxdxsGo7chYZupip7v6FOWl7g6666AjpOGwgy58j4K9GQGkrsP6DnXvj7hkmj/ZSo4 AGmokVgCr6pB4hS4WlcRX158tCRvrfPEhjnJbjtQcX7xT3jUiWySt4+i2SAAIGaUBtQ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/AMD: extend Zenbleed check to models "good" ucode isn't known for Message-Id: Date: Thu, 21 Sep 2023 03:33:02 +0000 commit 08539e8315fdae5f5bfd655d53ed35fd2922fe6c Author: Jan Beulich AuthorDate: Wed Aug 23 09:26:36 2023 +0200 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/AMD: extend Zenbleed check to models "good" ucode isn't known for Reportedly the AMD Custom APU 0405 found on SteamDeck, models 0x90 and 0x91, (quoting the respective Linux commit) is similarly affected. Put another instance of our Zen1 vs Zen2 distinction checks in amd_check_zenbleed(), forcing use of the chickenbit irrespective of ucode version (building upon real hardware never surfacing a version of 0xffffffff). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper (cherry picked from commit 145a69c0944ac70cfcf9d247c85dee9e99d9d302) --- xen/arch/x86/cpu/amd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 60c6d88edf..a591038757 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -800,10 +800,17 @@ void amd_check_zenbleed(void) case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; default: /* - * With the Fam17h check above, parts getting here are Zen1. - * They're not affected. + * With the Fam17h check above, most parts getting here are + * Zen1. They're not affected. Assume Zen2 ones making it + * here are affected regardless of microcode version. + * + * Zen1 vs Zen2 isn't a simple model number comparison, so use + * STIBP as a heuristic to distinguish. */ - return; + if (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) + return; + good_rev = ~0U; + break; } rdmsrl(MSR_AMD64_DE_CFG, val); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606066.943748 (Exim 4.92) (envelope-from ) id 1qjARF-0002mv-Nj; Thu, 21 Sep 2023 03:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606066.943748; Thu, 21 Sep 2023 03:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARF-0002mn-Kz; Thu, 21 Sep 2023 03:33:13 +0000 Received: by outflank-mailman (input) for mailman id 606066; Thu, 21 Sep 2023 03:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARE-0002mh-KG for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARE-0001KE-Ht for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjARE-0003qX-Gg for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03: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=I8L/wJWgTkVnLkwMQ9fQRzrvvppm/bTZARvN/CPqd68=; b=HtV7jNlqBtXH70ge7d6FpPLVBX hyaGzmXMYyiUBRH9UUsrIrZ9fT1xhAjBkDxqjpgOztIi0aiyaskeZGorAA9X70gsH+T6VDwaJ5ix2 Sd72Ae1CAmjfNBBMXUaQUkJ/UABTR52wYdq3/Z8Wzy2X18Pr+ADeW5pU3We/k59u/D1o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} Message-Id: Date: Thu, 21 Sep 2023 03:33:12 +0000 commit 1e52cdf07cdf52e5d99957c3ecbddf5b1feda963 Author: Andrew Cooper AuthorDate: Tue Sep 12 15:06:49 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} c/s 3fffaf9c13e9 ("x86/entry: Avoid using alternatives in NMI/#MC paths") dropped the only user, leaving behind the (incorrect) implication that Xen had split exit paths. Delete the unused SPEC_CTRL_EXIT_TO_XEN and rename SPEC_CTRL_EXIT_TO_XEN_IST to SPEC_CTRL_EXIT_TO_XEN for consistency. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 1c18d73774533a55ba9d1cbee8bdace03efdb5e7) --- xen/arch/x86/x86_64/entry.S | 2 +- xen/include/asm-x86/spec_ctrl_asm.h | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index db2ea7871e..59f2040787 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -664,7 +664,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN_IST /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ RESTORE_ALL adj=8 iretq diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index b61a5571ae..f5110616e4 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -79,7 +79,6 @@ * - SPEC_CTRL_ENTRY_FROM_PV * - SPEC_CTRL_ENTRY_FROM_INTR * - SPEC_CTRL_ENTRY_FROM_INTR_IST - * - SPEC_CTRL_EXIT_TO_XEN_IST * - SPEC_CTRL_EXIT_TO_XEN * - SPEC_CTRL_EXIT_TO_PV * @@ -273,11 +272,6 @@ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV -/* Use when exiting to Xen context. */ -#define SPEC_CTRL_EXIT_TO_XEN \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_XEN, X86_FEATURE_SC_MSR_PV - /* Use when exiting to PV guest context. */ #define SPEC_CTRL_EXIT_TO_PV \ ALTERNATIVE "", \ @@ -344,8 +338,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen in IST context. */ -.macro SPEC_CTRL_EXIT_TO_XEN_IST +/* Use when exiting to Xen context. */ +.macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end * Clobbers %rax, %rcx, %rdx -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:33:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606067.943752 (Exim 4.92) (envelope-from ) id 1qjARP-0002pN-PC; Thu, 21 Sep 2023 03:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606067.943752; Thu, 21 Sep 2023 03: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 1qjARP-0002pF-MX; Thu, 21 Sep 2023 03:33:23 +0000 Received: by outflank-mailman (input) for mailman id 606067; Thu, 21 Sep 2023 03:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARO-0002p3-LT for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARO-0001KM-Kp for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjARO-0003r5-Jp for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03: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=M2mwBa2/lYSEOY4Aus0ugRkFnssPlSCwFha7ne31tQ0=; b=3mjXYW5B9sRvxtE/DX3BoRajQu U8NdK1lqJVWqrVxmLVxHYf+wlxKeea0w6m7kpz8UNoDcDotEQCOWtpFsUNwN2Jk/6g271Ok0db/js LncZo+UDwLbMcVhtGF5UudqWKSNnUyCTTmZm1lDQz0fu9U7acIKaQMFPIpGqpMJoB0bo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user Message-Id: Date: Thu, 21 Sep 2023 03:33:22 +0000 commit afa5b17f385372226de6b0862f12ab39fda16b5c Author: Andrew Cooper AuthorDate: Tue Sep 12 17:03:16 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user With the SPEC_CTRL_EXIT_TO_XEN{,_IST} confusion fixed, it's now obvious that there's only a single EXIT_TO_XEN path. Fold DO_SPEC_CTRL_EXIT_TO_XEN into SPEC_CTRL_EXIT_TO_XEN to simplify further fixes. When merging labels, switch the name to .L\@_skip_sc_msr as "skip" on its own is going to be too generic shortly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 694bb0f280fd08a4377e36e32b84b5062def4de2) --- xen/include/asm-x86/spec_ctrl_asm.h | 40 +++++++++++++++---------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index f5110616e4..251c30eee5 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -216,27 +216,6 @@ wrmsr .endm -.macro DO_SPEC_CTRL_EXIT_TO_XEN -/* - * Requires %rbx=stack_end - * Clobbers %rax, %rcx, %rdx - * - * When returning to Xen context, look to see whether SPEC_CTRL shadowing is - * in effect, and reload the shadow value. This covers race conditions which - * exist with an NMI/MCE/etc hitting late in the return-to-guest path. - */ - xor %edx, %edx - - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip - - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax - mov $MSR_SPEC_CTRL, %ecx - wrmsr - -.L\@_skip: -.endm - .macro DO_SPEC_CTRL_EXIT_TO_GUEST /* * Requires %eax=spec_ctrl, %rsp=regs/cpuinfo @@ -345,11 +324,24 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): * Clobbers %rax, %rcx, %rdx */ testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip + jz .L\@_skip_sc_msr - DO_SPEC_CTRL_EXIT_TO_XEN + /* + * When returning to Xen context, look to see whether SPEC_CTRL shadowing + * is in effect, and reload the shadow value. This covers race conditions + * which exist with an NMI/MCE/etc hitting late in the return-to-guest + * path. + */ + xor %edx, %edx -.L\@_skip: + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + jz .L\@_skip_sc_msr + + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov $MSR_SPEC_CTRL, %ecx + wrmsr + +.L\@_skip_sc_msr: .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:33:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606068.943756 (Exim 4.92) (envelope-from ) id 1qjARZ-0002s4-Ql; Thu, 21 Sep 2023 03:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606068.943756; Thu, 21 Sep 2023 03: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 1qjARZ-0002rx-Nx; Thu, 21 Sep 2023 03:33:33 +0000 Received: by outflank-mailman (input) for mailman id 606068; Thu, 21 Sep 2023 03:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARY-0002rn-OR for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARY-0001KV-Nf for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjARY-0003rU-Mo for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03: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=RZWcpl1jLPMQDygDxPd/dGWPPB5YphkuHWxm6kkuOWs=; b=exOGi3t3gVVuatczvhzdBzQ2rv 9LwjCGZUn5BcCBI0/IkD1LYmpH+sXPsh1afb7WgXM2rijCulVHCLKqsX18eXiDVZIpE7vFKKdtL80 cTZuHcbv1Y3HDHaajcNYXov1TPoBcuQvDte03f7xkFKpACOSmbIaBvp6kJqwva30T8LY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros Message-Id: Date: Thu, 21 Sep 2023 03:33:32 +0000 commit 353e876a9dd5a93d0bf8819e77613c33db0de97b Author: Andrew Cooper AuthorDate: Fri Sep 1 11:38:44 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros These have grown more complex over time, with some already having been converted. Provide full Requires/Clobbers comments, otherwise missing at this level of indirection. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 7125429aafb9e3c9c88fc93001fc2300e0ac2cc8) --- xen/include/asm-x86/spec_ctrl_asm.h | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 251c30eee5..94ed5dc880 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -236,26 +236,45 @@ .endm /* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ -#define SPEC_CTRL_ENTRY_FROM_PV \ +.macro SPEC_CTRL_ENTRY_FROM_PV +/* + * Requires %rsp=regs/cpuinfo, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=0), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=0), \ X86_FEATURE_SC_MSR_PV +.endm /* Use in interrupt/exception context. May interrupt Xen or PV context. */ -#define SPEC_CTRL_ENTRY_FROM_INTR \ +.macro SPEC_CTRL_ENTRY_FROM_INTR +/* + * Requires %rsp=regs, %r14=stack_end, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=1), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV +.endm /* Use when exiting to PV guest context. */ -#define SPEC_CTRL_EXIT_TO_PV \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV; \ +.macro SPEC_CTRL_EXIT_TO_PV +/* + * Requires %rax=spec_ctrl, %rsp=regs/info + * Clobbers %rcx, %rdx + */ + ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV + DO_SPEC_CTRL_COND_VERW +.endm /* * Use in IST interrupt/exception context. May interrupt Xen or PV context. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:33:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606069.943759 (Exim 4.92) (envelope-from ) id 1qjARj-0002vK-Rx; Thu, 21 Sep 2023 03:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606069.943759; Thu, 21 Sep 2023 03: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 1qjARj-0002vD-PV; Thu, 21 Sep 2023 03:33:43 +0000 Received: by outflank-mailman (input) for mailman id 606069; Thu, 21 Sep 2023 03:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARi-0002v2-RS for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARi-0001Kd-Ql for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjARi-0003tS-Pc for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03: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=OPqLFZa+90IcPVly/t//0VGgLn1DWwrNXn3nGRQop1A=; b=qJcDoaPS01+bOXFDKN+irjmQ6W YZIGzR+x3OicO+tzhh66NthlIjhcBz0Nek5VCsn1EKX5QS66m7PVuJ5Om+3kR/rdOmD4SmMKS2Vzs FyoKsOazp4n2zf+PkfwGu06FA7bY6ic2OPaggygzlc3pHwakNKH7jHYKFkEgnYtOmsVk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments Message-Id: Date: Thu, 21 Sep 2023 03:33:42 +0000 commit 6cc49c355e952f4ff564c6b817e7eff57c5a02c7 Author: Andrew Cooper AuthorDate: Wed Aug 30 20:11:50 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments ... to better explain how they're used. Doing so highlights that SPEC_CTRL_EXIT_TO_XEN is missing a VERW flush for the corner case when e.g. an NMI hits late in an exit-to-guest path. Leave a TODO, which will be addressed in subsequent patches which arrange for VERW flushing to be safe within SPEC_CTRL_EXIT_TO_XEN. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 45f00557350dc7d0756551069803fc49c29184ca) --- xen/include/asm-x86/spec_ctrl_asm.h | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 94ed5dc880..9c397f7cbd 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -235,7 +235,10 @@ wrmsr .endm -/* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ +/* + * Used after an entry from PV context: SYSCALL, SYSENTER, INT, + * etc. There is always a guest speculation state in context. + */ .macro SPEC_CTRL_ENTRY_FROM_PV /* * Requires %rsp=regs/cpuinfo, %rdx=0 @@ -250,7 +253,11 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use in interrupt/exception context. May interrupt Xen or PV context. */ +/* + * Used after an exception or maskable interrupt, hitting Xen or PV context. + * There will either be a guest speculation context, or (barring fatal + * exceptions) a well-formed Xen speculation context. + */ .macro SPEC_CTRL_ENTRY_FROM_INTR /* * Requires %rsp=regs, %r14=stack_end, %rdx=0 @@ -265,7 +272,10 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use when exiting to PV guest context. */ +/* + * Used when exiting from any entry context, back to PV context. This + * includes from an IST entry which moved onto the primary stack. + */ .macro SPEC_CTRL_EXIT_TO_PV /* * Requires %rax=spec_ctrl, %rsp=regs/info @@ -277,7 +287,13 @@ .endm /* - * Use in IST interrupt/exception context. May interrupt Xen or PV context. + * Used after an IST entry hitting Xen or PV context. Special care is needed, + * because when hitting Xen context, there may not be a well-formed + * speculation context. (i.e. it can hit in the middle of + * SPEC_CTRL_{ENTRY,EXIT}_* regions.) + * + * An IST entry which hits PV context moves onto the primary stack and leaves + * via SPEC_CTRL_EXIT_TO_PV, *not* SPEC_CTRL_EXIT_TO_XEN. */ .macro SPEC_CTRL_ENTRY_FROM_INTR_IST /* @@ -336,7 +352,14 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen context. */ +/* + * Use when exiting from any entry context, back to Xen context. This + * includes returning to other SPEC_CTRL_{ENTRY,EXIT}_* regions with an + * incomplete speculation context. + * + * Because we might have interrupted Xen beyond SPEC_CTRL_EXIT_TO_$GUEST, we + * need to treat this as if it were an EXIT_TO_$GUEST case too. + */ .macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end @@ -361,6 +384,9 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): wrmsr .L\@_skip_sc_msr: + + /* TODO VERW */ + .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:33:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606070.943763 (Exim 4.92) (envelope-from ) id 1qjARt-0002xi-UG; Thu, 21 Sep 2023 03:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606070.943763; Thu, 21 Sep 2023 03: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 1qjARt-0002xb-Rk; Thu, 21 Sep 2023 03:33:53 +0000 Received: by outflank-mailman (input) for mailman id 606070; Thu, 21 Sep 2023 03:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARs-0002xS-UP for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjARs-0001L7-Tj for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjARs-0003u5-Sj for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03: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=BSeHyQdH/vkyFVPCnrfLqaPTOkwTsHBYzmXaNYQ55R8=; b=bPQltKbkx4o3McYN2QoP7VQsgo zzobvW8zfr7u9MhhuEWSufdASId3flRUdSLnrmd73WkmOk3YOSlv8Zn2jo06hbROdSTPoeZ/JEOBz UAvQXOURF5H316KGmIk/zzH+OfzWie9tkRA0HrUj91VR7Buxns8P+2R3cZt2v/Xbw600=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/entry: Adjust restore_all_xen to hold stack_end in %r14 Message-Id: Date: Thu, 21 Sep 2023 03:33:52 +0000 commit 19aca8f32778f289112fc8db2ee547cdf29c81ca Author: Andrew Cooper AuthorDate: Wed Sep 13 13:48:16 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/entry: Adjust restore_all_xen to hold stack_end in %r14 All other SPEC_CTRL_{ENTRY,EXIT}_* helpers hold stack_end in %r14. Adjust it for consistency. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 7aa28849a1155d856e214e9a80a7e65fffdc3e58) --- xen/arch/x86/x86_64/entry.S | 8 ++++---- xen/include/asm-x86/spec_ctrl_asm.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 59f2040787..266c0a0990 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -656,15 +656,15 @@ restore_all_xen: * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). */ - GET_STACK_END(bx) - cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%rbx) + GET_STACK_END(14) + cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) UNLIKELY_START(ne, exit_cr3) - mov STACK_CPUINFO_FIELD(pv_cr3)(%rbx), %rax + mov STACK_CPUINFO_FIELD(pv_cr3)(%r14), %rax mov %rax, %cr3 UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ RESTORE_ALL adj=8 iretq diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 9c397f7cbd..3e745813cf 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -362,10 +362,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %rbx=stack_end + * Requires %r14=stack_end * Clobbers %rax, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr /* @@ -376,10 +376,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax mov $MSR_SPEC_CTRL, %ecx wrmsr -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:34:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:34:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606071.943767 (Exim 4.92) (envelope-from ) id 1qjAS4-00030C-WB; Thu, 21 Sep 2023 03:34:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606071.943767; Thu, 21 Sep 2023 03:34:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjAS4-000304-TK; Thu, 21 Sep 2023 03:34:04 +0000 Received: by outflank-mailman (input) for mailman id 606071; Thu, 21 Sep 2023 03:34:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjAS3-0002zn-Df for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjAS3-0001LU-1V for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjAS2-0003ui-Vn for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03: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=d4cLVI4ezpOe2c3o2v6BIYAEdIeAFZueHH1h4IFaC+8=; b=3qHP6tmYppLHmt5l0Icw7mdakI GNvd7pvp9qrEGuc7uLN2JOSwONoQCmAZxrJulFlM6y6/CTh/C4sHLbn24Ms5C5MEHb/R385oB/BpU yVyHW0BcCa4YJhAnmDe222Lzq8iuPyamL2ytPmJgdhl4aceIq1i3R2ZLjhCugHt+K4/E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/entry: Track the IST-ness of an entry for the exit paths Message-Id: Date: Thu, 21 Sep 2023 03:34:02 +0000 commit 8064cbdbef79e328fad5158beeaf1c45bd0f5bd3 Author: Andrew Cooper AuthorDate: Wed Sep 13 12:20:12 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/entry: Track the IST-ness of an entry for the exit paths Use %r12 to hold an ist_exit boolean. This register is zero elsewhere in the entry/exit asm, so it only needs setting in the IST path. As this is subtle and fragile, add check_ist_exit() to be used in debugging builds to cross-check that the ist_exit boolean matches the entry vector. Write check_ist_exit() it in C, because it's debug only and the logic more complicated than I care to maintain in asm. For now, we only need to use this signal in the exit-to-Xen path, but some exit-to-guest paths happen in IST context too. Check the correctness in all exit paths to avoid the logic bit-rotting. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 21bdc25b05a0f8ab6bc73520a9ca01327360732c) x86/entry: Partially revert IST-exit checks The patch adding check_ist_exit() didn't account for the fact that reset_stack_and_jump() is not an ABI-preserving boundary. The IST-ness in %r12 doesn't survive into the next context, and is a stale value C. This shows up in Gitlab CI for the Clang build: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/5112783827 and in OSSTest for GCC 8: http://logs.test-lab.xenproject.org/osstest/logs/183045/test-amd64-amd64-xl-qemuu-debianhvm-amd64/serial-pinot0.log There's no straightforward way to reconstruct the IST-exit-ness on the exit-to-guest path after a context switch. For now, we only need IST-exit on the return-to-Xen path. Fixes: 21bdc25b05a0 ("x86/entry: Track the IST-ness of an entry for the exit paths") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 9b57c800b79b96769ea3dcd6468578fa664d19f9) --- xen/arch/x86/traps.c | 13 +++++++++++++ xen/arch/x86/x86_64/entry.S | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9679bfdb08..f7992ff230 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2348,6 +2348,19 @@ void asm_domain_crash_synchronous(unsigned long addr) do_softirq(); } +#ifdef CONFIG_DEBUG +void check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) +{ + const unsigned int ist_mask = + (1U << X86_EXC_NMI) | (1U << X86_EXC_DB) | + (1U << X86_EXC_DF) | (1U << X86_EXC_MC); + uint8_t ev = regs->entry_vector; + bool is_ist = (ev < TRAP_nr) && ((1U << ev) & ist_mask); + + ASSERT(is_ist == ist_exit); +} +#endif + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 266c0a0990..671e3b3fd5 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -650,8 +650,15 @@ ret_from_intr: .section .text.entry, "ax", @progbits ALIGN -/* No special register assumptions. */ +/* %r12=ist_exit */ restore_all_xen: + +#ifdef CONFIG_DEBUG + mov %rsp, %rdi + mov %r12, %rsi + call check_ist_exit +#endif + /* * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). @@ -1032,6 +1039,10 @@ handle_ist_exception: INDIRECT_CALL %rdx mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %bl, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) + + /* This is an IST exit */ + mov $1, %r12d + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) jne ret_from_intr -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:34:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:34:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606072.943772 (Exim 4.92) (envelope-from ) id 1qjASE-00033G-3E; Thu, 21 Sep 2023 03:34:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606072.943772; Thu, 21 Sep 2023 03: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 1qjASE-000338-0P; Thu, 21 Sep 2023 03:34:14 +0000 Received: by outflank-mailman (input) for mailman id 606072; Thu, 21 Sep 2023 03:34:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASD-00032z-5J for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASD-0001Li-4h for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjASD-0003vV-3h for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uTc0EsiTXRn6rlLj4q2Yv2aXeU6NLDpHg0viijcYlQE=; b=fB7rsA/OcuIRKrsHs+G1953bmk aOyCfI9XxiTEJSgnW2pzdxyPVIcWvCU3eAlO/CGdywKL59A0WJknMy0fW1LSRCAE+xx96XBXQd3iN P4omiBCJiu4EkkZiIH6hNcIlfKOj064ag8wsPehtEWSUxP4xrRVXn1wKZn9h9xVRvNTU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/spec-ctrl: Issue VERW during IST exit to Xen Message-Id: Date: Thu, 21 Sep 2023 03:34:13 +0000 commit 3e51782ebb088fde39fdcfa30d002baddd1a9e06 Author: Andrew Cooper AuthorDate: Wed Sep 13 13:53:33 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/spec-ctrl: Issue VERW during IST exit to Xen There is a corner case where e.g. an NMI hitting an exit-to-guest path after SPEC_CTRL_EXIT_TO_* would have run the entire NMI handler *after* the VERW flush to scrub potentially sensitive data from uarch buffers. In order to compensate, issue VERW when exiting to Xen from an IST entry. SPEC_CTRL_EXIT_TO_XEN already has two reads of spec_ctrl_flags off the stack, and we're about to add a third. Load the field into %ebx, and list the register as clobbered. %r12 has been arranged to be the ist_exit signal, so add this as an input dependency and use it to identify when to issue a VERW. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 3ee6066bcd737756b0990d417d94eddc0b0d2585) --- xen/arch/x86/x86_64/entry.S | 2 +- xen/include/asm-x86/spec_ctrl_asm.h | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 671e3b3fd5..88ff5c150f 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -671,7 +671,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r12=ist_exit %r14=end, Clob: abcd */ RESTORE_ALL adj=8 iretq diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 3e745813cf..8a816b8cf6 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -362,10 +362,12 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %r14=stack_end - * Clobbers %rax, %rcx, %rdx + * Requires %r12=ist_exit, %r14=stack_end + * Clobbers %rax, %rbx, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + movzbl STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14), %ebx + + testb $SCF_ist_sc_msr, %bl jz .L\@_skip_sc_msr /* @@ -376,7 +378,7 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + testb $SCF_use_shadow, %bl jz .L\@_skip_sc_msr mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax @@ -385,8 +387,16 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): .L\@_skip_sc_msr: - /* TODO VERW */ + test %r12, %r12 + jz .L\@_skip_ist_exit + + /* Logically DO_SPEC_CTRL_COND_VERW but without the %rsp=cpuinfo dependency */ + testb $SCF_verw, %bl + jz .L\@_skip_verw + verw STACK_CPUINFO_FIELD(verw_sel)(%r14) +.L\@_skip_verw: +.L\@_skip_ist_exit: .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:34:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:34:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606073.943777 (Exim 4.92) (envelope-from ) id 1qjASP-00035x-66; Thu, 21 Sep 2023 03:34:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606073.943777; Thu, 21 Sep 2023 03: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 1qjASP-00035l-1z; Thu, 21 Sep 2023 03:34:25 +0000 Received: by outflank-mailman (input) for mailman id 606073; Thu, 21 Sep 2023 03:34:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASN-00035b-8f for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASN-0001Lu-7o for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjASN-0003wK-6t for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mb94OYFTBKJez9mzhjdGCBPygrQjyiHXWCiFauKOPEM=; b=CF+VSSy6jO2VpZ1u9jCd40yaFF j2jKhHWC3CSGq7uNAsxTfgS0Lzp8/7XHj6EAl4fpFoeD2Y+cHC5uhMseyuENdj2lyKyJMZkhwkSyY CIXAO7UD/j1y1PharBG/4t7UxJp7ldIHecKy1dNLP3vtG++/0B1vbpsWbcCeyySDCH2M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/amd: Introduce is_zen{1,2}_uarch() predicates Message-Id: Date: Thu, 21 Sep 2023 03:34:23 +0000 commit a5857f1eca17a609119ae928c9fa73bb0996ddd9 Author: Andrew Cooper AuthorDate: Fri Sep 15 12:13:51 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/amd: Introduce is_zen{1,2}_uarch() predicates We already have 3 cases using STIBP as a Zen1/2 heuristic, and are about to introduce a 4th. Wrap the heuristic into a pair of predicates rather than opencoding it, and the explanation of the heuristic, at each usage site. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit de1d265001397f308c5c3c5d3ffc30e7ef8c0705) --- xen/arch/x86/cpu/amd.c | 18 ++++-------------- xen/include/asm-x86/amd.h | 11 +++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index a591038757..b71d891901 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -746,15 +746,13 @@ void amd_init_ssbd(const struct cpuinfo_x86 *c) * non-branch instructions to be ignored. It is to be set unilaterally in * newer microcode. * - * This chickenbit is something unrelated on Zen1, and Zen1 vs Zen2 isn't a - * simple model number comparison, so use STIBP as a heuristic to separate the - * two uarches in Fam17h(AMD)/18h(Hygon). + * This chickenbit is something unrelated on Zen1. */ void amd_init_spectral_chicken(void) { uint64_t val, chickenbit = 1 << 1; - if (cpu_has_hypervisor || !boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (cpu_has_hypervisor || !is_zen2_uarch()) return; if (rdmsr_safe(MSR_AMD64_DE_CFG2, val) == 0 && !(val & chickenbit)) @@ -803,11 +801,8 @@ void amd_check_zenbleed(void) * With the Fam17h check above, most parts getting here are * Zen1. They're not affected. Assume Zen2 ones making it * here are affected regardless of microcode version. - * - * Zen1 vs Zen2 isn't a simple model number comparison, so use - * STIBP as a heuristic to distinguish. */ - if (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (is_zen1_uarch()) return; good_rev = ~0U; break; @@ -1168,12 +1163,7 @@ static int __init zen2_c6_errata_check(void) */ s_time_t delta; - /* - * Zen1 vs Zen2 isn't a simple model number comparison, so use STIBP as - * a heuristic to separate the two uarches in Fam17h. - */ - if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || - !boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || !is_zen2_uarch()) return 0; /* diff --git a/xen/include/asm-x86/amd.h b/xen/include/asm-x86/amd.h index a82382e6bf..7fe1e19217 100644 --- a/xen/include/asm-x86/amd.h +++ b/xen/include/asm-x86/amd.h @@ -140,6 +140,17 @@ AMD_MODEL_RANGE(0x11, 0x0, 0x0, 0xff, 0xf), \ AMD_MODEL_RANGE(0x12, 0x0, 0x0, 0xff, 0xf)) +/* + * The Zen1 and Zen2 microarchitectures are implemented by AMD (Fam17h) and + * Hygon (Fam18h) but without simple model number rules. Instead, use STIBP + * as a heuristic that distinguishes the two. + * + * The caller is required to perform the appropriate vendor/family checks + * first. + */ +#define is_zen1_uarch() (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) +#define is_zen2_uarch() boot_cpu_has(X86_FEATURE_AMD_STIBP) + struct cpuinfo_x86; int cpu_has_amd_erratum(const struct cpuinfo_x86 *, int, ...); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:34:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:34:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606074.943780 (Exim 4.92) (envelope-from ) id 1qjASZ-00038f-6E; Thu, 21 Sep 2023 03:34:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606074.943780; Thu, 21 Sep 2023 03:34:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASZ-00038Y-3R; Thu, 21 Sep 2023 03:34:35 +0000 Received: by outflank-mailman (input) for mailman id 606074; Thu, 21 Sep 2023 03:34:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASX-00038N-EF for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASX-0001M3-Bl for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjASX-0003xD-A9 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MLL2VUk5HLA0ivnj9P8SWQAth9OM8m9nzNgsOYKEcCE=; b=x+EjrAwEthddpDwPAmnQX4TNoT 6oImFYNs8+XnwR2GoarvgnZCYyqApIke0/LkFlQhmKSLl5oEQNzKz7udv9aoRPrHntQyhTbbpHigh pdblAaExd+9vQBKBwHUTmbflGU2J9FHlJuyIHBlavpW952g2lHeCNrKCFpEQF1BXn/8Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/spec-ctrl: Mitigate the Zen1 DIV leakage Message-Id: Date: Thu, 21 Sep 2023 03:34:33 +0000 commit de751c3d906d17b2e25ee429f81b17a689c7c6c0 Author: Andrew Cooper AuthorDate: Wed Aug 30 20:24:25 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:04 2023 +0100 x86/spec-ctrl: Mitigate the Zen1 DIV leakage In the Zen1 microarchitecure, there is one divider in the pipeline which services uops from both threads. In the case of #DE, the latched result from the previous DIV to execute will be forwarded speculatively. This is an interesting covert channel that allows two threads to communicate without any system calls. In also allows userspace to obtain the result of the most recent DIV instruction executed (even speculatively) in the core, which can be from a higher privilege context. Scrub the result from the divider by executing a non-faulting divide. This needs performing on the exit-to-guest paths, and ist_exit-to-Xen. Alternatives in IST context is believed safe now that it's done in NMI context. This is XSA-439 / CVE-2023-20588. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit b5926c6ecf05c28ee99c6248c42d691ccbf0c315) --- docs/misc/xen-command-line.pandoc | 6 ++++- xen/arch/x86/hvm/svm/entry.S | 1 + xen/arch/x86/spec_ctrl.c | 49 ++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/cpufeatures.h | 2 +- xen/include/asm-x86/spec_ctrl_asm.h | 17 +++++++++++++ 5 files changed, 72 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index a37a3890d1..a7a1362bac 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2263,7 +2263,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). > {msr-sc,rsb,md-clear,ibpb-entry}=|{pv,hvm}=, > bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,psfd, > eager-fpu,l1d-flush,branch-harden,srb-lock, -> unpriv-mmio,gds-mit}= ]` +> unpriv-mmio,gds-mit,div-scrub}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2383,6 +2383,10 @@ has elected not to lock the configuration, Xen will use GDS_CTRL to mitigate GDS with. Otherwise, Xen will mitigate by disabling AVX, which blocks the use of the AVX2 Gather instructions. +On all hardware, the `div-scrub=` option can be used to force or prevent Xen +from mitigating the DIV-leakage vulnerability. By default, Xen will mitigate +DIV-leakage on hardware believed to be vulnerable. + ### sync_console > `= ` diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 0ff4008060..ad5ca50c12 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -72,6 +72,7 @@ __UNLIKELY_END(nsvm_hap) 1: /* No Spectre v1 concerns. Execution will hit VMRUN imminently. */ .endm ALTERNATIVE "", svm_vmentry_spec_ctrl, X86_FEATURE_SC_MSR_HVM + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV pop %r15 pop %r14 diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 082445179d..6e82a126a3 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -78,6 +79,7 @@ static int8_t __initdata opt_srb_lock = -1; static bool __initdata opt_unpriv_mmio; static bool __read_mostly opt_fb_clear_mmio; static int8_t __initdata opt_gds_mit = -1; +static int8_t __initdata opt_div_scrub = -1; static int __init parse_spec_ctrl(const char *s) { @@ -132,6 +134,7 @@ static int __init parse_spec_ctrl(const char *s) opt_srb_lock = 0; opt_unpriv_mmio = false; opt_gds_mit = 0; + opt_div_scrub = 0; } else if ( val > 0 ) rc = -EINVAL; @@ -284,6 +287,8 @@ static int __init parse_spec_ctrl(const char *s) opt_unpriv_mmio = val; else if ( (val = parse_boolean("gds-mit", s, ss)) >= 0 ) opt_gds_mit = val; + else if ( (val = parse_boolean("div-scrub", s, ss)) >= 0 ) + opt_div_scrub = val; else rc = -EINVAL; @@ -484,7 +489,7 @@ static void __init print_details(enum ind_thunk thunk) "\n"); /* Settings for Xen's protection, irrespective of guests. */ - printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s\n", + printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s%s\n", thunk == THUNK_NONE ? "N/A" : thunk == THUNK_RETPOLINE ? "RETPOLINE" : thunk == THUNK_LFENCE ? "LFENCE" : @@ -509,6 +514,7 @@ static void __init print_details(enum ind_thunk thunk) opt_l1d_flush ? " L1D_FLUSH" : "", opt_md_clear_pv || opt_md_clear_hvm || opt_fb_clear_mmio ? " VERW" : "", + opt_div_scrub ? " DIV" : "", opt_branch_harden ? " BRANCH_HARDEN" : ""); /* L1TF diagnostics, printed if vulnerable or PV shadowing is in use. */ @@ -962,6 +968,45 @@ static void __init srso_calculations(bool hw_smt_enabled) setup_force_cpu_cap(X86_FEATURE_SRSO_NO); } +/* + * The Div leakage issue is specific to the AMD Zen1 microarchitecure. + * + * However, there's no $FOO_NO bit defined, so if we're virtualised we have no + * hope of spotting the case where we might move to vulnerable hardware. We + * also can't make any useful conclusion about SMT-ness. + * + * Don't check the hypervisor bit, so at least we do the safe thing when + * booting on something that looks like a Zen1 CPU. + */ +static bool __init has_div_vuln(void) +{ + if ( !(boot_cpu_data.x86_vendor & + (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) + return false; + + if ( boot_cpu_data.x86 != 0x17 && boot_cpu_data.x86 != 0x18 ) + return false; + + return is_zen1_uarch(); +} + +static void __init div_calculations(bool hw_smt_enabled) +{ + bool cpu_bug_div = has_div_vuln(); + + if ( opt_div_scrub == -1 ) + opt_div_scrub = cpu_bug_div; + + if ( opt_div_scrub ) + setup_force_cpu_cap(X86_FEATURE_SC_DIV); + + if ( opt_smt == -1 && !cpu_has_hypervisor && cpu_bug_div && hw_smt_enabled ) + warning_add( + "Booted on leaky-DIV hardware with SMT/Hyperthreading\n" + "enabled. Please assess your configuration and choose an\n" + "explicit 'smt=' setting. See XSA-439.\n"); +} + static void __init ibpb_calculations(void) { bool def_ibpb_entry = false; @@ -1716,6 +1761,8 @@ void __init init_speculation_mitigations(void) ibpb_calculations(); + div_calculations(hw_smt_enabled); + /* Check whether Eager FPU should be enabled by default. */ if ( opt_eager_fpu == -1 ) opt_eager_fpu = should_use_eager_fpu(); diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h index ccf9d7287c..70b93b6b44 100644 --- a/xen/include/asm-x86/cpufeatures.h +++ b/xen/include/asm-x86/cpufeatures.h @@ -35,7 +35,7 @@ XEN_CPUFEATURE(SC_RSB_HVM, X86_SYNTH(19)) /* RSB overwrite needed for HVM XEN_CPUFEATURE(XEN_SELFSNOOP, X86_SYNTH(20)) /* SELFSNOOP gets used by Xen itself */ XEN_CPUFEATURE(SC_MSR_IDLE, X86_SYNTH(21)) /* Clear MSR_SPEC_CTRL on idle */ XEN_CPUFEATURE(XEN_LBR, X86_SYNTH(22)) /* Xen uses MSR_DEBUGCTL.LBR */ -/* Bits 23 unused. */ +XEN_CPUFEATURE(SC_DIV, X86_SYNTH(23)) /* DIV scrub needed */ XEN_CPUFEATURE(SC_RSB_IDLE, X86_SYNTH(24)) /* RSB overwrite needed for idle. */ XEN_CPUFEATURE(SC_VERW_IDLE, X86_SYNTH(25)) /* VERW used by Xen for idle */ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks */ diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 8a816b8cf6..0e69971f66 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -182,6 +182,19 @@ .L\@_verw_skip: .endm +.macro DO_SPEC_CTRL_DIV +/* + * Requires nothing + * Clobbers %rax + * + * Issue a DIV for its flushing side effect (Zen1 uarch specific). Any + * non-faulting DIV will do; a byte DIV has least latency, and doesn't clobber + * %rdx. + */ + mov $1, %eax + div %al +.endm + .macro DO_SPEC_CTRL_ENTRY maybexen:req /* * Requires %rsp=regs (also cpuinfo if !maybexen) @@ -284,6 +297,8 @@ ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV DO_SPEC_CTRL_COND_VERW + + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV .endm /* @@ -396,6 +411,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): verw STACK_CPUINFO_FIELD(verw_sel)(%r14) .L\@_skip_verw: + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV + .L\@_skip_ist_exit: .endm -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 03:34:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 03:34:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606075.943784 (Exim 4.92) (envelope-from ) id 1qjASj-0003BE-7v; Thu, 21 Sep 2023 03:34:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606075.943784; Thu, 21 Sep 2023 03:34:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASj-0003B7-4x; Thu, 21 Sep 2023 03:34:45 +0000 Received: by outflank-mailman (input) for mailman id 606075; Thu, 21 Sep 2023 03:34:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASh-0003Ao-G5 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjASh-0001MF-FO for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjASh-0003yB-EW for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 03:34:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gimGUJenSoXbO9UHwLNskLtqsYGNdLc2u/ZR7u1hkM0=; b=LXC5SMlgdryN3MF3hCldBrhQ28 uwPe7uclQV9s70DZtaa0/0ISG4bWf4BtsKd328BammpB/BPM2PdFXKTf1eLeuzTFM2O9mcVR9Zcy8 UWxPMfuin4OQX/O9NKEGYnhNbYXsaSLteCdEvfPhXc8JbBXt+W8F9Voy9l6TTvMyFCas=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/shadow: defer releasing of PV's top-level shadow reference Message-Id: Date: Thu, 21 Sep 2023 03:34:43 +0000 commit c450a4bc11e97eabe97dcefe06f510d7acea8d6d Author: Jan Beulich AuthorDate: Wed Sep 20 10:34:24 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 10:35:52 2023 +0100 x86/shadow: defer releasing of PV's top-level shadow reference sh_set_toplevel_shadow() re-pinning the top-level shadow we may be running on is not enough (and at the same time unnecessary when the shadow isn't what we're running on): That shadow becomes eligible for blowing away (from e.g. shadow_prealloc()) immediately after the paging lock was dropped. Yet it needs to remain valid until the actual page table switch occurred. Propagate up the call chain the shadow entry that needs releasing eventually, and carry out the release immediately after switching page tables. Handle update_cr3() failures by switching to idle pagetables. Note that various further uses of update_cr3() are HVM-only or only act on paused vCPU-s, in which case sh_set_toplevel_shadow() will not defer releasing of the reference. While changing the update_cr3() hook, also convert the "do_locking" parameter to boolean. This is CVE-2023-34322 / XSA-438. Reported-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: George Dunlap (cherry picked from commit fb0ff49fe9f784bfee0370c2a3c5f20e39d7a1cb) --- xen/arch/x86/mm.c | 27 +++++++++++++++----- xen/arch/x86/mm/hap/hap.c | 4 ++- xen/arch/x86/mm/shadow/common.c | 55 ++++++++++++++++++++++++++-------------- xen/arch/x86/mm/shadow/multi.c | 34 ++++++++++++++++--------- xen/arch/x86/mm/shadow/none.c | 3 ++- xen/arch/x86/mm/shadow/private.h | 14 +++++----- xen/arch/x86/pv/domain.c | 25 ++++++++++++++++-- xen/include/asm-x86/mm.h | 2 +- xen/include/asm-x86/paging.h | 6 ++--- xen/include/asm-x86/shadow.h | 8 ++++++ 10 files changed, 125 insertions(+), 53 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index a9b159891b..ea024c1450 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -565,15 +565,12 @@ void write_ptbase(struct vcpu *v) * * Update ref counts to shadow tables appropriately. */ -void update_cr3(struct vcpu *v) +pagetable_t update_cr3(struct vcpu *v) { mfn_t cr3_mfn; if ( paging_mode_enabled(v->domain) ) - { - paging_update_cr3(v, false); - return; - } + return paging_update_cr3(v, false); if ( !(v->arch.flags & TF_kernel_mode) ) cr3_mfn = pagetable_get_mfn(v->arch.guest_table_user); @@ -581,6 +578,8 @@ void update_cr3(struct vcpu *v) cr3_mfn = pagetable_get_mfn(v->arch.guest_table); make_cr3(v, cr3_mfn); + + return pagetable_null(); } static inline void set_tlbflush_timestamp(struct page_info *page) @@ -3254,6 +3253,7 @@ int new_guest_cr3(mfn_t mfn) struct domain *d = curr->domain; int rc; mfn_t old_base_mfn; + pagetable_t old_shadow; if ( is_pv_32bit_domain(d) ) { @@ -3321,9 +3321,22 @@ int new_guest_cr3(mfn_t mfn) if ( !VM_ASSIST(d, m2p_strict) ) fill_ro_mpt(mfn); curr->arch.guest_table = pagetable_from_mfn(mfn); - update_cr3(curr); + old_shadow = update_cr3(curr); + + /* + * In shadow mode update_cr3() can fail, in which case here we're still + * running on the prior top-level shadow (which we're about to release). + * Switch to the idle page tables in such an event; the guest will have + * been crashed already. + */ + if ( likely(!mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(curr->arch.cr3 & ~X86_CR3_NOFLUSH))) ) + write_ptbase(curr); + else + write_ptbase(idle_vcpu[curr->processor]); - write_ptbase(curr); + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(d, old_shadow); if ( likely(mfn_x(old_base_mfn) != 0) ) { diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 1f9a157a0c..fa479d3d97 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -728,10 +728,12 @@ static bool_t hap_invlpg(struct vcpu *v, unsigned long linear) return 1; } -static void hap_update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t hap_update_cr3(struct vcpu *v, bool do_locking, bool noflush) { v->arch.hvm.hw_cr[3] = v->arch.hvm.guest_cr[3]; hvm_update_guest_cr3(v, noflush); + + return pagetable_null(); } /* diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index c14a269935..242b93537f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2574,13 +2574,13 @@ void shadow_update_paging_modes(struct vcpu *v) } /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)) +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)) { mfn_t smfn; pagetable_t old_entry, new_entry; @@ -2637,20 +2637,37 @@ void sh_set_toplevel_shadow(struct vcpu *v, mfn_x(gmfn), mfn_x(pagetable_get_mfn(new_entry))); v->arch.paging.shadow.shadow_table[slot] = new_entry; - /* Decrement the refcount of the old contents of this slot */ - if ( !pagetable_is_null(old_entry) ) + /* + * Decrement the refcount of the old contents of this slot, unless + * we're still running on that shadow - in that case it'll need holding + * on to until the actual page table switch did occur. + */ + if ( !pagetable_is_null(old_entry) && (v != current || !is_pv_domain(d)) ) { - mfn_t old_smfn = pagetable_get_mfn(old_entry); - /* Need to repin the old toplevel shadow if it's been unpinned - * by shadow_prealloc(): in PV mode we're still running on this - * shadow and it's not safe to free it yet. */ - if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(d, old_smfn) ) - { - printk(XENLOG_G_ERR "can't re-pin %"PRI_mfn"\n", mfn_x(old_smfn)); - domain_crash(d); - } - sh_put_ref(d, old_smfn, 0); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + old_entry = pagetable_null(); } + + /* + * 2- and 3-level shadow mode is used for HVM only. Therefore we never run + * on such a shadow, so only call sites requesting an L4 shadow need to pay + * attention to the returned value. + */ + ASSERT(pagetable_is_null(old_entry) || root_type == SH_type_l4_64_shadow); + + return old_entry; +} + +/* + * Helper invoked when releasing of a top-level shadow's reference was + * deferred in sh_set_toplevel_shadow() above. + */ +void shadow_put_top_level(struct domain *d, pagetable_t old_entry) +{ + ASSERT(!pagetable_is_null(old_entry)); + paging_lock(d); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + paging_unlock(d); } /**************************************************************************/ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index f7acd18a36..cf3ded70e7 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3219,8 +3219,8 @@ sh_detach_old_tables(struct vcpu *v) } } -static void -sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t +sh_update_cr3(struct vcpu *v, bool do_locking, bool noflush) /* Updates vcpu->arch.cr3 after the guest has changed CR3. * Paravirtual guests should set v->arch.guest_table (and guest_table_user, * if appropriate). @@ -3234,6 +3234,7 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) { struct domain *d = v->domain; mfn_t gmfn; + pagetable_t old_entry = pagetable_null(); #if GUEST_PAGING_LEVELS == 3 && defined(CONFIG_HVM) const guest_l3e_t *gl3e; unsigned int i, guest_idx; @@ -3243,7 +3244,7 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) if ( !is_hvm_domain(d) && !v->is_initialised ) { ASSERT(v->arch.cr3 == 0); - return; + return old_entry; } if ( do_locking ) paging_lock(v->domain); @@ -3316,11 +3317,12 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) #if GUEST_PAGING_LEVELS == 4 if ( sh_remove_write_access(d, gmfn, 4, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, + sh_make_shadow); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } if ( !shadow_mode_external(d) && !is_pv_32bit_domain(d) ) { @@ -3366,24 +3368,30 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) gl2gfn = guest_l3e_get_gfn(gl3e[i]); gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sh_set_toplevel_shadow(v, i, gl2mfn, SH_type_l2_shadow, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, gl2mfn, + SH_type_l2_shadow, + sh_make_shadow); else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); } else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); + + ASSERT(pagetable_is_null(old_entry)); } } #elif GUEST_PAGING_LEVELS == 2 if ( sh_remove_write_access(d, gmfn, 2, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, + sh_make_shadow); + ASSERT(pagetable_is_null(old_entry)); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } #else #error This should never happen @@ -3477,6 +3485,8 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) /* Release the lock, if we took it (otherwise it's the caller's problem) */ if ( do_locking ) paging_unlock(v->domain); + + return old_entry; } diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index 79889b926a..2a5fd409b2 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -52,9 +52,10 @@ static unsigned long _gva_to_gfn(struct vcpu *v, struct p2m_domain *p2m, } #endif -static void _update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t _update_cr3(struct vcpu *v, bool do_locking, bool noflush) { ASSERT_UNREACHABLE(); + return pagetable_null(); } static void _update_paging_modes(struct vcpu *v) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 762214f73c..876745a401 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -391,13 +391,13 @@ mfn_t shadow_alloc(struct domain *d, void shadow_free(struct domain *d, mfn_t smfn); /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)); +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)); /* Update the shadows in response to a pagetable write from Xen */ int sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size); diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 7fe2c04aac..91f53214fd 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -424,10 +424,13 @@ bool __init xpti_pcid_enabled(void) static void _toggle_guest_pt(struct vcpu *v) { + bool guest_update; + pagetable_t old_shadow; unsigned long cr3; v->arch.flags ^= TF_kernel_mode; - update_cr3(v); + guest_update = v->arch.flags & TF_kernel_mode; + old_shadow = update_cr3(v); /* * Don't flush user global mappings from the TLB. Don't tick TLB clock. @@ -436,13 +439,31 @@ static void _toggle_guest_pt(struct vcpu *v) * TLB flush (for just the incoming PCID), as the top level page table may * have changed behind our backs. To be on the safe side, suppress the * no-flush unconditionally in this case. + * + * Furthermore in shadow mode update_cr3() can fail, in which case here + * we're still running on the prior top-level shadow (which we're about + * to release). Switch to the idle page tables in such an event; the + * guest will have been crashed already. */ cr3 = v->arch.cr3; if ( shadow_mode_enabled(v->domain) ) + { cr3 &= ~X86_CR3_NOFLUSH; + + if ( unlikely(mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(cr3))) ) + { + cr3 = idle_vcpu[v->processor]->arch.cr3; + /* Also suppress runstate/time area updates below. */ + guest_update = false; + } + } write_cr3(cr3); - if ( !(v->arch.flags & TF_kernel_mode) ) + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(v->domain, old_shadow); + + if ( !guest_update ) return; if ( v->arch.pv.need_update_runstate_area && update_runstate_area(v) ) diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index e1bcea57a8..cccef852b4 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -564,7 +564,7 @@ void audit_domains(void); #endif void make_cr3(struct vcpu *v, mfn_t mfn); -void update_cr3(struct vcpu *v); +pagetable_t update_cr3(struct vcpu *v); int vcpu_destroy_pagetables(struct vcpu *); void *do_page_walk(struct vcpu *v, unsigned long addr); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 43abaa5bd1..fceb208d36 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -138,7 +138,7 @@ struct paging_mode { paddr_t ga, uint32_t *pfec, unsigned int *page_order); #endif - void (*update_cr3 )(struct vcpu *v, int do_locking, + pagetable_t (*update_cr3 )(struct vcpu *v, bool do_locking, bool noflush); void (*update_paging_modes )(struct vcpu *v); bool (*flush_tlb )(bool (*flush_vcpu)(void *ctxt, @@ -315,9 +315,9 @@ static inline unsigned long paging_ga_to_gfn_cr3(struct vcpu *v, /* Update all the things that are derived from the guest's CR3. * Called when the guest changes CR3; the caller can then use v->arch.cr3 * as the value to load into the host CR3 to schedule this vcpu */ -static inline void paging_update_cr3(struct vcpu *v, bool noflush) +static inline pagetable_t paging_update_cr3(struct vcpu *v, bool noflush) { - paging_get_hostmode(v)->update_cr3(v, 1, noflush); + return paging_get_hostmode(v)->update_cr3(v, 1, noflush); } /* Update all the things that are derived from the guest's CR0/CR3/CR4. diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index e25f9604d8..302ae97fc6 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -97,6 +97,9 @@ void shadow_blow_tables_per_domain(struct domain *d); int shadow_set_allocation(struct domain *d, unsigned int pages, bool *preempted); +/* Helper to invoke for deferred releasing of a top-level shadow's reference. */ +void shadow_put_top_level(struct domain *d, pagetable_t old); + #else /* !CONFIG_SHADOW_PAGING */ #define shadow_vcpu_teardown(v) ASSERT(is_pv_vcpu(v)) @@ -118,6 +121,11 @@ static inline void shadow_prepare_page_type_change(struct domain *d, static inline void shadow_blow_tables_per_domain(struct domain *d) {} +static inline void shadow_put_top_level(struct domain *d, pagetable_t old) +{ + ASSERT_UNREACHABLE(); +} + static inline int shadow_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:44:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606284.944077 (Exim 4.92) (envelope-from ) id 1qjHAB-00018h-Bw; Thu, 21 Sep 2023 10:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606284.944077; Thu, 21 Sep 2023 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 1qjHAB-00018Z-9M; Thu, 21 Sep 2023 10:44:03 +0000 Received: by outflank-mailman (input) for mailman id 606284; Thu, 21 Sep 2023 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 1qjHA9-00018T-QF for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 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 1qjHA9-0004O2-Ku for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHA9-00057f-Hw for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fRoCmqPLmIm7ZmAOtNYQ7lyfVcDtULA/ncMgmkzb3Hs=; b=DjGWcwjmQBs4SoIJcTxvPwqjGi oZ5O8BixxHdbrupcD/lilSeyAecSX/sfiJeCEQuaVAqWttLjWnnmy1Yf8HEsmUJfKGeUDgpjqHemM pg5QVPsEfmMiYsksTT6zhrD95iI4TryVfEUG7p2MKvG2tL3QZgN9HyKZBbNJ7LV5E5Ik=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} Message-Id: Date: Thu, 21 Sep 2023 10:44:01 +0000 commit 1c18d73774533a55ba9d1cbee8bdace03efdb5e7 Author: Andrew Cooper AuthorDate: Tue Sep 12 15:06:49 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} c/s 3fffaf9c13e9 ("x86/entry: Avoid using alternatives in NMI/#MC paths") dropped the only user, leaving behind the (incorrect) implication that Xen had split exit paths. Delete the unused SPEC_CTRL_EXIT_TO_XEN and rename SPEC_CTRL_EXIT_TO_XEN_IST to SPEC_CTRL_EXIT_TO_XEN for consistency. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 10 ++-------- xen/arch/x86/x86_64/entry.S | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index f48f9e75e8..cfba355603 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -67,7 +67,6 @@ * - SPEC_CTRL_ENTRY_FROM_PV * - SPEC_CTRL_ENTRY_FROM_INTR * - SPEC_CTRL_ENTRY_FROM_INTR_IST - * - SPEC_CTRL_EXIT_TO_XEN_IST * - SPEC_CTRL_EXIT_TO_XEN * - SPEC_CTRL_EXIT_TO_PV * @@ -256,11 +255,6 @@ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV -/* Use when exiting to Xen context. */ -#define SPEC_CTRL_EXIT_TO_XEN \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_XEN, X86_FEATURE_SC_MSR_PV - /* Use when exiting to PV guest context. */ #define SPEC_CTRL_EXIT_TO_PV \ ALTERNATIVE "", \ @@ -327,8 +321,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen in IST context. */ -.macro SPEC_CTRL_EXIT_TO_XEN_IST +/* Use when exiting to Xen context. */ +.macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end * Clobbers %rax, %rcx, %rdx diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 81dd2c74b8..a1c860f569 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -673,7 +673,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN_IST /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ RESTORE_ALL adj=8 iretq -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:44:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606285.944081 (Exim 4.92) (envelope-from ) id 1qjHAK-0001AP-DY; Thu, 21 Sep 2023 10:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606285.944081; Thu, 21 Sep 2023 10: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 1qjHAK-0001AH-Ao; Thu, 21 Sep 2023 10:44:12 +0000 Received: by outflank-mailman (input) for mailman id 606285; Thu, 21 Sep 2023 10:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAJ-0001A3-QC for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAJ-0004OG-PU for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHAJ-000586-Mx for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+Xnp8dz4CZa7dXXscWRth9e7MEsIguLB/RRPHgvK108=; b=lg6Go85kosQgSlOhKeYQQil0sH yTaNv/lJiiBhaJ5r5rz/dl4x+QdOquPM8DqR9wDLuxdiSRVHm+kSGLCTgT1/eMx7bDEbklUkDA2Jv +6YQ7gMss2s3MjZRJe0Y7MXxuWjs4Kbs4r/Q5tZidhGQL/Jtss5+zDne19upB9fkqKTE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user Message-Id: Date: Thu, 21 Sep 2023 10:44:11 +0000 commit 694bb0f280fd08a4377e36e32b84b5062def4de2 Author: Andrew Cooper AuthorDate: Tue Sep 12 17:03:16 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user With the SPEC_CTRL_EXIT_TO_XEN{,_IST} confusion fixed, it's now obvious that there's only a single EXIT_TO_XEN path. Fold DO_SPEC_CTRL_EXIT_TO_XEN into SPEC_CTRL_EXIT_TO_XEN to simplify further fixes. When merging labels, switch the name to .L\@_skip_sc_msr as "skip" on its own is going to be too generic shortly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 40 +++++++++++++------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index cfba355603..72e7046f70 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -199,27 +199,6 @@ wrmsr .endm -.macro DO_SPEC_CTRL_EXIT_TO_XEN -/* - * Requires %rbx=stack_end - * Clobbers %rax, %rcx, %rdx - * - * When returning to Xen context, look to see whether SPEC_CTRL shadowing is - * in effect, and reload the shadow value. This covers race conditions which - * exist with an NMI/MCE/etc hitting late in the return-to-guest path. - */ - xor %edx, %edx - - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip - - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax - mov $MSR_SPEC_CTRL, %ecx - wrmsr - -.L\@_skip: -.endm - .macro DO_SPEC_CTRL_EXIT_TO_GUEST /* * Requires %eax=spec_ctrl, %rsp=regs/cpuinfo @@ -328,11 +307,24 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): * Clobbers %rax, %rcx, %rdx */ testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip + jz .L\@_skip_sc_msr - DO_SPEC_CTRL_EXIT_TO_XEN + /* + * When returning to Xen context, look to see whether SPEC_CTRL shadowing + * is in effect, and reload the shadow value. This covers race conditions + * which exist with an NMI/MCE/etc hitting late in the return-to-guest + * path. + */ + xor %edx, %edx -.L\@_skip: + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + jz .L\@_skip_sc_msr + + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov $MSR_SPEC_CTRL, %ecx + wrmsr + +.L\@_skip_sc_msr: .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:44:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:44:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606286.944085 (Exim 4.92) (envelope-from ) id 1qjHAU-0001Cz-FQ; Thu, 21 Sep 2023 10:44:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606286.944085; Thu, 21 Sep 2023 10: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 1qjHAU-0001Cq-CI; Thu, 21 Sep 2023 10:44:22 +0000 Received: by outflank-mailman (input) for mailman id 606286; Thu, 21 Sep 2023 10:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAT-0001Cg-TN for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAT-0004OY-Sh for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHAT-00058d-Ra for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=/i6SfVjj6lEqbY41wDKZAcTfppeT+HaewIvO+Ulqhpw=; b=z1/mYYXruDUHURaT5Uagtr5BTz pRN8aT223tGRtRQl+69tS39sJbr/14vzeKu9/Mu1YS0v6mYEB0+mKqLCa9KBdExUrDCmNAjAM1Y7T fuV9/rqku0LXMczqG+NnjA+AiOfP/9+Zg2SPPcJtE4erhtLBD1baMGmtxI8R2yp1cbFA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros Message-Id: Date: Thu, 21 Sep 2023 10:44:21 +0000 commit 7125429aafb9e3c9c88fc93001fc2300e0ac2cc8 Author: Andrew Cooper AuthorDate: Fri Sep 1 11:38:44 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros These have grown more complex over time, with some already having been converted. Provide full Requires/Clobbers comments, otherwise missing at this level of indirection. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 37 ++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index 72e7046f70..f768b0f48a 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -219,26 +219,45 @@ .endm /* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ -#define SPEC_CTRL_ENTRY_FROM_PV \ +.macro SPEC_CTRL_ENTRY_FROM_PV +/* + * Requires %rsp=regs/cpuinfo, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=0), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=0), \ X86_FEATURE_SC_MSR_PV +.endm /* Use in interrupt/exception context. May interrupt Xen or PV context. */ -#define SPEC_CTRL_ENTRY_FROM_INTR \ +.macro SPEC_CTRL_ENTRY_FROM_INTR +/* + * Requires %rsp=regs, %r14=stack_end, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=1), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV +.endm /* Use when exiting to PV guest context. */ -#define SPEC_CTRL_EXIT_TO_PV \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV; \ +.macro SPEC_CTRL_EXIT_TO_PV +/* + * Requires %rax=spec_ctrl, %rsp=regs/info + * Clobbers %rcx, %rdx + */ + ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV + DO_SPEC_CTRL_COND_VERW +.endm /* * Use in IST interrupt/exception context. May interrupt Xen or PV context. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:44:32 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:44:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606287.944088 (Exim 4.92) (envelope-from ) id 1qjHAe-0001FR-GF; Thu, 21 Sep 2023 10:44:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606287.944088; Thu, 21 Sep 2023 10: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 1qjHAe-0001FK-Di; Thu, 21 Sep 2023 10:44:32 +0000 Received: by outflank-mailman (input) for mailman id 606287; Thu, 21 Sep 2023 10:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAe-0001FC-0F for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAd-0004Oj-Vq for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHAd-00059K-Un for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5wB/WgmadcMqna4ttjasx68RBXhK/hvR7fpjbp+jtOY=; b=GXjdUxpBt5T0D8ajzgULE2HXT+ bjhZhcT7C8uQb89+9M5b2b1fZpDiC2z/x03xwnR/KG1p1f/Zx4GJ2KANZKRYm6iEleCs8Rwd5Hvje X/lG+7XDtCi3TNdxfTdjyQOJ26poCGl9762qoJxu2xw6aCd2OY8B1SiBlzuSYYCcIIwk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments Message-Id: Date: Thu, 21 Sep 2023 10:44:31 +0000 commit 45f00557350dc7d0756551069803fc49c29184ca Author: Andrew Cooper AuthorDate: Wed Aug 30 20:11:50 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments ... to better explain how they're used. Doing so highlights that SPEC_CTRL_EXIT_TO_XEN is missing a VERW flush for the corner case when e.g. an NMI hits late in an exit-to-guest path. Leave a TODO, which will be addressed in subsequent patches which arrange for VERW flushing to be safe within SPEC_CTRL_EXIT_TO_XEN. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 36 +++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index f768b0f48a..5a63210ce1 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -218,7 +218,10 @@ wrmsr .endm -/* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ +/* + * Used after an entry from PV context: SYSCALL, SYSENTER, INT, + * etc. There is always a guest speculation state in context. + */ .macro SPEC_CTRL_ENTRY_FROM_PV /* * Requires %rsp=regs/cpuinfo, %rdx=0 @@ -233,7 +236,11 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use in interrupt/exception context. May interrupt Xen or PV context. */ +/* + * Used after an exception or maskable interrupt, hitting Xen or PV context. + * There will either be a guest speculation context, or (barring fatal + * exceptions) a well-formed Xen speculation context. + */ .macro SPEC_CTRL_ENTRY_FROM_INTR /* * Requires %rsp=regs, %r14=stack_end, %rdx=0 @@ -248,7 +255,10 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use when exiting to PV guest context. */ +/* + * Used when exiting from any entry context, back to PV context. This + * includes from an IST entry which moved onto the primary stack. + */ .macro SPEC_CTRL_EXIT_TO_PV /* * Requires %rax=spec_ctrl, %rsp=regs/info @@ -260,7 +270,13 @@ .endm /* - * Use in IST interrupt/exception context. May interrupt Xen or PV context. + * Used after an IST entry hitting Xen or PV context. Special care is needed, + * because when hitting Xen context, there may not be a well-formed + * speculation context. (i.e. it can hit in the middle of + * SPEC_CTRL_{ENTRY,EXIT}_* regions.) + * + * An IST entry which hits PV context moves onto the primary stack and leaves + * via SPEC_CTRL_EXIT_TO_PV, *not* SPEC_CTRL_EXIT_TO_XEN. */ .macro SPEC_CTRL_ENTRY_FROM_INTR_IST /* @@ -319,7 +335,14 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen context. */ +/* + * Use when exiting from any entry context, back to Xen context. This + * includes returning to other SPEC_CTRL_{ENTRY,EXIT}_* regions with an + * incomplete speculation context. + * + * Because we might have interrupted Xen beyond SPEC_CTRL_EXIT_TO_$GUEST, we + * need to treat this as if it were an EXIT_TO_$GUEST case too. + */ .macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end @@ -344,6 +367,9 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): wrmsr .L\@_skip_sc_msr: + + /* TODO VERW */ + .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:44:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606288.944094 (Exim 4.92) (envelope-from ) id 1qjHAp-0001Io-I5; Thu, 21 Sep 2023 10:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606288.944094; Thu, 21 Sep 2023 10: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 1qjHAp-0001Ig-FB; Thu, 21 Sep 2023 10:44:43 +0000 Received: by outflank-mailman (input) for mailman id 606288; Thu, 21 Sep 2023 10:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAo-0001IW-3U for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAo-0004Oy-2r for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHAo-00059o-1p for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=f7PRyX+Xt1MQoca2r2ZqLtoitO7kkTP0urQc0btZ5ns=; b=0cNCO9b1x+itzr3vIFGMIAM/eK BR35SdeuJHX6fVBXQr5Bz7KDnW/rYweg18yjqXOdRPfpFdDU7xJWI5Y0X+tKLiQi8pRVJ4bcvRHH0 K+imOnD1PuQi3dLMwO04QL2zXDMUymEZRrguORaXEN9eSOTJDeEfFub2Op/OCYLmCfJ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/entry: Adjust restore_all_xen to hold stack_end in %r14 Message-Id: Date: Thu, 21 Sep 2023 10:44:42 +0000 commit 7aa28849a1155d856e214e9a80a7e65fffdc3e58 Author: Andrew Cooper AuthorDate: Wed Sep 13 13:48:16 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/entry: Adjust restore_all_xen to hold stack_end in %r14 All other SPEC_CTRL_{ENTRY,EXIT}_* helpers hold stack_end in %r14. Adjust it for consistency. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 8 ++++---- xen/arch/x86/x86_64/entry.S | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index 5a63210ce1..f94b818397 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -345,10 +345,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %rbx=stack_end + * Requires %r14=stack_end * Clobbers %rax, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr /* @@ -359,10 +359,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax mov $MSR_SPEC_CTRL, %ecx wrmsr diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index a1c860f569..525877e973 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -665,15 +665,15 @@ restore_all_xen: * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). */ - GET_STACK_END(bx) - cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%rbx) + GET_STACK_END(14) + cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) UNLIKELY_START(ne, exit_cr3) - mov STACK_CPUINFO_FIELD(pv_cr3)(%rbx), %rax + mov STACK_CPUINFO_FIELD(pv_cr3)(%r14), %rax mov %rax, %cr3 UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ RESTORE_ALL adj=8 iretq -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:44:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606289.944096 (Exim 4.92) (envelope-from ) id 1qjHAz-0001LO-JI; Thu, 21 Sep 2023 10:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606289.944096; Thu, 21 Sep 2023 10:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAz-0001LG-Gk; Thu, 21 Sep 2023 10:44:53 +0000 Received: by outflank-mailman (input) for mailman id 606289; Thu, 21 Sep 2023 10:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAy-0001L7-9q for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHAy-0004PC-5v for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHAy-0005Av-4x for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=SnHpxwNYt+iCVTqrwk8teJQTCZvzERwKUAYYDKO/Lzk=; b=rgM9TNZAxCEkFSHUNTNenXBmrY rpbS+R+PhdReO6zb4nNDVpqJO+EgCsMtKTGWBAvAPy5iuvq1ptoIxgd6ZxkU+vQjtP3sSNlCCGgpI QazHBmBP5dpf4nBwwRv2Vac1jUqL1bXtPXQ7dCqgCqCuE6VCmV64O3cW041s4hOSfLbM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/entry: Track the IST-ness of an entry for the exit paths Message-Id: Date: Thu, 21 Sep 2023 10:44:52 +0000 commit 21bdc25b05a0f8ab6bc73520a9ca01327360732c Author: Andrew Cooper AuthorDate: Wed Sep 13 12:20:12 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/entry: Track the IST-ness of an entry for the exit paths Use %r12 to hold an ist_exit boolean. This register is zero elsewhere in the entry/exit asm, so it only needs setting in the IST path. As this is subtle and fragile, add check_ist_exit() to be used in debugging builds to cross-check that the ist_exit boolean matches the entry vector. Write check_ist_exit() it in C, because it's debug only and the logic more complicated than I care to maintain in asm. For now, we only need to use this signal in the exit-to-Xen path, but some exit-to-guest paths happen in IST context too. Check the correctness in all exit paths to avoid the logic bit-rotting. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 13 +++++++++++++ xen/arch/x86/x86_64/compat/entry.S | 9 ++++++++- xen/arch/x86/x86_64/entry.S | 22 ++++++++++++++++++++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index dead728ce3..0a005f088b 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2259,6 +2259,19 @@ void asm_domain_crash_synchronous(unsigned long addr) do_softirq(); } +#ifdef CONFIG_DEBUG +void check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) +{ + const unsigned int ist_mask = + (1U << X86_EXC_NMI) | (1U << X86_EXC_DB) | + (1U << X86_EXC_DF) | (1U << X86_EXC_MC); + uint8_t ev = regs->entry_vector; + bool is_ist = (ev < X86_EXC_NUM) && ((1U << ev) & ist_mask); + + ASSERT(is_ist == ist_exit); +} +#endif + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index bd5abd8040..7504bfb4f3 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -117,8 +117,15 @@ compat_process_trap: call compat_create_bounce_frame jmp compat_test_all_events -/* %rbx: struct vcpu, interrupts disabled */ +/* %rbx: struct vcpu, %r12: ist_exit, interrupts disabled */ ENTRY(compat_restore_all_guest) + +#ifdef CONFIG_DEBUG + mov %rsp, %rdi + mov %r12, %rsi + call check_ist_exit +#endif + ASSERT_INTERRUPTS_DISABLED mov $~(X86_EFLAGS_IOPL | X86_EFLAGS_VM), %r11d and UREGS_eflags(%rsp),%r11d diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 525877e973..e5055e5bbf 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -142,8 +142,15 @@ process_trap: .section .text.entry, "ax", @progbits -/* %rbx: struct vcpu, interrupts disabled */ +/* %rbx: struct vcpu, %r12: ist_exit, interrupts disabled */ restore_all_guest: + +#ifdef CONFIG_DEBUG + mov %rsp, %rdi + mov %r12, %rsi + call check_ist_exit +#endif + ASSERT_INTERRUPTS_DISABLED /* Stash guest SPEC_CTRL value while we can read struct vcpu. */ @@ -659,8 +666,15 @@ ENTRY(early_page_fault) .section .text.entry, "ax", @progbits ALIGN -/* No special register assumptions. */ +/* %r12=ist_exit */ restore_all_xen: + +#ifdef CONFIG_DEBUG + mov %rsp, %rdi + mov %r12, %rsi + call check_ist_exit +#endif + /* * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). @@ -1087,6 +1101,10 @@ handle_ist_exception: .L_ist_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %bl, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) + + /* This is an IST exit */ + mov $1, %r12d + cmpb $X86_EXC_NMI, UREGS_entry_vector(%rsp) jne ret_from_intr -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:45:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606290.944101 (Exim 4.92) (envelope-from ) id 1qjHB9-0001OO-Mz; Thu, 21 Sep 2023 10:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606290.944101; Thu, 21 Sep 2023 10:45:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHB9-0001OG-K7; Thu, 21 Sep 2023 10:45:03 +0000 Received: by outflank-mailman (input) for mailman id 606290; Thu, 21 Sep 2023 10:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHB8-0001O4-9Q for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHB8-0004Q6-8t for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHB8-0005Ba-82 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=KzMnVGBcg01JvmPy+VuVqancD86hHM3RZMNysOg4/Rs=; b=laRG2hEZWhL4tybw34Db78QMfG 7JUpyOqUnVRm+1oaUXgT4agyG9Dyyz/d52imGUyxEaXAzq4RIVKhO3ijGA/D59VdCpG0bv/9c012E GkuVYXW9M3CYzUjQCLLHPEV3BVhbe85ZzIzByMaPAVG5YlIkwfAfj9snM+CAE1Zk4m1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Issue VERW during IST exit to Xen Message-Id: Date: Thu, 21 Sep 2023 10:45:02 +0000 commit 3ee6066bcd737756b0990d417d94eddc0b0d2585 Author: Andrew Cooper AuthorDate: Wed Sep 13 13:53:33 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/spec-ctrl: Issue VERW during IST exit to Xen There is a corner case where e.g. an NMI hitting an exit-to-guest path after SPEC_CTRL_EXIT_TO_* would have run the entire NMI handler *after* the VERW flush to scrub potentially sensitive data from uarch buffers. In order to compensate, issue VERW when exiting to Xen from an IST entry. SPEC_CTRL_EXIT_TO_XEN already has two reads of spec_ctrl_flags off the stack, and we're about to add a third. Load the field into %ebx, and list the register as clobbered. %r12 has been arranged to be the ist_exit signal, so add this as an input dependency and use it to identify when to issue a VERW. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 20 +++++++++++++++----- xen/arch/x86/x86_64/entry.S | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index f94b818397..343886b6b6 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -345,10 +345,12 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %r14=stack_end - * Clobbers %rax, %rcx, %rdx + * Requires %r12=ist_exit, %r14=stack_end + * Clobbers %rax, %rbx, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + movzbl STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14), %ebx + + testb $SCF_ist_sc_msr, %bl jz .L\@_skip_sc_msr /* @@ -359,7 +361,7 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + testb $SCF_use_shadow, %bl jz .L\@_skip_sc_msr mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax @@ -368,8 +370,16 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): .L\@_skip_sc_msr: - /* TODO VERW */ + test %r12, %r12 + jz .L\@_skip_ist_exit + + /* Logically DO_SPEC_CTRL_COND_VERW but without the %rsp=cpuinfo dependency */ + testb $SCF_verw, %bl + jz .L\@_skip_verw + verw STACK_CPUINFO_FIELD(verw_sel)(%r14) +.L\@_skip_verw: +.L\@_skip_ist_exit: .endm #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index e5055e5bbf..988ef6cbc6 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -687,7 +687,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r12=ist_exit %r14=end, Clob: abcd */ RESTORE_ALL adj=8 iretq -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:45:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606292.944105 (Exim 4.92) (envelope-from ) id 1qjHBJ-0001R9-OE; Thu, 21 Sep 2023 10:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606292.944105; Thu, 21 Sep 2023 10:45:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBJ-0001R1-LY; Thu, 21 Sep 2023 10:45:13 +0000 Received: by outflank-mailman (input) for mailman id 606292; Thu, 21 Sep 2023 10:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBI-0001Qn-E7 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBI-0004QF-C1 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHBI-0005CC-B6 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=OQhM1Iw1gRqyhyWSpxe4NqXdmrfhl1eRpuP/d54lqys=; b=4MvgjXO+hbZ0MzMbYdQe+WV/sm ou05rkr1qz4AFlR0yQLtITCVYxZ/ZceLEwi5nptbpak7waniwiMiulhaH+cYht7GHUmrUJCOproEB sU7EYz59fhED1bS2OVGmkkL22AXJt4yyR/WdbeDfq2yv23iU1hp/abTAFD9dYKOvpVx8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/amd: Introduce is_zen{1,2}_uarch() predicates Message-Id: Date: Thu, 21 Sep 2023 10:45:12 +0000 commit de1d265001397f308c5c3c5d3ffc30e7ef8c0705 Author: Andrew Cooper AuthorDate: Fri Sep 15 12:13:51 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/amd: Introduce is_zen{1,2}_uarch() predicates We already have 3 cases using STIBP as a Zen1/2 heuristic, and are about to introduce a 4th. Wrap the heuristic into a pair of predicates rather than opencoding it, and the explanation of the heuristic, at each usage site. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 18 ++++-------------- xen/arch/x86/include/asm/amd.h | 11 +++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index bbf7887f2e..4f27187f92 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -882,15 +882,13 @@ void amd_set_legacy_ssbd(bool enable) * non-branch instructions to be ignored. It is to be set unilaterally in * newer microcode. * - * This chickenbit is something unrelated on Zen1, and Zen1 vs Zen2 isn't a - * simple model number comparison, so use STIBP as a heuristic to separate the - * two uarches in Fam17h(AMD)/18h(Hygon). + * This chickenbit is something unrelated on Zen1. */ void amd_init_spectral_chicken(void) { uint64_t val, chickenbit = 1 << 1; - if (cpu_has_hypervisor || !boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (cpu_has_hypervisor || !is_zen2_uarch()) return; if (rdmsr_safe(MSR_AMD64_DE_CFG2, val) == 0 && !(val & chickenbit)) @@ -939,11 +937,8 @@ void amd_check_zenbleed(void) * With the Fam17h check above, most parts getting here are * Zen1. They're not affected. Assume Zen2 ones making it * here are affected regardless of microcode version. - * - * Zen1 vs Zen2 isn't a simple model number comparison, so use - * STIBP as a heuristic to distinguish. */ - if (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (is_zen1_uarch()) return; good_rev = ~0U; break; @@ -1298,12 +1293,7 @@ static int __init cf_check zen2_c6_errata_check(void) */ s_time_t delta; - /* - * Zen1 vs Zen2 isn't a simple model number comparison, so use STIBP as - * a heuristic to separate the two uarches in Fam17h. - */ - if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || - !boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || !is_zen2_uarch()) return 0; /* diff --git a/xen/arch/x86/include/asm/amd.h b/xen/arch/x86/include/asm/amd.h index 09ee52dc1c..d862cb7972 100644 --- a/xen/arch/x86/include/asm/amd.h +++ b/xen/arch/x86/include/asm/amd.h @@ -140,6 +140,17 @@ AMD_MODEL_RANGE(0x11, 0x0, 0x0, 0xff, 0xf), \ AMD_MODEL_RANGE(0x12, 0x0, 0x0, 0xff, 0xf)) +/* + * The Zen1 and Zen2 microarchitectures are implemented by AMD (Fam17h) and + * Hygon (Fam18h) but without simple model number rules. Instead, use STIBP + * as a heuristic that distinguishes the two. + * + * The caller is required to perform the appropriate vendor/family checks + * first. + */ +#define is_zen1_uarch() (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) +#define is_zen2_uarch() boot_cpu_has(X86_FEATURE_AMD_STIBP) + struct cpuinfo_x86; int cpu_has_amd_erratum(const struct cpuinfo_x86 *, int, ...); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:45:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:45:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606293.944110 (Exim 4.92) (envelope-from ) id 1qjHBT-0001TR-QC; Thu, 21 Sep 2023 10:45:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606293.944110; Thu, 21 Sep 2023 10:45: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 1qjHBT-0001TJ-N2; Thu, 21 Sep 2023 10:45:23 +0000 Received: by outflank-mailman (input) for mailman id 606293; Thu, 21 Sep 2023 10:45:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBS-0001T7-G2 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBS-0004RH-FN for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHBS-0005Cd-EU for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=SksqulNqqh5877g669aL0y6Ty0n7hRXBIW5uaUdcajM=; b=ZokT+FyAIX5xOqdsz5c8SZWbL5 /rquOhySSqne/iInYtnhGgkdoJRtGwFARR9fiC5aoZ3hDt83mM9ejQVzbVVw8MKcZ1ki5PLVplm2X 0MoJRlX6rtirn2PXZe15oP9ZAUbWU1FbGHTPnlq9j0gRoAXIb7/JDaBqT8rIle7aztyU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Mitigate the Zen1 DIV leakage Message-Id: Date: Thu, 21 Sep 2023 10:45:22 +0000 commit b5926c6ecf05c28ee99c6248c42d691ccbf0c315 Author: Andrew Cooper AuthorDate: Wed Aug 30 20:24:25 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 18 16:43:01 2023 +0100 x86/spec-ctrl: Mitigate the Zen1 DIV leakage In the Zen1 microarchitecure, there is one divider in the pipeline which services uops from both threads. In the case of #DE, the latched result from the previous DIV to execute will be forwarded speculatively. This is an interesting covert channel that allows two threads to communicate without any system calls. In also allows userspace to obtain the result of the most recent DIV instruction executed (even speculatively) in the core, which can be from a higher privilege context. Scrub the result from the divider by executing a non-faulting divide. This needs performing on the exit-to-guest paths, and ist_exit-to-Xen. Alternatives in IST context is believed safe now that it's done in NMI context. This is XSA-439 / CVE-2023-20588. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 6 +++- xen/arch/x86/hvm/svm/entry.S | 1 + xen/arch/x86/include/asm/cpufeatures.h | 2 +- xen/arch/x86/include/asm/spec_ctrl_asm.h | 17 +++++++++++ xen/arch/x86/spec_ctrl.c | 48 +++++++++++++++++++++++++++++++- 5 files changed, 71 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index f88e6a70ae..7acd688856 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2353,7 +2353,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). > {msr-sc,rsb,md-clear,ibpb-entry}=|{pv,hvm}=, > bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,psfd, > eager-fpu,l1d-flush,branch-harden,srb-lock, -> unpriv-mmio,gds-mit}= ]` +> unpriv-mmio,gds-mit,div-scrub}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2475,6 +2475,10 @@ has elected not to lock the configuration, Xen will use GDS_CTRL to mitigate GDS with. Otherwise, Xen will mitigate by disabling AVX, which blocks the use of the AVX2 Gather instructions. +On all hardware, the `div-scrub=` option can be used to force or prevent Xen +from mitigating the DIV-leakage vulnerability. By default, Xen will mitigate +DIV-leakage on hardware believed to be vulnerable. + ### sync_console > `= ` diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 9effd2199b..c52528fed4 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -72,6 +72,7 @@ __UNLIKELY_END(nsvm_hap) 1: /* No Spectre v1 concerns. Execution will hit VMRUN imminently. */ .endm ALTERNATIVE "", svm_vmentry_spec_ctrl, X86_FEATURE_SC_MSR_HVM + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV pop %r15 pop %r14 diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index da0593de85..c3aad21c3b 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -35,7 +35,7 @@ XEN_CPUFEATURE(SC_RSB_HVM, X86_SYNTH(19)) /* RSB overwrite needed for HVM XEN_CPUFEATURE(XEN_SELFSNOOP, X86_SYNTH(20)) /* SELFSNOOP gets used by Xen itself */ XEN_CPUFEATURE(SC_MSR_IDLE, X86_SYNTH(21)) /* Clear MSR_SPEC_CTRL on idle */ XEN_CPUFEATURE(XEN_LBR, X86_SYNTH(22)) /* Xen uses MSR_DEBUGCTL.LBR */ -/* Bits 23 unused. */ +XEN_CPUFEATURE(SC_DIV, X86_SYNTH(23)) /* DIV scrub needed */ XEN_CPUFEATURE(SC_RSB_IDLE, X86_SYNTH(24)) /* RSB overwrite needed for idle. */ XEN_CPUFEATURE(SC_VERW_IDLE, X86_SYNTH(25)) /* VERW used by Xen for idle */ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks */ diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index 343886b6b6..6cb7c1b949 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -165,6 +165,19 @@ .L\@_verw_skip: .endm +.macro DO_SPEC_CTRL_DIV +/* + * Requires nothing + * Clobbers %rax + * + * Issue a DIV for its flushing side effect (Zen1 uarch specific). Any + * non-faulting DIV will do; a byte DIV has least latency, and doesn't clobber + * %rdx. + */ + mov $1, %eax + div %al +.endm + .macro DO_SPEC_CTRL_ENTRY maybexen:req /* * Requires %rsp=regs (also cpuinfo if !maybexen) @@ -267,6 +280,8 @@ ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV DO_SPEC_CTRL_COND_VERW + + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV .endm /* @@ -379,6 +394,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): verw STACK_CPUINFO_FIELD(verw_sel)(%r14) .L\@_skip_verw: + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV + .L\@_skip_ist_exit: .endm diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 9b8fdb5303..6fd7d44ce4 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -67,6 +67,7 @@ static int8_t __initdata opt_srb_lock = -1; static bool __initdata opt_unpriv_mmio; static bool __ro_after_init opt_fb_clear_mmio; static int8_t __initdata opt_gds_mit = -1; +static int8_t __initdata opt_div_scrub = -1; static int __init cf_check parse_spec_ctrl(const char *s) { @@ -121,6 +122,7 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_srb_lock = 0; opt_unpriv_mmio = false; opt_gds_mit = 0; + opt_div_scrub = 0; } else if ( val > 0 ) rc = -EINVAL; @@ -273,6 +275,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_unpriv_mmio = val; else if ( (val = parse_boolean("gds-mit", s, ss)) >= 0 ) opt_gds_mit = val; + else if ( (val = parse_boolean("div-scrub", s, ss)) >= 0 ) + opt_div_scrub = val; else rc = -EINVAL; @@ -473,7 +477,7 @@ static void __init print_details(enum ind_thunk thunk) "\n"); /* Settings for Xen's protection, irrespective of guests. */ - printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s\n", + printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s%s\n", thunk == THUNK_NONE ? "N/A" : thunk == THUNK_RETPOLINE ? "RETPOLINE" : thunk == THUNK_LFENCE ? "LFENCE" : @@ -498,6 +502,7 @@ static void __init print_details(enum ind_thunk thunk) opt_l1d_flush ? " L1D_FLUSH" : "", opt_md_clear_pv || opt_md_clear_hvm || opt_fb_clear_mmio ? " VERW" : "", + opt_div_scrub ? " DIV" : "", opt_branch_harden ? " BRANCH_HARDEN" : ""); /* L1TF diagnostics, printed if vulnerable or PV shadowing is in use. */ @@ -955,6 +960,45 @@ static void __init srso_calculations(bool hw_smt_enabled) setup_force_cpu_cap(X86_FEATURE_SRSO_NO); } +/* + * The Div leakage issue is specific to the AMD Zen1 microarchitecure. + * + * However, there's no $FOO_NO bit defined, so if we're virtualised we have no + * hope of spotting the case where we might move to vulnerable hardware. We + * also can't make any useful conclusion about SMT-ness. + * + * Don't check the hypervisor bit, so at least we do the safe thing when + * booting on something that looks like a Zen1 CPU. + */ +static bool __init has_div_vuln(void) +{ + if ( !(boot_cpu_data.x86_vendor & + (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) + return false; + + if ( boot_cpu_data.x86 != 0x17 && boot_cpu_data.x86 != 0x18 ) + return false; + + return is_zen1_uarch(); +} + +static void __init div_calculations(bool hw_smt_enabled) +{ + bool cpu_bug_div = has_div_vuln(); + + if ( opt_div_scrub == -1 ) + opt_div_scrub = cpu_bug_div; + + if ( opt_div_scrub ) + setup_force_cpu_cap(X86_FEATURE_SC_DIV); + + if ( opt_smt == -1 && !cpu_has_hypervisor && cpu_bug_div && hw_smt_enabled ) + warning_add( + "Booted on leaky-DIV hardware with SMT/Hyperthreading\n" + "enabled. Please assess your configuration and choose an\n" + "explicit 'smt=' setting. See XSA-439.\n"); +} + static void __init ibpb_calculations(void) { bool def_ibpb_entry = false; @@ -1714,6 +1758,8 @@ void __init init_speculation_mitigations(void) ibpb_calculations(); + div_calculations(hw_smt_enabled); + /* Check whether Eager FPU should be enabled by default. */ if ( opt_eager_fpu == -1 ) opt_eager_fpu = should_use_eager_fpu(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:45:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:45:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606294.944113 (Exim 4.92) (envelope-from ) id 1qjHBd-0001Vr-RS; Thu, 21 Sep 2023 10:45:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606294.944113; Thu, 21 Sep 2023 10:45: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 1qjHBd-0001Vh-OX; Thu, 21 Sep 2023 10:45:33 +0000 Received: by outflank-mailman (input) for mailman id 606294; Thu, 21 Sep 2023 10:45:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBc-0001VL-K8 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBc-0004SF-JT for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHBc-0005D7-HR for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=vy7/CbH6h4eUc95s6znHiyrK+6/6/uxoTCqOnk4AaXs=; b=dgIxUGZRyzex1j4CSVfOmD3RKZ c57y3nAnEij8CDDY9SS/qU2pZDRBEU+RLbkTAiZaBGzzE2DtVUnYTnTcfWYK64znfg7xRmildVQk1 I6Gn+Uxsgl9wophPfoMJ6XTlsgQVhKgDGu35FlgN4upDzPtfAUFUpXH/gTcCwRF2H9d8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/vPCI: address violation of MISRA C:2012 Rule 8.3 Message-Id: Date: Thu, 21 Sep 2023 10:45:32 +0000 commit 93d2ee85f189aab6d8326871b9991469d795fbc9 Author: Federico Serafini AuthorDate: Tue Sep 19 11:01:56 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 19 11:01:56 2023 +0200 xen/vPCI: address violation of MISRA C:2012 Rule 8.3 Make function declaration consistent with the corresponding definition. No functional change. Signed-off-by: Federico Serafini Acked-by: Roger Pau Monné --- xen/include/xen/vpci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 0b8a2a3c74..d743d96a10 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -26,7 +26,7 @@ typedef int vpci_register_init_t(struct pci_dev *dev); __used_section(".data.vpci." p) = x /* Add vPCI handlers to device. */ -int __must_check vpci_add_handlers(struct pci_dev *dev); +int __must_check vpci_add_handlers(struct pci_dev *pdev); /* Remove all handlers and free vpci related structures. */ void vpci_remove_device(struct pci_dev *pdev); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:45:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:45:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606295.944117 (Exim 4.92) (envelope-from ) id 1qjHBn-0001YG-Sq; Thu, 21 Sep 2023 10:45:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606295.944117; Thu, 21 Sep 2023 10:45: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 1qjHBn-0001Y8-Q0; Thu, 21 Sep 2023 10:45:43 +0000 Received: by outflank-mailman (input) for mailman id 606295; Thu, 21 Sep 2023 10:45:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBm-0001Xp-ND for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBm-0004SV-MS for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHBm-0005DW-Lc for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=FYuZI99LIX6XaQINCFeZBjqWt9w6eys9Bo+WIxbxYpI=; b=0k/pB1nQk2DUW9ZwTR1YhY8ewO tyEdPbM4ZJzUB4DX7maQoovuvolrhj73uBvMgHOFFo2s6Pkq75ljqmF1CQ9nT2J3eaM2qIObG3ql7 AfSziz0/7hDDbomDP46AG8CJ0snmBHREGA5wMounVjDLmA72SPOmElE0Q9Np5bunHHO0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: Fix logging of MADT entries Message-Id: Date: Thu, 21 Sep 2023 10:45:42 +0000 commit fa6696e63b6e490f3348ad973b30e361d68e366f Author: Simon Gaiser AuthorDate: Tue Sep 19 11:02:13 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 19 11:02:13 2023 +0200 x86/ACPI: Fix logging of MADT entries The recent change to ignore MADT entries with invalid APIC IDs also affected logging of MADT entries. That's not desired [1] [2], so restore the old behavior. Fixes: 47342d8f490c ("x86/ACPI: Ignore entries with invalid APIC IDs when parsing MADT") Link: https://lore.kernel.org/xen-devel/0bd3583c-a55d-9a68-55b1-c383499d46d8@suse.com/ # [1] Link: https://lore.kernel.org/xen-devel/f780d40e-c828-c57a-b19c-16ee15c1454a@suse.com/ # [2] Signed-off-by: Simon Gaiser Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/boot.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index ead41bd535..170f9783c5 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -87,21 +87,22 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) if (BAD_MADT_ENTRY(processor, end)) return -EINVAL; - /* Ignore entries with invalid x2APIC ID */ - if (processor->local_apic_id == 0xffffffff) - return 0; - /* Don't register processors that cannot be onlined. */ if (madt_revision >= 5 && !(processor->lapic_flags & ACPI_MADT_ENABLED) && !(processor->lapic_flags & ACPI_MADT_ONLINE_CAPABLE)) return 0; - if ((processor->lapic_flags & ACPI_MADT_ENABLED) || opt_cpu_info) { + if ((processor->lapic_flags & ACPI_MADT_ENABLED) || + processor->local_apic_id != 0xffffffff || opt_cpu_info) { acpi_table_print_madt_entry(header); log = true; } + /* Ignore entries with invalid x2APIC ID */ + if (processor->local_apic_id == 0xffffffff) + return 0; + /* Record local apic id only when enabled and fitting. */ if (processor->local_apic_id >= MAX_APICS || processor->uid >= MAX_MADT_ENTRIES) { @@ -146,19 +147,20 @@ acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end) if (BAD_MADT_ENTRY(processor, end)) return -EINVAL; - /* Ignore entries with invalid APIC ID */ - if (processor->id == 0xff) - return 0; - /* Don't register processors that cannot be onlined. */ if (madt_revision >= 5 && !(processor->lapic_flags & ACPI_MADT_ENABLED) && !(processor->lapic_flags & ACPI_MADT_ONLINE_CAPABLE)) return 0; - if ((processor->lapic_flags & ACPI_MADT_ENABLED) || opt_cpu_info) + if ((processor->lapic_flags & ACPI_MADT_ENABLED) || + processor->id != 0xff || opt_cpu_info) acpi_table_print_madt_entry(header); + /* Ignore entries with invalid APIC ID */ + if (processor->id == 0xff) + return 0; + /* Record local apic id only when enabled */ if (processor->lapic_flags & ACPI_MADT_ENABLED) { x86_acpiid_to_apicid[processor->processor_id] = processor->id; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:45:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606296.944121 (Exim 4.92) (envelope-from ) id 1qjHBx-0001bx-Vz; Thu, 21 Sep 2023 10:45:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606296.944121; Thu, 21 Sep 2023 10:45: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 1qjHBx-0001bq-T5; Thu, 21 Sep 2023 10:45:53 +0000 Received: by outflank-mailman (input) for mailman id 606296; Thu, 21 Sep 2023 10:45:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBw-0001bY-QX for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHBw-0004Sg-Pj for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:45:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHBw-0005Dx-Op for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10: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=ySKFObEwKeav108MWcW1IqNhohPYoNJ3Z4M/Qjx2gtM=; b=mC1EU5gzOzAjJTaXDIg8HtUTFH yrbkn6oZ6CQKl6YyhjZINvcpkM2+A+mqOT3WrQeymIvkMktGkJLSKydV9OKh5pzz4sfqc5GaT+DLA hJu8VuOZlkZdxn5+UFx7PhJjKLhlbHHW+FMpy14QrLaYMqCaDQ2O5nelGnEldlt6SRLQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Define minimal stub headers required for full build Message-Id: Date: Thu, 21 Sep 2023 10:45:52 +0000 commit 4a2f68f90930458903589aefa2bef7b368af3df4 Author: Shawn Anastasio AuthorDate: Thu Sep 14 14:03:32 2023 -0500 Commit: Jan Beulich CommitDate: Tue Sep 19 11:03:18 2023 +0200 xen/ppc: Define minimal stub headers required for full build Additionally, change inclusion of asm/ headers to corresponding xen/ ones throughout arch/ppc now that they work. Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/Kconfig | 1 + xen/arch/ppc/include/asm/Makefile | 2 + xen/arch/ppc/include/asm/altp2m.h | 25 ++++ xen/arch/ppc/include/asm/bug.h | 9 ++ xen/arch/ppc/include/asm/cache.h | 2 + xen/arch/ppc/include/asm/config.h | 10 ++ xen/arch/ppc/include/asm/cpufeature.h | 10 ++ xen/arch/ppc/include/asm/current.h | 43 ++++++ xen/arch/ppc/include/asm/delay.h | 12 ++ xen/arch/ppc/include/asm/device.h | 53 +++++++ xen/arch/ppc/include/asm/div64.h | 14 ++ xen/arch/ppc/include/asm/domain.h | 47 ++++++ xen/arch/ppc/include/asm/event.h | 36 +++++ xen/arch/ppc/include/asm/flushtlb.h | 24 +++ xen/arch/ppc/include/asm/grant_table.h | 5 + xen/arch/ppc/include/asm/guest_access.h | 68 +++++++++ xen/arch/ppc/include/asm/guest_atomics.h | 23 +++ xen/arch/ppc/include/asm/hardirq.h | 19 +++ xen/arch/ppc/include/asm/hypercall.h | 5 + xen/arch/ppc/include/asm/io.h | 16 ++ xen/arch/ppc/include/asm/iocap.h | 8 + xen/arch/ppc/include/asm/iommu.h | 8 + xen/arch/ppc/include/asm/irq.h | 33 +++++ xen/arch/ppc/include/asm/mem_access.h | 5 + xen/arch/ppc/include/asm/mm.h | 243 ++++++++++++++++++++++++++++++- xen/arch/ppc/include/asm/monitor.h | 43 ++++++ xen/arch/ppc/include/asm/nospec.h | 15 ++ xen/arch/ppc/include/asm/numa.h | 26 ++++ xen/arch/ppc/include/asm/p2m.h | 95 ++++++++++++ xen/arch/ppc/include/asm/page.h | 18 +++ xen/arch/ppc/include/asm/paging.h | 7 + xen/arch/ppc/include/asm/pci.h | 7 + xen/arch/ppc/include/asm/percpu.h | 24 +++ xen/arch/ppc/include/asm/processor.h | 10 ++ xen/arch/ppc/include/asm/random.h | 9 ++ xen/arch/ppc/include/asm/setup.h | 6 + xen/arch/ppc/include/asm/smp.h | 18 +++ xen/arch/ppc/include/asm/softirq.h | 8 + xen/arch/ppc/include/asm/spinlock.h | 15 ++ xen/arch/ppc/include/asm/system.h | 219 +++++++++++++++++++++++++++- xen/arch/ppc/include/asm/time.h | 23 +++ xen/arch/ppc/include/asm/xenoprof.h | 0 xen/arch/ppc/mm-radix.c | 2 +- xen/arch/ppc/tlb-radix.c | 2 +- xen/include/public/hvm/save.h | 2 + xen/include/public/pmu.h | 2 + xen/include/public/xen.h | 2 + 47 files changed, 1270 insertions(+), 4 deletions(-) diff --git a/xen/arch/ppc/Kconfig b/xen/arch/ppc/Kconfig index ab116ffb2a..a6eae597af 100644 --- a/xen/arch/ppc/Kconfig +++ b/xen/arch/ppc/Kconfig @@ -1,6 +1,7 @@ config PPC def_bool y select HAS_DEVICE_TREE + select HAS_PDX config PPC64 def_bool y diff --git a/xen/arch/ppc/include/asm/Makefile b/xen/arch/ppc/include/asm/Makefile new file mode 100644 index 0000000000..821addb0bf --- /dev/null +++ b/xen/arch/ppc/include/asm/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +generic-y += vm_event.h diff --git a/xen/arch/ppc/include/asm/altp2m.h b/xen/arch/ppc/include/asm/altp2m.h new file mode 100644 index 0000000000..bd5c9aa415 --- /dev/null +++ b/xen/arch/ppc/include/asm/altp2m.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_ALTP2M_H__ +#define __ASM_PPC_ALTP2M_H__ + +#include + +struct domain; +struct vcpu; + +/* Alternate p2m on/off per domain */ +static inline bool altp2m_active(const struct domain *d) +{ + /* Not implemented on PPC. */ + return false; +} + +/* Alternate p2m VCPU */ +static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +{ + /* Not implemented on PPC, should not be reached. */ + ASSERT_UNREACHABLE(); + return 0; +} + +#endif /* __ASM_PPC_ALTP2M_H__ */ diff --git a/xen/arch/ppc/include/asm/bug.h b/xen/arch/ppc/include/asm/bug.h index e5e874b31c..35d4568402 100644 --- a/xen/arch/ppc/include/asm/bug.h +++ b/xen/arch/ppc/include/asm/bug.h @@ -4,6 +4,7 @@ #define _ASM_PPC_BUG_H #include +#include /* * Power ISA guarantees that an instruction consisting of all zeroes is @@ -15,4 +16,12 @@ #define BUG_FN_REG r0 +/* TODO: implement this properly */ +#define BUG() do { \ + die(); \ +} while (0) + +/* TODO: implement this properly */ +#define BUG_FRAME(type, line, ptr, second_frame, msg) do { } while (0) + #endif /* _ASM_PPC_BUG_H */ diff --git a/xen/arch/ppc/include/asm/cache.h b/xen/arch/ppc/include/asm/cache.h index 8a0a6b7b17..0d7323d789 100644 --- a/xen/arch/ppc/include/asm/cache.h +++ b/xen/arch/ppc/include/asm/cache.h @@ -3,4 +3,6 @@ #ifndef _ASM_PPC_CACHE_H #define _ASM_PPC_CACHE_H +#define __read_mostly __section(".data.read_mostly") + #endif /* _ASM_PPC_CACHE_H */ diff --git a/xen/arch/ppc/include/asm/config.h b/xen/arch/ppc/include/asm/config.h index 30438d22d2..a11a09c570 100644 --- a/xen/arch/ppc/include/asm/config.h +++ b/xen/arch/ppc/include/asm/config.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef __PPC_CONFIG_H__ #define __PPC_CONFIG_H__ @@ -41,6 +42,15 @@ #define XEN_VIRT_START _AC(0xc000000000000000, UL) +#define VMAP_VIRT_START (XEN_VIRT_START + GB(1)) +#define VMAP_VIRT_SIZE GB(1) + +#define FRAMETABLE_VIRT_START (XEN_VIRT_START + GB(32)) +#define FRAMETABLE_SIZE GB(32) +#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) + +#define HYPERVISOR_VIRT_START XEN_VIRT_START + #define SMP_CACHE_BYTES (1 << 6) #define STACK_ORDER 0 diff --git a/xen/arch/ppc/include/asm/cpufeature.h b/xen/arch/ppc/include/asm/cpufeature.h new file mode 100644 index 0000000000..1c5946512b --- /dev/null +++ b/xen/arch/ppc/include/asm/cpufeature.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_CPUFEATURE_H__ +#define __ASM_PPC_CPUFEATURE_H__ + +static inline int cpu_nr_siblings(unsigned int cpu) +{ + return 1; +} + +#endif /* __ASM_PPC_CPUFEATURE_H__ */ diff --git a/xen/arch/ppc/include/asm/current.h b/xen/arch/ppc/include/asm/current.h new file mode 100644 index 0000000000..0ca06033f9 --- /dev/null +++ b/xen/arch/ppc/include/asm/current.h @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_CURRENT_H__ +#define __ASM_PPC_CURRENT_H__ + +#include + +#ifndef __ASSEMBLY__ + +struct vcpu; + +/* Which VCPU is "current" on this PCPU. */ +DECLARE_PER_CPU(struct vcpu *, curr_vcpu); + +#define current (this_cpu(curr_vcpu)) +#define set_current(vcpu) do { current = (vcpu); } while (0) +#define get_cpu_current(cpu) (per_cpu(curr_vcpu, cpu)) + +/* Per-VCPU state that lives at the top of the stack */ +struct cpu_info { + struct cpu_user_regs guest_cpu_user_regs; + unsigned long elr; + unsigned int flags; +}; + +static inline struct cpu_info *get_cpu_info(void) +{ +#ifdef __clang__ + unsigned long sp; + + asm ( "mr %0, 1" : "=r" (sp) ); +#else + register unsigned long sp asm ("r1"); +#endif + + return (struct cpu_info *)((sp & ~(STACK_SIZE - 1)) + + STACK_SIZE - sizeof(struct cpu_info)); +} + +#define guest_cpu_user_regs() (&get_cpu_info()->guest_cpu_user_regs) + +#endif /* __ASSEMBLY__ */ + +#endif /* __ASM_PPC_CURRENT_H__ */ diff --git a/xen/arch/ppc/include/asm/delay.h b/xen/arch/ppc/include/asm/delay.h new file mode 100644 index 0000000000..da6635888b --- /dev/null +++ b/xen/arch/ppc/include/asm/delay.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_DELAY_H__ +#define __ASM_PPC_DELAY_H__ + +#include + +static inline void udelay(unsigned long usecs) +{ + BUG_ON("unimplemented"); +} + +#endif /* __ASM_PPC_DELAY_H__ */ diff --git a/xen/arch/ppc/include/asm/device.h b/xen/arch/ppc/include/asm/device.h new file mode 100644 index 0000000000..8253e61d51 --- /dev/null +++ b/xen/arch/ppc/include/asm/device.h @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_DEVICE_H__ +#define __ASM_PPC_DEVICE_H__ + +enum device_type +{ + DEV_DT, + DEV_PCI, +}; + +struct device { + enum device_type type; +#ifdef CONFIG_HAS_DEVICE_TREE + struct dt_device_node *of_node; /* Used by drivers imported from Linux */ +#endif +}; + +enum device_class +{ + DEVICE_SERIAL, + DEVICE_IOMMU, + DEVICE_PCI_HOSTBRIDGE, + /* Use for error */ + DEVICE_UNKNOWN, +}; + +struct device_desc { + /* Device name */ + const char *name; + /* Device class */ + enum device_class class; + /* List of devices supported by this driver */ + const struct dt_device_match *dt_match; + /* + * Device initialization. + * + * -EAGAIN is used to indicate that device probing is deferred. + */ + int (*init)(struct dt_device_node *dev, const void *data); +}; + +typedef struct device device_t; + +#define DT_DEVICE_START(name_, namestr_, class_) \ +static const struct device_desc __dev_desc_##name_ __used \ +__section(".dev.info") = { \ + .name = namestr_, \ + .class = class_, \ + +#define DT_DEVICE_END \ +}; + +#endif /* __ASM_PPC_DEVICE_H__ */ diff --git a/xen/arch/ppc/include/asm/div64.h b/xen/arch/ppc/include/asm/div64.h new file mode 100644 index 0000000000..d213e50585 --- /dev/null +++ b/xen/arch/ppc/include/asm/div64.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_DIV64_H__ +#define __ASM_PPC_DIV64_H__ + +#include + +#define do_div(n, base) ({ \ + uint32_t base_ = (base); \ + uint32_t rem_ = (uint64_t)(n) % base_; \ + (n) = (uint64_t)(n) / base_; \ + rem_; \ +}) + +#endif /* __ASM_PPC_DIV64_H__ */ diff --git a/xen/arch/ppc/include/asm/domain.h b/xen/arch/ppc/include/asm/domain.h new file mode 100644 index 0000000000..573276d0a8 --- /dev/null +++ b/xen/arch/ppc/include/asm/domain.h @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_DOMAIN_H__ +#define __ASM_PPC_DOMAIN_H__ + +#include +#include + +struct hvm_domain +{ + uint64_t params[HVM_NR_PARAMS]; +}; + +#define is_domain_direct_mapped(d) ((void)(d), 0) + +/* TODO: Implement */ +#define guest_mode(r) ({ (void)(r); BUG_ON("unimplemented"); 0; }) + +struct arch_vcpu_io { +}; + +struct arch_vcpu { +}; + +struct arch_domain { + struct hvm_domain hvm; +}; + +#include + +static inline struct vcpu_guest_context *alloc_vcpu_guest_context(void) +{ + return xmalloc(struct vcpu_guest_context); +} + +static inline void free_vcpu_guest_context(struct vcpu_guest_context *vgc) +{ + xfree(vgc); +} + +struct guest_memory_policy {}; +static inline void update_guest_memory_policy(struct vcpu *v, + struct guest_memory_policy *gmp) +{} + +static inline void arch_vcpu_block(struct vcpu *v) {} + +#endif /* __ASM_PPC_DOMAIN_H__ */ diff --git a/xen/arch/ppc/include/asm/event.h b/xen/arch/ppc/include/asm/event.h new file mode 100644 index 0000000000..1b95ee4f61 --- /dev/null +++ b/xen/arch/ppc/include/asm/event.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_EVENT_H__ +#define __ASM_PPC_EVENT_H__ + +#include + +/* TODO: implement */ +static inline void vcpu_kick(struct vcpu *v) { BUG_ON("unimplemented"); } +static inline void vcpu_mark_events_pending(struct vcpu *v) { BUG_ON("unimplemented"); } +static inline void vcpu_update_evtchn_irq(struct vcpu *v) { BUG_ON("unimplemented"); } +static inline void vcpu_block_unless_event_pending(struct vcpu *v) { BUG_ON("unimplemented"); } + +static inline int vcpu_event_delivery_is_enabled(struct vcpu *v) +{ + BUG_ON("unimplemented"); + return 0; +} + +/* No arch specific virq definition now. Default to global. */ +static inline bool arch_virq_is_global(unsigned int virq) +{ + return true; +} + +static inline int local_events_need_delivery(void) +{ + BUG_ON("unimplemented"); + return 0; +} + +static inline void local_event_delivery_enable(void) +{ + BUG_ON("unimplemented"); +} + +#endif /* __ASM_PPC_EVENT_H__ */ diff --git a/xen/arch/ppc/include/asm/flushtlb.h b/xen/arch/ppc/include/asm/flushtlb.h new file mode 100644 index 0000000000..afcb740783 --- /dev/null +++ b/xen/arch/ppc/include/asm/flushtlb.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_FLUSHTLB_H__ +#define __ASM_PPC_FLUSHTLB_H__ + +#include + +/* + * Filter the given set of CPUs, removing those that definitely flushed their + * TLB since @page_timestamp. + */ +/* XXX lazy implementation just doesn't clear anything.... */ +static inline void tlbflush_filter(cpumask_t *mask, uint32_t page_timestamp) {} + +#define tlbflush_current_time() (0) + +static inline void page_set_tlbflush_timestamp(struct page_info *page) +{ + page->tlbflush_timestamp = tlbflush_current_time(); +} + +/* Flush specified CPUs' TLBs */ +void arch_flush_tlb_mask(const cpumask_t *mask); + +#endif /* __ASM_PPC_FLUSHTLB_H__ */ diff --git a/xen/arch/ppc/include/asm/grant_table.h b/xen/arch/ppc/include/asm/grant_table.h new file mode 100644 index 0000000000..d0ff58dd3d --- /dev/null +++ b/xen/arch/ppc/include/asm/grant_table.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_GRANT_TABLE_H__ +#define __ASM_PPC_GRANT_TABLE_H__ + +#endif /* __ASM_PPC_GRANT_TABLE_H__ */ diff --git a/xen/arch/ppc/include/asm/guest_access.h b/xen/arch/ppc/include/asm/guest_access.h new file mode 100644 index 0000000000..6546931911 --- /dev/null +++ b/xen/arch/ppc/include/asm/guest_access.h @@ -0,0 +1,68 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_GUEST_ACCESS_H__ +#define __ASM_PPC_GUEST_ACCESS_H__ + +#include + +/* TODO */ + +static inline unsigned long raw_copy_to_guest( + void *to, + const void *from, + unsigned int len) +{ + BUG_ON("unimplemented"); +} +static inline unsigned long raw_copy_to_guest_flush_dcache( + void *to, + const void *from, + unsigned int len) +{ + BUG_ON("unimplemented"); +} +static inline unsigned long raw_copy_from_guest( + void *to, + const void *from, + unsigned int len) +{ + BUG_ON("unimplemented"); +} +static inline unsigned long raw_clear_guest(void *to, unsigned int len) +{ + BUG_ON("unimplemented"); +} + +/* Copy data to guest physical address, then clean the region. */ +static inline unsigned long copy_to_guest_phys_flush_dcache( + struct domain *d, + paddr_t gpa, + void *buf, + unsigned int len) +{ + BUG_ON("unimplemented"); +} + +static inline int access_guest_memory_by_gpa( + struct domain *d, + paddr_t gpa, + void *buf, + uint32_t size, + bool is_write) +{ + BUG_ON("unimplemented"); +} + + +#define __raw_copy_to_guest raw_copy_to_guest +#define __raw_copy_from_guest raw_copy_from_guest +#define __raw_clear_guest raw_clear_guest + +/* + * Pre-validate a guest handle. + * Allows use of faster __copy_* functions. + */ +/* All PPC guests are paging mode external and hence safe */ +#define guest_handle_okay(hnd, nr) (1) +#define guest_handle_subrange_okay(hnd, first, last) (1) + +#endif /* __ASM_PPC_GUEST_ACCESS_H__ */ diff --git a/xen/arch/ppc/include/asm/guest_atomics.h b/xen/arch/ppc/include/asm/guest_atomics.h new file mode 100644 index 0000000000..1190e10bbb --- /dev/null +++ b/xen/arch/ppc/include/asm/guest_atomics.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_GUEST_ATOMICS_H__ +#define __ASM_PPC_GUEST_ATOMICS_H__ + +#include + +/* TODO: implement */ +#define unimplemented_guest_bit_op(d, nr, p) ({ \ + (void)(d); \ + (void)(nr); \ + (void)(p); \ + BUG_ON("unimplemented"); \ + false; \ +}) + +#define guest_test_bit(d, nr, p) unimplemented_guest_bit_op(d, nr, p) +#define guest_clear_bit(d, nr, p) unimplemented_guest_bit_op(d, nr, p) +#define guest_set_bit(d, nr, p) unimplemented_guest_bit_op(d, nr, p) +#define guest_test_and_set_bit(d, nr, p) unimplemented_guest_bit_op(d, nr, p) +#define guest_test_and_clear_bit(d, nr, p) unimplemented_guest_bit_op(d, nr, p) +#define guest_test_and_change_bit(d, nr, p) unimplemented_guest_bit_op(d, nr, p) + +#endif /* __ASM_PPC_GUEST_ATOMICS_H__ */ diff --git a/xen/arch/ppc/include/asm/hardirq.h b/xen/arch/ppc/include/asm/hardirq.h new file mode 100644 index 0000000000..343efc7e69 --- /dev/null +++ b/xen/arch/ppc/include/asm/hardirq.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_HARDIRQ_H__ +#define __ASM_PPC_HARDIRQ_H__ + +#include + +typedef struct { + unsigned long __softirq_pending; + unsigned int __local_irq_count; +} __cacheline_aligned irq_cpustat_t; + +#include /* Standard mappings for irq_cpustat_t above */ + +#define in_irq() (local_irq_count(smp_processor_id()) != 0) + +#define irq_enter() (local_irq_count(smp_processor_id())++) +#define irq_exit() (local_irq_count(smp_processor_id())--) + +#endif /* __ASM_PPC_HARDIRQ_H__ */ diff --git a/xen/arch/ppc/include/asm/hypercall.h b/xen/arch/ppc/include/asm/hypercall.h new file mode 100644 index 0000000000..1e8ca0ce9c --- /dev/null +++ b/xen/arch/ppc/include/asm/hypercall.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_HYPERCALL_H__ +#define __ASM_PPC_HYPERCALL_H__ + +#endif /* __ASM_PPC_HYPERCALL_H__ */ diff --git a/xen/arch/ppc/include/asm/io.h b/xen/arch/ppc/include/asm/io.h new file mode 100644 index 0000000000..85b5b27157 --- /dev/null +++ b/xen/arch/ppc/include/asm/io.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_IO_H__ +#define __ASM_PPC_IO_H__ + +#include + +/* TODO */ +#define readb(c) ({ (void)(c); BUG_ON("unimplemented"); 0; }) +#define readw(c) ({ (void)(c); BUG_ON("unimplemented"); 0; }) +#define readl(c) ({ (void)(c); BUG_ON("unimplemented"); 0; }) + +#define writeb(v,c) ({ (void)(v); (void)(c); BUG_ON("unimplemented"); }) +#define writew(v,c) ({ (void)(v); (void)(c); BUG_ON("unimplemented"); }) +#define writel(v,c) ({ (void)(v); (void)(c); BUG_ON("unimplemented"); }) + +#endif /* __ASM_PPC_IO_H__ */ diff --git a/xen/arch/ppc/include/asm/iocap.h b/xen/arch/ppc/include/asm/iocap.h new file mode 100644 index 0000000000..76bf13a70f --- /dev/null +++ b/xen/arch/ppc/include/asm/iocap.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_IOCAP_H__ +#define __ASM_PPC_IOCAP_H__ + +#define cache_flush_permitted(d) \ + (!rangeset_is_empty((d)->iomem_caps)) + +#endif /* __ASM_PPC_IOCAP_H__ */ diff --git a/xen/arch/ppc/include/asm/iommu.h b/xen/arch/ppc/include/asm/iommu.h new file mode 100644 index 0000000000..024ead3473 --- /dev/null +++ b/xen/arch/ppc/include/asm/iommu.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_IOMMU_H__ +#define __ASM_PPC_IOMMU_H__ + +struct arch_iommu { +}; + +#endif /* __ASM_PPC_IOMMU_H__ */ diff --git a/xen/arch/ppc/include/asm/irq.h b/xen/arch/ppc/include/asm/irq.h new file mode 100644 index 0000000000..5c37d0cf25 --- /dev/null +++ b/xen/arch/ppc/include/asm/irq.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_IRQ_H__ +#define __ASM_PPC_IRQ_H__ + +#include +#include +#include + +/* TODO */ +#define nr_irqs 0U +#define nr_static_irqs 0 +#define arch_hwdom_irqs(domid) 0U + +#define domain_pirq_to_irq(d, pirq) (pirq) + +struct arch_pirq { +}; + +struct arch_irq_desc { + unsigned int type; +}; + +static inline void arch_move_irqs(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +static inline int platform_get_irq(const struct dt_device_node *device, int index) +{ + BUG_ON("unimplemented"); +} + +#endif /* __ASM_PPC_IRQ_H__ */ diff --git a/xen/arch/ppc/include/asm/mem_access.h b/xen/arch/ppc/include/asm/mem_access.h new file mode 100644 index 0000000000..e7986dfdbd --- /dev/null +++ b/xen/arch/ppc/include/asm/mem_access.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_MEM_ACCESS_H__ +#define __ASM_PPC_MEM_ACCESS_H__ + +#endif /* __ASM_PPC_MEM_ACCESS_H__ */ diff --git a/xen/arch/ppc/include/asm/mm.h b/xen/arch/ppc/include/asm/mm.h index c85a7ed686..a433936076 100644 --- a/xen/arch/ppc/include/asm/mm.h +++ b/xen/arch/ppc/include/asm/mm.h @@ -1,10 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef _ASM_PPC_MM_H #define _ASM_PPC_MM_H +#include +#include +#include +#include #include +#include + +void setup_initial_pagetables(void); #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) +#define paddr_to_pdx(pa) mfn_to_pdx(maddr_to_mfn(pa)) +#define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) +#define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) +#define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) +#define maddr_to_mfn(ma) _mfn(paddr_to_pfn(ma)) +#define vmap_to_mfn(va) maddr_to_mfn(virt_to_maddr((vaddr_t)va)) +#define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK)) #define maddr_to_virt(pa) ((void *)((paddr_t)(pa) | XEN_VIRT_START)) @@ -13,6 +28,232 @@ #define __pa(x) (virt_to_maddr(x)) #define __va(x) (maddr_to_virt(x)) -void setup_initial_pagetables(void); +/* Convert between Xen-heap virtual addresses and machine frame numbers. */ +#define __virt_to_mfn(va) (virt_to_maddr(va) >> PAGE_SHIFT) +#define __mfn_to_virt(mfn) (maddr_to_virt((paddr_t)(mfn) << PAGE_SHIFT)) + +/* Convert between Xen-heap virtual addresses and page-info structures. */ +static inline struct page_info *virt_to_page(const void *v) +{ + BUG_ON("unimplemented"); + return NULL; +} + +#define virt_to_mfn(va) __virt_to_mfn(va) +#define mfn_to_virt(mfn) __mfn_to_virt(mfn) + +#define PG_shift(idx) (BITS_PER_LONG - (idx)) +#define PG_mask(x, idx) (x ## UL << PG_shift(idx)) + +#define PGT_none PG_mask(0, 1) /* no special uses of this page */ +#define PGT_writable_page PG_mask(1, 1) /* has writable mappings? */ +#define PGT_type_mask PG_mask(1, 1) /* Bits 31 or 63. */ + + /* 2-bit count of uses of this frame as its current type. */ +#define PGT_count_mask PG_mask(3, 3) + +/* Cleared when the owning guest 'frees' this page. */ +#define _PGC_allocated PG_shift(1) +#define PGC_allocated PG_mask(1, 1) +/* Page is Xen heap? */ +#define _PGC_xen_heap PG_shift(2) +#define PGC_xen_heap PG_mask(1, 2) +/* Page is broken? */ +#define _PGC_broken PG_shift(7) +#define PGC_broken PG_mask(1, 7) + /* Mutually-exclusive page states: { inuse, offlining, offlined, free }. */ +#define PGC_state PG_mask(3, 9) +#define PGC_state_inuse PG_mask(0, 9) +#define PGC_state_offlining PG_mask(1, 9) +#define PGC_state_offlined PG_mask(2, 9) +#define PGC_state_free PG_mask(3, 9) +#define page_state_is(pg, st) (((pg)->count_info&PGC_state) == PGC_state_##st) +/* Page is not reference counted */ +#define _PGC_extra PG_shift(10) +#define PGC_extra PG_mask(1, 10) + +/* Count of references to this frame. */ +#define PGC_count_width PG_shift(10) +#define PGC_count_mask ((1UL<count_info & PGC_xen_heap) +#define is_xen_heap_mfn(mfn) \ + (mfn_valid(mfn) && is_xen_heap_page(mfn_to_page(mfn))) + +#define is_xen_fixed_mfn(mfn) \ + ((mfn_to_maddr(mfn) >= virt_to_maddr((vaddr_t)_start)) && \ + (mfn_to_maddr(mfn) <= virt_to_maddr((vaddr_t)_end - 1))) + +#define page_get_owner(_p) (_p)->v.inuse.domain +#define page_set_owner(_p,_d) ((_p)->v.inuse.domain = (_d)) + +/* TODO: implement */ +#define mfn_valid(mfn) ({ (void) (mfn); 0; }) + +#define domain_set_alloc_bitsize(d) ((void)(d)) +#define domain_clamp_alloc_bitsize(d, b) (b) + +#define PFN_ORDER(pfn_) ((pfn_)->v.free.order) + +struct page_info +{ + /* Each frame can be threaded onto a doubly-linked list. */ + struct page_list_entry list; + + /* Reference count and various PGC_xxx flags and fields. */ + unsigned long count_info; + + /* Context-dependent fields follow... */ + union { + /* Page is in use: ((count_info & PGC_count_mask) != 0). */ + struct { + /* Type reference count and various PGT_xxx flags and fields. */ + unsigned long type_info; + } inuse; + /* Page is on a free list: ((count_info & PGC_count_mask) == 0). */ + union { + struct { + /* + * Index of the first *possibly* unscrubbed page in the buddy. + * One more bit than maximum possible order to accommodate + * INVALID_DIRTY_IDX. + */ +#define INVALID_DIRTY_IDX ((1UL << (MAX_ORDER + 1)) - 1) + unsigned long first_dirty:MAX_ORDER + 1; + + /* Do TLBs need flushing for safety before next page use? */ + bool need_tlbflush:1; + +#define BUDDY_NOT_SCRUBBING 0 +#define BUDDY_SCRUBBING 1 +#define BUDDY_SCRUB_ABORT 2 + unsigned long scrub_state:2; + }; + + unsigned long val; + } free; + + } u; + + union { + /* Page is in use, but not as a shadow. */ + struct { + /* Owner of this page (NULL if page is anonymous). */ + struct domain *domain; + } inuse; + + /* Page is on a free list. */ + struct { + /* Order-size of the free chunk this page is the head of. */ + unsigned int order; + } free; + + } v; + + union { + /* + * Timestamp from 'TLB clock', used to avoid extra safety flushes. + * Only valid for: a) free pages, and b) pages with zero type count + */ + uint32_t tlbflush_timestamp; + }; + uint64_t pad; +}; + + +#define FRAMETABLE_VIRT_START (XEN_VIRT_START + GB(32)) +#define frame_table ((struct page_info *)FRAMETABLE_VIRT_START) + +/* PDX of the first page in the frame table. */ +extern unsigned long frametable_base_pdx; + +/* Convert between machine frame numbers and page-info structures. */ +#define mfn_to_page(mfn) \ + (frame_table + (mfn_to_pdx(mfn) - frametable_base_pdx)) +#define page_to_mfn(pg) \ + pdx_to_mfn((unsigned long)((pg) - frame_table) + frametable_base_pdx) + +static inline void *page_to_virt(const struct page_info *pg) +{ + return mfn_to_virt(mfn_x(page_to_mfn(pg))); +} + +/* + * Common code requires get_page_type and put_page_type. + * We don't care about typecounts so we just do the minimum to make it + * happy. + */ +static inline int get_page_type(struct page_info *page, unsigned long type) +{ + return 1; +} + +static inline void put_page_type(struct page_info *page) +{ + return; +} + +/* TODO */ +static inline bool get_page_nr(struct page_info *page, const struct domain *domain, + unsigned long nr) +{ + BUG_ON("unimplemented"); +} +static inline void put_page_nr(struct page_info *page, unsigned long nr) +{ + BUG_ON("unimplemented"); +} + +static inline void put_page_and_type(struct page_info *page) +{ + put_page_type(page); + put_page(page); +} + +/* + * PPC does not have an M2P, but common code expects a handful of + * M2P-related defines and functions. Provide dummy versions of these. + */ +#define INVALID_M2P_ENTRY (~0UL) +#define SHARED_M2P_ENTRY (~0UL - 1UL) +#define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY) + +#define set_gpfn_from_mfn(mfn, pfn) BUG_ON("unimplemented") +#define mfn_to_gfn(d, mfn) ({ BUG_ON("unimplemented"); _gfn(0); }) + +#define PDX_GROUP_SHIFT XEN_PT_SHIFT_LVL_3 + +static inline unsigned long domain_get_maximum_gpfn(struct domain *d) +{ + BUG_ON("unimplemented"); + return 0; +} + +static inline long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + BUG_ON("unimplemented"); + return 0; +} + +static inline unsigned int arch_get_dma_bitsize(void) +{ + return 32; /* TODO */ +} + +/* + * On PPC, all the RAM is currently direct mapped in Xen. + * Hence return always true. + */ +static inline bool arch_mfns_in_directmap(unsigned long mfn, unsigned long nr) +{ + return true; +} #endif /* _ASM_PPC_MM_H */ diff --git a/xen/arch/ppc/include/asm/monitor.h b/xen/arch/ppc/include/asm/monitor.h new file mode 100644 index 0000000000..e5b0282bf1 --- /dev/null +++ b/xen/arch/ppc/include/asm/monitor.h @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Derived from xen/arch/arm/include/asm/monitor.h */ +#ifndef __ASM_PPC_MONITOR_H__ +#define __ASM_PPC_MONITOR_H__ + +#include +#include + +static inline +void arch_monitor_allow_userspace(struct domain *d, bool allow_userspace) +{ +} + +static inline +int arch_monitor_domctl_op(struct domain *d, struct xen_domctl_monitor_op *mop) +{ + /* No arch-specific monitor ops on PPC. */ + return -EOPNOTSUPP; +} + +int arch_monitor_domctl_event(struct domain *d, + struct xen_domctl_monitor_op *mop); + +static inline +int arch_monitor_init_domain(struct domain *d) +{ + /* No arch-specific domain initialization on PPC. */ + return 0; +} + +static inline +void arch_monitor_cleanup_domain(struct domain *d) +{ + /* No arch-specific domain cleanup on PPC. */ +} + +static inline uint32_t arch_monitor_get_capabilities(struct domain *d) +{ + BUG_ON("unimplemented"); + return 0; +} + +#endif /* __ASM_PPC_MONITOR_H__ */ diff --git a/xen/arch/ppc/include/asm/nospec.h b/xen/arch/ppc/include/asm/nospec.h new file mode 100644 index 0000000000..b97322e48d --- /dev/null +++ b/xen/arch/ppc/include/asm/nospec.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* From arch/arm/include/asm/nospec.h. */ +#ifndef __ASM_PPC_NOSPEC_H__ +#define __ASM_PPC_NOSPEC_H__ + +static inline bool evaluate_nospec(bool condition) +{ + return condition; +} + +static inline void block_speculation(void) +{ +} + +#endif /* __ASM_PPC_NOSPEC_H__ */ diff --git a/xen/arch/ppc/include/asm/numa.h b/xen/arch/ppc/include/asm/numa.h new file mode 100644 index 0000000000..7fdf66c3da --- /dev/null +++ b/xen/arch/ppc/include/asm/numa.h @@ -0,0 +1,26 @@ +#ifndef __ASM_PPC_NUMA_H__ +#define __ASM_PPC_NUMA_H__ + +#include +#include + +typedef uint8_t nodeid_t; + +/* Fake one node for now. See also node_online_map. */ +#define cpu_to_node(cpu) 0 +#define node_to_cpumask(node) (cpu_online_map) + +/* + * TODO: make first_valid_mfn static when NUMA is supported on PPC, this + * is required because the dummy helpers are using it. + */ +extern mfn_t first_valid_mfn; + +/* XXX: implement NUMA support */ +#define node_spanned_pages(nid) (max_page - mfn_x(first_valid_mfn)) +#define node_start_pfn(nid) (mfn_x(first_valid_mfn)) +#define __node_distance(a, b) (20) + +#define arch_want_default_dmazone() (false) + +#endif /* __ASM_PPC_NUMA_H__ */ diff --git a/xen/arch/ppc/include/asm/p2m.h b/xen/arch/ppc/include/asm/p2m.h new file mode 100644 index 0000000000..25ba054668 --- /dev/null +++ b/xen/arch/ppc/include/asm/p2m.h @@ -0,0 +1,95 @@ +#ifndef __ASM_PPC_P2M_H__ +#define __ASM_PPC_P2M_H__ + +#include + +#define paddr_bits PADDR_BITS + +/* + * List of possible type for each page in the p2m entry. + * The number of available bit per page in the pte for this purpose is 4 bits. + * So it's possible to only have 16 fields. If we run out of value in the + * future, it's possible to use higher value for pseudo-type and don't store + * them in the p2m entry. + */ +typedef enum { + p2m_invalid = 0, /* Nothing mapped here */ + p2m_ram_rw, /* Normal read/write guest RAM */ + p2m_ram_ro, /* Read-only; writes are silently dropped */ + p2m_max_real_type, /* Types after this won't be store in the p2m */ +} p2m_type_t; + +#include + +static inline int get_page_and_type(struct page_info *page, + struct domain *domain, + unsigned long type) +{ + BUG_ON("unimplemented"); + return 1; +} + +/* Look up a GFN and take a reference count on the backing page. */ +typedef unsigned int p2m_query_t; +#define P2M_ALLOC (1u<<0) /* Populate PoD and paged-out entries */ +#define P2M_UNSHARE (1u<<1) /* Break CoW sharing */ + +static inline struct page_info *get_page_from_gfn( + struct domain *d, unsigned long gfn, p2m_type_t *t, p2m_query_t q) +{ + BUG_ON("unimplemented"); + return NULL; +} + +static inline void memory_type_changed(struct domain *d) +{ + BUG_ON("unimplemented"); +} + + +static inline int guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, + unsigned int order) +{ + BUG_ON("unimplemented"); + return 1; +} + +static inline int guest_physmap_add_entry(struct domain *d, + gfn_t gfn, + mfn_t mfn, + unsigned long page_order, + p2m_type_t t) +{ + BUG_ON("unimplemented"); + return 1; +} + +/* Untyped version for RAM only, for compatibility */ +static inline int __must_check +guest_physmap_add_page(struct domain *d, gfn_t gfn, mfn_t mfn, + unsigned int page_order) +{ + return guest_physmap_add_entry(d, gfn, mfn, page_order, p2m_ram_rw); +} + +static inline mfn_t gfn_to_mfn(struct domain *d, gfn_t gfn) +{ + BUG_ON("unimplemented"); + return _mfn(0); +} + +static inline bool arch_acquire_resource_check(struct domain *d) +{ + /* + * The reference counting of foreign entries in set_foreign_p2m_entry() + * is supported on PPC. + */ + return true; +} + +static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) +{ + /* Not supported on PPC. */ +} + +#endif /* __ASM_PPC_P2M_H__ */ diff --git a/xen/arch/ppc/include/asm/page.h b/xen/arch/ppc/include/asm/page.h index c5ee047df7..890e285051 100644 --- a/xen/arch/ppc/include/asm/page.h +++ b/xen/arch/ppc/include/asm/page.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef _ASM_PPC_PAGE_H #define _ASM_PPC_PAGE_H @@ -36,6 +37,9 @@ #define PTE_XEN_RO (PTE_XEN_BASE | PTE_EAA_READ) #define PTE_XEN_RX (PTE_XEN_BASE | PTE_EAA_READ | PTE_EAA_EXECUTE) +/* TODO */ +#define PAGE_HYPERVISOR 0 + /* * Radix Tree layout for 64KB pages: * @@ -178,4 +182,18 @@ struct prtb_entry { void tlbie_all(void); +static inline void invalidate_icache(void) +{ + BUG_ON("unimplemented"); +} + +#define clear_page(page) memset(page, 0, PAGE_SIZE) +#define copy_page(dp, sp) memcpy(dp, sp, PAGE_SIZE) + +/* TODO: Flush the dcache for an entire page. */ +static inline void flush_page_to_ram(unsigned long mfn, bool sync_icache) +{ + BUG_ON("unimplemented"); +} + #endif /* _ASM_PPC_PAGE_H */ diff --git a/xen/arch/ppc/include/asm/paging.h b/xen/arch/ppc/include/asm/paging.h new file mode 100644 index 0000000000..eccacece29 --- /dev/null +++ b/xen/arch/ppc/include/asm/paging.h @@ -0,0 +1,7 @@ +#ifndef __ASM_PPC_PAGING_H__ +#define __ASM_PPC_PAGING_H__ + +#define paging_mode_translate(d) (1) +#define paging_mode_external(d) (1) + +#endif /* __ASM_PPC_PAGING_H__ */ diff --git a/xen/arch/ppc/include/asm/pci.h b/xen/arch/ppc/include/asm/pci.h new file mode 100644 index 0000000000..e76c8e5475 --- /dev/null +++ b/xen/arch/ppc/include/asm/pci.h @@ -0,0 +1,7 @@ +#ifndef __ASM_PPC_PCI_H__ +#define __ASM_PPC_PCI_H__ + +struct arch_pci_dev { +}; + +#endif /* __ASM_PPC_PCI_H__ */ diff --git a/xen/arch/ppc/include/asm/percpu.h b/xen/arch/ppc/include/asm/percpu.h new file mode 100644 index 0000000000..e7c40c0f03 --- /dev/null +++ b/xen/arch/ppc/include/asm/percpu.h @@ -0,0 +1,24 @@ +#ifndef __PPC_PERCPU_H__ +#define __PPC_PERCPU_H__ + +#ifndef __ASSEMBLY__ + +extern char __per_cpu_start[], __per_cpu_data_end[]; +extern unsigned long __per_cpu_offset[NR_CPUS]; +void percpu_init_areas(void); + +#define smp_processor_id() 0 /* TODO: Fix this */ + +#define per_cpu(var, cpu) \ + (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu])) +#define this_cpu(var) \ + (*RELOC_HIDE(&per_cpu__##var, smp_processor_id())) + +#define per_cpu_ptr(var, cpu) \ + (*RELOC_HIDE(var, __per_cpu_offset[cpu])) +#define this_cpu_ptr(var) \ + (*RELOC_HIDE(var, smp_processor_id())) + +#endif + +#endif /* __PPC_PERCPU_H__ */ diff --git a/xen/arch/ppc/include/asm/processor.h b/xen/arch/ppc/include/asm/processor.h index edb8a6088d..d3dd943c20 100644 --- a/xen/arch/ppc/include/asm/processor.h +++ b/xen/arch/ppc/include/asm/processor.h @@ -110,6 +110,10 @@ /* Macro to adjust thread priority for hardware multithreading */ #define HMT_very_low() asm volatile ( "or %r31, %r31, %r31" ) +/* TODO: This isn't correct */ +#define cpu_to_core(cpu) (0) +#define cpu_to_socket(cpu) (0) + /* * User-accessible registers: most of these need to be saved/restored * for every nested Xen invocation. @@ -178,6 +182,12 @@ static inline void noreturn die(void) HMT_very_low(); } +/* + * Implemented on pre-POWER10 by setting HMT to low then to medium using + * the special OR forms. See HMT_very_low above. + */ +#define cpu_relax() asm volatile ( "or %r1, %r1, %r1; or %r2, %r2, %r2" ) + #endif /* __ASSEMBLY__ */ #endif /* _ASM_PPC_PROCESSOR_H */ diff --git a/xen/arch/ppc/include/asm/random.h b/xen/arch/ppc/include/asm/random.h new file mode 100644 index 0000000000..2f9e9bbae4 --- /dev/null +++ b/xen/arch/ppc/include/asm/random.h @@ -0,0 +1,9 @@ +#ifndef __ASM_PPC_RANDOM_H__ +#define __ASM_PPC_RANDOM_H__ + +static inline unsigned int arch_get_random(void) +{ + return 0; +} + +#endif /* __ASM_PPC_RANDOM_H__ */ diff --git a/xen/arch/ppc/include/asm/setup.h b/xen/arch/ppc/include/asm/setup.h new file mode 100644 index 0000000000..e4f64879b6 --- /dev/null +++ b/xen/arch/ppc/include/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef __ASM_PPC_SETUP_H__ +#define __ASM_PPC_SETUP_H__ + +#define max_init_domid (0) + +#endif /* __ASM_PPC_SETUP_H__ */ diff --git a/xen/arch/ppc/include/asm/smp.h b/xen/arch/ppc/include/asm/smp.h new file mode 100644 index 0000000000..eca43f0e6c --- /dev/null +++ b/xen/arch/ppc/include/asm/smp.h @@ -0,0 +1,18 @@ +#ifndef __ASM_SMP_H +#define __ASM_SMP_H + +#include +#include + +DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); +DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); + +#define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) + +/* + * Do we, for platform reasons, need to actually keep CPUs online when we + * would otherwise prefer them to be off? + */ +#define park_offline_cpus false + +#endif diff --git a/xen/arch/ppc/include/asm/softirq.h b/xen/arch/ppc/include/asm/softirq.h new file mode 100644 index 0000000000..a0b28a5e51 --- /dev/null +++ b/xen/arch/ppc/include/asm/softirq.h @@ -0,0 +1,8 @@ +#ifndef __ASM_PPC_SOFTIRQ_H__ +#define __ASM_PPC_SOFTIRQ_H__ + +#define NR_ARCH_SOFTIRQS 0 + +#define arch_skip_send_event_check(cpu) 0 + +#endif /* __ASM_PPC_SOFTIRQ_H__ */ diff --git a/xen/arch/ppc/include/asm/spinlock.h b/xen/arch/ppc/include/asm/spinlock.h new file mode 100644 index 0000000000..4bdb4b1e98 --- /dev/null +++ b/xen/arch/ppc/include/asm/spinlock.h @@ -0,0 +1,15 @@ +#ifndef __ASM_SPINLOCK_H +#define __ASM_SPINLOCK_H + +#define arch_lock_acquire_barrier() smp_mb() +#define arch_lock_release_barrier() smp_mb() + +#define arch_lock_relax() cpu_relax() +#define arch_lock_signal() +#define arch_lock_signal_wmb() \ +({ \ + smp_wmb(); \ + arch_lock_signal(); \ +}) + +#endif /* __ASM_SPINLOCK_H */ diff --git a/xen/arch/ppc/include/asm/system.h b/xen/arch/ppc/include/asm/system.h index 94091df644..a17072bafd 100644 --- a/xen/arch/ppc/include/asm/system.h +++ b/xen/arch/ppc/include/asm/system.h @@ -1,6 +1,223 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) IBM Corp. 2005 + * Copyright (C) Raptor Engineering LLC + * + * Authors: Jimi Xenidis + * Shawn Anastasio + */ + #ifndef _ASM_SYSTEM_H_ #define _ASM_SYSTEM_H_ -#define smp_wmb() __asm__ __volatile__ ( "lwsync" : : : "memory" ) +#include +#include +#include +#include +#include + +#define xchg(ptr,x) \ +({ \ + __typeof__(*(ptr)) _x_ = (x); \ + (__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, sizeof(*(ptr))); \ +}) + +#define build_xchg(fn, type, ldinsn, stinsn) \ +static inline unsigned long fn(volatile type *m, unsigned long val) \ +{ \ + unsigned long dummy; \ + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER \ + "1: " ldinsn " %0,0,%3\n" \ + stinsn " %2,0,%3\n" \ + "2: bne- 1b\n" \ + PPC_ATOMIC_EXIT_BARRIER \ + : "=&r" (dummy), "=m" (*m) \ + : "r" (val), "r" (m) \ + : "cc", "memory" ); \ + return dummy; \ +} + +build_xchg(__xchg_u8, uint8_t, "lbarx", "stbcx.") +build_xchg(__xchg_u16, uint16_t, "lharx", "sthcx.") +build_xchg(__xchg_u32, uint32_t, "lwarx", "stwcx.") +build_xchg(__xchg_u64, uint64_t, "ldarx", "stdcx.") + +#undef build_xchg + +/* + * This function doesn't exist, so you'll get a linker error + * if something tries to do an invalid xchg(). + */ +extern void __xchg_called_with_bad_pointer(void); + +static inline unsigned long __xchg(volatile void *ptr, unsigned long x, + int size) +{ + switch ( size ) + { + case 1: + return __xchg_u8(ptr, x); + case 2: + return __xchg_u16(ptr, x); + case 4: + return __xchg_u32(ptr, x); + case 8: + return __xchg_u64(ptr, x); + } + __xchg_called_with_bad_pointer(); + return x; +} + + +static inline unsigned long __cmpxchg_u32(volatile int *p, int old, int new) +{ + unsigned int prev; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: lwarx %0,0,%2\n" + "cmpw 0,%0,%3\n" + "bne- 2f\n " + "stwcx. %4,0,%2\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER "\n" + "2:" + : "=&r" (prev), "=m" (*p) + : "r" (p), "r" (old), "r" (new), "m" (*p) + : "cc", "memory" ); + + return prev; +} + +static inline unsigned long __cmpxchg_u64(volatile long *p, unsigned long old, + unsigned long new) +{ + unsigned long prev; + + asm volatile ( PPC_ATOMIC_ENTRY_BARRIER + "1: ldarx %0,0,%2\n" + "cmpd 0,%0,%3\n" + "bne- 2f\n" + "stdcx. %4,0,%2\n" + "bne- 1b\n" + PPC_ATOMIC_EXIT_BARRIER "\n" + "2:" + : "=&r" (prev), "=m" (*p) + : "r" (p), "r" (old), "r" (new), "m" (*p) + : "cc", "memory" ); + + return prev; +} + +/* This function doesn't exist, so you'll get a linker error + if something tries to do an invalid cmpxchg(). */ +extern void __cmpxchg_called_with_bad_pointer(void); + +static always_inline unsigned long __cmpxchg( + volatile void *ptr, + unsigned long old, + unsigned long new, + int size) +{ + switch ( size ) + { + case 2: + BUG_ON("unimplemented"); return 0; /* XXX implement __cmpxchg_u16 ? */ + case 4: + return __cmpxchg_u32(ptr, old, new); + case 8: + return __cmpxchg_u64(ptr, old, new); + } + __cmpxchg_called_with_bad_pointer(); + return old; +} + +#define cmpxchg_user(ptr,o,n) cmpxchg(ptr,o,n) + +#define cmpxchg(ptr,o,n) \ + ({ \ + __typeof__(*(ptr)) _o_ = (o); \ + __typeof__(*(ptr)) _n_ = (n); \ + (__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)_o_, \ + (unsigned long)_n_, sizeof(*(ptr))); \ + }) + + +/* + * Memory barrier. + * The sync instruction guarantees that all memory accesses initiated + * by this processor have been performed (with respect to all other + * mechanisms that access memory). The eieio instruction is a barrier + * providing an ordering (separately) for (a) cacheable stores and (b) + * loads and stores to non-cacheable memory (e.g. I/O devices). + * + * mb() prevents loads and stores being reordered across this point. + * rmb() prevents loads being reordered across this point. + * wmb() prevents stores being reordered across this point. + * read_barrier_depends() prevents data-dependent loads being reordered + * across this point (nop on PPC). + * + * We have to use the sync instructions for mb(), since lwsync doesn't + * order loads with respect to previous stores. Lwsync is fine for + * rmb(), though. + * For wmb(), we use sync since wmb is used in drivers to order + * stores to system memory with respect to writes to the device. + * However, smp_wmb() can be a lighter-weight eieio barrier on + * SMP since it is only used to order updates to system memory. + */ +#define mb() __asm__ __volatile__ ( "sync" : : : "memory" ) +#define rmb() __asm__ __volatile__ ( "lwsync" : : : "memory" ) +#define wmb() __asm__ __volatile__ ( "sync" : : : "memory" ) +#define read_barrier_depends() do { } while(0) + +#define set_mb(var, value) do { var = value; smp_mb(); } while (0) +#define set_wmb(var, value) do { var = value; smp_wmb(); } while (0) + +#define smp_mb__before_atomic() smp_mb() +#define smp_mb__after_atomic() smp_mb() + +#define smp_mb() mb() +#define smp_rmb() rmb() +#define smp_wmb() __asm__ __volatile__ ("lwsync" : : : "memory") +#define smp_read_barrier_depends() read_barrier_depends() + +#define local_save_flags(flags) ((flags) = mfmsr()) +#define local_irq_restore(flags) do { \ + __asm__ __volatile__("": : :"memory"); \ + mtmsrd((flags)); \ +} while(0) + +static inline void local_irq_disable(void) +{ + unsigned long msr; + msr = mfmsr(); + mtmsrd(msr & ~MSR_EE); + barrier(); +} + +static inline void local_irq_enable(void) +{ + unsigned long msr; + barrier(); + msr = mfmsr(); + mtmsrd(msr | MSR_EE); +} + +static inline void __do_save_and_cli(unsigned long *flags) +{ + unsigned long msr; + msr = mfmsr(); + *flags = msr; + mtmsrd(msr & ~MSR_EE); + barrier(); +} + +#define local_irq_save(flags) __do_save_and_cli(&flags) + +static inline int local_irq_is_enabled(void) +{ + return !!(mfmsr() & MSR_EE); +} + +#define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) #endif /* _ASM_SYSTEM_H */ diff --git a/xen/arch/ppc/include/asm/time.h b/xen/arch/ppc/include/asm/time.h new file mode 100644 index 0000000000..aa9dda82a3 --- /dev/null +++ b/xen/arch/ppc/include/asm/time.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PPC_TIME_H__ +#define __ASM_PPC_TIME_H__ + +#include +#include +#include + +struct vcpu; + +/* TODO: implement */ +static inline void force_update_vcpu_system_time(struct vcpu *v) { + BUG_ON("unimplemented"); +} + +typedef unsigned long cycles_t; + +static inline cycles_t get_cycles(void) +{ + return mfspr(SPRN_TBRL); +} + +#endif /* __ASM_PPC_TIME_H__ */ diff --git a/xen/arch/ppc/include/asm/xenoprof.h b/xen/arch/ppc/include/asm/xenoprof.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/xen/arch/ppc/mm-radix.c b/xen/arch/ppc/mm-radix.c index 3feeb90ebc..06129cef9c 100644 --- a/xen/arch/ppc/mm-radix.c +++ b/xen/arch/ppc/mm-radix.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/xen/arch/ppc/tlb-radix.c b/xen/arch/ppc/tlb-radix.c index 3dde102c62..74213113e0 100644 --- a/xen/arch/ppc/tlb-radix.c +++ b/xen/arch/ppc/tlb-radix.c @@ -5,9 +5,9 @@ * * Copyright 2015-2016, Aneesh Kumar K.V, IBM Corporation. */ +#include #include -#include #include #include diff --git a/xen/include/public/hvm/save.h b/xen/include/public/hvm/save.h index 464ebdb0da..2cf4238daa 100644 --- a/xen/include/public/hvm/save.h +++ b/xen/include/public/hvm/save.h @@ -89,6 +89,8 @@ DECLARE_HVM_SAVE_TYPE(END, 0, struct hvm_save_end); #include "../arch-x86/hvm/save.h" #elif defined(__arm__) || defined(__aarch64__) #include "../arch-arm/hvm/save.h" +#elif defined(__powerpc64__) +#include "../arch-ppc.h" #else #error "unsupported architecture" #endif diff --git a/xen/include/public/pmu.h b/xen/include/public/pmu.h index eb87a81e7b..5a176b6ac3 100644 --- a/xen/include/public/pmu.h +++ b/xen/include/public/pmu.h @@ -11,6 +11,8 @@ #include "arch-x86/pmu.h" #elif defined (__arm__) || defined (__aarch64__) #include "arch-arm.h" +#elif defined (__powerpc64__) +#include "arch-ppc.h" #else #error "Unsupported architecture" #endif diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 920567e006..b812a0a324 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -16,6 +16,8 @@ #include "arch-x86/xen.h" #elif defined(__arm__) || defined (__aarch64__) #include "arch-arm.h" +#elif defined(__powerpc64__) +#include "arch-ppc.h" #else #error "Unsupported architecture" #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:46:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:46:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606297.944124 (Exim 4.92) (envelope-from ) id 1qjHC8-0001gr-3b; Thu, 21 Sep 2023 10:46:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606297.944124; Thu, 21 Sep 2023 10: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 1qjHC8-0001gk-0u; Thu, 21 Sep 2023 10:46:04 +0000 Received: by outflank-mailman (input) for mailman id 606297; Thu, 21 Sep 2023 10:46:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHC6-0001fF-TK for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHC6-0004TP-Sj for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHC6-0005Ei-Rw for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46: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=9G8fh/y3r21+Xztqhi2x3Cb/le0LnTBaCq+rtEWjxyE=; b=XmfGXbuSuXNMiagcnb5k643otd MHMtrOUNP5Fic80hMz3isO4thc1NnMFiK+tU8hO87aY+7hhJLYEgk1gU+qGBREmgjpxWfylryigJN 9w/+d+1mL/jR8f6naIowooUnLnPwE0BTAOd9xguoG1cX1jpXbxNz4SVzKatFGoIShP7Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Add stub function and symbol definitions Message-Id: Date: Thu, 21 Sep 2023 10:46:02 +0000 commit 23f2f4a0977503187cd05cbc8963464a25e75eaf Author: Shawn Anastasio AuthorDate: Thu Sep 14 14:03:33 2023 -0500 Commit: Jan Beulich CommitDate: Tue Sep 19 11:03:22 2023 +0200 xen/ppc: Add stub function and symbol definitions Add stub function and symbol definitions required by common code. If the file that the definition is supposed to be located in doesn't already exist yet, temporarily place its definition in the new stubs.c Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/Makefile | 1 + xen/arch/ppc/mm-radix.c | 42 ++++++ xen/arch/ppc/setup.c | 8 ++ xen/arch/ppc/stubs.c | 339 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 390 insertions(+) diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile index b3205b8f7a..6d5569ff64 100644 --- a/xen/arch/ppc/Makefile +++ b/xen/arch/ppc/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.init.o obj-y += mm-radix.o obj-y += opal.o obj-y += setup.o +obj-y += stubs.o obj-y += tlb-radix.o $(TARGET): $(TARGET)-syms diff --git a/xen/arch/ppc/mm-radix.c b/xen/arch/ppc/mm-radix.c index 06129cef9c..11d0f27b60 100644 --- a/xen/arch/ppc/mm-radix.c +++ b/xen/arch/ppc/mm-radix.c @@ -265,3 +265,45 @@ void __init setup_initial_pagetables(void) /* Turn on the MMU */ enable_mmu(); } + +/* + * TODO: Implement the functions below + */ +unsigned long __read_mostly frametable_base_pdx; + +void put_page(struct page_info *p) +{ + BUG_ON("unimplemented"); +} + +void arch_dump_shared_mem_info(void) +{ + BUG_ON("unimplemented"); +} + +int xenmem_add_to_physmap_one(struct domain *d, + unsigned int space, + union add_to_physmap_extra extra, + unsigned long idx, + gfn_t gfn) +{ + BUG_ON("unimplemented"); +} + +int destroy_xen_mappings(unsigned long s, unsigned long e) +{ + BUG_ON("unimplemented"); +} + +int map_pages_to_xen(unsigned long virt, + mfn_t mfn, + unsigned long nr_mfns, + unsigned int flags) +{ + BUG_ON("unimplemented"); +} + +int __init populate_pt_range(unsigned long virt, unsigned long nr_mfns) +{ + BUG_ON("unimplemented"); +} diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c index 3fc7705d9b..959c1454a0 100644 --- a/xen/arch/ppc/setup.c +++ b/xen/arch/ppc/setup.c @@ -1,5 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include +#include +#include +#include #include #include #include @@ -33,3 +36,8 @@ void __init noreturn start_xen(unsigned long r3, unsigned long r4, unreachable(); } + +void arch_get_xen_caps(xen_capabilities_info_t *info) +{ + BUG_ON("unimplemented"); +} diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c new file mode 100644 index 0000000000..4c276b0e39 --- /dev/null +++ b/xen/arch/ppc/stubs.c @@ -0,0 +1,339 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#include +#include +#include +#include +#include +#include +#include + +#include + +/* smpboot.c */ + +cpumask_t cpu_online_map; +cpumask_t cpu_present_map; +cpumask_t cpu_possible_map; + +/* ID of the PCPU we're running on */ +DEFINE_PER_CPU(unsigned int, cpu_id); +/* XXX these seem awfully x86ish... */ +/* representing HT siblings of each logical CPU */ +DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_mask); +/* representing HT and core siblings of each logical CPU */ +DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_mask); + +nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; + +/* time.c */ + +s_time_t get_s_time(void) +{ + BUG_ON("unimplemented"); +} + +int reprogram_timer(s_time_t timeout) +{ + BUG_ON("unimplemented"); +} + +void send_timer_event(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +/* traps.c */ + +void show_execution_state(const struct cpu_user_regs *regs) +{ + BUG_ON("unimplemented"); +} + +void arch_hypercall_tasklet_result(struct vcpu *v, long res) +{ + BUG_ON("unimplemented"); +} + +void vcpu_show_execution_state(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +/* shutdown.c */ + +void machine_restart(unsigned int delay_millisecs) +{ + BUG_ON("unimplemented"); +} + +void machine_halt(void) +{ + BUG_ON("unimplemented"); +} + +/* vm_event.c */ + +void vm_event_fill_regs(vm_event_request_t *req) +{ + BUG_ON("unimplemented"); +} + +void vm_event_set_registers(struct vcpu *v, vm_event_response_t *rsp) +{ + BUG_ON("unimplemented"); +} + +void vm_event_monitor_next_interrupt(struct vcpu *v) +{ + /* Not supported on PPC. */ +} + +/* domctl.c */ +void arch_get_domain_info(const struct domain *d, + struct xen_domctl_getdomaininfo *info) +{ + BUG_ON("unimplemented"); +} + +/* monitor.c */ + +int arch_monitor_domctl_event(struct domain *d, + struct xen_domctl_monitor_op *mop) +{ + BUG_ON("unimplemented"); +} + +/* smp.c */ + +void arch_flush_tlb_mask(const cpumask_t *mask) +{ + BUG_ON("unimplemented"); +} + +void smp_send_event_check_mask(const cpumask_t *mask) +{ + BUG_ON("unimplemented"); +} + +void smp_send_call_function_mask(const cpumask_t *mask) +{ + BUG_ON("unimplemented"); +} + +/* irq.c */ + +struct pirq *alloc_pirq_struct(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) +{ + BUG_ON("unimplemented"); +} + +void pirq_guest_unbind(struct domain *d, struct pirq *pirq) +{ + BUG_ON("unimplemented"); +} + +void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) +{ + 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, +}; + +int arch_init_one_irq_desc(struct irq_desc *desc) +{ + BUG_ON("unimplemented"); +} + +void smp_send_state_dump(unsigned int cpu) +{ + BUG_ON("unimplemented"); +} + +/* domain.c */ + +DEFINE_PER_CPU(struct vcpu *, curr_vcpu); +unsigned long __per_cpu_offset[NR_CPUS]; + +void context_switch(struct vcpu *prev, struct vcpu *next) +{ + BUG_ON("unimplemented"); +} + +void continue_running(struct vcpu *same) +{ + BUG_ON("unimplemented"); +} + +void sync_local_execstate(void) +{ + BUG_ON("unimplemented"); +} + +void sync_vcpu_execstate(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +void startup_cpu_idle_loop(void) +{ + BUG_ON("unimplemented"); +} + +void free_domain_struct(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void dump_pageframe_info(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void free_vcpu_struct(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +int arch_vcpu_create(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +void arch_vcpu_destroy(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +void vcpu_switch_to_aarch64_mode(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) +{ + BUG_ON("unimplemented"); +} + +int arch_domain_create(struct domain *d, + struct xen_domctl_createdomain *config, + unsigned int flags) +{ + BUG_ON("unimplemented"); +} + +int arch_domain_teardown(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void arch_domain_destroy(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void arch_domain_shutdown(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void arch_domain_pause(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void arch_domain_unpause(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +int arch_domain_soft_reset(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void arch_domain_creation_finished(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +int arch_set_info_guest(struct vcpu *v, vcpu_guest_context_u c) +{ + BUG_ON("unimplemented"); +} + +int arch_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + BUG_ON("unimplemented"); +} + +int arch_vcpu_reset(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +int domain_relinquish_resources(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void arch_dump_domain_info(struct domain *d) +{ + BUG_ON("unimplemented"); +} + +void arch_dump_vcpu_info(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +void vcpu_mark_events_pending(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +void vcpu_update_evtchn_irq(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +void vcpu_block_unless_event_pending(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +void vcpu_kick(struct vcpu *v) +{ + BUG_ON("unimplemented"); +} + +struct domain *alloc_domain_struct(void) +{ + BUG_ON("unimplemented"); +} + +struct vcpu *alloc_vcpu_struct(const struct domain *d) +{ + BUG_ON("unimplemented"); +} + +unsigned long +hypercall_create_continuation(unsigned int op, const char *format, ...) +{ + BUG_ON("unimplemented"); +} + +int __init parse_arch_dom0_param(const char *s, const char *e) +{ + BUG_ON("unimplemented"); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:46:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:46:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606298.944129 (Exim 4.92) (envelope-from ) id 1qjHCI-0001nZ-53; Thu, 21 Sep 2023 10:46:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606298.944129; Thu, 21 Sep 2023 10: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 1qjHCI-0001nR-2M; Thu, 21 Sep 2023 10:46:14 +0000 Received: by outflank-mailman (input) for mailman id 606298; Thu, 21 Sep 2023 10:46:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHCG-0001nF-WD for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHCG-0004Ta-VY for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHCG-0005F9-Uk for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46: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=L2TXvj8QShYys1vz6Wz8iULRugrx4491bDQY3bJFpLA=; b=4k35csGT96GWe/QcAt3NYhLIJm q1EINaRp57zgR0WdL8fhH+hd2NV1hXNkeFAG48uBOJC5wcxQP9OrOM74K5/8mBR6X9JNWFyRJ4v3e 5L+iN/atsAPeMhMRqfMn0s0JgOulX7XyKug2RvDH0D55p1pyusgqiimbJtWPW7LevJHc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Enable full Xen build Message-Id: Date: Thu, 21 Sep 2023 10:46:12 +0000 commit ea36ac0de27c2a7c847a2a52c3e0f97a45864d81 Author: Shawn Anastasio AuthorDate: Thu Sep 14 14:03:34 2023 -0500 Commit: Jan Beulich CommitDate: Tue Sep 19 11:03:26 2023 +0200 xen/ppc: Enable full Xen build Bring ppc's Makefile and arch.mk in line with arm and x86 to disable the build overrides and enable the full Xen build. Signed-off-by: Shawn Anastasio Reviewed-by: Jan Beulich --- xen/arch/ppc/Makefile | 16 +++++++++++++++- xen/arch/ppc/arch.mk | 3 --- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile index 6d5569ff64..71feb5e2c4 100644 --- a/xen/arch/ppc/Makefile +++ b/xen/arch/ppc/Makefile @@ -11,10 +11,24 @@ $(TARGET): $(TARGET)-syms cp -f $< $@ $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds - $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) -o $@ + $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ + $(objtree)/common/symbols-dummy.o -o $(dot-target).0 + $(NM) -pa --format=sysv $(dot-target).0 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).0.S + $(MAKE) $(build)=$(@D) $(dot-target).0.o + $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ + $(dot-target).0.o -o $(dot-target).1 + $(NM) -pa --format=sysv $(dot-target).1 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).1.S + $(MAKE) $(build)=$(@D) $(dot-target).1.o + $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ + $(dot-target).1.o -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > $@.map + rm -f $(@D)/.$(@F).[0-9]* $(obj)/xen.lds: $(src)/xen.lds.S FORCE $(call if_changed_dep,cpp_lds_S) diff --git a/xen/arch/ppc/arch.mk b/xen/arch/ppc/arch.mk index d05cbf1df5..917ad0e6a8 100644 --- a/xen/arch/ppc/arch.mk +++ b/xen/arch/ppc/arch.mk @@ -7,6 +7,3 @@ CFLAGS += -m64 -mlittle-endian -mcpu=$(ppc-march-y) CFLAGS += -mstrict-align -mcmodel=medium -mabi=elfv2 -fPIC -mno-altivec -mno-vsx -msoft-float LDFLAGS += -m elf64lppc - -# TODO: Drop override when more of the build is working -override ALL_OBJS-y = arch/$(SRCARCH)/built_in.o common/libfdt/built_in.o lib/built_in.o -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 10:46:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 10:46:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606299.944133 (Exim 4.92) (envelope-from ) id 1qjHCS-0001xy-6U; Thu, 21 Sep 2023 10:46:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606299.944133; Thu, 21 Sep 2023 10:46: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 1qjHCS-0001xq-3o; Thu, 21 Sep 2023 10:46:24 +0000 Received: by outflank-mailman (input) for mailman id 606299; Thu, 21 Sep 2023 10:46:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHCR-0001xg-2k for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjHCR-0004Tm-2A for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjHCR-0005Fb-1J for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 10:46: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=OYMIToBbKc1/Kt0gagFgSP3nxrRt29QjwI8h6qs7qRs=; b=iwmoKa2HBqqjDvDcyB0jnxGcA2 LaTE6DW4AonxEb4F3YvzeDL948MbjEXZuJZ2l6bJGZfkP4O8rR8hkVbPLCJRWZjfeZxiLqcANmtZt blaPhXCdRaCIR65baRSZG/afXZ6IP+Z2MCVJN718HY+CaHx31Ep6f0NQm4Jzx8GIha4M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/entry: Partially revert IST-exit checks Message-Id: Date: Thu, 21 Sep 2023 10:46:23 +0000 commit 9b57c800b79b96769ea3dcd6468578fa664d19f9 Author: Andrew Cooper AuthorDate: Tue Sep 19 11:23:34 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:35:22 2023 +0100 x86/entry: Partially revert IST-exit checks The patch adding check_ist_exit() didn't account for the fact that reset_stack_and_jump() is not an ABI-preserving boundary. The IST-ness in %r12 doesn't survive into the next context, and is a stale value C. This shows up in Gitlab CI for the Clang build: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/5112783827 and in OSSTest for GCC 8: http://logs.test-lab.xenproject.org/osstest/logs/183045/test-amd64-amd64-xl-qemuu-debianhvm-amd64/serial-pinot0.log There's no straightforward way to reconstruct the IST-exit-ness on the exit-to-guest path after a context switch. For now, we only need IST-exit on the return-to-Xen path. Fixes: 21bdc25b05a0 ("x86/entry: Track the IST-ness of an entry for the exit paths") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/compat/entry.S | 9 +-------- xen/arch/x86/x86_64/entry.S | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 7504bfb4f3..bd5abd8040 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -117,15 +117,8 @@ compat_process_trap: call compat_create_bounce_frame jmp compat_test_all_events -/* %rbx: struct vcpu, %r12: ist_exit, interrupts disabled */ +/* %rbx: struct vcpu, interrupts disabled */ ENTRY(compat_restore_all_guest) - -#ifdef CONFIG_DEBUG - mov %rsp, %rdi - mov %r12, %rsi - call check_ist_exit -#endif - ASSERT_INTERRUPTS_DISABLED mov $~(X86_EFLAGS_IOPL | X86_EFLAGS_VM), %r11d and UREGS_eflags(%rsp),%r11d diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 988ef6cbc6..5ca74f5f62 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -142,15 +142,8 @@ process_trap: .section .text.entry, "ax", @progbits -/* %rbx: struct vcpu, %r12: ist_exit, interrupts disabled */ +/* %rbx: struct vcpu, interrupts disabled */ restore_all_guest: - -#ifdef CONFIG_DEBUG - mov %rsp, %rdi - mov %r12, %rsi - call check_ist_exit -#endif - ASSERT_INTERRUPTS_DISABLED /* Stash guest SPEC_CTRL value while we can read struct vcpu. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:00:11 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606520.944464 (Exim 4.92) (envelope-from ) id 1qjN24-0007bd-4G; Thu, 21 Sep 2023 17:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606520.944464; Thu, 21 Sep 2023 17:00:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN24-0007bG-1V; Thu, 21 Sep 2023 17:00:04 +0000 Received: by outflank-mailman (input) for mailman id 606520; Thu, 21 Sep 2023 17:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN22-0007Hu-LM for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN22-0005SW-8n for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN22-00014W-6D for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17: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=apZAlTyljdh3kafaNzDfDflFpzjpD1DXbz0EsryyDu0=; b=FnRH2kR1EpDfnk0UajFZOyk3X1 MsGDP/d8WFYXfqpQUJ3B7LQDZB80PaMg1xS7ahbK2/hb6nFKydJHGGGnB6FnjTPdNs0/iE6BpEQOx JNpYvlY29Q1Typrc7X/pavqUU9CFtXdGQOjNlXrcGroj0MXs8dd/HqzuZGYN2dNBPqFg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/AMD: extend Zenbleed check to models "good" ucode isn't known for Message-Id: Date: Thu, 21 Sep 2023 17:00:02 +0000 commit d2d2dcae879c6cc05227c9620f0a772f35fe6886 Author: Jan Beulich AuthorDate: Wed Aug 23 09:26:36 2023 +0200 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/AMD: extend Zenbleed check to models "good" ucode isn't known for Reportedly the AMD Custom APU 0405 found on SteamDeck, models 0x90 and 0x91, (quoting the respective Linux commit) is similarly affected. Put another instance of our Zen1 vs Zen2 distinction checks in amd_check_zenbleed(), forcing use of the chickenbit irrespective of ucode version (building upon real hardware never surfacing a version of 0xffffffff). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper (cherry picked from commit 145a69c0944ac70cfcf9d247c85dee9e99d9d302) --- xen/arch/x86/cpu/amd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3ea214fc2e..1bb3044be1 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -909,10 +909,17 @@ void amd_check_zenbleed(void) case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; default: /* - * With the Fam17h check above, parts getting here are Zen1. - * They're not affected. + * With the Fam17h check above, most parts getting here are + * Zen1. They're not affected. Assume Zen2 ones making it + * here are affected regardless of microcode version. + * + * Zen1 vs Zen2 isn't a simple model number comparison, so use + * STIBP as a heuristic to distinguish. */ - return; + if (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) + return; + good_rev = ~0U; + break; } rdmsrl(MSR_AMD64_DE_CFG, val); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:00:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606521.944469 (Exim 4.92) (envelope-from ) id 1qjN2D-00083O-5k; Thu, 21 Sep 2023 17:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606521.944469; Thu, 21 Sep 2023 17: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 1qjN2D-00083G-30; Thu, 21 Sep 2023 17:00:13 +0000 Received: by outflank-mailman (input) for mailman id 606521; Thu, 21 Sep 2023 17:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2C-000838-Fm for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2C-0005Sc-Di for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN2C-00015h-B7 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZS/Ri9OYdryM7goYJQ9AYN2QsovsgU8HfJsF1BosALQ=; b=KeLqojwrk7k4zPzAoaizp8q/Hp 3VJdDYbhYqgk6jlAUcprqDJbz6mV20Cv56FMevPEhSigwxpGp0UXj44JKCD3gdZyclJ/J8YlolB3W si7ilrzULFZjAva5TydEUjjKc34n50DL718GXO6oQx1/rHPo9cIcPL3T/u1lGZ94dsdA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} Message-Id: Date: Thu, 21 Sep 2023 17:00:12 +0000 commit dc28aba565f226f9bec24cfde993e78478acfb4e Author: Andrew Cooper AuthorDate: Tue Sep 12 15:06:49 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} c/s 3fffaf9c13e9 ("x86/entry: Avoid using alternatives in NMI/#MC paths") dropped the only user, leaving behind the (incorrect) implication that Xen had split exit paths. Delete the unused SPEC_CTRL_EXIT_TO_XEN and rename SPEC_CTRL_EXIT_TO_XEN_IST to SPEC_CTRL_EXIT_TO_XEN for consistency. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 1c18d73774533a55ba9d1cbee8bdace03efdb5e7) --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 10 ++-------- xen/arch/x86/x86_64/entry.S | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index f23bb105c5..e8fd01243c 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -79,7 +79,6 @@ * - SPEC_CTRL_ENTRY_FROM_PV * - SPEC_CTRL_ENTRY_FROM_INTR * - SPEC_CTRL_ENTRY_FROM_INTR_IST - * - SPEC_CTRL_EXIT_TO_XEN_IST * - SPEC_CTRL_EXIT_TO_XEN * - SPEC_CTRL_EXIT_TO_PV * @@ -268,11 +267,6 @@ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV -/* Use when exiting to Xen context. */ -#define SPEC_CTRL_EXIT_TO_XEN \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_XEN, X86_FEATURE_SC_MSR_PV - /* Use when exiting to PV guest context. */ #define SPEC_CTRL_EXIT_TO_PV \ ALTERNATIVE "", \ @@ -339,8 +333,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen in IST context. */ -.macro SPEC_CTRL_EXIT_TO_XEN_IST +/* Use when exiting to Xen context. */ +.macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end * Clobbers %rax, %rcx, %rdx diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 7675a59ff0..b45a09823a 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -673,7 +673,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN_IST /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ RESTORE_ALL adj=8 iretq -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:00:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606522.944473 (Exim 4.92) (envelope-from ) id 1qjN2N-00085r-79; Thu, 21 Sep 2023 17:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606522.944473; Thu, 21 Sep 2023 17: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 1qjN2N-00085j-4V; Thu, 21 Sep 2023 17:00:23 +0000 Received: by outflank-mailman (input) for mailman id 606522; Thu, 21 Sep 2023 17:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2M-00085d-LA for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2M-0005Tj-Ib for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN2M-00016j-Ft for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xww8UiRU1GQuT33Y05NQws6YY2EPcdimRmEqf/eDISk=; b=NwwJvxpxbrpfyLPuIhgg6gKZGT 2LUiOqpHdhiH9fljZ8USInau2UZvEtJ2xhBugPv+NH627qkndHilRD5F2dGrTpXinkaHZOXUmB91m XresPUs3xtBnu05M81YfVr9gbfVv5UmQ3gs4hpJrOCN8ZqHON221ykG8yp9oJ7C6POjI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user Message-Id: Date: Thu, 21 Sep 2023 17:00:22 +0000 commit 84690fb82c4f4aecb72a6789d8994efa74841e09 Author: Andrew Cooper AuthorDate: Tue Sep 12 17:03:16 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user With the SPEC_CTRL_EXIT_TO_XEN{,_IST} confusion fixed, it's now obvious that there's only a single EXIT_TO_XEN path. Fold DO_SPEC_CTRL_EXIT_TO_XEN into SPEC_CTRL_EXIT_TO_XEN to simplify further fixes. When merging labels, switch the name to .L\@_skip_sc_msr as "skip" on its own is going to be too generic shortly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 694bb0f280fd08a4377e36e32b84b5062def4de2) --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 40 +++++++++++++------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index e8fd01243c..d5f65d80ea 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -211,27 +211,6 @@ wrmsr .endm -.macro DO_SPEC_CTRL_EXIT_TO_XEN -/* - * Requires %rbx=stack_end - * Clobbers %rax, %rcx, %rdx - * - * When returning to Xen context, look to see whether SPEC_CTRL shadowing is - * in effect, and reload the shadow value. This covers race conditions which - * exist with an NMI/MCE/etc hitting late in the return-to-guest path. - */ - xor %edx, %edx - - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip - - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax - mov $MSR_SPEC_CTRL, %ecx - wrmsr - -.L\@_skip: -.endm - .macro DO_SPEC_CTRL_EXIT_TO_GUEST /* * Requires %eax=spec_ctrl, %rsp=regs/cpuinfo @@ -340,11 +319,24 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): * Clobbers %rax, %rcx, %rdx */ testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip + jz .L\@_skip_sc_msr - DO_SPEC_CTRL_EXIT_TO_XEN + /* + * When returning to Xen context, look to see whether SPEC_CTRL shadowing + * is in effect, and reload the shadow value. This covers race conditions + * which exist with an NMI/MCE/etc hitting late in the return-to-guest + * path. + */ + xor %edx, %edx -.L\@_skip: + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + jz .L\@_skip_sc_msr + + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov $MSR_SPEC_CTRL, %ecx + wrmsr + +.L\@_skip_sc_msr: .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:00:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606523.944476 (Exim 4.92) (envelope-from ) id 1qjN2X-00088V-8Z; Thu, 21 Sep 2023 17:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606523.944476; Thu, 21 Sep 2023 17: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 1qjN2X-00088N-60; Thu, 21 Sep 2023 17:00:33 +0000 Received: by outflank-mailman (input) for mailman id 606523; Thu, 21 Sep 2023 17:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2W-00088D-MP for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2W-0005Ub-Lk for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN2W-00017Z-Ko for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZRfjj4PJpxRvfZHrl89SqiCRINjG1ciesyOLFP5fs08=; b=wcXOa4oAWEdDjhIFk7RBqxOQbz ru/uENxnq7AnvROCM5LxAhfb9zQfIR7Wdblk2p9aSY2gBGqnSf70AYQz9JwDOATmL6QYfTfiqGoK2 zSz2nxvbK15xckC9vohqD88JxTRZYiQ3cWKO0jruz0QdIVtjS1StvnIOdV8PshnLHVkc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros Message-Id: Date: Thu, 21 Sep 2023 17:00:32 +0000 commit 3952c73bdbd05f0e666986fce633a591237b3c88 Author: Andrew Cooper AuthorDate: Fri Sep 1 11:38:44 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros These have grown more complex over time, with some already having been converted. Provide full Requires/Clobbers comments, otherwise missing at this level of indirection. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 7125429aafb9e3c9c88fc93001fc2300e0ac2cc8) --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 37 ++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index d5f65d80ea..c6d5f2ad01 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -231,26 +231,45 @@ .endm /* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ -#define SPEC_CTRL_ENTRY_FROM_PV \ +.macro SPEC_CTRL_ENTRY_FROM_PV +/* + * Requires %rsp=regs/cpuinfo, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=0), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=0), \ X86_FEATURE_SC_MSR_PV +.endm /* Use in interrupt/exception context. May interrupt Xen or PV context. */ -#define SPEC_CTRL_ENTRY_FROM_INTR \ +.macro SPEC_CTRL_ENTRY_FROM_INTR +/* + * Requires %rsp=regs, %r14=stack_end, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=1), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV +.endm /* Use when exiting to PV guest context. */ -#define SPEC_CTRL_EXIT_TO_PV \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV; \ +.macro SPEC_CTRL_EXIT_TO_PV +/* + * Requires %rax=spec_ctrl, %rsp=regs/info + * Clobbers %rcx, %rdx + */ + ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV + DO_SPEC_CTRL_COND_VERW +.endm /* * Use in IST interrupt/exception context. May interrupt Xen or PV context. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:00:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606524.944480 (Exim 4.92) (envelope-from ) id 1qjN2h-0008Bf-A1; Thu, 21 Sep 2023 17:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606524.944480; Thu, 21 Sep 2023 17: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 1qjN2h-0008BY-7V; Thu, 21 Sep 2023 17:00:43 +0000 Received: by outflank-mailman (input) for mailman id 606524; Thu, 21 Sep 2023 17:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2g-0008BO-R9 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2g-0005Uj-Oh for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN2g-00018R-Nk for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17: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=CnbiX3D0qto0VjW5aoOEEsRsV4HapJLP9JbkQdGTv0k=; b=TBc8kxeP1zaSc6fBs1dzt3mZRo uh5FOq5ABTJOQZfDJrqwpmoA3/vWsKxAartPNLWp3LH6iVSk8Ki70vJZeK13Q0LIxzSIJmQ3Z1gUJ 4iEG7xO7b1UC6Mv/YzUtHMtyag2h5A2VgN10blH9N+SZvBLYaPayCPvIl/pz1SHjMyBo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments Message-Id: Date: Thu, 21 Sep 2023 17:00:42 +0000 commit ba023e93d0b1e60b80251bf080bab694efb9f8e3 Author: Andrew Cooper AuthorDate: Wed Aug 30 20:11:50 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments ... to better explain how they're used. Doing so highlights that SPEC_CTRL_EXIT_TO_XEN is missing a VERW flush for the corner case when e.g. an NMI hits late in an exit-to-guest path. Leave a TODO, which will be addressed in subsequent patches which arrange for VERW flushing to be safe within SPEC_CTRL_EXIT_TO_XEN. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 45f00557350dc7d0756551069803fc49c29184ca) --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 36 +++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index c6d5f2ad01..97c4db31cd 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -230,7 +230,10 @@ wrmsr .endm -/* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ +/* + * Used after an entry from PV context: SYSCALL, SYSENTER, INT, + * etc. There is always a guest speculation state in context. + */ .macro SPEC_CTRL_ENTRY_FROM_PV /* * Requires %rsp=regs/cpuinfo, %rdx=0 @@ -245,7 +248,11 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use in interrupt/exception context. May interrupt Xen or PV context. */ +/* + * Used after an exception or maskable interrupt, hitting Xen or PV context. + * There will either be a guest speculation context, or (barring fatal + * exceptions) a well-formed Xen speculation context. + */ .macro SPEC_CTRL_ENTRY_FROM_INTR /* * Requires %rsp=regs, %r14=stack_end, %rdx=0 @@ -260,7 +267,10 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use when exiting to PV guest context. */ +/* + * Used when exiting from any entry context, back to PV context. This + * includes from an IST entry which moved onto the primary stack. + */ .macro SPEC_CTRL_EXIT_TO_PV /* * Requires %rax=spec_ctrl, %rsp=regs/info @@ -272,7 +282,13 @@ .endm /* - * Use in IST interrupt/exception context. May interrupt Xen or PV context. + * Used after an IST entry hitting Xen or PV context. Special care is needed, + * because when hitting Xen context, there may not be a well-formed + * speculation context. (i.e. it can hit in the middle of + * SPEC_CTRL_{ENTRY,EXIT}_* regions.) + * + * An IST entry which hits PV context moves onto the primary stack and leaves + * via SPEC_CTRL_EXIT_TO_PV, *not* SPEC_CTRL_EXIT_TO_XEN. */ .macro SPEC_CTRL_ENTRY_FROM_INTR_IST /* @@ -331,7 +347,14 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen context. */ +/* + * Use when exiting from any entry context, back to Xen context. This + * includes returning to other SPEC_CTRL_{ENTRY,EXIT}_* regions with an + * incomplete speculation context. + * + * Because we might have interrupted Xen beyond SPEC_CTRL_EXIT_TO_$GUEST, we + * need to treat this as if it were an EXIT_TO_$GUEST case too. + */ .macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end @@ -356,6 +379,9 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): wrmsr .L\@_skip_sc_msr: + + /* TODO VERW */ + .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:00:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:00:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606525.944485 (Exim 4.92) (envelope-from ) id 1qjN2r-0008EI-Bh; Thu, 21 Sep 2023 17:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606525.944485; Thu, 21 Sep 2023 17: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 1qjN2r-0008EA-93; Thu, 21 Sep 2023 17:00:53 +0000 Received: by outflank-mailman (input) for mailman id 606525; Thu, 21 Sep 2023 17:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2q-0008E1-SE for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN2q-0005Uq-RY for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN2q-00019K-Qj for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17: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=+8MxU38KAOze1kYNUl0lKUfB7jDT1j4dMubbwzMaAcA=; b=md+NPNeARBSHpyD58zSFJQA92x Zvxn6OSD5JyG8a4W+/6OZAj7YwwyLQfUHtNxTEDynY2TwLCACFP2FlJ6VnLlTcd6N6QssJlcbN9u3 6kZ9ubE7L1WdqJ0H7/7acB6aJXV4RZ/BiMdz7ZFW6drxSeHeoyH9/ap9aQwcIUk+YO/Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/entry: Adjust restore_all_xen to hold stack_end in %r14 Message-Id: Date: Thu, 21 Sep 2023 17:00:52 +0000 commit 5f7efd47c8273fde972637d0360851802f76eca9 Author: Andrew Cooper AuthorDate: Wed Sep 13 13:48:16 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/entry: Adjust restore_all_xen to hold stack_end in %r14 All other SPEC_CTRL_{ENTRY,EXIT}_* helpers hold stack_end in %r14. Adjust it for consistency. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 7aa28849a1155d856e214e9a80a7e65fffdc3e58) --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 8 ++++---- xen/arch/x86/x86_64/entry.S | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index 97c4db31cd..66c706496f 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -357,10 +357,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %rbx=stack_end + * Requires %r14=stack_end * Clobbers %rax, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr /* @@ -371,10 +371,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax mov $MSR_SPEC_CTRL, %ecx wrmsr diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index b45a09823a..92279a225d 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -665,15 +665,15 @@ restore_all_xen: * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). */ - GET_STACK_END(bx) - cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%rbx) + GET_STACK_END(14) + cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) UNLIKELY_START(ne, exit_cr3) - mov STACK_CPUINFO_FIELD(pv_cr3)(%rbx), %rax + mov STACK_CPUINFO_FIELD(pv_cr3)(%r14), %rax mov %rax, %cr3 UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ RESTORE_ALL adj=8 iretq -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:01:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606526.944489 (Exim 4.92) (envelope-from ) id 1qjN32-0008H7-DD; Thu, 21 Sep 2023 17:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606526.944489; Thu, 21 Sep 2023 17:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN32-0008Gz-AY; Thu, 21 Sep 2023 17:01:04 +0000 Received: by outflank-mailman (input) for mailman id 606526; Thu, 21 Sep 2023 17:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN31-0008Gl-0u for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN30-0005VT-Ue for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN30-0001AU-Tf for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17: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=2QZC89I3UlE8JEWtQ0hsML5Hgc7VZqfspnoXJEzd4nU=; b=JBy+bN9VQi3B5qZL4C2XMEnUq3 x7ajhPMr7KzTMExQGbJZnwHTbhuykzT/XKoTDbcM6TFeQn7I8xahJMBkvoiytR/hKadLvAdr66ZgK II6/OjfYW3+fq3VDPuKRUcI4FPtODQtfV+iu1qm/CxxcoVyD/pTbW2+yOFFaFq33mE4g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/entry: Track the IST-ness of an entry for the exit paths Message-Id: Date: Thu, 21 Sep 2023 17:01:02 +0000 commit e4a71bc0da0baf7464bb0d8e33053f330e5ea366 Author: Andrew Cooper AuthorDate: Wed Sep 13 12:20:12 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/entry: Track the IST-ness of an entry for the exit paths Use %r12 to hold an ist_exit boolean. This register is zero elsewhere in the entry/exit asm, so it only needs setting in the IST path. As this is subtle and fragile, add check_ist_exit() to be used in debugging builds to cross-check that the ist_exit boolean matches the entry vector. Write check_ist_exit() it in C, because it's debug only and the logic more complicated than I care to maintain in asm. For now, we only need to use this signal in the exit-to-Xen path, but some exit-to-guest paths happen in IST context too. Check the correctness in all exit paths to avoid the logic bit-rotting. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 21bdc25b05a0f8ab6bc73520a9ca01327360732c) x86/entry: Partially revert IST-exit checks The patch adding check_ist_exit() didn't account for the fact that reset_stack_and_jump() is not an ABI-preserving boundary. The IST-ness in %r12 doesn't survive into the next context, and is a stale value C. This shows up in Gitlab CI for the Clang build: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/5112783827 and in OSSTest for GCC 8: http://logs.test-lab.xenproject.org/osstest/logs/183045/test-amd64-amd64-xl-qemuu-debianhvm-amd64/serial-pinot0.log There's no straightforward way to reconstruct the IST-exit-ness on the exit-to-guest path after a context switch. For now, we only need IST-exit on the return-to-Xen path. Fixes: 21bdc25b05a0 ("x86/entry: Track the IST-ness of an entry for the exit paths") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 9b57c800b79b96769ea3dcd6468578fa664d19f9) --- xen/arch/x86/traps.c | 13 +++++++++++++ xen/arch/x86/x86_64/entry.S | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index d12004b1c6..e65cc60041 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2315,6 +2315,19 @@ void asm_domain_crash_synchronous(unsigned long addr) do_softirq(); } +#ifdef CONFIG_DEBUG +void check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) +{ + const unsigned int ist_mask = + (1U << X86_EXC_NMI) | (1U << X86_EXC_DB) | + (1U << X86_EXC_DF) | (1U << X86_EXC_MC); + uint8_t ev = regs->entry_vector; + bool is_ist = (ev < TRAP_nr) && ((1U << ev) & ist_mask); + + ASSERT(is_ist == ist_exit); +} +#endif + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 92279a225d..4cebc4fbe3 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -659,8 +659,15 @@ ENTRY(early_page_fault) .section .text.entry, "ax", @progbits ALIGN -/* No special register assumptions. */ +/* %r12=ist_exit */ restore_all_xen: + +#ifdef CONFIG_DEBUG + mov %rsp, %rdi + mov %r12, %rsi + call check_ist_exit +#endif + /* * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). @@ -1091,6 +1098,10 @@ handle_ist_exception: .L_ist_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %bl, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) + + /* This is an IST exit */ + mov $1, %r12d + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) jne ret_from_intr -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:01:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:01:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606527.944492 (Exim 4.92) (envelope-from ) id 1qjN3C-0008KJ-G3; Thu, 21 Sep 2023 17:01:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606527.944492; Thu, 21 Sep 2023 17:01: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 1qjN3C-0008KC-DP; Thu, 21 Sep 2023 17:01:14 +0000 Received: by outflank-mailman (input) for mailman id 606527; Thu, 21 Sep 2023 17:01:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3B-0008Jt-1u for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3B-0005Ve-1J for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN3B-0001BR-0T for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01: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=TzxHmBBgOwjW59vXTyZmYFb61JfIangI12X3SDgiT6I=; b=zXKcHputhlJjpPM2dEo1OXRQqJ 1Gr5ehohh9KIZXasGECsQSI1dJfPskLopstzoVvDTY0icPEao+R7EtN6sSiLp0x7rGDbnZskjYf3g fZkh0cwsQNEqwx73ixG4b+ccYYLrpO6t292ZoJ547cgxt/0jsHO0Ol7GF/lD9RYICmeQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/spec-ctrl: Issue VERW during IST exit to Xen Message-Id: Date: Thu, 21 Sep 2023 17:01:13 +0000 commit 2e2c3efcfc9f183674a8de6ed954ffbe7188b70d Author: Andrew Cooper AuthorDate: Wed Sep 13 13:53:33 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/spec-ctrl: Issue VERW during IST exit to Xen There is a corner case where e.g. an NMI hitting an exit-to-guest path after SPEC_CTRL_EXIT_TO_* would have run the entire NMI handler *after* the VERW flush to scrub potentially sensitive data from uarch buffers. In order to compensate, issue VERW when exiting to Xen from an IST entry. SPEC_CTRL_EXIT_TO_XEN already has two reads of spec_ctrl_flags off the stack, and we're about to add a third. Load the field into %ebx, and list the register as clobbered. %r12 has been arranged to be the ist_exit signal, so add this as an input dependency and use it to identify when to issue a VERW. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 3ee6066bcd737756b0990d417d94eddc0b0d2585) --- xen/arch/x86/include/asm/spec_ctrl_asm.h | 20 +++++++++++++++----- xen/arch/x86/x86_64/entry.S | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index 66c706496f..28a75796e6 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -357,10 +357,12 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %r14=stack_end - * Clobbers %rax, %rcx, %rdx + * Requires %r12=ist_exit, %r14=stack_end + * Clobbers %rax, %rbx, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + movzbl STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14), %ebx + + testb $SCF_ist_sc_msr, %bl jz .L\@_skip_sc_msr /* @@ -371,7 +373,7 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + testb $SCF_use_shadow, %bl jz .L\@_skip_sc_msr mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax @@ -380,8 +382,16 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): .L\@_skip_sc_msr: - /* TODO VERW */ + test %r12, %r12 + jz .L\@_skip_ist_exit + + /* Logically DO_SPEC_CTRL_COND_VERW but without the %rsp=cpuinfo dependency */ + testb $SCF_verw, %bl + jz .L\@_skip_verw + verw STACK_CPUINFO_FIELD(verw_sel)(%r14) +.L\@_skip_verw: +.L\@_skip_ist_exit: .endm #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 4cebc4fbe3..c12e011b4d 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -680,7 +680,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r12=ist_exit %r14=end, Clob: abcd */ RESTORE_ALL adj=8 iretq -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:01:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:01:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606529.944496 (Exim 4.92) (envelope-from ) id 1qjN3M-0008Mp-Hi; Thu, 21 Sep 2023 17:01:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606529.944496; Thu, 21 Sep 2023 17:01: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 1qjN3M-0008Mh-F7; Thu, 21 Sep 2023 17:01:24 +0000 Received: by outflank-mailman (input) for mailman id 606529; Thu, 21 Sep 2023 17:01:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3L-0008MZ-4w for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3L-0005Vo-4G for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN3L-0001CG-3M for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01: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=nOUyouSkAjpb3/8l39z7t44o9k1moEhQCx0qRLgrxxs=; b=PzXCytOCvup4OBq/Dz6dVIAozY 5PLhw3Q2hdK75oxIMv5Xwg9ywHTMz/rKDwIIIOaQxW0xYrHU9hI/NzOA2ZeKTA5Ocn6MEc9A404+D cEJpXolmHuo4B6VziHRs4KD/okBbwcTWYEboKojiCAsDfVdHFBpkQYthCZuLcfyMTQKY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/amd: Introduce is_zen{1,2}_uarch() predicates Message-Id: Date: Thu, 21 Sep 2023 17:01:23 +0000 commit 19ee1e1faa32b79274b3484cb1170a5970f1e602 Author: Andrew Cooper AuthorDate: Fri Sep 15 12:13:51 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/amd: Introduce is_zen{1,2}_uarch() predicates We already have 3 cases using STIBP as a Zen1/2 heuristic, and are about to introduce a 4th. Wrap the heuristic into a pair of predicates rather than opencoding it, and the explanation of the heuristic, at each usage site. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit de1d265001397f308c5c3c5d3ffc30e7ef8c0705) --- xen/arch/x86/cpu/amd.c | 18 ++++-------------- xen/arch/x86/include/asm/amd.h | 11 +++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 1bb3044be1..e94ba5a0e0 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -855,15 +855,13 @@ void amd_set_legacy_ssbd(bool enable) * non-branch instructions to be ignored. It is to be set unilaterally in * newer microcode. * - * This chickenbit is something unrelated on Zen1, and Zen1 vs Zen2 isn't a - * simple model number comparison, so use STIBP as a heuristic to separate the - * two uarches in Fam17h(AMD)/18h(Hygon). + * This chickenbit is something unrelated on Zen1. */ void amd_init_spectral_chicken(void) { uint64_t val, chickenbit = 1 << 1; - if (cpu_has_hypervisor || !boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (cpu_has_hypervisor || !is_zen2_uarch()) return; if (rdmsr_safe(MSR_AMD64_DE_CFG2, val) == 0 && !(val & chickenbit)) @@ -912,11 +910,8 @@ void amd_check_zenbleed(void) * With the Fam17h check above, most parts getting here are * Zen1. They're not affected. Assume Zen2 ones making it * here are affected regardless of microcode version. - * - * Zen1 vs Zen2 isn't a simple model number comparison, so use - * STIBP as a heuristic to distinguish. */ - if (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (is_zen1_uarch()) return; good_rev = ~0U; break; @@ -1277,12 +1272,7 @@ static int __init cf_check zen2_c6_errata_check(void) */ s_time_t delta; - /* - * Zen1 vs Zen2 isn't a simple model number comparison, so use STIBP as - * a heuristic to separate the two uarches in Fam17h. - */ - if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || - !boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || !is_zen2_uarch()) return 0; /* diff --git a/xen/arch/x86/include/asm/amd.h b/xen/arch/x86/include/asm/amd.h index a975d3de26..82324110ab 100644 --- a/xen/arch/x86/include/asm/amd.h +++ b/xen/arch/x86/include/asm/amd.h @@ -140,6 +140,17 @@ AMD_MODEL_RANGE(0x11, 0x0, 0x0, 0xff, 0xf), \ AMD_MODEL_RANGE(0x12, 0x0, 0x0, 0xff, 0xf)) +/* + * The Zen1 and Zen2 microarchitectures are implemented by AMD (Fam17h) and + * Hygon (Fam18h) but without simple model number rules. Instead, use STIBP + * as a heuristic that distinguishes the two. + * + * The caller is required to perform the appropriate vendor/family checks + * first. + */ +#define is_zen1_uarch() (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) +#define is_zen2_uarch() boot_cpu_has(X86_FEATURE_AMD_STIBP) + struct cpuinfo_x86; int cpu_has_amd_erratum(const struct cpuinfo_x86 *, int, ...); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:01:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:01:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606530.944500 (Exim 4.92) (envelope-from ) id 1qjN3W-0008PE-JJ; Thu, 21 Sep 2023 17:01:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606530.944500; Thu, 21 Sep 2023 17:01: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 1qjN3W-0008P7-Gi; Thu, 21 Sep 2023 17:01:34 +0000 Received: by outflank-mailman (input) for mailman id 606530; Thu, 21 Sep 2023 17:01:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3V-0008Oz-8L for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3V-0005Vv-7j for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN3V-0001D3-6h for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01: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=bfCeYuRt4t/gBTWdzLKNbReQglKO5Ujir7igINVKPnY=; b=bqWeZhAQ8pybkcA64FJ7UVLwoL 1f73rPJVKWzdb1FvkAKfmTPxP5SPyYO4IpaNb4TIKNF4+IOuqVdezDsvNZfHTVkNbBB3pHw4WwY8E R/9IB+hQXE08abRakGzzPJoYnCK4CL5LZBNImaKuCPHPByB52bhFshdPjXUV4tzvt6QM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/spec-ctrl: Mitigate the Zen1 DIV leakage Message-Id: Date: Thu, 21 Sep 2023 17:01:33 +0000 commit 9ac2f49f5fa3a5159409241d4f74fb0d721dd4c5 Author: Andrew Cooper AuthorDate: Wed Aug 30 20:24:25 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:36:49 2023 +0100 x86/spec-ctrl: Mitigate the Zen1 DIV leakage In the Zen1 microarchitecure, there is one divider in the pipeline which services uops from both threads. In the case of #DE, the latched result from the previous DIV to execute will be forwarded speculatively. This is an interesting covert channel that allows two threads to communicate without any system calls. In also allows userspace to obtain the result of the most recent DIV instruction executed (even speculatively) in the core, which can be from a higher privilege context. Scrub the result from the divider by executing a non-faulting divide. This needs performing on the exit-to-guest paths, and ist_exit-to-Xen. Alternatives in IST context is believed safe now that it's done in NMI context. This is XSA-439 / CVE-2023-20588. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit b5926c6ecf05c28ee99c6248c42d691ccbf0c315) --- docs/misc/xen-command-line.pandoc | 6 +++- xen/arch/x86/hvm/svm/entry.S | 1 + xen/arch/x86/include/asm/cpufeatures.h | 2 +- xen/arch/x86/include/asm/spec_ctrl_asm.h | 17 +++++++++++ xen/arch/x86/spec_ctrl.c | 48 +++++++++++++++++++++++++++++++- 5 files changed, 71 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index d9dae740cc..b92c8f969c 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2315,7 +2315,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). > {msr-sc,rsb,md-clear,ibpb-entry}=|{pv,hvm}=, > bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,psfd, > eager-fpu,l1d-flush,branch-harden,srb-lock, -> unpriv-mmio,gds-mit}= ]` +> unpriv-mmio,gds-mit,div-scrub}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2437,6 +2437,10 @@ has elected not to lock the configuration, Xen will use GDS_CTRL to mitigate GDS with. Otherwise, Xen will mitigate by disabling AVX, which blocks the use of the AVX2 Gather instructions. +On all hardware, the `div-scrub=` option can be used to force or prevent Xen +from mitigating the DIV-leakage vulnerability. By default, Xen will mitigate +DIV-leakage on hardware believed to be vulnerable. + ### sync_console > `= ` diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 981cd82e7c..934f12cf5c 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -74,6 +74,7 @@ __UNLIKELY_END(nsvm_hap) 1: /* No Spectre v1 concerns. Execution will hit VMRUN imminently. */ .endm ALTERNATIVE "", svm_vmentry_spec_ctrl, X86_FEATURE_SC_MSR_HVM + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV pop %r15 pop %r14 diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index da0593de85..c3aad21c3b 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -35,7 +35,7 @@ XEN_CPUFEATURE(SC_RSB_HVM, X86_SYNTH(19)) /* RSB overwrite needed for HVM XEN_CPUFEATURE(XEN_SELFSNOOP, X86_SYNTH(20)) /* SELFSNOOP gets used by Xen itself */ XEN_CPUFEATURE(SC_MSR_IDLE, X86_SYNTH(21)) /* Clear MSR_SPEC_CTRL on idle */ XEN_CPUFEATURE(XEN_LBR, X86_SYNTH(22)) /* Xen uses MSR_DEBUGCTL.LBR */ -/* Bits 23 unused. */ +XEN_CPUFEATURE(SC_DIV, X86_SYNTH(23)) /* DIV scrub needed */ XEN_CPUFEATURE(SC_RSB_IDLE, X86_SYNTH(24)) /* RSB overwrite needed for idle. */ XEN_CPUFEATURE(SC_VERW_IDLE, X86_SYNTH(25)) /* VERW used by Xen for idle */ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks */ diff --git a/xen/arch/x86/include/asm/spec_ctrl_asm.h b/xen/arch/x86/include/asm/spec_ctrl_asm.h index 28a75796e6..f4b8b9d956 100644 --- a/xen/arch/x86/include/asm/spec_ctrl_asm.h +++ b/xen/arch/x86/include/asm/spec_ctrl_asm.h @@ -177,6 +177,19 @@ .L\@_verw_skip: .endm +.macro DO_SPEC_CTRL_DIV +/* + * Requires nothing + * Clobbers %rax + * + * Issue a DIV for its flushing side effect (Zen1 uarch specific). Any + * non-faulting DIV will do; a byte DIV has least latency, and doesn't clobber + * %rdx. + */ + mov $1, %eax + div %al +.endm + .macro DO_SPEC_CTRL_ENTRY maybexen:req /* * Requires %rsp=regs (also cpuinfo if !maybexen) @@ -279,6 +292,8 @@ ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV DO_SPEC_CTRL_COND_VERW + + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV .endm /* @@ -391,6 +406,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): verw STACK_CPUINFO_FIELD(verw_sel)(%r14) .L\@_skip_verw: + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV + .L\@_skip_ist_exit: .endm diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 79b98f0fe7..0ff3c895ac 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -79,6 +79,7 @@ static int8_t __initdata opt_srb_lock = -1; static bool __initdata opt_unpriv_mmio; static bool __ro_after_init opt_fb_clear_mmio; static int8_t __initdata opt_gds_mit = -1; +static int8_t __initdata opt_div_scrub = -1; static int __init cf_check parse_spec_ctrl(const char *s) { @@ -133,6 +134,7 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_srb_lock = 0; opt_unpriv_mmio = false; opt_gds_mit = 0; + opt_div_scrub = 0; } else if ( val > 0 ) rc = -EINVAL; @@ -285,6 +287,8 @@ static int __init cf_check parse_spec_ctrl(const char *s) opt_unpriv_mmio = val; else if ( (val = parse_boolean("gds-mit", s, ss)) >= 0 ) opt_gds_mit = val; + else if ( (val = parse_boolean("div-scrub", s, ss)) >= 0 ) + opt_div_scrub = val; else rc = -EINVAL; @@ -485,7 +489,7 @@ static void __init print_details(enum ind_thunk thunk) "\n"); /* Settings for Xen's protection, irrespective of guests. */ - printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s\n", + printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s%s\n", thunk == THUNK_NONE ? "N/A" : thunk == THUNK_RETPOLINE ? "RETPOLINE" : thunk == THUNK_LFENCE ? "LFENCE" : @@ -510,6 +514,7 @@ static void __init print_details(enum ind_thunk thunk) opt_l1d_flush ? " L1D_FLUSH" : "", opt_md_clear_pv || opt_md_clear_hvm || opt_fb_clear_mmio ? " VERW" : "", + opt_div_scrub ? " DIV" : "", opt_branch_harden ? " BRANCH_HARDEN" : ""); /* L1TF diagnostics, printed if vulnerable or PV shadowing is in use. */ @@ -967,6 +972,45 @@ static void __init srso_calculations(bool hw_smt_enabled) setup_force_cpu_cap(X86_FEATURE_SRSO_NO); } +/* + * The Div leakage issue is specific to the AMD Zen1 microarchitecure. + * + * However, there's no $FOO_NO bit defined, so if we're virtualised we have no + * hope of spotting the case where we might move to vulnerable hardware. We + * also can't make any useful conclusion about SMT-ness. + * + * Don't check the hypervisor bit, so at least we do the safe thing when + * booting on something that looks like a Zen1 CPU. + */ +static bool __init has_div_vuln(void) +{ + if ( !(boot_cpu_data.x86_vendor & + (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) + return false; + + if ( boot_cpu_data.x86 != 0x17 && boot_cpu_data.x86 != 0x18 ) + return false; + + return is_zen1_uarch(); +} + +static void __init div_calculations(bool hw_smt_enabled) +{ + bool cpu_bug_div = has_div_vuln(); + + if ( opt_div_scrub == -1 ) + opt_div_scrub = cpu_bug_div; + + if ( opt_div_scrub ) + setup_force_cpu_cap(X86_FEATURE_SC_DIV); + + if ( opt_smt == -1 && !cpu_has_hypervisor && cpu_bug_div && hw_smt_enabled ) + warning_add( + "Booted on leaky-DIV hardware with SMT/Hyperthreading\n" + "enabled. Please assess your configuration and choose an\n" + "explicit 'smt=' setting. See XSA-439.\n"); +} + static void __init ibpb_calculations(void) { bool def_ibpb_entry = false; @@ -1726,6 +1770,8 @@ void __init init_speculation_mitigations(void) ibpb_calculations(); + div_calculations(hw_smt_enabled); + /* Check whether Eager FPU should be enabled by default. */ if ( opt_eager_fpu == -1 ) opt_eager_fpu = should_use_eager_fpu(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Sep 21 17:01:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Sep 2023 17:01:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606531.944505 (Exim 4.92) (envelope-from ) id 1qjN3g-0008Rp-LO; Thu, 21 Sep 2023 17:01:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606531.944505; Thu, 21 Sep 2023 17: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 1qjN3g-0008Rh-IP; Thu, 21 Sep 2023 17:01:44 +0000 Received: by outflank-mailman (input) for mailman id 606531; Thu, 21 Sep 2023 17:01:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3f-0008RX-C1 for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjN3f-0005W3-BQ for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjN3f-0001Dy-AU for xen-changelog@lists.xenproject.org; Thu, 21 Sep 2023 17:01: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=gtVtvnmLdggPEbb+l9wgFpP0Kh1lC0gK/WEnnk8pEUA=; b=Sem7X2Bjl4vC+AHI7GbROlYcsd b3ebQ/XfXZrqkENJJuIDWZTYt/MRKf9tLYXv7VUlnbaMBnJuYjEM6st4Cr8eEQEfIACGOZqlO6p09 VkPzB4U/Cg/Tg0ffXylP2Ue03CEM87oxBO0SFvMjqXwGVKsSX7FXOkaH75VuM4ib+fDg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/shadow: defer releasing of PV's top-level shadow reference Message-Id: Date: Thu, 21 Sep 2023 17:01:43 +0000 commit 90c540c58985dc774cf0a1d2dc423473d3f37267 Author: Jan Beulich AuthorDate: Wed Sep 20 10:33:26 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 10:35:08 2023 +0100 x86/shadow: defer releasing of PV's top-level shadow reference sh_set_toplevel_shadow() re-pinning the top-level shadow we may be running on is not enough (and at the same time unnecessary when the shadow isn't what we're running on): That shadow becomes eligible for blowing away (from e.g. shadow_prealloc()) immediately after the paging lock was dropped. Yet it needs to remain valid until the actual page table switch occurred. Propagate up the call chain the shadow entry that needs releasing eventually, and carry out the release immediately after switching page tables. Handle update_cr3() failures by switching to idle pagetables. Note that various further uses of update_cr3() are HVM-only or only act on paused vCPU-s, in which case sh_set_toplevel_shadow() will not defer releasing of the reference. While changing the update_cr3() hook, also convert the "do_locking" parameter to boolean. This is CVE-2023-34322 / XSA-438. Reported-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: George Dunlap (cherry picked from commit fb0ff49fe9f784bfee0370c2a3c5f20e39d7a1cb) --- xen/arch/x86/include/asm/mm.h | 2 +- xen/arch/x86/include/asm/paging.h | 6 ++--- xen/arch/x86/include/asm/shadow.h | 8 ++++++ xen/arch/x86/mm.c | 27 ++++++++++++++----- xen/arch/x86/mm/hap/hap.c | 6 +++-- xen/arch/x86/mm/shadow/common.c | 55 +++++++++++++++++++++++++-------------- xen/arch/x86/mm/shadow/multi.c | 33 +++++++++++++++-------- xen/arch/x86/mm/shadow/none.c | 4 ++- xen/arch/x86/mm/shadow/private.h | 14 +++++----- xen/arch/x86/pv/domain.c | 25 ++++++++++++++++-- 10 files changed, 127 insertions(+), 53 deletions(-) diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index d723c7c38f..a5d7fdd32e 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -552,7 +552,7 @@ void audit_domains(void); #endif void make_cr3(struct vcpu *v, mfn_t mfn); -void update_cr3(struct vcpu *v); +pagetable_t update_cr3(struct vcpu *v); int vcpu_destroy_pagetables(struct vcpu *); void *do_page_walk(struct vcpu *v, unsigned long addr); diff --git a/xen/arch/x86/include/asm/paging.h b/xen/arch/x86/include/asm/paging.h index 6f7000d5f4..94c590f31a 100644 --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -138,7 +138,7 @@ struct paging_mode { paddr_t ga, uint32_t *pfec, unsigned int *page_order); #endif - void (*update_cr3 )(struct vcpu *v, int do_locking, + pagetable_t (*update_cr3 )(struct vcpu *v, bool do_locking, bool noflush); void (*update_paging_modes )(struct vcpu *v); bool (*flush_tlb )(const unsigned long *vcpu_bitmap); @@ -310,9 +310,9 @@ static inline unsigned long paging_ga_to_gfn_cr3(struct vcpu *v, /* Update all the things that are derived from the guest's CR3. * Called when the guest changes CR3; the caller can then use v->arch.cr3 * as the value to load into the host CR3 to schedule this vcpu */ -static inline void paging_update_cr3(struct vcpu *v, bool noflush) +static inline pagetable_t paging_update_cr3(struct vcpu *v, bool noflush) { - paging_get_hostmode(v)->update_cr3(v, 1, noflush); + return paging_get_hostmode(v)->update_cr3(v, 1, noflush); } /* Update all the things that are derived from the guest's CR0/CR3/CR4. diff --git a/xen/arch/x86/include/asm/shadow.h b/xen/arch/x86/include/asm/shadow.h index dad876d294..0b72c9eda8 100644 --- a/xen/arch/x86/include/asm/shadow.h +++ b/xen/arch/x86/include/asm/shadow.h @@ -99,6 +99,9 @@ int shadow_set_allocation(struct domain *d, unsigned int pages, int shadow_get_allocation_bytes(struct domain *d, uint64_t *size); +/* Helper to invoke for deferred releasing of a top-level shadow's reference. */ +void shadow_put_top_level(struct domain *d, pagetable_t old); + #else /* !CONFIG_SHADOW_PAGING */ #define shadow_vcpu_teardown(v) ASSERT(is_pv_vcpu(v)) @@ -121,6 +124,11 @@ static inline void shadow_prepare_page_type_change(struct domain *d, static inline void shadow_blow_tables_per_domain(struct domain *d) {} +static inline void shadow_put_top_level(struct domain *d, pagetable_t old) +{ + ASSERT_UNREACHABLE(); +} + static inline int shadow_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index b46eee1332..e884a6fdbd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -567,15 +567,12 @@ void write_ptbase(struct vcpu *v) * * Update ref counts to shadow tables appropriately. */ -void update_cr3(struct vcpu *v) +pagetable_t update_cr3(struct vcpu *v) { mfn_t cr3_mfn; if ( paging_mode_enabled(v->domain) ) - { - paging_update_cr3(v, false); - return; - } + return paging_update_cr3(v, false); if ( !(v->arch.flags & TF_kernel_mode) ) cr3_mfn = pagetable_get_mfn(v->arch.guest_table_user); @@ -583,6 +580,8 @@ void update_cr3(struct vcpu *v) cr3_mfn = pagetable_get_mfn(v->arch.guest_table); make_cr3(v, cr3_mfn); + + return pagetable_null(); } static inline void set_tlbflush_timestamp(struct page_info *page) @@ -3285,6 +3284,7 @@ int new_guest_cr3(mfn_t mfn) struct domain *d = curr->domain; int rc; mfn_t old_base_mfn; + pagetable_t old_shadow; if ( is_pv_32bit_domain(d) ) { @@ -3352,9 +3352,22 @@ int new_guest_cr3(mfn_t mfn) if ( !VM_ASSIST(d, m2p_strict) ) fill_ro_mpt(mfn); curr->arch.guest_table = pagetable_from_mfn(mfn); - update_cr3(curr); + old_shadow = update_cr3(curr); + + /* + * In shadow mode update_cr3() can fail, in which case here we're still + * running on the prior top-level shadow (which we're about to release). + * Switch to the idle page tables in such an event; the guest will have + * been crashed already. + */ + if ( likely(!mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(curr->arch.cr3 & ~X86_CR3_NOFLUSH))) ) + write_ptbase(curr); + else + write_ptbase(idle_vcpu[curr->processor]); - write_ptbase(curr); + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(d, old_shadow); if ( likely(mfn_x(old_base_mfn) != 0) ) { diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 0fc1b1d9ac..57a19c3d59 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -739,11 +739,13 @@ static bool cf_check hap_invlpg(struct vcpu *v, unsigned long linear) return 1; } -static void cf_check hap_update_cr3( - struct vcpu *v, int do_locking, bool noflush) +static pagetable_t cf_check hap_update_cr3( + struct vcpu *v, bool do_locking, bool noflush) { v->arch.hvm.hw_cr[3] = v->arch.hvm.guest_cr[3]; hvm_update_guest_cr3(v, noflush); + + return pagetable_null(); } static bool flush_vcpu(const struct vcpu *v, const unsigned long *vcpu_bitmap) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index cf5e181f74..c0940f939e 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2590,13 +2590,13 @@ void cf_check shadow_update_paging_modes(struct vcpu *v) } /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)) +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)) { mfn_t smfn; pagetable_t old_entry, new_entry; @@ -2653,20 +2653,37 @@ void sh_set_toplevel_shadow(struct vcpu *v, mfn_x(gmfn), mfn_x(pagetable_get_mfn(new_entry))); v->arch.paging.shadow.shadow_table[slot] = new_entry; - /* Decrement the refcount of the old contents of this slot */ - if ( !pagetable_is_null(old_entry) ) + /* + * Decrement the refcount of the old contents of this slot, unless + * we're still running on that shadow - in that case it'll need holding + * on to until the actual page table switch did occur. + */ + if ( !pagetable_is_null(old_entry) && (v != current || !is_pv_domain(d)) ) { - mfn_t old_smfn = pagetable_get_mfn(old_entry); - /* Need to repin the old toplevel shadow if it's been unpinned - * by shadow_prealloc(): in PV mode we're still running on this - * shadow and it's not safe to free it yet. */ - if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(d, old_smfn) ) - { - printk(XENLOG_G_ERR "can't re-pin %"PRI_mfn"\n", mfn_x(old_smfn)); - domain_crash(d); - } - sh_put_ref(d, old_smfn, 0); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + old_entry = pagetable_null(); } + + /* + * 2- and 3-level shadow mode is used for HVM only. Therefore we never run + * on such a shadow, so only call sites requesting an L4 shadow need to pay + * attention to the returned value. + */ + ASSERT(pagetable_is_null(old_entry) || root_type == SH_type_l4_64_shadow); + + return old_entry; +} + +/* + * Helper invoked when releasing of a top-level shadow's reference was + * deferred in sh_set_toplevel_shadow() above. + */ +void shadow_put_top_level(struct domain *d, pagetable_t old_entry) +{ + ASSERT(!pagetable_is_null(old_entry)); + paging_lock(d); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + paging_unlock(d); } /**************************************************************************/ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 671bf8c228..c92b354a78 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3224,7 +3224,8 @@ static void cf_check sh_detach_old_tables(struct vcpu *v) } } -static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t cf_check sh_update_cr3(struct vcpu *v, bool do_locking, + bool noflush) /* Updates vcpu->arch.cr3 after the guest has changed CR3. * Paravirtual guests should set v->arch.guest_table (and guest_table_user, * if appropriate). @@ -3238,6 +3239,7 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) { struct domain *d = v->domain; mfn_t gmfn; + pagetable_t old_entry = pagetable_null(); #if GUEST_PAGING_LEVELS == 3 const guest_l3e_t *gl3e; unsigned int i, guest_idx; @@ -3247,7 +3249,7 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) if ( !is_hvm_domain(d) && !v->is_initialised ) { ASSERT(v->arch.cr3 == 0); - return; + return old_entry; } if ( do_locking ) paging_lock(v->domain); @@ -3320,11 +3322,12 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) #if GUEST_PAGING_LEVELS == 4 if ( sh_remove_write_access(d, gmfn, 4, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, + sh_make_shadow); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } if ( !shadow_mode_external(d) && !is_pv_32bit_domain(d) ) { @@ -3368,24 +3371,30 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) gl2gfn = guest_l3e_get_gfn(gl3e[i]); gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sh_set_toplevel_shadow(v, i, gl2mfn, SH_type_l2_shadow, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, gl2mfn, + SH_type_l2_shadow, + sh_make_shadow); else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); } else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); + + ASSERT(pagetable_is_null(old_entry)); } } #elif GUEST_PAGING_LEVELS == 2 if ( sh_remove_write_access(d, gmfn, 2, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, + sh_make_shadow); + ASSERT(pagetable_is_null(old_entry)); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } #else #error This should never happen @@ -3473,6 +3482,8 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) /* Release the lock, if we took it (otherwise it's the caller's problem) */ if ( do_locking ) paging_unlock(v->domain); + + return old_entry; } diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index eaaa874b11..743c0ffb85 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -52,9 +52,11 @@ static unsigned long cf_check _gva_to_gfn( } #endif -static void cf_check _update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t cf_check _update_cr3(struct vcpu *v, bool do_locking, + bool noflush) { ASSERT_UNREACHABLE(); + return pagetable_null(); } static void cf_check _update_paging_modes(struct vcpu *v) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index c2bb1ed3c3..91f798c5aa 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -391,13 +391,13 @@ mfn_t shadow_alloc(struct domain *d, void shadow_free(struct domain *d, mfn_t smfn); /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)); +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)); /* Update the shadows in response to a pagetable write from Xen */ int sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size); diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 5c92812dc6..2a445bb17b 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -424,10 +424,13 @@ bool __init xpti_pcid_enabled(void) static void _toggle_guest_pt(struct vcpu *v) { + bool guest_update; + pagetable_t old_shadow; unsigned long cr3; v->arch.flags ^= TF_kernel_mode; - update_cr3(v); + guest_update = v->arch.flags & TF_kernel_mode; + old_shadow = update_cr3(v); /* * Don't flush user global mappings from the TLB. Don't tick TLB clock. @@ -436,13 +439,31 @@ static void _toggle_guest_pt(struct vcpu *v) * TLB flush (for just the incoming PCID), as the top level page table may * have changed behind our backs. To be on the safe side, suppress the * no-flush unconditionally in this case. + * + * Furthermore in shadow mode update_cr3() can fail, in which case here + * we're still running on the prior top-level shadow (which we're about + * to release). Switch to the idle page tables in such an event; the + * guest will have been crashed already. */ cr3 = v->arch.cr3; if ( shadow_mode_enabled(v->domain) ) + { cr3 &= ~X86_CR3_NOFLUSH; + + if ( unlikely(mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(cr3))) ) + { + cr3 = idle_vcpu[v->processor]->arch.cr3; + /* Also suppress runstate/time area updates below. */ + guest_update = false; + } + } write_cr3(cr3); - if ( !(v->arch.flags & TF_kernel_mode) ) + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(v->domain, old_shadow); + + if ( !guest_update ) return; if ( v->arch.pv.need_update_runstate_area && update_runstate_area(v) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 13:44:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 13:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606894.944953 (Exim 4.92) (envelope-from ) id 1qjgRu-0005KZ-TE; Fri, 22 Sep 2023 13:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606894.944953; Fri, 22 Sep 2023 13: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 1qjgRu-0005KR-Q4; Fri, 22 Sep 2023 13:44:02 +0000 Received: by outflank-mailman (input) for mailman id 606894; Fri, 22 Sep 2023 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 1qjgRu-0005KL-6v for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 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 1qjgRu-0002NL-38 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjgRu-0002uU-21 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 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=rP2qk8ugTvv3hfVxD/Lnu4NRJkIavo+0o92agnnIf94=; b=10U/l+9DJA5m2Mr/lqjsCIBQt0 xSMQe3KdPOnyz1V8UOWWUAkYKfcws61QQJ1RSdGMf5NQr6p7z8KzEomj9i5wBUcSdqpGz9XlfKud6 3qyVEdc58MaDF3K0Fy9dLWdFojZJVm8bLrSBR95V3sc63OUiQYqoc9oYwAg4aw4W6Auk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: defer releasing of PV's top-level shadow reference Message-Id: Date: Fri, 22 Sep 2023 13:44:02 +0000 commit fb0ff49fe9f784bfee0370c2a3c5f20e39d7a1cb Author: Jan Beulich AuthorDate: Wed Sep 20 10:31:42 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 10:31:42 2023 +0100 x86/shadow: defer releasing of PV's top-level shadow reference sh_set_toplevel_shadow() re-pinning the top-level shadow we may be running on is not enough (and at the same time unnecessary when the shadow isn't what we're running on): That shadow becomes eligible for blowing away (from e.g. shadow_prealloc()) immediately after the paging lock was dropped. Yet it needs to remain valid until the actual page table switch occurred. Propagate up the call chain the shadow entry that needs releasing eventually, and carry out the release immediately after switching page tables. Handle update_cr3() failures by switching to idle pagetables. Note that various further uses of update_cr3() are HVM-only or only act on paused vCPU-s, in which case sh_set_toplevel_shadow() will not defer releasing of the reference. While changing the update_cr3() hook, also convert the "do_locking" parameter to boolean. This is CVE-2023-34322 / XSA-438. Reported-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: George Dunlap --- xen/arch/x86/include/asm/mm.h | 2 +- xen/arch/x86/include/asm/paging.h | 6 ++--- xen/arch/x86/include/asm/shadow.h | 8 ++++++ xen/arch/x86/mm.c | 27 ++++++++++++++----- xen/arch/x86/mm/hap/hap.c | 6 +++-- xen/arch/x86/mm/shadow/common.c | 55 +++++++++++++++++++++++++-------------- xen/arch/x86/mm/shadow/multi.c | 33 +++++++++++++++-------- xen/arch/x86/mm/shadow/none.c | 4 ++- xen/arch/x86/mm/shadow/private.h | 14 +++++----- xen/arch/x86/pv/domain.c | 25 ++++++++++++++++-- 10 files changed, 127 insertions(+), 53 deletions(-) diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index 8f6681429d..05dfe35502 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -556,7 +556,7 @@ void audit_domains(void); #endif void make_cr3(struct vcpu *v, mfn_t mfn); -void update_cr3(struct vcpu *v); +pagetable_t update_cr3(struct vcpu *v); int vcpu_destroy_pagetables(struct vcpu *); void *do_page_walk(struct vcpu *v, unsigned long addr); diff --git a/xen/arch/x86/include/asm/paging.h b/xen/arch/x86/include/asm/paging.h index 403243bfbd..8fad4cfc18 100644 --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -118,7 +118,7 @@ struct paging_mode { paddr_t ga, uint32_t *pfec, unsigned int *page_order); #endif - void (*update_cr3 )(struct vcpu *v, int do_locking, + pagetable_t (*update_cr3 )(struct vcpu *v, bool do_locking, bool noflush); unsigned int guest_levels; @@ -294,9 +294,9 @@ static inline bool paging_flush_tlb(const unsigned long *vcpu_bitmap) /* Update all the things that are derived from the guest's CR3. * Called when the guest changes CR3; the caller can then use v->arch.cr3 * as the value to load into the host CR3 to schedule this vcpu */ -static inline void paging_update_cr3(struct vcpu *v, bool noflush) +static inline pagetable_t paging_update_cr3(struct vcpu *v, bool noflush) { - paging_get_hostmode(v)->update_cr3(v, 1, noflush); + return paging_get_hostmode(v)->update_cr3(v, 1, noflush); } /* Update all the things that are derived from the guest's CR0/CR3/CR4. diff --git a/xen/arch/x86/include/asm/shadow.h b/xen/arch/x86/include/asm/shadow.h index 20df34d0a8..9a8d1b8353 100644 --- a/xen/arch/x86/include/asm/shadow.h +++ b/xen/arch/x86/include/asm/shadow.h @@ -94,6 +94,9 @@ void shadow_blow_tables_per_domain(struct domain *d); int shadow_set_allocation(struct domain *d, unsigned int pages, bool *preempted); +/* Helper to invoke for deferred releasing of a top-level shadow's reference. */ +void shadow_put_top_level(struct domain *d, pagetable_t old); + #else /* !CONFIG_SHADOW_PAGING */ #define shadow_vcpu_teardown(v) ASSERT(is_pv_vcpu(v)) @@ -114,6 +117,11 @@ static inline void shadow_prepare_page_type_change(struct domain *d, static inline void shadow_blow_tables_per_domain(struct domain *d) {} +static inline void shadow_put_top_level(struct domain *d, pagetable_t old) +{ + ASSERT_UNREACHABLE(); +} + static inline int shadow_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 28fdf820ef..39544bd9f9 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -549,15 +549,12 @@ void write_ptbase(struct vcpu *v) * * Update ref counts to shadow tables appropriately. */ -void update_cr3(struct vcpu *v) +pagetable_t update_cr3(struct vcpu *v) { mfn_t cr3_mfn; if ( paging_mode_enabled(v->domain) ) - { - paging_update_cr3(v, false); - return; - } + return paging_update_cr3(v, false); if ( !(v->arch.flags & TF_kernel_mode) ) cr3_mfn = pagetable_get_mfn(v->arch.guest_table_user); @@ -565,6 +562,8 @@ void update_cr3(struct vcpu *v) cr3_mfn = pagetable_get_mfn(v->arch.guest_table); make_cr3(v, cr3_mfn); + + return pagetable_null(); } static inline void set_tlbflush_timestamp(struct page_info *page) @@ -3269,6 +3268,7 @@ int new_guest_cr3(mfn_t mfn) struct domain *d = curr->domain; int rc; mfn_t old_base_mfn; + pagetable_t old_shadow; if ( is_pv_32bit_domain(d) ) { @@ -3336,9 +3336,22 @@ int new_guest_cr3(mfn_t mfn) if ( !VM_ASSIST(d, m2p_strict) ) fill_ro_mpt(mfn); curr->arch.guest_table = pagetable_from_mfn(mfn); - update_cr3(curr); + old_shadow = update_cr3(curr); + + /* + * In shadow mode update_cr3() can fail, in which case here we're still + * running on the prior top-level shadow (which we're about to release). + * Switch to the idle page tables in such an event; the guest will have + * been crashed already. + */ + if ( likely(!mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(curr->arch.cr3 & ~X86_CR3_NOFLUSH))) ) + write_ptbase(curr); + else + write_ptbase(idle_vcpu[curr->processor]); - write_ptbase(curr); + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(d, old_shadow); if ( likely(mfn_x(old_base_mfn) != 0) ) { diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index d05f1b7a95..e30f543d2c 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -707,11 +707,13 @@ static bool cf_check hap_invlpg(struct vcpu *v, unsigned long linear) return 1; } -static void cf_check hap_update_cr3( - struct vcpu *v, int do_locking, bool noflush) +static pagetable_t cf_check hap_update_cr3( + struct vcpu *v, bool do_locking, bool noflush) { v->arch.hvm.hw_cr[3] = v->arch.hvm.guest_cr[3]; hvm_update_guest_cr3(v, noflush); + + return pagetable_null(); } static bool flush_vcpu(const struct vcpu *v, const unsigned long *vcpu_bitmap) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index a0ae6adb4f..8211e77cc7 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2526,13 +2526,13 @@ static void cf_check shadow_update_paging_modes(struct vcpu *v) } /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)) +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)) { mfn_t smfn; pagetable_t old_entry, new_entry; @@ -2589,20 +2589,37 @@ void sh_set_toplevel_shadow(struct vcpu *v, mfn_x(gmfn), mfn_x(pagetable_get_mfn(new_entry))); v->arch.paging.shadow.shadow_table[slot] = new_entry; - /* Decrement the refcount of the old contents of this slot */ - if ( !pagetable_is_null(old_entry) ) + /* + * Decrement the refcount of the old contents of this slot, unless + * we're still running on that shadow - in that case it'll need holding + * on to until the actual page table switch did occur. + */ + if ( !pagetable_is_null(old_entry) && (v != current || !is_pv_domain(d)) ) { - mfn_t old_smfn = pagetable_get_mfn(old_entry); - /* Need to repin the old toplevel shadow if it's been unpinned - * by shadow_prealloc(): in PV mode we're still running on this - * shadow and it's not safe to free it yet. */ - if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(d, old_smfn) ) - { - printk(XENLOG_G_ERR "can't re-pin %"PRI_mfn"\n", mfn_x(old_smfn)); - domain_crash(d); - } - sh_put_ref(d, old_smfn, 0); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + old_entry = pagetable_null(); } + + /* + * 2- and 3-level shadow mode is used for HVM only. Therefore we never run + * on such a shadow, so only call sites requesting an L4 shadow need to pay + * attention to the returned value. + */ + ASSERT(pagetable_is_null(old_entry) || root_type == SH_type_l4_64_shadow); + + return old_entry; +} + +/* + * Helper invoked when releasing of a top-level shadow's reference was + * deferred in sh_set_toplevel_shadow() above. + */ +void shadow_put_top_level(struct domain *d, pagetable_t old_entry) +{ + ASSERT(!pagetable_is_null(old_entry)); + paging_lock(d); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + paging_unlock(d); } /**************************************************************************/ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index cf74fdf5dd..447512870d 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3156,7 +3156,8 @@ sh_update_linear_entries(struct vcpu *v) sh_flush_local(d); } -static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t cf_check sh_update_cr3(struct vcpu *v, bool do_locking, + bool noflush) /* Updates vcpu->arch.cr3 after the guest has changed CR3. * Paravirtual guests should set v->arch.guest_table (and guest_table_user, * if appropriate). @@ -3170,6 +3171,7 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) { struct domain *d = v->domain; mfn_t gmfn; + pagetable_t old_entry = pagetable_null(); #if GUEST_PAGING_LEVELS == 3 const guest_l3e_t *gl3e; unsigned int i, guest_idx; @@ -3179,7 +3181,7 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) if ( !is_hvm_domain(d) && !v->is_initialised ) { ASSERT(v->arch.cr3 == 0); - return; + return old_entry; } if ( do_locking ) paging_lock(v->domain); @@ -3252,11 +3254,12 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) #if GUEST_PAGING_LEVELS == 4 if ( sh_remove_write_access(d, gmfn, 4, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, + sh_make_shadow); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } if ( !shadow_mode_external(d) && !is_pv_32bit_domain(d) ) { @@ -3300,24 +3303,30 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) gl2gfn = guest_l3e_get_gfn(gl3e[i]); gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sh_set_toplevel_shadow(v, i, gl2mfn, SH_type_l2_shadow, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, gl2mfn, + SH_type_l2_shadow, + sh_make_shadow); else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); } else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); + + ASSERT(pagetable_is_null(old_entry)); } } #elif GUEST_PAGING_LEVELS == 2 if ( sh_remove_write_access(d, gmfn, 2, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, + sh_make_shadow); + ASSERT(pagetable_is_null(old_entry)); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } #else #error This should never happen @@ -3405,6 +3414,8 @@ static void cf_check sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) /* Release the lock, if we took it (otherwise it's the caller's problem) */ if ( do_locking ) paging_unlock(v->domain); + + return old_entry; } diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index c462639eab..9c4be4562f 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -55,9 +55,11 @@ static unsigned long cf_check _gva_to_gfn( } #endif -static void cf_check _update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t cf_check _update_cr3(struct vcpu *v, bool do_locking, + bool noflush) { ASSERT_UNREACHABLE(); + return pagetable_null(); } static const struct paging_mode sh_paging_none = { diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index a0f275251f..a5fc3a7676 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -383,13 +383,13 @@ mfn_t shadow_alloc(struct domain *d, void shadow_free(struct domain *d, mfn_t smfn); /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)); +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)); /* Update the shadows in response to a pagetable write from Xen */ int sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size); diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 5c92812dc6..2a445bb17b 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -424,10 +424,13 @@ bool __init xpti_pcid_enabled(void) static void _toggle_guest_pt(struct vcpu *v) { + bool guest_update; + pagetable_t old_shadow; unsigned long cr3; v->arch.flags ^= TF_kernel_mode; - update_cr3(v); + guest_update = v->arch.flags & TF_kernel_mode; + old_shadow = update_cr3(v); /* * Don't flush user global mappings from the TLB. Don't tick TLB clock. @@ -436,13 +439,31 @@ static void _toggle_guest_pt(struct vcpu *v) * TLB flush (for just the incoming PCID), as the top level page table may * have changed behind our backs. To be on the safe side, suppress the * no-flush unconditionally in this case. + * + * Furthermore in shadow mode update_cr3() can fail, in which case here + * we're still running on the prior top-level shadow (which we're about + * to release). Switch to the idle page tables in such an event; the + * guest will have been crashed already. */ cr3 = v->arch.cr3; if ( shadow_mode_enabled(v->domain) ) + { cr3 &= ~X86_CR3_NOFLUSH; + + if ( unlikely(mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(cr3))) ) + { + cr3 = idle_vcpu[v->processor]->arch.cr3; + /* Also suppress runstate/time area updates below. */ + guest_update = false; + } + } write_cr3(cr3); - if ( !(v->arch.flags & TF_kernel_mode) ) + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(v->domain, old_shadow); + + if ( !guest_update ) return; if ( v->arch.pv.need_update_runstate_area && update_runstate_area(v) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 13:44:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 13:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606895.944957 (Exim 4.92) (envelope-from ) id 1qjgS4-0005MW-UY; Fri, 22 Sep 2023 13:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606895.944957; Fri, 22 Sep 2023 13: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 1qjgS4-0005MN-Rh; Fri, 22 Sep 2023 13:44:12 +0000 Received: by outflank-mailman (input) for mailman id 606895; Fri, 22 Sep 2023 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 1qjgS4-0005MH-74 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 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 1qjgS4-0002NS-6I for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjgS4-0002v4-5B for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 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=lafb5afWvWxCzkcw2vemCPXQsi7JryTaAaZurOKQTwI=; b=GTpUewNCdHc1SX67Cfvcb62jUY DA8lAHDIaG+KxnDYA6jUNHycP5iq6jxMaGXJ+KWsGYjS2teR2Rq04+g+4n9y2l0Cj0EkBXJRsGMol BLdcVlMrKfQSEkMxGvtbWU/i3Pcrh9rIlD0PzA909SlMeVB9EcDsLBUUzV5KQxE/TU6c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: Remove esr_disable Message-Id: Date: Fri, 22 Sep 2023 13:44:12 +0000 commit e07a27697684e4a0a170c2fa0b9f7104b7bc12c9 Author: Andrew Cooper AuthorDate: Tue Aug 29 16:38:09 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 20:53:58 2023 +0100 x86/APIC: Remove esr_disable It is unconditionally 0 in Xen, and was deleted in Linux somewhere between 2.5 and 2.6. Remove it in Xen too. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/apic.c | 48 +++++++---------------- xen/arch/x86/include/asm/mach-generic/mach_apic.h | 3 -- 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 41879230ec..f1264ce7ed 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -496,14 +496,6 @@ void setup_local_APIC(bool bsp) unsigned long oldvalue, value, maxlvt; int i, j; - /* Pound the ESR really hard over the head with a big hammer - mbligh */ - if (esr_disable) { - apic_write(APIC_ESR, 0); - apic_write(APIC_ESR, 0); - apic_write(APIC_ESR, 0); - apic_write(APIC_ESR, 0); - } - BUILD_BUG_ON((SPURIOUS_APIC_VECTOR & 0x0f) != 0x0f); /* @@ -628,33 +620,21 @@ void setup_local_APIC(bool bsp) value = APIC_DM_NMI | APIC_LVT_MASKED; apic_write(APIC_LVT1, value); - if (!esr_disable) { - maxlvt = get_maxlvt(); - if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ - apic_write(APIC_ESR, 0); - oldvalue = apic_read(APIC_ESR); + maxlvt = get_maxlvt(); + if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ + apic_write(APIC_ESR, 0); + oldvalue = apic_read(APIC_ESR); - value = ERROR_APIC_VECTOR; // enables sending errors - apic_write(APIC_LVTERR, value); - /* - * spec says clear errors after enabling vector. - */ - if (maxlvt > 3) - apic_write(APIC_ESR, 0); - value = apic_read(APIC_ESR); - if (value != oldvalue) - apic_printk(APIC_VERBOSE, "ESR value before enabling " - "vector: %#lx after: %#lx\n", - oldvalue, value); - } else { - /* - * Something untraceble is creating bad interrupts on - * secondary quads ... for the moment, just leave the - * ESR disabled - we can't do anything useful with the - * errors anyway - mbligh - */ - printk("Leaving ESR disabled.\n"); - } + value = ERROR_APIC_VECTOR; // enables sending errors + apic_write(APIC_LVTERR, value); + /* spec says clear errors after enabling vector. */ + if (maxlvt > 3) + apic_write(APIC_ESR, 0); + value = apic_read(APIC_ESR); + if (value != oldvalue) + apic_printk(APIC_VERBOSE, + "ESR value before enabling vector: %#lx after: %#lx\n", + oldvalue, value); if (nmi_watchdog == NMI_LOCAL_APIC && !bsp) setup_apic_nmi_watchdog(); diff --git a/xen/arch/x86/include/asm/mach-generic/mach_apic.h b/xen/arch/x86/include/asm/mach-generic/mach_apic.h index b6f6361c60..cf8b31b6e0 100644 --- a/xen/arch/x86/include/asm/mach-generic/mach_apic.h +++ b/xen/arch/x86/include/asm/mach-generic/mach_apic.h @@ -6,9 +6,6 @@ #include #include -/* ESR was originally disabled in Linux for NUMA-Q. Do we really need to? */ -#define esr_disable (0) - /* The following are dependent on APIC delivery mode (logical vs. physical). */ #define INT_DELIVERY_MODE (genapic.int_delivery_mode) #define INT_DEST_MODE (genapic.int_dest_mode) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 13:44:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 13:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606896.944960 (Exim 4.92) (envelope-from ) id 1qjgSF-0005PL-Vp; Fri, 22 Sep 2023 13:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606896.944960; Fri, 22 Sep 2023 13: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 1qjgSF-0005PD-TG; Fri, 22 Sep 2023 13:44:23 +0000 Received: by outflank-mailman (input) for mailman id 606896; Fri, 22 Sep 2023 13:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSE-0005Oy-A5 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSE-0002Nu-9S for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjgSE-0002vZ-8K for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13: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=BeLVVKLxo/eZyEPPnMZx6KoMaYgwT5eCYUGvXUC8rC4=; b=pYfWVhxHYRJkhd/dG+9doPBZ+d GbClDSNdDavZC1G00g2xdmKImOSHAndvWGMRQHAEwkqleiSYDcCyHm1lKFa5XNtgyWXjEm2py+Zar b88JYtFFHrW685BmWJP4eIkBS11Qskd4Zx3EYfwOpWzY2Y5HUZJ/w3apWcb1gsZtcAPc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add python3's setuptools to some containers Message-Id: Date: Fri, 22 Sep 2023 13:44:22 +0000 commit bbc72a7877d87f34aebcb8554b125745fdad9a98 Author: Javi Merino AuthorDate: Tue Sep 19 07:30:26 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 20:53:58 2023 +0100 automation: Add python3's setuptools to some containers In preparation of supporting both distutils and setuptools, add the python3 setuptools module to the containers that have recent python3 installations. Debian Stretch, Ubuntu trusty (14.04), Ubuntu xenial (16.04) and Ubuntu bionic (18.04) are kept without setuptools on purpose, to test installations that don't have it. Centos 7 in particular is kept with python2 only. Signed-off-by: Javi Merino Reviewed-by: Andrew Cooper --- automation/build/alpine/3.18-arm64v8.dockerfile | 1 + automation/build/alpine/3.18.dockerfile | 1 + automation/build/archlinux/current.dockerfile | 1 + automation/build/debian/bookworm-arm64v8.dockerfile | 1 + automation/build/debian/bookworm-i386.dockerfile | 1 + automation/build/debian/bookworm.dockerfile | 1 + automation/build/suse/opensuse-leap.dockerfile | 1 + automation/build/suse/opensuse-tumbleweed.dockerfile | 1 + automation/build/ubuntu/focal.dockerfile | 1 + 9 files changed, 9 insertions(+) diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index ce198f7d04..470f5d72a9 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -32,6 +32,7 @@ RUN apk --no-cache add \ ocaml-findlib \ patch \ python3-dev \ + py3-setuptools \ texinfo \ util-linux-dev \ xz-dev \ diff --git a/automation/build/alpine/3.18.dockerfile b/automation/build/alpine/3.18.dockerfile index ca5756955e..5d2a69a060 100644 --- a/automation/build/alpine/3.18.dockerfile +++ b/automation/build/alpine/3.18.dockerfile @@ -34,6 +34,7 @@ RUN apk --no-cache add \ ocaml-findlib \ patch \ python3-dev \ + py3-setuptools \ texinfo \ util-linux-dev \ xz-dev \ diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 13fb472d9e..47e79637a4 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -34,6 +34,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ pixman \ pkgconfig \ python \ + python-setuptools \ sdl \ sdl2 \ spice \ diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile index a6d4246d96..640b1e0ead 100644 --- a/automation/build/debian/bookworm-arm64v8.dockerfile +++ b/automation/build/debian/bookworm-arm64v8.dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ libncurses5-dev \ libssl-dev \ python3-dev \ + python3-setuptools \ xorg-dev \ uuid-dev \ libyajl-dev \ diff --git a/automation/build/debian/bookworm-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile index eb1c732f53..559bf670f0 100644 --- a/automation/build/debian/bookworm-i386.dockerfile +++ b/automation/build/debian/bookworm-i386.dockerfile @@ -18,6 +18,7 @@ RUN apt-get update && \ libncurses5-dev \ libssl-dev \ python3-dev \ + python3-setuptools \ xorg-dev \ uuid-dev \ libyajl-dev \ diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile index f8415425e6..ae008c8d46 100644 --- a/automation/build/debian/bookworm.dockerfile +++ b/automation/build/debian/bookworm.dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ libncurses5-dev \ libssl-dev \ python3-dev \ + python3-setuptools \ xorg-dev \ uuid-dev \ libyajl-dev \ diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile index 98ee42970d..7010b71aca 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -60,6 +60,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl)' \ 'pkgconfig(sdl2)' \ python3-devel \ + python3-setuptools \ systemd-devel \ tar \ transfig \ diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile index aed81f0240..959e1f6939 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -63,6 +63,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl)' \ 'pkgconfig(sdl2)' \ python3-devel \ + python3-setuptools \ systemd-devel \ tar \ transfig \ diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile index 9c851c0620..e3d11194ee 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ libncurses5-dev \ libssl-dev \ python3-dev \ + python3-setuptools \ xorg-dev \ uuid-dev \ libyajl-dev \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 13:44:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 13:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606897.944965 (Exim 4.92) (envelope-from ) id 1qjgSQ-0005SJ-2b; Fri, 22 Sep 2023 13:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606897.944965; Fri, 22 Sep 2023 13:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSP-0005SB-W6; Fri, 22 Sep 2023 13:44:33 +0000 Received: by outflank-mailman (input) for mailman id 606897; Fri, 22 Sep 2023 13:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSO-0005Rv-D8 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSO-0002O1-CM for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjgSO-0002w7-BQ for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13: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=j0A2shvK376saQSNqRf/Og4vHjON6xlUEmDiyEUOmsA=; b=yZBHmSjiw5ri9MO8+I+v3rxmjV dBkXhy/pMpsc3uH6EaPh7pLvCyzjR2XrO10D5M3K+63dv9Cw9dTMDp50BzGzNL9fB9C2YcOa9ADzx x72JRdJQ62uR4lGONwza7ovkvjPE3Queq/9G3WvECh8nrNGiJ5DO1XX5dcrHoq1oxKbg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/python: convert setup.py to use setuptools if available Message-Id: Date: Fri, 22 Sep 2023 13:44:32 +0000 commit 9314a61936506dc4bd3779a5c7ba4706e2644aac Author: Marek Marczykowski-Górecki AuthorDate: Tue Sep 19 07:30:27 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 20:53:58 2023 +0100 tools/python: convert setup.py to use setuptools if available Python distutils is deprecated and is going to be removed in Python 3.12. Add support for setuptools. Setuptools in Python 3.11 complains: SetuptoolsDeprecationWarning: setup.py install is deprecated. Use build and pip and other standards-based tools. Keep using setup.py anyway to build the C extension. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Javi Merino Reviewed-by: Andrew Cooper --- tools/pygrub/setup.py | 7 +++++-- tools/python/setup.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py index 502aa4df2d..c9cac47eee 100644 --- a/tools/pygrub/setup.py +++ b/tools/pygrub/setup.py @@ -1,5 +1,8 @@ -from distutils.core import setup, Extension -from distutils.ccompiler import new_compiler +# Prefer setuptools, fall back to distutils +try: + from setuptools import setup, Extension +except ImportError: + from distutils.core import setup, Extension import os import sys diff --git a/tools/python/setup.py b/tools/python/setup.py index 721a3141d7..02354f6986 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -1,5 +1,8 @@ - -from distutils.core import setup, Extension +# Prefer setuptools, fall back to distutils +try: + from setuptools import setup, Extension +except ImportError: + from distutils.core import setup, Extension import os, sys XEN_ROOT = "../.." -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 13:44:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 13:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606898.944968 (Exim 4.92) (envelope-from ) id 1qjgSa-0005V4-3z; Fri, 22 Sep 2023 13:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606898.944968; Fri, 22 Sep 2023 13:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSa-0005Ux-1P; Fri, 22 Sep 2023 13:44:44 +0000 Received: by outflank-mailman (input) for mailman id 606898; Fri, 22 Sep 2023 13:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSY-0005Um-GZ for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSY-0002OB-Fp for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjgSY-0002wd-Ex for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13: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=7lwN0yZYnv0c0rfeIV8BMFGxENoQurJMq9vl9G9yabg=; b=YGkZLH2K4hD8oRORoRdkXSH858 fNPe+5Hqk1YVsYh5xoelijHqt8Ytlw0un61SAANlNgS48aLi+y+o1+YZunI4XZp3WPmhQy9Oq746z F+14/wRHQHR6Lkxvh5bTpcC8ETUUAjK2yu4Su7FaZPQ/aj+RPSIscODeDQST+8b24hSw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Don't use distutils in configure or Makefile Message-Id: Date: Fri, 22 Sep 2023 13:44:42 +0000 commit 2a353c048c68667611af3dfabc98d80ac117a73b Author: Marek Marczykowski-Górecki AuthorDate: Tue Sep 19 07:30:28 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 20:53:58 2023 +0100 tools: Don't use distutils in configure or Makefile Python distutils is deprecated and is going to be removed in Python 3.12. distutils.sysconfig is available as the sysconfig module in stdlib since Python 2.7 and Python 3.2, so use that directly. Update the README to reflect that we now depend on Python 2.7. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Javi Merino Reviewed-by: Andrew Cooper [Regen ./configure] Signed-off-by: Andrew Cooper --- README | 4 ++-- docs/configure | 5 +++++ m4/python_devel.m4 | 28 ++++++++++++++-------------- tools/config.h.in | 12 ++++++------ tools/configure | 28 ++++++++++++++-------------- tools/libs/stat/Makefile | 4 ++-- 6 files changed, 43 insertions(+), 38 deletions(-) diff --git a/README b/README index f8cc426f78..f75fa536d9 100644 --- a/README +++ b/README @@ -50,7 +50,7 @@ provided by your OS distributor: - GNU Binutils 2.24 or later * POSIX compatible awk * Development install of zlib (e.g., zlib-dev) - * Development install of Python 2.6 or later (e.g., python-dev) + * Development install of Python 2.7 or later (e.g., python-dev) * Development install of curses (e.g., libncurses-dev) * Development install of openssl (e.g., openssl-dev) * Development install of x11 (e.g. xorg-x11-dev) @@ -180,7 +180,7 @@ Python Runtime Libraries Various tools, such as pygrub, have the following runtime dependencies: - * Python 2.6 or later. + * Python 2.7 or later. URL: https://www.python.org/ Debian: python diff --git a/docs/configure b/docs/configure index 6f79e1acc6..b5cb2bf169 100755 --- a/docs/configure +++ b/docs/configure @@ -1986,6 +1986,11 @@ _ACEOF XEN_RUN_STORED=$rundir_path/xenstored +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_STORED "$XEN_RUN_STORED" +_ACEOF + + XEN_LIB_DIR=$localstatedir/lib/xen diff --git a/m4/python_devel.m4 b/m4/python_devel.m4 index bbf1e0354b..bb60857b03 100644 --- a/m4/python_devel.m4 +++ b/m4/python_devel.m4 @@ -5,21 +5,21 @@ ac_previous_libs=$LIBS AC_PATH_PROG([pyconfig], [$PYTHON-config], [no]) AS_IF([test x"$pyconfig" = x"no"], [ dnl For those that don't have python-config - CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print("-I" + distutils.sysconfig.get_config_var("INCLUDEPY"))'`" - CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("CFLAGS"))'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print("-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ + CPPFLAGS="$CFLAGS `$PYTHON -c 'import sysconfig; \ + print("-I" + sysconfig.get_config_var("INCLUDEPY"))'`" + CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("CFLAGS"))'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import sysconfig; \ + print("-L" + sysconfig.get_python_lib(plat_specific=1,\ standard_lib=1) + "/config")'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("LINKFORSHARED"))'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("LDFLAGS"))'`" - LIBS="$LIBS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("LIBS"))'`" - LIBS="$LIBS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("SYSLIBS"))'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("LINKFORSHARED"))'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("LDFLAGS"))'`" + LIBS="$LIBS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("LIBS"))'`" + LIBS="$LIBS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("SYSLIBS"))'`" ], [ dnl If python-config is found use it CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`" diff --git a/tools/config.h.in b/tools/config.h.in index 3ed31a3edc..0bb2fe08a1 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -39,15 +39,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* pygrub enabled */ +#undef HAVE_PYGRUB + /* Qemu traditional enabled */ #undef HAVE_QEMU_TRADITIONAL /* ROMBIOS enabled */ #undef HAVE_ROMBIOS -/* pygrub enabled */ -#undef HAVE_PYGRUB - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -153,12 +153,12 @@ /* Xen's runstate path */ #undef XEN_RUN_DIR -/* Xen's script dir */ -#undef XEN_SCRIPT_DIR - /* Xenstore's runstate path */ #undef XEN_RUN_STORED +/* Xen's script dir */ +#undef XEN_SCRIPT_DIR + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/tools/configure b/tools/configure index 96218cadc4..38c0808d3a 100755 --- a/tools/configure +++ b/tools/configure @@ -7852,21 +7852,21 @@ fi if test x"$pyconfig" = x"no"; then : - CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print("-I" + distutils.sysconfig.get_config_var("INCLUDEPY"))'`" - CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("CFLAGS"))'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print("-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ + CPPFLAGS="$CFLAGS `$PYTHON -c 'import sysconfig; \ + print("-I" + sysconfig.get_config_var("INCLUDEPY"))'`" + CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("CFLAGS"))'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import sysconfig; \ + print("-L" + sysconfig.get_python_lib(plat_specific=1,\ standard_lib=1) + "/config")'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("LINKFORSHARED"))'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("LDFLAGS"))'`" - LIBS="$LIBS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("LIBS"))'`" - LIBS="$LIBS `$PYTHON -c 'import distutils.sysconfig; \ - print(distutils.sysconfig.get_config_var("SYSLIBS"))'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("LINKFORSHARED"))'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("LDFLAGS"))'`" + LIBS="$LIBS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("LIBS"))'`" + LIBS="$LIBS `$PYTHON -c 'import sysconfig; \ + print(sysconfig.get_config_var("SYSLIBS"))'`" else diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index ee5c42bf7b..a968eaff48 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -73,8 +73,8 @@ $(PYLIB): $(PYSRC) python-bindings: $(PYLIB) $(PYMOD) pythonlibdir = $(shell $(PYTHON) -c \ - 'import distutils.sysconfig as cfg; \ - print(cfg.get_python_lib(False, False, prefix="$(prefix)"))') + 'import sysconfig; \ + print(sysconfig.get_python_lib("platlib", vars={"platbase": "$(prefix)"}))') .PHONY: install-python-bindings install-python-bindings: $(PYLIB) $(PYMOD) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 13:44:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 13:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606900.944973 (Exim 4.92) (envelope-from ) id 1qjgSk-0005Xz-5o; Fri, 22 Sep 2023 13:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606900.944973; Fri, 22 Sep 2023 13: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 1qjgSk-0005Xs-30; Fri, 22 Sep 2023 13:44:54 +0000 Received: by outflank-mailman (input) for mailman id 606900; Fri, 22 Sep 2023 13:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSi-0005XU-Lf for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjgSi-0002OJ-In for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjgSi-0002xB-Hr for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 13: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=ukjqpBH15NUXOW3sngvH93F/B7qaa1sFgYD+YM/aysg=; b=uNYcdGuWllgIfLmh0og5ml3Zay YMaHtlim3h+JEu/szC1+j4JjYxWZNYPPbMyKzc82KxzgyXdMYfVcRDkYGzNzXycfWNUoy5VW0kbQn NVUuHJw4W3itgD5jcA7MOK7xpojlJRjzBwZAJoGfFuE4LCAcUAmkfFwN+GrIO0yAZvpw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] README: Remove old note about the build system's python expectation Message-Id: Date: Fri, 22 Sep 2023 13:44:52 +0000 commit 932c3c8b4bd5cb7e3a2fe78105a80928307c9858 Author: Javi Merino AuthorDate: Tue Sep 19 07:30:29 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 20:53:58 2023 +0100 README: Remove old note about the build system's python expectation Changesets 5852ca485263 (build: fix tools/configure in case only python3 exists) and c8a8645f1efe ("xen/build: Automatically locate a suitable python interpreter") cause the build to look for python3, python and python2 in that order. Remove the outdated note from the README. Signed-off-by: Javi Merino Reviewed-by: Andrew Cooper --- README | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README b/README index f75fa536d9..a491c8dce5 100644 --- a/README +++ b/README @@ -184,13 +184,6 @@ Various tools, such as pygrub, have the following runtime dependencies: URL: https://www.python.org/ Debian: python -Note that the build system expects `python` to be available. If your system -only has `python2` or `python3` but not `python` (as in Linux From Scratch), -you will need to create a symlink for it, or specify PYTHON= when invoking -make, like (note the position of PYTHON= matters): - - # make PYTHON=/usr/bin/python3 - Intel(R) Trusted Execution Technology Support ============================================= -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:22:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606958.945066 (Exim 4.92) (envelope-from ) id 1qjjqt-0000qS-2d; Fri, 22 Sep 2023 17:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606958.945066; Fri, 22 Sep 2023 17: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 1qjjqs-0000qK-WF; Fri, 22 Sep 2023 17:22:03 +0000 Received: by outflank-mailman (input) for mailman id 606958; Fri, 22 Sep 2023 17:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjqs-0000qE-H0 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjqs-0007uC-8s for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjqs-0000R3-6D for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=l2XjSj/aAj0Cb7xeFR6QWnxz3tEOUgcPkTdGa9E896U=; b=E1dZOX9myzu3jQLSQYqZPPG3by kYcB53o8v0E/XkrGC85+43ZF5haotm/+U3eYQS70rAClYK3urOvhbvdWFQyBExXedjBGomcLTrdtA K9f4LL5DOnbZ+mmzXiqtv6pnYAvnT2QWd4rHTWE2wQe1xEQz2gNRESX4zIv37D+eGtvU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/AMD: extend Zenbleed check to models "good" ucode isn't known for Message-Id: Date: Fri, 22 Sep 2023 17:22:02 +0000 commit db3386e6cad6065c2a9155d4056b59164edb64dd Author: Jan Beulich AuthorDate: Wed Aug 23 09:26:36 2023 +0200 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/AMD: extend Zenbleed check to models "good" ucode isn't known for Reportedly the AMD Custom APU 0405 found on SteamDeck, models 0x90 and 0x91, (quoting the respective Linux commit) is similarly affected. Put another instance of our Zen1 vs Zen2 distinction checks in amd_check_zenbleed(), forcing use of the chickenbit irrespective of ucode version (building upon real hardware never surfacing a version of 0xffffffff). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper (cherry picked from commit 145a69c0944ac70cfcf9d247c85dee9e99d9d302) --- xen/arch/x86/cpu/amd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 82375bf242..d8b78ae111 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -783,10 +783,17 @@ void amd_check_zenbleed(void) case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; default: /* - * With the Fam17h check above, parts getting here are Zen1. - * They're not affected. + * With the Fam17h check above, most parts getting here are + * Zen1. They're not affected. Assume Zen2 ones making it + * here are affected regardless of microcode version. + * + * Zen1 vs Zen2 isn't a simple model number comparison, so use + * STIBP as a heuristic to distinguish. */ - return; + if (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) + return; + good_rev = ~0U; + break; } rdmsrl(MSR_AMD64_DE_CFG, val); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606959.945071 (Exim 4.92) (envelope-from ) id 1qjjr3-0000sH-4G; Fri, 22 Sep 2023 17:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606959.945071; Fri, 22 Sep 2023 17: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 1qjjr3-0000s9-1Q; Fri, 22 Sep 2023 17:22:13 +0000 Received: by outflank-mailman (input) for mailman id 606959; Fri, 22 Sep 2023 17:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjr2-0000s3-DD for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjr2-0007vq-Bx for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjr2-0000Re-Ay for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=HDtizthkKhuZg9j9pG2CWIuAP0hpmv0g+BkS7lpXmkU=; b=wnMNNkv4C5vz5q7O17Py8hJiWO yAo8ZTp6qBrKLYXhn2U5jC/9eELicB8RbWoPCmed9J9RF6OHwod8Nb5UL9MkRxSnZelhRy74Rvxq7 Sl0oxs2qG/FYRPZlEb8LbOvJsfnDCC1ht0bealCNlTHWpEsyXtXrRkOPe4keKAYqPHq0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} Message-Id: Date: Fri, 22 Sep 2023 17:22:12 +0000 commit 094cd5cb851d267feda3681d034ad46e91c60532 Author: Andrew Cooper AuthorDate: Tue Sep 12 15:06:49 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/spec-ctrl: Fix confusion between SPEC_CTRL_EXIT_TO_XEN{,_IST} c/s 3fffaf9c13e9 ("x86/entry: Avoid using alternatives in NMI/#MC paths") dropped the only user, leaving behind the (incorrect) implication that Xen had split exit paths. Delete the unused SPEC_CTRL_EXIT_TO_XEN and rename SPEC_CTRL_EXIT_TO_XEN_IST to SPEC_CTRL_EXIT_TO_XEN for consistency. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 1c18d73774533a55ba9d1cbee8bdace03efdb5e7) --- xen/arch/x86/x86_64/entry.S | 2 +- xen/include/asm-x86/spec_ctrl_asm.h | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 3c85933256..e82b4581cf 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -607,7 +607,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN_IST /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ RESTORE_ALL adj=8 iretq diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 9eb4ad9ab7..253e633f44 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -79,7 +79,6 @@ * - SPEC_CTRL_ENTRY_FROM_PV * - SPEC_CTRL_ENTRY_FROM_INTR * - SPEC_CTRL_ENTRY_FROM_INTR_IST - * - SPEC_CTRL_EXIT_TO_XEN_IST * - SPEC_CTRL_EXIT_TO_XEN * - SPEC_CTRL_EXIT_TO_PV * @@ -268,11 +267,6 @@ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV -/* Use when exiting to Xen context. */ -#define SPEC_CTRL_EXIT_TO_XEN \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_XEN, X86_FEATURE_SC_MSR_PV - /* Use when exiting to PV guest context. */ #define SPEC_CTRL_EXIT_TO_PV \ ALTERNATIVE "", \ @@ -339,8 +333,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen in IST context. */ -.macro SPEC_CTRL_EXIT_TO_XEN_IST +/* Use when exiting to Xen context. */ +.macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end * Clobbers %rax, %rcx, %rdx -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606960.945074 (Exim 4.92) (envelope-from ) id 1qjjrD-0000up-5M; Fri, 22 Sep 2023 17:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606960.945074; Fri, 22 Sep 2023 17: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 1qjjrD-0000ui-2w; Fri, 22 Sep 2023 17:22:23 +0000 Received: by outflank-mailman (input) for mailman id 606960; Fri, 22 Sep 2023 17:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrC-0000uX-GE for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrC-0007wH-FS for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjrC-0000S9-Dw for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=74f1QAgiN77NBOsXHlX2cu/mldoT9IOP1oWNVFi3HEI=; b=p6cb3qBdBqrfOMqJIIB4TnQPVR G0PlEBFLeVU0RacmEnQ9qPVKHQI2ZMcCWBaeYDKE9mBZWUqOexQxet7Nr1dKmsdGSnLGESnkJ7Pvv FZOiVuimvqU2woGJR98EHDLZJsBFmKz2mFVRgb0kT2dQlWatGyr4QghyFlLJa1VPiQSU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user Message-Id: Date: Fri, 22 Sep 2023 17:22:22 +0000 commit 806893afb66fe7fa96ec495f2b7561bb396053ee Author: Andrew Cooper AuthorDate: Tue Sep 12 17:03:16 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/spec-ctrl: Fold DO_SPEC_CTRL_EXIT_TO_XEN into it's single user With the SPEC_CTRL_EXIT_TO_XEN{,_IST} confusion fixed, it's now obvious that there's only a single EXIT_TO_XEN path. Fold DO_SPEC_CTRL_EXIT_TO_XEN into SPEC_CTRL_EXIT_TO_XEN to simplify further fixes. When merging labels, switch the name to .L\@_skip_sc_msr as "skip" on its own is going to be too generic shortly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 694bb0f280fd08a4377e36e32b84b5062def4de2) --- xen/include/asm-x86/spec_ctrl_asm.h | 40 +++++++++++++++---------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 253e633f44..bff3e7f085 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -211,27 +211,6 @@ wrmsr .endm -.macro DO_SPEC_CTRL_EXIT_TO_XEN -/* - * Requires %rbx=stack_end - * Clobbers %rax, %rcx, %rdx - * - * When returning to Xen context, look to see whether SPEC_CTRL shadowing is - * in effect, and reload the shadow value. This covers race conditions which - * exist with an NMI/MCE/etc hitting late in the return-to-guest path. - */ - xor %edx, %edx - - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip - - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax - mov $MSR_SPEC_CTRL, %ecx - wrmsr - -.L\@_skip: -.endm - .macro DO_SPEC_CTRL_EXIT_TO_GUEST /* * Requires %eax=spec_ctrl, %rsp=regs/cpuinfo @@ -340,11 +319,24 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): * Clobbers %rax, %rcx, %rdx */ testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) - jz .L\@_skip + jz .L\@_skip_sc_msr - DO_SPEC_CTRL_EXIT_TO_XEN + /* + * When returning to Xen context, look to see whether SPEC_CTRL shadowing + * is in effect, and reload the shadow value. This covers race conditions + * which exist with an NMI/MCE/etc hitting late in the return-to-guest + * path. + */ + xor %edx, %edx -.L\@_skip: + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + jz .L\@_skip_sc_msr + + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov $MSR_SPEC_CTRL, %ecx + wrmsr + +.L\@_skip_sc_msr: .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606961.945078 (Exim 4.92) (envelope-from ) id 1qjjrN-0000yB-8R; Fri, 22 Sep 2023 17:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606961.945078; Fri, 22 Sep 2023 17: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 1qjjrN-0000y4-5i; Fri, 22 Sep 2023 17:22:33 +0000 Received: by outflank-mailman (input) for mailman id 606961; Fri, 22 Sep 2023 17:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrM-0000xy-NM for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrM-0007wP-L5 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjrM-0000SY-HQ for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=5IomyaOPkOU9ZtprKbV7HQn4TodnThjA8Jj4JiQ/aPM=; b=Mq+7ij3TIxMlJYt8DIzXJ/ZiuX ts0xO/7Eglhdm4r6oq5YZz/2Bet/fyEWdxz/dC9PqlE/+Yu0YhrXsYmjjkGQL1yT77LKEu9bGuWZ8 8oiN8ZYpE1mw97R87kQTckg6rcGQOH9pz+gyilko48rUiptH7R6i6V/JezsJXRFjvwzg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros Message-Id: Date: Fri, 22 Sep 2023 17:22:32 +0000 commit 67b97438604c6a7ff7ee3dd5c98fff3f5669f6d7 Author: Andrew Cooper AuthorDate: Fri Sep 1 11:38:44 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/spec-ctrl: Turn the remaining SPEC_CTRL_{ENTRY,EXIT}_* into asm macros These have grown more complex over time, with some already having been converted. Provide full Requires/Clobbers comments, otherwise missing at this level of indirection. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 7125429aafb9e3c9c88fc93001fc2300e0ac2cc8) --- xen/include/asm-x86/spec_ctrl_asm.h | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index bff3e7f085..1b4078ed8e 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -231,26 +231,45 @@ .endm /* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ -#define SPEC_CTRL_ENTRY_FROM_PV \ +.macro SPEC_CTRL_ENTRY_FROM_PV +/* + * Requires %rsp=regs/cpuinfo, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=0), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=0), \ X86_FEATURE_SC_MSR_PV +.endm /* Use in interrupt/exception context. May interrupt Xen or PV context. */ -#define SPEC_CTRL_ENTRY_FROM_INTR \ +.macro SPEC_CTRL_ENTRY_FROM_INTR +/* + * Requires %rsp=regs, %r14=stack_end, %rdx=0 + * Clobbers %rax, %rcx, %rdx + */ ALTERNATIVE "", __stringify(DO_SPEC_CTRL_COND_IBPB maybexen=1), \ - X86_FEATURE_IBPB_ENTRY_PV; \ - ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV; \ + X86_FEATURE_IBPB_ENTRY_PV + + ALTERNATIVE "", DO_OVERWRITE_RSB, X86_FEATURE_SC_RSB_PV + ALTERNATIVE "", __stringify(DO_SPEC_CTRL_ENTRY maybexen=1), \ X86_FEATURE_SC_MSR_PV +.endm /* Use when exiting to PV guest context. */ -#define SPEC_CTRL_EXIT_TO_PV \ - ALTERNATIVE "", \ - DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV; \ +.macro SPEC_CTRL_EXIT_TO_PV +/* + * Requires %rax=spec_ctrl, %rsp=regs/info + * Clobbers %rcx, %rdx + */ + ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV + DO_SPEC_CTRL_COND_VERW +.endm /* * Use in IST interrupt/exception context. May interrupt Xen or PV context. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:22:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606962.945083 (Exim 4.92) (envelope-from ) id 1qjjrX-00010o-A3; Fri, 22 Sep 2023 17:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606962.945083; Fri, 22 Sep 2023 17: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 1qjjrX-00010f-7M; Fri, 22 Sep 2023 17:22:43 +0000 Received: by outflank-mailman (input) for mailman id 606962; Fri, 22 Sep 2023 17:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrW-00010Z-On for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrW-0007wX-O4 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjrW-0000T1-N6 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=qxNptzbIPpMfEm4xqep/SWFrP6UBcclK9AaoqrAoltA=; b=OfrEBGYhx8OrDmBFyQpwpaMVZb 67xD+uv7whXhPIecfzVWg1wMzOXv6EIQLnZe6un8jQlbLO8oRT0O6GI9p00iQ/GRiXDSbF+So7vT6 qTMwSIqU93uMe1R6+2lGLMVdMoPZIGfmt564dkECIZZuXXxjURjF7SMZMrRhy75RCuDI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments Message-Id: Date: Fri, 22 Sep 2023 17:22:42 +0000 commit 93504b3a6c92a1f2821af5e0960be8fda066ad77 Author: Andrew Cooper AuthorDate: Wed Aug 30 20:11:50 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/spec-ctrl: Improve all SPEC_CTRL_{ENTER,EXIT}_* comments ... to better explain how they're used. Doing so highlights that SPEC_CTRL_EXIT_TO_XEN is missing a VERW flush for the corner case when e.g. an NMI hits late in an exit-to-guest path. Leave a TODO, which will be addressed in subsequent patches which arrange for VERW flushing to be safe within SPEC_CTRL_EXIT_TO_XEN. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 45f00557350dc7d0756551069803fc49c29184ca) --- xen/include/asm-x86/spec_ctrl_asm.h | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 1b4078ed8e..f8cd76fe9e 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -230,7 +230,10 @@ wrmsr .endm -/* Use after an entry from PV context (syscall/sysenter/int80/int82/etc). */ +/* + * Used after an entry from PV context: SYSCALL, SYSENTER, INT, + * etc. There is always a guest speculation state in context. + */ .macro SPEC_CTRL_ENTRY_FROM_PV /* * Requires %rsp=regs/cpuinfo, %rdx=0 @@ -245,7 +248,11 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use in interrupt/exception context. May interrupt Xen or PV context. */ +/* + * Used after an exception or maskable interrupt, hitting Xen or PV context. + * There will either be a guest speculation context, or (barring fatal + * exceptions) a well-formed Xen speculation context. + */ .macro SPEC_CTRL_ENTRY_FROM_INTR /* * Requires %rsp=regs, %r14=stack_end, %rdx=0 @@ -260,7 +267,10 @@ X86_FEATURE_SC_MSR_PV .endm -/* Use when exiting to PV guest context. */ +/* + * Used when exiting from any entry context, back to PV context. This + * includes from an IST entry which moved onto the primary stack. + */ .macro SPEC_CTRL_EXIT_TO_PV /* * Requires %rax=spec_ctrl, %rsp=regs/info @@ -272,7 +282,13 @@ .endm /* - * Use in IST interrupt/exception context. May interrupt Xen or PV context. + * Used after an IST entry hitting Xen or PV context. Special care is needed, + * because when hitting Xen context, there may not be a well-formed + * speculation context. (i.e. it can hit in the middle of + * SPEC_CTRL_{ENTRY,EXIT}_* regions.) + * + * An IST entry which hits PV context moves onto the primary stack and leaves + * via SPEC_CTRL_EXIT_TO_PV, *not* SPEC_CTRL_EXIT_TO_XEN. */ .macro SPEC_CTRL_ENTRY_FROM_INTR_IST /* @@ -331,7 +347,14 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): UNLIKELY_END(\@_serialise) .endm -/* Use when exiting to Xen context. */ +/* + * Use when exiting from any entry context, back to Xen context. This + * includes returning to other SPEC_CTRL_{ENTRY,EXIT}_* regions with an + * incomplete speculation context. + * + * Because we might have interrupted Xen beyond SPEC_CTRL_EXIT_TO_$GUEST, we + * need to treat this as if it were an EXIT_TO_$GUEST case too. + */ .macro SPEC_CTRL_EXIT_TO_XEN /* * Requires %rbx=stack_end @@ -356,6 +379,9 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): wrmsr .L\@_skip_sc_msr: + + /* TODO VERW */ + .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:22:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606963.945087 (Exim 4.92) (envelope-from ) id 1qjjri-00013a-BX; Fri, 22 Sep 2023 17:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606963.945087; Fri, 22 Sep 2023 17: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 1qjjri-00013T-8r; Fri, 22 Sep 2023 17:22:54 +0000 Received: by outflank-mailman (input) for mailman id 606963; Fri, 22 Sep 2023 17:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrg-000130-TN for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrg-0007wg-Sd for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjrg-0000TS-Q5 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=dfqZGOiHUwAE9CunL0aTx01xeq2/asw74/bi+mqVQCk=; b=5sRjMtRmVjfhyPHU+N2mKSMW52 AI4jLionpiFcNZ57LSv86ceVaM5uWhZ7wEFcHS88TITrHiFdj9eKKNle9jtb+b2NT+J57L8c+lvL4 3pzCSkPrYe0ApNPmige57AFYOUYjPMWDb8zSG5cpV1dkdnSHLtslN7dh/yeW2xE68i98=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/entry: Adjust restore_all_xen to hold stack_end in %r14 Message-Id: Date: Fri, 22 Sep 2023 17:22:52 +0000 commit d75cb6dab86763b65210d69a40ac59bce90e1bb8 Author: Andrew Cooper AuthorDate: Wed Sep 13 13:48:16 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/entry: Adjust restore_all_xen to hold stack_end in %r14 All other SPEC_CTRL_{ENTRY,EXIT}_* helpers hold stack_end in %r14. Adjust it for consistency. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 7aa28849a1155d856e214e9a80a7e65fffdc3e58) --- xen/arch/x86/x86_64/entry.S | 8 ++++---- xen/include/asm-x86/spec_ctrl_asm.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index e82b4581cf..3cec072f81 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -599,15 +599,15 @@ restore_all_xen: * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). */ - GET_STACK_END(bx) - cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%rbx) + GET_STACK_END(14) + cmpb $0, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) UNLIKELY_START(ne, exit_cr3) - mov STACK_CPUINFO_FIELD(pv_cr3)(%rbx), %rax + mov STACK_CPUINFO_FIELD(pv_cr3)(%r14), %rax mov %rax, %cr3 UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %rbx=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ RESTORE_ALL adj=8 iretq diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index f8cd76fe9e..fa82f0a13c 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -357,10 +357,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %rbx=stack_end + * Requires %r14=stack_end * Clobbers %rax, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr /* @@ -371,10 +371,10 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%rbx) + testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) jz .L\@_skip_sc_msr - mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%rbx), %eax + mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax mov $MSR_SPEC_CTRL, %ecx wrmsr -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:23:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606965.945090 (Exim 4.92) (envelope-from ) id 1qjjrs-00016J-Dc; Fri, 22 Sep 2023 17:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606965.945090; Fri, 22 Sep 2023 17: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 1qjjrs-00016B-Af; Fri, 22 Sep 2023 17:23:04 +0000 Received: by outflank-mailman (input) for mailman id 606965; Fri, 22 Sep 2023 17:23:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrr-000162-0E for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjrq-0007x5-Vk for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjrq-0000Vf-Un for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=bA3QWzcODtT+KAsZnlQrCL/rJCJXPyUC22THuZTvdU0=; b=WVn1GgmEDC7k7XkDrsu9XC8i2W D92Csf3WNiO7zW33T0dtm/DBNMnliL1xSMWTJk4PAbbrBlYFnec+0B6i9uHMTelZeXZfaYLZ4CasX fP1K3G306B9h3wEZ4RVKHCBoBg59f21dqySXOivMkM/mXnQNMHeBiinsbmHaWL4SXm0g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/entry: Track the IST-ness of an entry for the exit paths Message-Id: Date: Fri, 22 Sep 2023 17:23:02 +0000 commit d39e5cf76f2a15120491b3b020d973d04c181388 Author: Andrew Cooper AuthorDate: Wed Sep 13 12:20:12 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/entry: Track the IST-ness of an entry for the exit paths Use %r12 to hold an ist_exit boolean. This register is zero elsewhere in the entry/exit asm, so it only needs setting in the IST path. As this is subtle and fragile, add check_ist_exit() to be used in debugging builds to cross-check that the ist_exit boolean matches the entry vector. Write check_ist_exit() it in C, because it's debug only and the logic more complicated than I care to maintain in asm. For now, we only need to use this signal in the exit-to-Xen path, but some exit-to-guest paths happen in IST context too. Check the correctness in all exit paths to avoid the logic bit-rotting. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 21bdc25b05a0f8ab6bc73520a9ca01327360732c) x86/entry: Partially revert IST-exit checks The patch adding check_ist_exit() didn't account for the fact that reset_stack_and_jump() is not an ABI-preserving boundary. The IST-ness in %r12 doesn't survive into the next context, and is a stale value C. This shows up in Gitlab CI for the Clang build: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/5112783827 and in OSSTest for GCC 8: http://logs.test-lab.xenproject.org/osstest/logs/183045/test-amd64-amd64-xl-qemuu-debianhvm-amd64/serial-pinot0.log There's no straightforward way to reconstruct the IST-exit-ness on the exit-to-guest path after a context switch. For now, we only need IST-exit on the return-to-Xen path. Fixes: 21bdc25b05a0 ("x86/entry: Track the IST-ness of an entry for the exit paths") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 9b57c800b79b96769ea3dcd6468578fa664d19f9) --- xen/arch/x86/traps.c | 13 +++++++++++++ xen/arch/x86/x86_64/entry.S | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index a4f12ad3ee..71dae00428 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2236,6 +2236,19 @@ void asm_domain_crash_synchronous(unsigned long addr) do_softirq(); } +#ifdef CONFIG_DEBUG +void check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) +{ + const unsigned int ist_mask = + (1U << X86_EXC_NMI) | (1U << X86_EXC_DB) | + (1U << X86_EXC_DF) | (1U << X86_EXC_MC); + uint8_t ev = regs->entry_vector; + bool is_ist = (ev < TRAP_nr) && ((1U << ev) & ist_mask); + + ASSERT(is_ist == ist_exit); +} +#endif + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 3cec072f81..fd6836daf0 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -593,8 +593,15 @@ ret_from_intr: .section .text.entry, "ax", @progbits ALIGN -/* No special register assumptions. */ +/* %r12=ist_exit */ restore_all_xen: + +#ifdef CONFIG_DEBUG + mov %rsp, %rdi + mov %r12, %rsi + call check_ist_exit +#endif + /* * Check whether we need to switch to the per-CPU page tables, in * case we return to late PV exit code (from an NMI or #MC). @@ -973,6 +980,10 @@ handle_ist_exception: INDIRECT_CALL %rdx mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %bl, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) + + /* This is an IST exit */ + mov $1, %r12d + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) jne ret_from_intr -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:23:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606966.945095 (Exim 4.92) (envelope-from ) id 1qjjs2-00018t-Ek; Fri, 22 Sep 2023 17:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606966.945095; Fri, 22 Sep 2023 17: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 1qjjs2-00018l-C7; Fri, 22 Sep 2023 17:23:14 +0000 Received: by outflank-mailman (input) for mailman id 606966; Fri, 22 Sep 2023 17:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjs1-00018d-3P for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjs1-0007xH-2k for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjs1-0000WA-1j for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gvi6b0c10qvlMdQjSiodE5uBA3UBgKuiyb4XCV2p3Vw=; b=WYEBX0ZRX635Rr4NEjOOYkhvf7 NpY1u4cDz1C/v/HUBtSBcDykxsgishwxpGwIQk67tMF/IlPR621SQAmg022+kIkrBezXIkgwzNT9m VLfe2FqWxNvJyR0gT9gpBaiJm9JodvL+pjcSO7P9T6F90tEOznr9FpeDs7tcukpogNaY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Issue VERW during IST exit to Xen Message-Id: Date: Fri, 22 Sep 2023 17:23:13 +0000 commit dac906062088f11a0577e9d7ef2642c5d8663432 Author: Andrew Cooper AuthorDate: Wed Sep 13 13:53:33 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/spec-ctrl: Issue VERW during IST exit to Xen There is a corner case where e.g. an NMI hitting an exit-to-guest path after SPEC_CTRL_EXIT_TO_* would have run the entire NMI handler *after* the VERW flush to scrub potentially sensitive data from uarch buffers. In order to compensate, issue VERW when exiting to Xen from an IST entry. SPEC_CTRL_EXIT_TO_XEN already has two reads of spec_ctrl_flags off the stack, and we're about to add a third. Load the field into %ebx, and list the register as clobbered. %r12 has been arranged to be the ist_exit signal, so add this as an input dependency and use it to identify when to issue a VERW. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit 3ee6066bcd737756b0990d417d94eddc0b0d2585) --- xen/arch/x86/x86_64/entry.S | 2 +- xen/include/asm-x86/spec_ctrl_asm.h | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index fd6836daf0..ff3b2d366c 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -614,7 +614,7 @@ UNLIKELY_START(ne, exit_cr3) UNLIKELY_END(exit_cr3) /* WARNING! `ret`, `call *`, `jmp *` not safe beyond this point. */ - SPEC_CTRL_EXIT_TO_XEN /* Req: %r14=end, Clob: acd */ + SPEC_CTRL_EXIT_TO_XEN /* Req: %r12=ist_exit %r14=end, Clob: abcd */ RESTORE_ALL adj=8 iretq diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index fa82f0a13c..478fcf12e6 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -357,10 +357,12 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ .macro SPEC_CTRL_EXIT_TO_XEN /* - * Requires %r14=stack_end - * Clobbers %rax, %rcx, %rdx + * Requires %r12=ist_exit, %r14=stack_end + * Clobbers %rax, %rbx, %rcx, %rdx */ - testb $SCF_ist_sc_msr, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + movzbl STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14), %ebx + + testb $SCF_ist_sc_msr, %bl jz .L\@_skip_sc_msr /* @@ -371,7 +373,7 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): */ xor %edx, %edx - testb $SCF_use_shadow, STACK_CPUINFO_FIELD(spec_ctrl_flags)(%r14) + testb $SCF_use_shadow, %bl jz .L\@_skip_sc_msr mov STACK_CPUINFO_FIELD(shadow_spec_ctrl)(%r14), %eax @@ -380,8 +382,16 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): .L\@_skip_sc_msr: - /* TODO VERW */ + test %r12, %r12 + jz .L\@_skip_ist_exit + + /* Logically DO_SPEC_CTRL_COND_VERW but without the %rsp=cpuinfo dependency */ + testb $SCF_verw, %bl + jz .L\@_skip_verw + verw STACK_CPUINFO_FIELD(verw_sel)(%r14) +.L\@_skip_verw: +.L\@_skip_ist_exit: .endm #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:23:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606967.945098 (Exim 4.92) (envelope-from ) id 1qjjsC-0001BW-G7; Fri, 22 Sep 2023 17:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606967.945098; Fri, 22 Sep 2023 17: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 1qjjsC-0001BO-Da; Fri, 22 Sep 2023 17:23:24 +0000 Received: by outflank-mailman (input) for mailman id 606967; Fri, 22 Sep 2023 17:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjsB-0001BB-6r for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjsB-0007xe-5k for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjsB-0000Wl-4l for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=hPBeAd0DdM3kdmfC4y4lucjItT/f0FlI96g0Y9ZZXqA=; b=K4kPo5Ao+OAo2oxeLdHyZTEtTK JAbKl36Ru5h82NcW7f3qvUlhUBqCxG8gN2VkXbYmPCoL4BpSJSM+XF1E8XJFs55HHt+FRdThhAOVr /SmiadbOGWa1m7TBHng56OlJFT4tV+fV10p1JTGihKDFnmNSvCB86dNBCSVUxUwWVJs0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/amd: Introduce is_zen{1,2}_uarch() predicates Message-Id: Date: Fri, 22 Sep 2023 17:23:23 +0000 commit b007f82a708bb5119314677168318e301038b0f8 Author: Andrew Cooper AuthorDate: Fri Sep 15 12:13:51 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/amd: Introduce is_zen{1,2}_uarch() predicates We already have 3 cases using STIBP as a Zen1/2 heuristic, and are about to introduce a 4th. Wrap the heuristic into a pair of predicates rather than opencoding it, and the explanation of the heuristic, at each usage site. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit de1d265001397f308c5c3c5d3ffc30e7ef8c0705) --- xen/arch/x86/cpu/amd.c | 11 +++-------- xen/include/asm-x86/amd.h | 11 +++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index d8b78ae111..030c4501be 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -742,15 +742,13 @@ void amd_init_ssbd(const struct cpuinfo_x86 *c) * non-branch instructions to be ignored. It is to be set unilaterally in * newer microcode. * - * This chickenbit is something unrelated on Zen1, and Zen1 vs Zen2 isn't a - * simple model number comparison, so use STIBP as a heuristic to separate the - * two uarches in Fam17h(AMD)/18h(Hygon). + * This chickenbit is something unrelated on Zen1. */ void amd_init_spectral_chicken(void) { uint64_t val, chickenbit = 1 << 1; - if (cpu_has_hypervisor || !boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (cpu_has_hypervisor || !is_zen2_uarch()) return; if (rdmsr_safe(MSR_AMD64_DE_CFG2, val) == 0 && !(val & chickenbit)) @@ -786,11 +784,8 @@ void amd_check_zenbleed(void) * With the Fam17h check above, most parts getting here are * Zen1. They're not affected. Assume Zen2 ones making it * here are affected regardless of microcode version. - * - * Zen1 vs Zen2 isn't a simple model number comparison, so use - * STIBP as a heuristic to distinguish. */ - if (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) + if (is_zen1_uarch()) return; good_rev = ~0U; break; diff --git a/xen/include/asm-x86/amd.h b/xen/include/asm-x86/amd.h index a82382e6bf..7fe1e19217 100644 --- a/xen/include/asm-x86/amd.h +++ b/xen/include/asm-x86/amd.h @@ -140,6 +140,17 @@ AMD_MODEL_RANGE(0x11, 0x0, 0x0, 0xff, 0xf), \ AMD_MODEL_RANGE(0x12, 0x0, 0x0, 0xff, 0xf)) +/* + * The Zen1 and Zen2 microarchitectures are implemented by AMD (Fam17h) and + * Hygon (Fam18h) but without simple model number rules. Instead, use STIBP + * as a heuristic that distinguishes the two. + * + * The caller is required to perform the appropriate vendor/family checks + * first. + */ +#define is_zen1_uarch() (!boot_cpu_has(X86_FEATURE_AMD_STIBP)) +#define is_zen2_uarch() boot_cpu_has(X86_FEATURE_AMD_STIBP) + struct cpuinfo_x86; int cpu_has_amd_erratum(const struct cpuinfo_x86 *, int, ...); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:23:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606968.945104 (Exim 4.92) (envelope-from ) id 1qjjsM-0001Ei-Jy; Fri, 22 Sep 2023 17:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606968.945104; Fri, 22 Sep 2023 17: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 1qjjsM-0001Ea-GN; Fri, 22 Sep 2023 17:23:34 +0000 Received: by outflank-mailman (input) for mailman id 606968; Fri, 22 Sep 2023 17:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjsL-0001EQ-9d for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjsL-0007xl-8w for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjsL-0000XE-84 for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=Eg03SwpeHsxNWIWf3zo7Wy4kfDIYkxD7v8VN9EOtfCE=; b=P8slHp7o/NoomOWT/8DiP3iqaU 1ZoZwNpiPKEDpp3vshpVMmJnXGZ/xTj33BHkMXLzdwJekgDa3KR/eBsEqIiuQFfGBB3MWm+oxOGjj ltHNv92frKqsB17CzuHyAPNwCdClhm1Zuf9vFj9hb8pJi/hy3WNkfPHXHU0TA1UjpYaQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Mitigate the Zen1 DIV leakage Message-Id: Date: Fri, 22 Sep 2023 17:23:33 +0000 commit d7b78041dc819efde0350f27754a61cb01a93496 Author: Andrew Cooper AuthorDate: Wed Aug 30 20:24:25 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 19 19:38:35 2023 +0100 x86/spec-ctrl: Mitigate the Zen1 DIV leakage In the Zen1 microarchitecure, there is one divider in the pipeline which services uops from both threads. In the case of #DE, the latched result from the previous DIV to execute will be forwarded speculatively. This is an interesting covert channel that allows two threads to communicate without any system calls. In also allows userspace to obtain the result of the most recent DIV instruction executed (even speculatively) in the core, which can be from a higher privilege context. Scrub the result from the divider by executing a non-faulting divide. This needs performing on the exit-to-guest paths, and ist_exit-to-Xen. Alternatives in IST context is believed safe now that it's done in NMI context. This is XSA-439 / CVE-2023-20588. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit b5926c6ecf05c28ee99c6248c42d691ccbf0c315) --- docs/misc/xen-command-line.pandoc | 6 ++++- xen/arch/x86/hvm/svm/entry.S | 1 + xen/arch/x86/spec_ctrl.c | 49 ++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/cpufeatures.h | 3 ++- xen/include/asm-x86/spec_ctrl_asm.h | 17 +++++++++++++ 5 files changed, 73 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 16a61ad858..f3d1009f2d 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2189,7 +2189,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). > {msr-sc,rsb,md-clear,ibpb-entry}=|{pv,hvm}=, > bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,psfd, > eager-fpu,l1d-flush,branch-harden,srb-lock, -> unpriv-mmio,gds-mit}= ]` +> unpriv-mmio,gds-mit,div-scrub}= ]` Controls for speculative execution sidechannel mitigations. By default, Xen will pick the most appropriate mitigations based on compiled in support, @@ -2309,6 +2309,10 @@ has elected not to lock the configuration, Xen will use GDS_CTRL to mitigate GDS with. Otherwise, Xen will mitigate by disabling AVX, which blocks the use of the AVX2 Gather instructions. +On all hardware, the `div-scrub=` option can be used to force or prevent Xen +from mitigating the DIV-leakage vulnerability. By default, Xen will mitigate +DIV-leakage on hardware believed to be vulnerable. + ### sync_console > `= ` diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 0ff4008060..ad5ca50c12 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -72,6 +72,7 @@ __UNLIKELY_END(nsvm_hap) 1: /* No Spectre v1 concerns. Execution will hit VMRUN imminently. */ .endm ALTERNATIVE "", svm_vmentry_spec_ctrl, X86_FEATURE_SC_MSR_HVM + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV pop %r15 pop %r14 diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index e9cc6b586a..f75124117b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -78,6 +79,7 @@ static int8_t __initdata opt_srb_lock = -1; static bool __initdata opt_unpriv_mmio; static bool __read_mostly opt_fb_clear_mmio; static int8_t __initdata opt_gds_mit = -1; +static int8_t __initdata opt_div_scrub = -1; static int __init parse_spec_ctrl(const char *s) { @@ -132,6 +134,7 @@ static int __init parse_spec_ctrl(const char *s) opt_srb_lock = 0; opt_unpriv_mmio = false; opt_gds_mit = 0; + opt_div_scrub = 0; } else if ( val > 0 ) rc = -EINVAL; @@ -284,6 +287,8 @@ static int __init parse_spec_ctrl(const char *s) opt_unpriv_mmio = val; else if ( (val = parse_boolean("gds-mit", s, ss)) >= 0 ) opt_gds_mit = val; + else if ( (val = parse_boolean("div-scrub", s, ss)) >= 0 ) + opt_div_scrub = val; else rc = -EINVAL; @@ -484,7 +489,7 @@ static void __init print_details(enum ind_thunk thunk) "\n"); /* Settings for Xen's protection, irrespective of guests. */ - printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s\n", + printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s%s%s, Other:%s%s%s%s%s%s\n", thunk == THUNK_NONE ? "N/A" : thunk == THUNK_RETPOLINE ? "RETPOLINE" : thunk == THUNK_LFENCE ? "LFENCE" : @@ -509,6 +514,7 @@ static void __init print_details(enum ind_thunk thunk) opt_l1d_flush ? " L1D_FLUSH" : "", opt_md_clear_pv || opt_md_clear_hvm || opt_fb_clear_mmio ? " VERW" : "", + opt_div_scrub ? " DIV" : "", opt_branch_harden ? " BRANCH_HARDEN" : ""); /* L1TF diagnostics, printed if vulnerable or PV shadowing is in use. */ @@ -933,6 +939,45 @@ static void __init srso_calculations(bool hw_smt_enabled) setup_force_cpu_cap(X86_FEATURE_SRSO_NO); } +/* + * The Div leakage issue is specific to the AMD Zen1 microarchitecure. + * + * However, there's no $FOO_NO bit defined, so if we're virtualised we have no + * hope of spotting the case where we might move to vulnerable hardware. We + * also can't make any useful conclusion about SMT-ness. + * + * Don't check the hypervisor bit, so at least we do the safe thing when + * booting on something that looks like a Zen1 CPU. + */ +static bool __init has_div_vuln(void) +{ + if ( !(boot_cpu_data.x86_vendor & + (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) + return false; + + if ( boot_cpu_data.x86 != 0x17 && boot_cpu_data.x86 != 0x18 ) + return false; + + return is_zen1_uarch(); +} + +static void __init div_calculations(bool hw_smt_enabled) +{ + bool cpu_bug_div = has_div_vuln(); + + if ( opt_div_scrub == -1 ) + opt_div_scrub = cpu_bug_div; + + if ( opt_div_scrub ) + setup_force_cpu_cap(X86_FEATURE_SC_DIV); + + if ( opt_smt == -1 && !cpu_has_hypervisor && cpu_bug_div && hw_smt_enabled ) + warning_add( + "Booted on leaky-DIV hardware with SMT/Hyperthreading\n" + "enabled. Please assess your configuration and choose an\n" + "explicit 'smt=' setting. See XSA-439.\n"); +} + static void __init ibpb_calculations(void) { bool def_ibpb_entry = false; @@ -1644,6 +1689,8 @@ void __init init_speculation_mitigations(void) ibpb_calculations(); + div_calculations(hw_smt_enabled); + /* Check whether Eager FPU should be enabled by default. */ if ( opt_eager_fpu == -1 ) opt_eager_fpu = should_use_eager_fpu(); diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h index bdb119a34c..d993e06e4c 100644 --- a/xen/include/asm-x86/cpufeatures.h +++ b/xen/include/asm-x86/cpufeatures.h @@ -35,7 +35,8 @@ XEN_CPUFEATURE(SC_RSB_HVM, X86_SYNTH(19)) /* RSB overwrite needed for HVM XEN_CPUFEATURE(XEN_SELFSNOOP, X86_SYNTH(20)) /* SELFSNOOP gets used by Xen itself */ XEN_CPUFEATURE(SC_MSR_IDLE, X86_SYNTH(21)) /* Clear MSR_SPEC_CTRL on idle */ XEN_CPUFEATURE(XEN_LBR, X86_SYNTH(22)) /* Xen uses MSR_DEBUGCTL.LBR */ -/* Bits 23,24 unused. */ +XEN_CPUFEATURE(SC_DIV, X86_SYNTH(23)) /* DIV scrub needed */ +/* Bit 24 unused. */ XEN_CPUFEATURE(SC_VERW_IDLE, X86_SYNTH(25)) /* VERW used by Xen for idle */ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks */ XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch Tracking */ diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index 478fcf12e6..c47399dbf2 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -177,6 +177,19 @@ .L\@_verw_skip: .endm +.macro DO_SPEC_CTRL_DIV +/* + * Requires nothing + * Clobbers %rax + * + * Issue a DIV for its flushing side effect (Zen1 uarch specific). Any + * non-faulting DIV will do; a byte DIV has least latency, and doesn't clobber + * %rdx. + */ + mov $1, %eax + div %al +.endm + .macro DO_SPEC_CTRL_ENTRY maybexen:req /* * Requires %rsp=regs (also cpuinfo if !maybexen) @@ -279,6 +292,8 @@ ALTERNATIVE "", DO_SPEC_CTRL_EXIT_TO_GUEST, X86_FEATURE_SC_MSR_PV DO_SPEC_CTRL_COND_VERW + + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV .endm /* @@ -391,6 +406,8 @@ UNLIKELY_DISPATCH_LABEL(\@_serialise): verw STACK_CPUINFO_FIELD(verw_sel)(%r14) .L\@_skip_verw: + ALTERNATIVE "", DO_SPEC_CTRL_DIV, X86_FEATURE_SC_DIV + .L\@_skip_ist_exit: .endm -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Sep 22 17:23:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Sep 2023 17:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.606970.945106 (Exim 4.92) (envelope-from ) id 1qjjsW-0001HX-Kp; Fri, 22 Sep 2023 17:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606970.945106; Fri, 22 Sep 2023 17:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjsW-0001HP-Hr; Fri, 22 Sep 2023 17:23:44 +0000 Received: by outflank-mailman (input) for mailman id 606970; Fri, 22 Sep 2023 17:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjsV-0001HA-EV for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjjsV-0007xt-Dg for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qjjsV-0000Xg-Bj for xen-changelog@lists.xenproject.org; Fri, 22 Sep 2023 17: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=gPBt7XsDnbueUDMwU6QXwSkxoul5Pyg+sv4ck1sT0Pg=; b=20ulyltoHwMw+1hSsp2goujQB5 oq6cuyX2HPHE1hQXb1qCQDBhjHrMXRUSW/2px+OWXb817flxCVGvrzZFvWpeVq+GKYido1hhLkWK8 9ujtQBbV5JuMal7fGMI045ieGl/F+tmkfidbRgYxul26Ifwth3sp3RtnB5i5PDaY8Re0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/shadow: defer releasing of PV's top-level shadow reference Message-Id: Date: Fri, 22 Sep 2023 17:23:43 +0000 commit 3a9a2901cc8b24f28dbdc6fb63f57006c77a1f47 Author: Jan Beulich AuthorDate: Wed Sep 20 10:36:06 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Sep 20 10:36:10 2023 +0100 x86/shadow: defer releasing of PV's top-level shadow reference sh_set_toplevel_shadow() re-pinning the top-level shadow we may be running on is not enough (and at the same time unnecessary when the shadow isn't what we're running on): That shadow becomes eligible for blowing away (from e.g. shadow_prealloc()) immediately after the paging lock was dropped. Yet it needs to remain valid until the actual page table switch occurred. Propagate up the call chain the shadow entry that needs releasing eventually, and carry out the release immediately after switching page tables. Handle update_cr3() failures by switching to idle pagetables. Note that various further uses of update_cr3() are HVM-only or only act on paused vCPU-s, in which case sh_set_toplevel_shadow() will not defer releasing of the reference. While changing the update_cr3() hook, also convert the "do_locking" parameter to boolean. This is CVE-2023-34322 / XSA-438. Reported-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: George Dunlap (cherry picked from commit fb0ff49fe9f784bfee0370c2a3c5f20e39d7a1cb) --- xen/arch/x86/mm.c | 27 +++++++++++++++----- xen/arch/x86/mm/hap/hap.c | 4 ++- xen/arch/x86/mm/shadow/common.c | 55 ++++++++++++++++++++++++++-------------- xen/arch/x86/mm/shadow/multi.c | 38 +++++++++++++++++---------- xen/arch/x86/mm/shadow/none.c | 3 ++- xen/arch/x86/mm/shadow/private.h | 14 +++++----- xen/arch/x86/pv/domain.c | 25 ++++++++++++++++-- xen/include/asm-x86/mm.h | 2 +- xen/include/asm-x86/paging.h | 6 ++--- xen/include/asm-x86/shadow.h | 8 ++++++ 10 files changed, 127 insertions(+), 55 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c88dc749d4..44ac8cae76 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -564,15 +564,12 @@ void write_ptbase(struct vcpu *v) * * Update ref counts to shadow tables appropriately. */ -void update_cr3(struct vcpu *v) +pagetable_t update_cr3(struct vcpu *v) { mfn_t cr3_mfn; if ( paging_mode_enabled(v->domain) ) - { - paging_update_cr3(v, false); - return; - } + return paging_update_cr3(v, false); if ( !(v->arch.flags & TF_kernel_mode) ) cr3_mfn = pagetable_get_mfn(v->arch.guest_table_user); @@ -580,6 +577,8 @@ void update_cr3(struct vcpu *v) cr3_mfn = pagetable_get_mfn(v->arch.guest_table); make_cr3(v, cr3_mfn); + + return pagetable_null(); } static inline void set_tlbflush_timestamp(struct page_info *page) @@ -3241,6 +3240,7 @@ int new_guest_cr3(mfn_t mfn) struct domain *d = curr->domain; int rc; mfn_t old_base_mfn; + pagetable_t old_shadow; if ( is_pv_32bit_domain(d) ) { @@ -3308,9 +3308,22 @@ int new_guest_cr3(mfn_t mfn) if ( !VM_ASSIST(d, m2p_strict) ) fill_ro_mpt(mfn); curr->arch.guest_table = pagetable_from_mfn(mfn); - update_cr3(curr); + old_shadow = update_cr3(curr); + + /* + * In shadow mode update_cr3() can fail, in which case here we're still + * running on the prior top-level shadow (which we're about to release). + * Switch to the idle page tables in such an event; the guest will have + * been crashed already. + */ + if ( likely(!mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(curr->arch.cr3 & ~X86_CR3_NOFLUSH))) ) + write_ptbase(curr); + else + write_ptbase(idle_vcpu[curr->processor]); - write_ptbase(curr); + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(d, old_shadow); if ( likely(mfn_x(old_base_mfn) != 0) ) { diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 1f9a157a0c..fa479d3d97 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -728,10 +728,12 @@ static bool_t hap_invlpg(struct vcpu *v, unsigned long linear) return 1; } -static void hap_update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t hap_update_cr3(struct vcpu *v, bool do_locking, bool noflush) { v->arch.hvm.hw_cr[3] = v->arch.hvm.guest_cr[3]; hvm_update_guest_cr3(v, noflush); + + return pagetable_null(); } /* diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e73931573b..04ceca4a52 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2641,13 +2641,13 @@ void shadow_update_paging_modes(struct vcpu *v) } /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)) +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)) { mfn_t smfn; pagetable_t old_entry, new_entry; @@ -2704,20 +2704,37 @@ void sh_set_toplevel_shadow(struct vcpu *v, mfn_x(gmfn), mfn_x(pagetable_get_mfn(new_entry))); v->arch.paging.shadow.shadow_table[slot] = new_entry; - /* Decrement the refcount of the old contents of this slot */ - if ( !pagetable_is_null(old_entry) ) + /* + * Decrement the refcount of the old contents of this slot, unless + * we're still running on that shadow - in that case it'll need holding + * on to until the actual page table switch did occur. + */ + if ( !pagetable_is_null(old_entry) && (v != current || !is_pv_domain(d)) ) { - mfn_t old_smfn = pagetable_get_mfn(old_entry); - /* Need to repin the old toplevel shadow if it's been unpinned - * by shadow_prealloc(): in PV mode we're still running on this - * shadow and it's not safe to free it yet. */ - if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(d, old_smfn) ) - { - printk(XENLOG_G_ERR "can't re-pin %"PRI_mfn"\n", mfn_x(old_smfn)); - domain_crash(d); - } - sh_put_ref(d, old_smfn, 0); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + old_entry = pagetable_null(); } + + /* + * 2- and 3-level shadow mode is used for HVM only. Therefore we never run + * on such a shadow, so only call sites requesting an L4 shadow need to pay + * attention to the returned value. + */ + ASSERT(pagetable_is_null(old_entry) || root_type == SH_type_l4_64_shadow); + + return old_entry; +} + +/* + * Helper invoked when releasing of a top-level shadow's reference was + * deferred in sh_set_toplevel_shadow() above. + */ +void shadow_put_top_level(struct domain *d, pagetable_t old_entry) +{ + ASSERT(!pagetable_is_null(old_entry)); + paging_lock(d); + sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + paging_unlock(d); } /**************************************************************************/ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 6a9f82d39c..35d47d6fbb 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3604,8 +3604,8 @@ sh_detach_old_tables(struct vcpu *v) } } -static void -sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t +sh_update_cr3(struct vcpu *v, bool do_locking, bool noflush) /* Updates vcpu->arch.cr3 after the guest has changed CR3. * Paravirtual guests should set v->arch.guest_table (and guest_table_user, * if appropriate). @@ -3619,6 +3619,7 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) { struct domain *d = v->domain; mfn_t gmfn; + pagetable_t old_entry = pagetable_null(); #if GUEST_PAGING_LEVELS == 3 && defined(CONFIG_HVM) const guest_l3e_t *gl3e; unsigned int i, guest_idx; @@ -3628,7 +3629,7 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) if ( is_pv_domain(d) && !v->is_initialised ) { ASSERT(v->arch.cr3 == 0); - return; + return old_entry; } if ( do_locking ) paging_lock(v->domain); @@ -3701,11 +3702,12 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) #if GUEST_PAGING_LEVELS == 4 if ( sh_remove_write_access(d, gmfn, 4, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, + sh_make_shadow); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } if ( !shadow_mode_external(d) && !is_pv_32bit_domain(d) ) { @@ -3751,26 +3753,32 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) gl2gfn = guest_l3e_get_gfn(gl3e[i]); gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sh_set_toplevel_shadow(v, i, gl2mfn, (i == 3) - ? SH_type_l2h_shadow - : SH_type_l2_shadow, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, gl2mfn, + (i == 3 + ? SH_type_l2h_shadow + : SH_type_l2_shadow), + sh_make_shadow); else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, - sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); } else - sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, + sh_make_shadow); + + ASSERT(pagetable_is_null(old_entry)); } } #elif GUEST_PAGING_LEVELS == 2 if ( sh_remove_write_access(d, gmfn, 2, 0) != 0 ) guest_flush_tlb_mask(d, d->dirty_cpumask); - sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, sh_make_shadow); + old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, + sh_make_shadow); + ASSERT(pagetable_is_null(old_entry)); if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) ) { ASSERT(d->is_dying || d->is_shutting_down); - return; + return old_entry; } #else #error This should never happen @@ -3864,6 +3872,8 @@ sh_update_cr3(struct vcpu *v, int do_locking, bool noflush) /* Release the lock, if we took it (otherwise it's the caller's problem) */ if ( do_locking ) paging_unlock(v->domain); + + return old_entry; } diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index 691269a59e..9b9c03ce7e 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -50,9 +50,10 @@ static unsigned long _gva_to_gfn(struct vcpu *v, struct p2m_domain *p2m, return gfn_x(INVALID_GFN); } -static void _update_cr3(struct vcpu *v, int do_locking, bool noflush) +static pagetable_t _update_cr3(struct vcpu *v, bool do_locking, bool noflush) { ASSERT_UNREACHABLE(); + return pagetable_null(); } static void _update_paging_modes(struct vcpu *v) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 1be84fc951..c9064b294b 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -360,13 +360,13 @@ mfn_t shadow_alloc(struct domain *d, void shadow_free(struct domain *d, mfn_t smfn); /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */ -void sh_set_toplevel_shadow(struct vcpu *v, - unsigned int slot, - mfn_t gmfn, - unsigned int root_type, - mfn_t (*make_shadow)(struct vcpu *v, - mfn_t gmfn, - uint32_t shadow_type)); +pagetable_t sh_set_toplevel_shadow(struct vcpu *v, + unsigned int slot, + mfn_t gmfn, + unsigned int root_type, + mfn_t (*make_shadow)(struct vcpu *v, + mfn_t gmfn, + uint32_t shadow_type)); /* Update the shadows in response to a pagetable write from Xen */ int sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size); diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 39a00c6ec2..d994a8cf36 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -408,10 +408,13 @@ bool __init xpti_pcid_enabled(void) static void _toggle_guest_pt(struct vcpu *v) { + bool guest_update; + pagetable_t old_shadow; unsigned long cr3; v->arch.flags ^= TF_kernel_mode; - update_cr3(v); + guest_update = v->arch.flags & TF_kernel_mode; + old_shadow = update_cr3(v); /* * Don't flush user global mappings from the TLB. Don't tick TLB clock. @@ -420,13 +423,31 @@ static void _toggle_guest_pt(struct vcpu *v) * TLB flush (for just the incoming PCID), as the top level page table may * have changed behind our backs. To be on the safe side, suppress the * no-flush unconditionally in this case. + * + * Furthermore in shadow mode update_cr3() can fail, in which case here + * we're still running on the prior top-level shadow (which we're about + * to release). Switch to the idle page tables in such an event; the + * guest will have been crashed already. */ cr3 = v->arch.cr3; if ( shadow_mode_enabled(v->domain) ) + { cr3 &= ~X86_CR3_NOFLUSH; + + if ( unlikely(mfn_eq(pagetable_get_mfn(old_shadow), + maddr_to_mfn(cr3))) ) + { + cr3 = idle_vcpu[v->processor]->arch.cr3; + /* Also suppress runstate/time area updates below. */ + guest_update = false; + } + } write_cr3(cr3); - if ( !(v->arch.flags & TF_kernel_mode) ) + if ( !pagetable_is_null(old_shadow) ) + shadow_put_top_level(v->domain, old_shadow); + + if ( !guest_update ) return; if ( v->arch.pv.need_update_runstate_area && update_runstate_area(v) ) diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 71dd28f126..cffd0d6425 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -569,7 +569,7 @@ void audit_domains(void); #endif void make_cr3(struct vcpu *v, mfn_t mfn); -void update_cr3(struct vcpu *v); +pagetable_t update_cr3(struct vcpu *v); int vcpu_destroy_pagetables(struct vcpu *); void *do_page_walk(struct vcpu *v, unsigned long addr); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 5ec508a351..5bcdbf93a7 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -136,7 +136,7 @@ struct paging_mode { unsigned long cr3, paddr_t ga, uint32_t *pfec, unsigned int *page_order); - void (*update_cr3 )(struct vcpu *v, int do_locking, + pagetable_t (*update_cr3 )(struct vcpu *v, bool do_locking, bool noflush); void (*update_paging_modes )(struct vcpu *v); bool (*flush_tlb )(bool (*flush_vcpu)(void *ctxt, @@ -309,9 +309,9 @@ static inline unsigned long paging_ga_to_gfn_cr3(struct vcpu *v, /* Update all the things that are derived from the guest's CR3. * Called when the guest changes CR3; the caller can then use v->arch.cr3 * as the value to load into the host CR3 to schedule this vcpu */ -static inline void paging_update_cr3(struct vcpu *v, bool noflush) +static inline pagetable_t paging_update_cr3(struct vcpu *v, bool noflush) { - paging_get_hostmode(v)->update_cr3(v, 1, noflush); + return paging_get_hostmode(v)->update_cr3(v, 1, noflush); } /* Update all the things that are derived from the guest's CR0/CR3/CR4. diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index e25f9604d8..302ae97fc6 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -97,6 +97,9 @@ void shadow_blow_tables_per_domain(struct domain *d); int shadow_set_allocation(struct domain *d, unsigned int pages, bool *preempted); +/* Helper to invoke for deferred releasing of a top-level shadow's reference. */ +void shadow_put_top_level(struct domain *d, pagetable_t old); + #else /* !CONFIG_SHADOW_PAGING */ #define shadow_vcpu_teardown(v) ASSERT(is_pv_vcpu(v)) @@ -118,6 +121,11 @@ static inline void shadow_prepare_page_type_change(struct domain *d, static inline void shadow_blow_tables_per_domain(struct domain *d) {} +static inline void shadow_put_top_level(struct domain *d, pagetable_t old) +{ + ASSERT_UNREACHABLE(); +} + static inline int shadow_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:11:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607382.945684 (Exim 4.92) (envelope-from ) id 1qkDeJ-00038E-HP; Sun, 24 Sep 2023 01:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607382.945684; Sun, 24 Sep 2023 01: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 1qkDeJ-000386-EY; Sun, 24 Sep 2023 01:11:03 +0000 Received: by outflank-mailman (input) for mailman id 607382; Sun, 24 Sep 2023 01:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDeH-00037y-Mo for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDeH-0002aj-MB for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDeH-00037C-Kz for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01: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=zU7xm1YlV6cexE4zTQlYYpAUZBRwLihjdymeT7ufjj4=; b=UhuvcC8YJYbvU0H+LdQGalCu9b 6iA3BDhjsvO+yxGb9HzI0oMirvMnSttygdbYVUreEA0Q+s1EwS8BWDSFJ/2yr16xIALXHcUiuMFQc Vzh5wMcSlgeF6I5E7m1hH2QQ1T8BoETQRWd5ykdU0v+6dGA9KMCy8QcePWhnw0ZYZLaM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/light: Revoke permissions when a PCI detach for HVM domain Message-Id: Date: Sun, 24 Sep 2023 01:11:01 +0000 commit 39113a8a23fb932b1de81ac83463c16af98d533d Author: Julien Grall AuthorDate: Fri Sep 15 13:52:04 2023 +0100 Commit: Julien Grall CommitDate: Thu Sep 21 11:02:31 2023 +0100 tools/light: Revoke permissions when a PCI detach for HVM domain Currently, libxl will grant IOMEM, I/O port and IRQ permissions when a PCI is attached (see pci_add_dm_done()) for all domain types. However, the permissions are only revoked for non-HVM domain (see do_pci_remove()). This means that HVM domains will be left with extra permissions. While this look bad on the paper, the IRQ permissions should be revoked when the Device Model call xc_physdev_unmap_pirq() and such domain cannot directly mapped I/O port and IOMEM regions. Instead, this has to be done by a Device Model. The Device Model can only run in dom0 or PV stubdomain (upstream libxl doesn't have support for HVM/PVH stubdomain). For PV/PVH stubdomain, the permission are properly revoked, so there is no security concern. This leaves dom0. There are two cases: 1) Privileged: Anyone gaining access to the Device Model would already have large control on the host. 2) Deprivileged: PCI passthrough require PHYSDEV operations which are not accessible when the Device Model is restricted. So overall, it is believed that the extra permissions cannot be exploited. Rework the code so the permissions are all removed for HVM domains. This needs to happen after the QEMU has detached the device. So the revocation is now moved to pci_remove_detached(). Also add a comment on top of the error message when the PIRQ cannot be unbind to explain this could be a spurious error as QEMU may have already done it. Signed-off-by: Julien Grall Release-acked-by: Henry Wang Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_pci.c | 137 ++++++++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 60 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 7f5f170e6e..96cb4da079 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1968,7 +1968,6 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) goto out_fail; } - rc = ERROR_FAIL; if (type == LIBXL_DOMAIN_TYPE_HVM) { prs->hvm = true; switch (libxl__device_model_version_running(gc, domid)) { @@ -1989,65 +1988,7 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) rc = ERROR_INVAL; goto out_fail; } - } else { - char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain, - pci->bus, pci->dev, pci->func); - FILE *f = fopen(sysfs_path, "r"); - unsigned int start = 0, end = 0, flags = 0, size = 0; - int irq = 0; - int i; - - if (f == NULL) { - LOGED(ERROR, domid, "Couldn't open %s", sysfs_path); - goto skip1; - } - for (i = 0; i < PROC_PCI_NUM_RESOURCES; i++) { - if (fscanf(f, "0x%x 0x%x 0x%x\n", &start, &end, &flags) != 3) - continue; - size = end - start + 1; - if (start) { - if (flags & PCI_BAR_IO) { - rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 0); - if (rc < 0) - LOGED(ERROR, domid, - "xc_domain_ioport_permission error 0x%x/0x%x", - start, - size); - } else { - rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, - (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 0); - if (rc < 0) - LOGED(ERROR, domid, - "xc_domain_iomem_permission error 0x%x/0x%x", - start, - size); - } - } - } - fclose(f); -skip1: - if (!pci_supp_legacy_irq()) - goto skip_irq; - sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, - pci->bus, pci->dev, pci->func); - f = fopen(sysfs_path, "r"); - if (f == NULL) { - LOGED(ERROR, domid, "Couldn't open %s", sysfs_path); - goto skip_irq; - } - if ((fscanf(f, "%u", &irq) == 1) && irq) { - rc = xc_physdev_unmap_pirq(ctx->xch, domid, irq); - if (rc < 0) { - LOGED(ERROR, domid, "xc_physdev_unmap_pirq irq=%d", irq); - } - rc = xc_domain_irq_permission(ctx->xch, domid, irq, 0); - if (rc < 0) { - LOGED(ERROR, domid, "xc_domain_irq_permission irq=%d", irq); - } - } - fclose(f); } -skip_irq: rc = 0; out_fail: pci_remove_detached(egc, prs, rc); /* must be last */ @@ -2226,7 +2167,11 @@ static void pci_remove_detached(libxl__egc *egc, int rc) { STATE_AO_GC(prs->aodev->ao); - int stubdomid = 0; + libxl_ctx *ctx = libxl__gc_owner(gc); + unsigned int start = 0, end = 0, flags = 0, size = 0; + int irq = 0, i, stubdomid = 0; + const char *sysfs_path; + FILE *f; uint32_t domainid = prs->domid; bool isstubdom; @@ -2242,6 +2187,78 @@ static void pci_remove_detached(libxl__egc *egc, if (rc && !prs->force) goto out; + /* Revoke the permissions */ + sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", + pci->domain, pci->bus, pci->dev, pci->func); + + f = fopen(sysfs_path, "r"); + if (f == NULL) { + LOGED(ERROR, domid, "Couldn't open %s", sysfs_path); + goto skip_bar; + } + + for (i = 0; i < PROC_PCI_NUM_RESOURCES; i++) { + if (fscanf(f, "0x%x 0x%x 0x%x\n", &start, &end, &flags) != 3) + continue; + size = end - start + 1; + if (start) { + if (flags & PCI_BAR_IO) { + rc = xc_domain_ioport_permission(ctx->xch, domid, start, + size, 0); + if (rc < 0) + LOGED(ERROR, domid, + "xc_domain_ioport_permission error 0x%x/0x%x", + start, + size); + } else { + rc = xc_domain_iomem_permission(ctx->xch, domid, + start >> XC_PAGE_SHIFT, + (size + (XC_PAGE_SIZE - 1)) >> XC_PAGE_SHIFT, + 0); + if (rc < 0) + LOGED(ERROR, domid, + "xc_domain_iomem_permission error 0x%x/0x%x", + start, + size); + } + } + } + fclose(f); + +skip_bar: + if (!pci_supp_legacy_irq()) + goto skip_legacy_irq; + + sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, + pci->bus, pci->dev, pci->func); + + f = fopen(sysfs_path, "r"); + if (f == NULL) { + LOGED(ERROR, domid, "Couldn't open %s", sysfs_path); + goto skip_legacy_irq; + } + + if ((fscanf(f, "%u", &irq) == 1) && irq) { + rc = xc_physdev_unmap_pirq(ctx->xch, domid, irq); + if (rc < 0) { + /* + * QEMU may have already unmapped the IRQ. So the error + * may be spurious. For now, still print an error message as + * it is not easy to distinguished between valid and + * spurious error. + */ + LOGED(ERROR, domid, "xc_physdev_unmap_pirq irq=%d", irq); + } + rc = xc_domain_irq_permission(ctx->xch, domid, irq, 0); + if (rc < 0) { + LOGED(ERROR, domid, "xc_domain_irq_permission irq=%d", irq); + } + } + + fclose(f); + +skip_legacy_irq: + isstubdom = libxl_is_stubdom(CTX, domid, &domainid); /* don't do multiple resets while some functions are still passed through */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:11:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607383.945688 (Exim 4.92) (envelope-from ) id 1qkDeT-0003AA-Id; Sun, 24 Sep 2023 01:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607383.945688; Sun, 24 Sep 2023 01: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 1qkDeT-0003A3-G3; Sun, 24 Sep 2023 01:11:13 +0000 Received: by outflank-mailman (input) for mailman id 607383; Sun, 24 Sep 2023 01:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDeR-00039u-QO for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDeR-0002ar-PJ for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDeR-00037k-OJ for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01: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=wDOHVel8LXt7GoWgpHV1Q8asSTbetu4JsbdSpxyaT9M=; b=GRbC0QnomW/rT2pKHKkbY39u3Y 7cSxFsiKM6NCDIUZrh6b0IR+qixujvDC0JGczD6SieVijfV3BbNe92pKI4TeZVwHWZ3lEJW1WEcfN V7bfA60yuS8cgm7qOXvyNvTEE6Z+UbJti93kpKcCf//spkD5qsl1hj02hT6LrrfPa6KM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head.S: Fix wrong enable_boot_cpu_mm() code movement Message-Id: Date: Sun, 24 Sep 2023 01:11:11 +0000 commit 405cff8491001179eeef2444358d15759912644d Author: Henry Wang AuthorDate: Sat Sep 16 12:06:49 2023 +0800 Commit: Julien Grall CommitDate: Fri Sep 22 08:58:35 2023 +0100 xen/arm64: head.S: Fix wrong enable_boot_cpu_mm() code movement Some addressed comments on enable_boot_cpu_mm() were reintroduced back during the code movement from arm64/head.S to arm64/mmu/head.S. We should drop the unreachable code, move the 'mov lr, x5' closer to 'b remove_identity_mapping' so it is clearer that it will return, and update the in-code comment accordingly. Fixes: 6734327d76be ("xen/arm64: Split and move MMU-specific head.S to mmu/head.S") Reported-by: Julien Grall Signed-off-by: Henry Wang Reviewed-by: Julien Grall Reviewed-by: Ayan Kumar Halder --- xen/arch/arm/arm64/mmu/head.S | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index a5271e3880..88075ef083 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -329,7 +329,6 @@ ENTRY(enable_boot_cpu_mm) load_paddr x0, boot_pgtable bl enable_mmu - mov lr, x5 /* * The MMU is turned on and we are in the 1:1 mapping. Switch @@ -338,19 +337,15 @@ ENTRY(enable_boot_cpu_mm) ldr x0, =1f br x0 1: + mov lr, x5 /* * The 1:1 map may clash with other parts of the Xen virtual memory * layout. As it is not used anymore, remove it completely to * avoid having to worry about replacing existing mapping - * afterwards. Function will return to primary_switched. + * afterwards. Function will return to the virtual address requested + * by the caller. */ b remove_identity_mapping - - /* - * Below is supposed to be unreachable code, as "ret" in - * remove_identity_mapping will use the return address in LR in advance. - */ - b fail ENDPROC(enable_boot_cpu_mm) /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:11:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607384.945692 (Exim 4.92) (envelope-from ) id 1qkDed-0003D6-K8; Sun, 24 Sep 2023 01:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607384.945692; Sun, 24 Sep 2023 01: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 1qkDed-0003Cy-HX; Sun, 24 Sep 2023 01:11:23 +0000 Received: by outflank-mailman (input) for mailman id 607384; Sun, 24 Sep 2023 01:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDeb-0003Ce-Sy for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDeb-0002b3-SO for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDeb-00038F-RI for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01: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=qbs4HHgAXZgeNxkiBsNcdwb8GmqG7/lw1y52NBJXYdg=; b=vwd8xcWXfPk1Yq8gw2dFeQCcle wq5paBgtCxxW+esBBPodWUe3+H8DTJCH7VMrZsnX0d8HQkW7cUky3KWr0tqsqitrDzXcDLew3H1x9 rq/fz0xYoMcq0cPZcP5Lal5YVUMJKXAua+3OJdWTYpf3tPf5qTnp11ijiKO32uS0qa54=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] console/serial: bump buffer from 16K to 32K Message-Id: Date: Sun, 24 Sep 2023 01:11:21 +0000 commit d09e44e5d8fdfe0a8b8af1ef604dbc699497e11a Author: Roger Pau Monne AuthorDate: Tue Sep 19 14:51:18 2023 +0200 Commit: Julien Grall CommitDate: Fri Sep 22 09:04:29 2023 +0100 console/serial: bump buffer from 16K to 32K Testing on a Kaby Lake box with 8 CPUs leads to the serial buffer being filled halfway during dom0 boot, and thus a non-trivial chunk of Linux boot messages are dropped. Increasing the buffer to 32K does fix the issue and Linux boot messages are no longer dropped. There's no justification either on why 16K was chosen, and hence bumping to 32K in order to cope with current systems generating output faster does seem appropriate to have a better user experience with the provided defaults. Signed-off-by: Roger Pau Monné Acked-by: Julien Grall --- xen/drivers/char/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index 06350c3873..e18ec3788c 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -77,13 +77,13 @@ config HAS_EHCI config SERIAL_TX_BUFSIZE int "Size of the transmit serial buffer" - default 16384 + default 32768 help Controls the default size of the transmit buffer (in bytes) used by the serial driver. Note the value provided will be rounded down to the nearest power of 2. - Default value is 16384 (16kiB). + Default value is 32768 (32KiB). config XHCI bool "XHCI DbC UART driver" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:11:32 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:11:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607385.945696 (Exim 4.92) (envelope-from ) id 1qkDem-0003Fo-Lm; Sun, 24 Sep 2023 01:11:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607385.945696; Sun, 24 Sep 2023 01:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDem-0003Fh-J3; Sun, 24 Sep 2023 01:11:32 +0000 Received: by outflank-mailman (input) for mailman id 607385; Sun, 24 Sep 2023 01:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDem-0003Fb-05 for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDel-0002bE-Ve for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDel-00038s-Ub for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gbjSZ2PHPTmOaYJsLDLHNsnoatf7dipB73QYMUx7a24=; b=uMAE0CwcA2lNVJRHx0A2/qYX3A 6iFZo2D+6C+0olFZLuq3cdYYHZ+N6Ab+S2vJWXZMmQOYFrL0LCGXwIDWDqGBLxARGzkxM00w7156p KOW0o2l//SvfJlMlqTXPzEbclBMy8CLZYAhYCHikZame1aSUHCMENZCBQGrRRj60MX/s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] credit: Limit load balancing to once per millisecond Message-Id: Date: Sun, 24 Sep 2023 01:11:31 +0000 commit 58feb9e0ac70f9fedf44b290665bd3023b23f0fe Author: George Dunlap AuthorDate: Mon Sep 18 16:46:47 2023 +0100 Commit: George Dunlap CommitDate: Fri Sep 22 13:42:20 2023 +0100 credit: Limit load balancing to once per millisecond The credit scheduler tries as hard as it can to ensure that it always runs scheduling units with positive credit (PRI_TS_UNDER) before running those with negative credit (PRI_TS_OVER). If the next runnable scheduling unit is of priority OVER, it will always run the load balancer, which will scour the system looking for another scheduling unit of the UNDER priority. Unfortunately, as the number of cores on a system has grown, the cost of the work-stealing algorithm has dramatically increased; a recent trace on a system with 128 cores showed this taking over 50 microseconds. Add a parameter, load_balance_ratelimit, to limit the frequency of load balance operations on a given pcpu. Default this to 1 millisecond. Invert the load balancing conditional to make it more clear, and line up more closely with the comment above it. Overall it might be cleaner to have the last_load_balance checking happen inside csched_load_balance(), but that would require either passing both now and spc into the function, or looking them up again; both of which seemed to be worse than simply checking and setting the values before calling it. On a system with a vcpu:pcpu ratio of 2:1, running Windows guests (which will end up calling YIELD during spinlock contention), this patch increased performance significantly. Signed-off-by: George Dunlap Reviewed-by: Juergen Gross Release-acked-by: Henry Wang --- docs/misc/xen-command-line.pandoc | 8 +++++++ xen/common/sched/credit.c | 47 +++++++++++++++++++++++++++++++-------- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 7acd688856..604650aaee 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1884,6 +1884,14 @@ By default, Xen will use the INVPCID instruction for TLB management if it is available. This option can be used to cause Xen to fall back to older mechanisms, which are generally slower. +### load-balance-ratelimit +> `= ` + +The minimum interval between load balancing events on a given pcpu, in +microseconds. A value of '0' will disable rate limiting. Maximum +value 1 second. At the moment only credit honors this parameter. +Default 1ms. + ### noirqbalance (x86) > `= ` diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index f2cd3d9da3..b447cd8845 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -50,6 +50,10 @@ #define CSCHED_TICKS_PER_TSLICE 3 /* Default timeslice: 30ms */ #define CSCHED_DEFAULT_TSLICE_MS 30 +/* Default load balancing ratelimit: 1ms */ +#define CSCHED_DEFAULT_LOAD_BALANCE_RATELIMIT_US 1000 +/* Max load balancing ratelimit: 1s */ +#define CSCHED_MAX_LOAD_BALANCE_RATELIMIT_US 1000000 #define CSCHED_CREDITS_PER_MSEC 10 /* Never set a timer shorter than this value. */ #define CSCHED_MIN_TIMER XEN_SYSCTL_SCHED_RATELIMIT_MIN @@ -153,6 +157,7 @@ struct csched_pcpu { unsigned int idle_bias; unsigned int nr_runnable; + s_time_t last_load_balance; unsigned int tick; struct timer ticker; @@ -218,7 +223,7 @@ struct csched_private { /* Period of master and tick in milliseconds */ unsigned int tick_period_us, ticks_per_tslice; - s_time_t ratelimit, tslice, unit_migr_delay; + s_time_t ratelimit, tslice, unit_migr_delay, load_balance_ratelimit; struct list_head active_sdom; uint32_t weight; @@ -612,6 +617,8 @@ init_pdata(struct csched_private *prv, struct csched_pcpu *spc, int cpu) BUG_ON(!is_idle_unit(curr_on_cpu(cpu))); cpumask_set_cpu(cpu, prv->idlers); spc->nr_runnable = 0; + + spc->last_load_balance = NOW(); } static void cf_check @@ -1676,9 +1683,17 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) return NULL; } +/* + * Minimum delay, in microseconds, between load balance operations. + * This prevents spending too much time doing load balancing, particularly + * when the system has a high number of YIELDs due to spinlock priority inversion. + */ +static unsigned int __ro_after_init load_balance_ratelimit_us = CSCHED_DEFAULT_LOAD_BALANCE_RATELIMIT_US; +integer_param("load-balance-ratelimit", load_balance_ratelimit_us); + static struct csched_unit * csched_load_balance(struct csched_private *prv, int cpu, - struct csched_unit *snext, bool *stolen) + struct csched_unit *snext, bool *stolen) { const struct cpupool *c = get_sched_res(cpu)->cpupool; struct csched_unit *speer; @@ -1958,15 +1973,19 @@ static void cf_check csched_schedule( /* * SMP Load balance: * - * If the next highest priority local runnable UNIT has already eaten - * through its credits, look on other PCPUs to see if we have more - * urgent work... If not, csched_load_balance() will return snext, but - * already removed from the runq. + * If the next highest priority local runnable UNIT has + * already eaten through its credits (and we're below the + * balancing ratelimit), look on other PCPUs to see if we have + * more urgent work... If we don't, csched_load_balance() will + * return snext, but already removed from the runq. */ - if ( snext->pri > CSCHED_PRI_TS_OVER ) - __runq_remove(snext); - else + if ( snext->pri <= CSCHED_PRI_TS_OVER + && now - spc->last_load_balance > prv->load_balance_ratelimit ) { + spc->last_load_balance = now; snext = csched_load_balance(prv, sched_cpu, snext, &migrated); + } + else + __runq_remove(snext); } while ( !unit_runnable_state(snext->unit) ); @@ -2181,6 +2200,14 @@ csched_global_init(void) XEN_SYSCTL_CSCHED_MGR_DLY_MAX_US, vcpu_migration_delay_us); } + if ( load_balance_ratelimit_us > CSCHED_MAX_LOAD_BALANCE_RATELIMIT_US ) + { + load_balance_ratelimit_us = CSCHED_MAX_LOAD_BALANCE_RATELIMIT_US; + printk("WARNING: load-balance-ratelimit outside of valid range [0,%d]us.\n" + "Setting to max.\n", + CSCHED_MAX_LOAD_BALANCE_RATELIMIT_US); + } + return 0; } @@ -2223,6 +2250,8 @@ csched_init(struct scheduler *ops) prv->unit_migr_delay = MICROSECS(vcpu_migration_delay_us); + prv->load_balance_ratelimit = MICROSECS(load_balance_ratelimit_us); + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:11:42 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:11:42 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607386.945699 (Exim 4.92) (envelope-from ) id 1qkDew-0003IN-NI; Sun, 24 Sep 2023 01:11:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607386.945699; Sun, 24 Sep 2023 01:11:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDew-0003IF-Kd; Sun, 24 Sep 2023 01:11:42 +0000 Received: by outflank-mailman (input) for mailman id 607386; Sun, 24 Sep 2023 01:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDew-0003I5-31 for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDew-0002bd-2Q for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDew-00039d-1T for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01: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=qZI5yDutRcINq0p4Jdk7c4Yt08qLy0kpJYvSxjySsQY=; b=fU7xyY3/UaGjyYFLZLnuQ4tkkY Hoy5yKxmHTyiEUEz77cYQw+EgDOC3PI0mXnF+ky0MPOPstGxl1OMsFNXofl7QsSTlksMVjx55yNgF 9DQL+welzFcsmU0FDGSyk123TZO6DtlUeE3IWwLfggLLs42e4oW4MG9wOnPpbRKa/phI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] credit: Don't steal vcpus which have yielded Message-Id: Date: Sun, 24 Sep 2023 01:11:42 +0000 commit e282067cf298ca6df319c3be86269858e2b26ae8 Author: George Dunlap AuthorDate: Fri Jun 30 12:06:32 2023 +0100 Commit: George Dunlap CommitDate: Fri Sep 22 13:42:21 2023 +0100 credit: Don't steal vcpus which have yielded On large systems with many vcpus yielding due to spinlock priority inversion, it's not uncommon for a vcpu to yield its timeslice, only to be immediately stolen by another pcpu looking for higher-priority work. To prevent this: * Keep the YIELD flag until a vcpu is removed from a runqueue * When looking for work to steal, skip vcpus which have yielded NB that this does mean that sometimes a VM is inserted into an empty runqueue; handle that case. Signed-off-by: George Dunlap Reviewed-by: Juergen Gross Release-acked-by: Henry Wang --- xen/common/sched/credit.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index b447cd8845..a72d071527 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -298,14 +298,10 @@ __runq_insert(struct csched_unit *svc) * runnable unit if we can. The next runq_sort will bring it forward * within 30ms if the queue too long. */ if ( test_bit(CSCHED_FLAG_UNIT_YIELD, &svc->flags) - && __runq_elem(iter)->pri > CSCHED_PRI_IDLE ) - { + && __runq_elem(iter)->pri > CSCHED_PRI_IDLE + && iter->next != runq ) iter=iter->next; - /* Some sanity checks */ - BUG_ON(iter == runq); - } - list_add_tail(&svc->runq_elem, iter); } @@ -321,6 +317,11 @@ __runq_remove(struct csched_unit *svc) { BUG_ON( !__unit_on_runq(svc) ); list_del_init(&svc->runq_elem); + + /* + * Clear YIELD flag when scheduling back in + */ + clear_bit(CSCHED_FLAG_UNIT_YIELD, &svc->flags); } static inline void @@ -1637,6 +1638,13 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) if ( speer->pri <= pri ) break; + /* + * Don't steal a UNIT which has yielded; it's waiting for a + * reason + */ + if ( test_bit(CSCHED_FLAG_UNIT_YIELD, &speer->flags) ) + continue; + /* Is this UNIT runnable on our PCPU? */ unit = speer->unit; BUG_ON( is_idle_unit(unit) ); @@ -1954,11 +1962,6 @@ static void cf_check csched_schedule( dec_nr_runnable(sched_cpu); } - /* - * Clear YIELD flag before scheduling out - */ - clear_bit(CSCHED_FLAG_UNIT_YIELD, &scurr->flags); - do { snext = __runq_elem(runq->next); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:11:52 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:11:52 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607387.945704 (Exim 4.92) (envelope-from ) id 1qkDf6-0003Ll-Q1; Sun, 24 Sep 2023 01:11:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607387.945704; Sun, 24 Sep 2023 01:11:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDf6-0003Ld-NP; Sun, 24 Sep 2023 01:11:52 +0000 Received: by outflank-mailman (input) for mailman id 607387; Sun, 24 Sep 2023 01:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDf6-0003LW-F2 for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDf6-0002bl-5t for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDf6-0003AM-4n for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01: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=aJVZWwiK+xXSxRbrRBdc6+MigBT9WB8VpKsJlfJWd+Q=; b=1TpfhDApQ+7Q4x2prZ/XTJjDoF hEW2u3s9QhcZ9+CYcqe3D1esQ/DdmsR9l73oN5GkqXzURB3ZkAUcykqWciwGxyH78XLgyRRUIGmTx TkBKl99KAMoLsaSSrTwjvSBLUnl21/ahI2HLgRu1HI2QUmqgoWIP+EVqRyKbsbB8wkzY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/paging: Delete update_cr3()'s do_locking parameter Message-Id: Date: Sun, 24 Sep 2023 01:11:52 +0000 commit e71157d1ac2a7fbf413130663cf0a93ff9fbcf7e Author: Andrew Cooper AuthorDate: Wed Sep 20 20:06:53 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Sep 22 16:00:17 2023 +0100 x86/paging: Delete update_cr3()'s do_locking parameter Nicola reports that the XSA-438 fix introduced new MISRA violations because of some incidental tidying it tried to do. The parameter is useless, so resolve the MISRA regression by removing it. hap_update_cr3() discards the parameter entirely, while sh_update_cr3() uses it to distinguish internal and external callers and therefore whether the paging lock should be taken. However, we have paging_lock_recursive() for this purpose, which also avoids the ability for the shadow internal callers to accidentally not hold the lock. Fixes: fb0ff49fe9f7 ("x86/shadow: defer releasing of PV's top-level shadow reference") Reported-by: Nicola Vetrini Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Henry Wang --- xen/arch/x86/include/asm/paging.h | 5 ++--- xen/arch/x86/mm/hap/hap.c | 5 ++--- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 17 ++++++++--------- xen/arch/x86/mm/shadow/none.c | 3 +-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/include/asm/paging.h b/xen/arch/x86/include/asm/paging.h index 8fad4cfc18..f291f2f9a2 100644 --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -118,8 +118,7 @@ struct paging_mode { paddr_t ga, uint32_t *pfec, unsigned int *page_order); #endif - pagetable_t (*update_cr3 )(struct vcpu *v, bool do_locking, - bool noflush); + pagetable_t (*update_cr3 )(struct vcpu *v, bool noflush); unsigned int guest_levels; @@ -296,7 +295,7 @@ static inline bool paging_flush_tlb(const unsigned long *vcpu_bitmap) * as the value to load into the host CR3 to schedule this vcpu */ static inline pagetable_t paging_update_cr3(struct vcpu *v, bool noflush) { - return paging_get_hostmode(v)->update_cr3(v, 1, noflush); + return paging_get_hostmode(v)->update_cr3(v, noflush); } /* Update all the things that are derived from the guest's CR0/CR3/CR4. diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index e30f543d2c..9f964c1d87 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -707,8 +707,7 @@ static bool cf_check hap_invlpg(struct vcpu *v, unsigned long linear) return 1; } -static pagetable_t cf_check hap_update_cr3( - struct vcpu *v, bool do_locking, bool noflush) +static pagetable_t cf_check hap_update_cr3(struct vcpu *v, bool noflush) { v->arch.hvm.hw_cr[3] = v->arch.hvm.guest_cr[3]; hvm_update_guest_cr3(v, noflush); @@ -794,7 +793,7 @@ static void cf_check hap_update_paging_modes(struct vcpu *v) } /* CR3 is effectively updated by a mode change. Flush ASIDs, etc. */ - hap_update_cr3(v, 0, false); + hap_update_cr3(v, false); unlock: paging_unlock(d); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 8211e77cc7..8aa7b698f8 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2510,7 +2510,7 @@ static void sh_update_paging_modes(struct vcpu *v) } #endif /* OOS */ - v->arch.paging.mode->update_cr3(v, 0, false); + v->arch.paging.mode->update_cr3(v, false); } /* diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 447512870d..90cf0ceaa3 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2475,7 +2475,7 @@ static int cf_check sh_page_fault( * In any case, in the PAE case, the ASSERT is not true; it can * happen because of actions the guest is taking. */ #if GUEST_PAGING_LEVELS == 3 - v->arch.paging.mode->update_cr3(v, 0, false); + v->arch.paging.mode->update_cr3(v, false); #else ASSERT(d->is_shutting_down); #endif @@ -3156,17 +3156,13 @@ sh_update_linear_entries(struct vcpu *v) sh_flush_local(d); } -static pagetable_t cf_check sh_update_cr3(struct vcpu *v, bool do_locking, - bool noflush) +static pagetable_t cf_check sh_update_cr3(struct vcpu *v, bool noflush) /* Updates vcpu->arch.cr3 after the guest has changed CR3. * Paravirtual guests should set v->arch.guest_table (and guest_table_user, * if appropriate). * HVM guests should also make sure hvm_get_guest_cntl_reg(v, 3) works; * this function will call hvm_update_guest_cr(v, 3) to tell them where the * shadow tables are. - * If do_locking != 0, assume we are being called from outside the - * shadow code, and must take and release the paging lock; otherwise - * that is the caller's responsibility. */ { struct domain *d = v->domain; @@ -3184,7 +3180,11 @@ static pagetable_t cf_check sh_update_cr3(struct vcpu *v, bool do_locking, return old_entry; } - if ( do_locking ) paging_lock(v->domain); + /* + * This is used externally (with the paging lock not taken) and internally + * by the shadow code (with the lock already taken). + */ + paging_lock_recursive(v->domain); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Need to resync all the shadow entries on a TLB flush. Resync @@ -3412,8 +3412,7 @@ static pagetable_t cf_check sh_update_cr3(struct vcpu *v, bool do_locking, shadow_sync_other_vcpus(v); #endif - /* Release the lock, if we took it (otherwise it's the caller's problem) */ - if ( do_locking ) paging_unlock(v->domain); + paging_unlock(v->domain); return old_entry; } diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index 9c4be4562f..2a4005a795 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -55,8 +55,7 @@ static unsigned long cf_check _gva_to_gfn( } #endif -static pagetable_t cf_check _update_cr3(struct vcpu *v, bool do_locking, - bool noflush) +static pagetable_t cf_check _update_cr3(struct vcpu *v, bool noflush) { ASSERT_UNREACHABLE(); return pagetable_null(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:12:02 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:12:02 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607388.945709 (Exim 4.92) (envelope-from ) id 1qkDfG-0003P2-SK; Sun, 24 Sep 2023 01:12:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607388.945709; Sun, 24 Sep 2023 01:12:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfG-0003Ou-Ou; Sun, 24 Sep 2023 01:12:02 +0000 Received: by outflank-mailman (input) for mailman id 607388; Sun, 24 Sep 2023 01:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfG-0003Ok-9j for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfG-0002c5-99 for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDfG-0003BK-8B for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01: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=Vi1LYmcKl/Yj7blHWZ6rAvVpSK+6oq5zzAV5JgXkhkw=; b=LQh5zdukCtIbAbesxqia6I3k1F BSEysGAEJTrskLNw9Ri8Dueg97xzQU0UebQNg8YVL+Nqf2shfhToombChFI6oq8ogKGrZtCZJB+Nf +aYfesmzjjjEuLgBXtRdXHKlODFOYHUyfYseaMwAd+kEcNBeAzFELxpgihenNB6QUpV4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/emul: ASSERT that X86EMUL_DONE doesn't escape to callers Message-Id: Date: Sun, 24 Sep 2023 01:12:02 +0000 commit f6b0a80a36766e759a8a49c3556c1f03279978e4 Author: Andrew Cooper AuthorDate: Fri Sep 15 16:10:58 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Sep 22 16:00:17 2023 +0100 x86/emul: ASSERT that X86EMUL_DONE doesn't escape to callers This property is far from clear. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_emulate/x86_emulate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e88245eae9..94caec1d14 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -8651,6 +8651,12 @@ int x86_emulate_wrapper( rc = x86_emulate(ctxt, ops); + /* + * X86EMUL_DONE is an internal signal in the emulator, and is not expected + * to ever escape out to callers. + */ + ASSERT(rc != X86EMUL_DONE); + /* * Most retire flags should only be set for successful instruction * emulation. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:12:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:12:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607390.945713 (Exim 4.92) (envelope-from ) id 1qkDfQ-0003SQ-TI; Sun, 24 Sep 2023 01:12:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607390.945713; Sun, 24 Sep 2023 01:12:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfQ-0003SI-QK; Sun, 24 Sep 2023 01:12:12 +0000 Received: by outflank-mailman (input) for mailman id 607390; Sun, 24 Sep 2023 01:12:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfQ-0003SA-Cm for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfQ-0002dz-CB for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDfQ-0003C5-BH for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GUBKM4a3p7EVeQ9gZ3gdFu3+1k6UaGdD8kyuH0MPjn8=; b=0qJQBPfC0ivFpjARLwIR/SJ8k6 P6rfyMJXhVrxRfalsF0SValXs+wwUAh2LiatVsdTbKYOoAij1ZKUz6bNsZWjkLnNaBHIFN3+n4VTZ Y2bU4a0AiVR/cGl8LV+03OYzJh3PwHCdipH/k4Np86ZfxtgQ2QU0u7HJLtUGBxPp6HU8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Fix the determiniation of whether to inject #DB Message-Id: Date: Sun, 24 Sep 2023 01:12:12 +0000 commit 95a8a2c123971fa805395222cd6e1c77f3d1826d Author: Andrew Cooper AuthorDate: Tue Sep 12 22:31:43 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Sep 22 16:00:17 2023 +0100 x86/pv: Fix the determiniation of whether to inject #DB We long ago fixed the emulator to not inject exceptions behind our back. Therefore, assert that that a PV event (including interrupts, because that would be buggy too) isn't pending, rather than skipping the #DB injection if one is. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/pv/emul-priv-op.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 142bc4818c..0d9f84f458 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1358,14 +1358,17 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) switch ( rc ) { case X86EMUL_OKAY: + ASSERT(!curr->arch.pv.trap_bounce.flags); + if ( ctxt.ctxt.retire.singlestep ) ctxt.bpmatch |= DR_STEP; + if ( ctxt.bpmatch ) { curr->arch.dr6 |= ctxt.bpmatch | DR_STATUS_RESERVED_ONE; - if ( !(curr->arch.pv.trap_bounce.flags & TBF_EXCEPTION) ) - pv_inject_hw_exception(X86_EXC_DB, X86_EVENT_NO_EC); + pv_inject_hw_exception(X86_EXC_DB, X86_EVENT_NO_EC); } + /* fall through */ case X86EMUL_RETRY: return EXCRET_fault_fixed; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:12:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:12:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607391.945716 (Exim 4.92) (envelope-from ) id 1qkDfa-0003W1-Ub; Sun, 24 Sep 2023 01:12:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607391.945716; Sun, 24 Sep 2023 01:12:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfa-0003Vs-Rn; Sun, 24 Sep 2023 01:12:22 +0000 Received: by outflank-mailman (input) for mailman id 607391; Sun, 24 Sep 2023 01:12:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfa-0003Vm-Fw for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfa-0002e8-FC for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDfa-0003Cs-ED for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12: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=IIkEXJynRDjMvglzV528/Ca+4K68SYGmNhbLSB8mXPg=; b=wrWH0XwlRtVqF85DICPK12xDT7 HfGgSu8Avp3Dp89570vC18/OHL2bpVj3geajBC0tqElDG3LFeX2kyUKSzmA/jUbeEZvVIVrHnLmlF mR7z94RzrDVPx3fmG9wcgUr7D68O9B+mX8sOUFk6daLx5lkavPkwzzcfBc1lUdoQWNXk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/mm: Factor out the pdx compression logic in ma/va converters Message-Id: Date: Sun, 24 Sep 2023 01:12:22 +0000 commit bc2cda8c598054731fc6bd8d1c52841601bc0347 Author: Alejandro Vallejo AuthorDate: Tue Aug 8 14:02:17 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Sep 22 18:26:04 2023 +0100 xen/mm: Factor out the pdx compression logic in ma/va converters This patch factors out the pdx compression logic hardcoded in both ports for the maddr<->vaddr conversion functions. Touches both x86 and arm ports. Signed-off-by: Alejandro Vallejo Reviewed-by: Julien Grall Reviewed-by: Andrew Cooper --- xen/arch/arm/include/asm/mm.h | 3 +-- xen/arch/x86/include/asm/x86_64/page.h | 29 +++++++++++++---------------- xen/include/xen/pdx.h | 25 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index aaacba3f04..d25e59f828 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -319,8 +319,7 @@ static inline void *maddr_to_virt(paddr_t ma) (DIRECTMAP_SIZE >> PAGE_SHIFT)); return (void *)(XENHEAP_VIRT_START - (directmap_base_pdx << PAGE_SHIFT) + - ((ma & ma_va_bottom_mask) | - ((ma & ma_top_mask) >> pfn_pdx_hole_shift))); + maddr_to_directmapoff(ma)); } #endif diff --git a/xen/arch/x86/include/asm/x86_64/page.h b/xen/arch/x86/include/asm/x86_64/page.h index 53faa7875b..f49e10475f 100644 --- a/xen/arch/x86/include/asm/x86_64/page.h +++ b/xen/arch/x86/include/asm/x86_64/page.h @@ -36,26 +36,23 @@ static inline unsigned long __virt_to_maddr(unsigned long va) { ASSERT(va < DIRECTMAP_VIRT_END); if ( va >= DIRECTMAP_VIRT_START ) - va -= DIRECTMAP_VIRT_START; - else - { - BUILD_BUG_ON(XEN_VIRT_END - XEN_VIRT_START != GB(1)); - /* Signed, so ((long)XEN_VIRT_START >> 30) fits in an imm32. */ - ASSERT(((long)va >> (PAGE_ORDER_1G + PAGE_SHIFT)) == - ((long)XEN_VIRT_START >> (PAGE_ORDER_1G + PAGE_SHIFT))); - - va += xen_phys_start - XEN_VIRT_START; - } - return (va & ma_va_bottom_mask) | - ((va << pfn_pdx_hole_shift) & ma_top_mask); + return directmapoff_to_maddr(va - DIRECTMAP_VIRT_START); + + BUILD_BUG_ON(XEN_VIRT_END - XEN_VIRT_START != GB(1)); + /* Signed, so ((long)XEN_VIRT_START >> 30) fits in an imm32. */ + ASSERT(((long)va >> (PAGE_ORDER_1G + PAGE_SHIFT)) == + ((long)XEN_VIRT_START >> (PAGE_ORDER_1G + PAGE_SHIFT))); + + return xen_phys_start + va - XEN_VIRT_START; } static inline void *__maddr_to_virt(unsigned long ma) { - ASSERT(pfn_to_pdx(ma >> PAGE_SHIFT) < (DIRECTMAP_SIZE >> PAGE_SHIFT)); - return (void *)(DIRECTMAP_VIRT_START + - ((ma & ma_va_bottom_mask) | - ((ma & ma_top_mask) >> pfn_pdx_hole_shift))); + /* Offset in the direct map, accounting for pdx compression */ + unsigned long va_offset = maddr_to_directmapoff(ma); + + ASSERT(va_offset < DIRECTMAP_SIZE); + return (void *)(DIRECTMAP_VIRT_START + va_offset); } /* read access (should only be used for debug printk's) */ diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index de5439a5e5..6276b685e2 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -160,6 +160,31 @@ static inline unsigned long pdx_to_pfn(unsigned long pdx) #define mfn_to_pdx(mfn) pfn_to_pdx(mfn_x(mfn)) #define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) +/** + * Computes the offset into the direct map of an maddr + * + * @param ma Machine address + * @return Offset on the direct map where that + * machine address can be accessed + */ +static inline unsigned long maddr_to_directmapoff(paddr_t ma) +{ + return (((ma & ma_top_mask) >> pfn_pdx_hole_shift) | + (ma & ma_va_bottom_mask)); +} + +/** + * Computes a machine address given a direct map offset + * + * @param offset Offset into the direct map + * @return Corresponding machine address of that virtual location + */ +static inline paddr_t directmapoff_to_maddr(unsigned long offset) +{ + return ((((paddr_t)offset << pfn_pdx_hole_shift) & ma_top_mask) | + (offset & ma_va_bottom_mask)); +} + /** * Initializes global variables with information about the compressible * range of the current memory regions. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:12:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607392.945720 (Exim 4.92) (envelope-from ) id 1qkDfl-0003Yh-W3; Sun, 24 Sep 2023 01:12:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607392.945720; Sun, 24 Sep 2023 01:12:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfl-0003YZ-TL; Sun, 24 Sep 2023 01:12:33 +0000 Received: by outflank-mailman (input) for mailman id 607392; Sun, 24 Sep 2023 01:12:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfk-0003YQ-It for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfk-0002eJ-ID for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDfk-0003Dg-HI for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KiU3+luTKlwHqjKBS0/zC2Jl1yYF6uOND6ivWwKCd+8=; b=u6lfTT9Z5PsYIQMESSakST/JCw vkEu9J2QCz/vV8KVZ6EphEK8bPSORJJQvAL714fa2rfRMx6TAkDWl9psGYeiZXvBTTulLMT6krf0z rFQqygDfn2ct1nJetsrycBLpSQdLP23etYGyjKG/3pkCQ34Q2rh5YCIHhhVpLRERleyo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pdx: Standardize region validation wrt pdx compression Message-Id: Date: Sun, 24 Sep 2023 01:12:32 +0000 commit 63d077ede470ae7c5ca94eb1a1fc0e6a3621d811 Author: Alejandro Vallejo AuthorDate: Tue Aug 8 14:02:18 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Sep 22 18:26:22 2023 +0100 xen/pdx: Standardize region validation wrt pdx compression Regions must be occasionally validated for pdx compression validity. That is, whether any of the machine addresses spanning the region have a bit set in the pdx "hole" (which is expected to always contain zeroes). There are a few such tests through the code, and they all check for different things. This patch replaces all such occurrences with a call to a centralized function that checks a region for validity. Signed-off-by: Alejandro Vallejo Reviewed-by: Julien Grall Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_64/mm.c | 6 ++++-- xen/common/efi/boot.c | 13 ++++++++++--- xen/common/pdx.c | 10 ++++++++-- xen/include/xen/pdx.h | 9 +++++++++ 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 15b36e332d..c3ebb77714 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1158,6 +1158,8 @@ static int transfer_pages_to_heap(struct mem_hotadd_info *info) static int mem_hotadd_check(unsigned long spfn, unsigned long epfn) { unsigned long s, e, length, sidx, eidx; + paddr_t mem_base = pfn_to_paddr(spfn); + unsigned long mem_npages = epfn - spfn; if ( (spfn >= epfn) ) return 0; @@ -1168,7 +1170,7 @@ static int mem_hotadd_check(unsigned long spfn, unsigned long epfn) if ( (spfn | epfn) & ((1UL << PAGETABLE_ORDER) - 1) ) return 0; - if ( (spfn | epfn) & pfn_hole_mask ) + if ( !pdx_is_region_compressible(mem_base, mem_npages) ) return 0; /* Make sure the new range is not present now */ @@ -1207,7 +1209,7 @@ static int mem_hotadd_check(unsigned long spfn, unsigned long epfn) length += (e - s) * sizeof(struct page_info); - if ((length >> PAGE_SHIFT) > (epfn - spfn)) + if ( (length >> PAGE_SHIFT) > mem_npages ) return 0; return 1; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 99cb033e2a..a1bd4c3d60 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #if EFI_PAGE_SIZE != PAGE_SIZE # error Cannot use xen/pfn.h here! @@ -1646,9 +1647,11 @@ static __init void copy_mapping(unsigned long mfn, unsigned long end, static bool __init cf_check ram_range_valid(unsigned long smfn, unsigned long emfn) { + paddr_t ram_base = pfn_to_paddr(smfn); + unsigned long ram_npages = emfn - smfn; unsigned long sz = pfn_to_pdx(emfn - 1) / PDX_GROUP_COUNT + 1; - return !(smfn & pfn_hole_mask) && + return pdx_is_region_compressible(ram_base, ram_npages) && find_next_bit(pdx_group_valid, sz, pfn_to_pdx(smfn) / PDX_GROUP_COUNT) < sz; } @@ -1682,6 +1685,8 @@ void __init efi_init_memory(void) u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; unsigned long smfn, emfn; unsigned int prot = PAGE_HYPERVISOR_RWX; + paddr_t mem_base; + unsigned long mem_npages; printk(XENLOG_INFO " %013" PRIx64 "-%013" PRIx64 " type=%u attr=%016" PRIx64 "\n", @@ -1733,6 +1738,9 @@ void __init efi_init_memory(void) smfn = PFN_DOWN(desc->PhysicalStart); emfn = PFN_UP(desc->PhysicalStart + len); + mem_base = pfn_to_paddr(smfn); + mem_npages = emfn - smfn; + if ( desc->Attribute & EFI_MEMORY_WB ) prot |= _PAGE_WB; else if ( desc->Attribute & EFI_MEMORY_WT ) @@ -1760,8 +1768,7 @@ void __init efi_init_memory(void) prot |= _PAGE_NX; if ( pfn_to_pdx(emfn - 1) < (DIRECTMAP_SIZE >> PAGE_SHIFT) && - !(smfn & pfn_hole_mask) && - !((smfn ^ (emfn - 1)) & ~pfn_pdx_bottom_mask) ) + pdx_is_region_compressible(mem_base, mem_npages) ) { if ( (unsigned long)mfn_to_virt(emfn - 1) >= HYPERVISOR_VIRT_END ) prot &= ~_PAGE_GLOBAL; diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 99d4a90a50..3c88ceeb9c 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -88,7 +88,7 @@ bool __mfn_valid(unsigned long mfn) } /* Sets all bits from the most-significant 1-bit down to the LSB */ -static uint64_t __init fill_mask(uint64_t mask) +static uint64_t fill_mask(uint64_t mask) { while (mask & (mask + 1)) mask |= mask + 1; @@ -96,6 +96,12 @@ static uint64_t __init fill_mask(uint64_t mask) return mask; } +bool pdx_is_region_compressible(paddr_t base, unsigned long npages) +{ + return !(paddr_to_pfn(base) & pfn_hole_mask) && + !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); +} + /* We don't want to compress the low MAX_ORDER bits of the addresses. */ uint64_t __init pdx_init_mask(uint64_t base_addr) { @@ -103,7 +109,7 @@ uint64_t __init pdx_init_mask(uint64_t base_addr) (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); } -uint64_t __init pdx_region_mask(uint64_t base, uint64_t len) +uint64_t pdx_region_mask(uint64_t base, uint64_t len) { /* * We say a bit "moves" in a range if there exist 2 addresses in that diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 6276b685e2..c1b18a2138 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -79,6 +79,15 @@ extern unsigned long pfn_top_mask, ma_top_mask; (sizeof(*frame_table) & -sizeof(*frame_table))) extern unsigned long pdx_group_valid[]; +/** + * Validate a region's compatibility with the current compression runtime + * + * @param base Base address of the region + * @param npages Number of PAGE_SIZE-sized pages in the region + * @return True iff the region can be used with the current compression + */ +bool pdx_is_region_compressible(paddr_t base, unsigned long npages); + /** * Calculates a mask covering "moving" bits of all addresses of a region * -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 24 01:12:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Sep 2023 01:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.607394.945724 (Exim 4.92) (envelope-from ) id 1qkDfw-0003bs-2k; Sun, 24 Sep 2023 01:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 607394.945724; Sun, 24 Sep 2023 01:12:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfw-0003bl-00; Sun, 24 Sep 2023 01:12:44 +0000 Received: by outflank-mailman (input) for mailman id 607394; Sun, 24 Sep 2023 01:12:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfu-0003bY-MC for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkDfu-0002en-L7 for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qkDfu-0003EG-KG for xen-changelog@lists.xenproject.org; Sun, 24 Sep 2023 01:12: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=moIt0cN8Fc0UPS6F45CpTu0XUZ1NkQXStOPyfuxZvyo=; b=JIHGEGNFMqtdGVxByA6Xl8FOgY /KFbfUXS25HyViiuoL19RTAogK0jw59HOJjaJBprDLCaQLjSUfnB3hGG/yrHLOBYmtoJSTgnSawvq /xoQVGFoAKRph9rrhkTaOls8h0W97rkKpXrzEfiMaT2uT4xkwb4sfYoS9fy+DfLy5o/A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pdx: Reorder pdx.[ch] Message-Id: Date: Sun, 24 Sep 2023 01:12:42 +0000 commit 88a9501a848aade858a3bbda75f20cdf7c3c2f9a Author: Alejandro Vallejo AuthorDate: Tue Aug 8 14:02:19 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Sep 22 18:26:35 2023 +0100 xen/pdx: Reorder pdx.[ch] The next patch compiles out compression-related chunks, and it's helpful to have them grouped together beforehand. No functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Julien Grall Reviewed-by: Andrew Cooper --- xen/common/pdx.c | 58 +++++++++++++++++++++++++------------------------- xen/include/xen/pdx.h | 59 ++++++++++++++++++++++++++------------------------- 2 files changed, 59 insertions(+), 58 deletions(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 3c88ceeb9c..d3d38965bd 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -20,6 +20,35 @@ #include #include +/** + * Maximum (non-inclusive) usable pdx. Must be + * modifiable after init due to memory hotplug + */ +unsigned long __read_mostly max_pdx; + +unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( + (FRAMETABLE_NR + PDX_GROUP_COUNT - 1) / PDX_GROUP_COUNT)] = { [0] = 1 }; + +bool __mfn_valid(unsigned long mfn) +{ + if ( unlikely(evaluate_nospec(mfn >= max_page)) ) + return false; + return likely(!(mfn & pfn_hole_mask)) && + likely(test_bit(pfn_to_pdx(mfn) / PDX_GROUP_COUNT, + pdx_group_valid)); +} + +void set_pdx_range(unsigned long smfn, unsigned long emfn) +{ + unsigned long idx, eidx; + + idx = pfn_to_pdx(smfn) / PDX_GROUP_COUNT; + eidx = (pfn_to_pdx(emfn - 1) + PDX_GROUP_COUNT) / PDX_GROUP_COUNT; + + for ( ; idx < eidx; ++idx ) + __set_bit(idx, pdx_group_valid); +} + /* * Diagram to make sense of the following variables. The masks and shifts * are done on mfn values in order to convert to/from pdx: @@ -47,12 +76,6 @@ * ones. */ -/** - * Maximum (non-inclusive) usable pdx. Must be - * modifiable after init due to memory hotplug - */ -unsigned long __read_mostly max_pdx; - /** Mask for the lower non-compressible bits of an mfn */ unsigned long __ro_after_init pfn_pdx_bottom_mask = ~0UL; @@ -75,18 +98,6 @@ unsigned long __ro_after_init pfn_hole_mask = 0; /** Number of bits of the "compressible" bit slice of an mfn */ unsigned int __ro_after_init pfn_pdx_hole_shift = 0; -unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( - (FRAMETABLE_NR + PDX_GROUP_COUNT - 1) / PDX_GROUP_COUNT)] = { [0] = 1 }; - -bool __mfn_valid(unsigned long mfn) -{ - if ( unlikely(evaluate_nospec(mfn >= max_page)) ) - return false; - return likely(!(mfn & pfn_hole_mask)) && - likely(test_bit(pfn_to_pdx(mfn) / PDX_GROUP_COUNT, - pdx_group_valid)); -} - /* Sets all bits from the most-significant 1-bit down to the LSB */ static uint64_t fill_mask(uint64_t mask) { @@ -124,17 +135,6 @@ uint64_t pdx_region_mask(uint64_t base, uint64_t len) return fill_mask(base ^ (base + len - 1)); } -void set_pdx_range(unsigned long smfn, unsigned long emfn) -{ - unsigned long idx, eidx; - - idx = pfn_to_pdx(smfn) / PDX_GROUP_COUNT; - eidx = (pfn_to_pdx(emfn - 1) + PDX_GROUP_COUNT) / PDX_GROUP_COUNT; - - for ( ; idx < eidx; ++idx ) - __set_bit(idx, pdx_group_valid); -} - void __init pfn_pdx_hole_setup(unsigned long mask) { unsigned int i, j, bottom_shift = 0, hole_shift = 0; diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index c1b18a2138..f3fbc4273a 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -70,15 +70,41 @@ #ifdef CONFIG_HAS_PDX extern unsigned long max_pdx; -extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; -extern unsigned int pfn_pdx_hole_shift; -extern unsigned long pfn_hole_mask; -extern unsigned long pfn_top_mask, ma_top_mask; #define PDX_GROUP_COUNT ((1 << PDX_GROUP_SHIFT) / \ (sizeof(*frame_table) & -sizeof(*frame_table))) extern unsigned long pdx_group_valid[]; +/** + * Mark [smfn, emfn) as allocatable in the frame table + * + * @param smfn Start mfn + * @param emfn End mfn + */ +void set_pdx_range(unsigned long smfn, unsigned long emfn); + +/** + * Invoked to determine if an mfn has an associated valid frame table entry + * + * In order for it to be legal it must pass bounds, grouping and + * compression sanity checks. + * + * @param mfn To-be-checked mfn + * @return True iff all checks pass + */ +bool __mfn_valid(unsigned long mfn); + +#define page_to_pdx(pg) ((pg) - frame_table) +#define pdx_to_page(pdx) gcc11_wrap(frame_table + (pdx)) + +#define mfn_to_pdx(mfn) pfn_to_pdx(mfn_x(mfn)) +#define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) + +extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; +extern unsigned int pfn_pdx_hole_shift; +extern unsigned long pfn_hole_mask; +extern unsigned long pfn_top_mask, ma_top_mask; + /** * Validate a region's compatibility with the current compression runtime * @@ -120,28 +146,6 @@ uint64_t pdx_region_mask(uint64_t base, uint64_t len); */ uint64_t pdx_init_mask(uint64_t base_addr); -/** - * Mark [smfn, emfn) as accesible in the frame table - * - * @param smfn Start mfn - * @param emfn End mfn - */ -void set_pdx_range(unsigned long smfn, unsigned long emfn); - -#define page_to_pdx(pg) ((pg) - frame_table) -#define pdx_to_page(pdx) gcc11_wrap(frame_table + (pdx)) - -/** - * Invoked to determine if an mfn has an associated valid frame table entry - * - * In order for it to be legal it must pass bounds, grouping and - * compression sanity checks. - * - * @param mfn To-be-checked mfn - * @return True iff all checks pass - */ -bool __mfn_valid(unsigned long mfn); - /** * Map pfn to its corresponding pdx * @@ -166,9 +170,6 @@ static inline unsigned long pdx_to_pfn(unsigned long pdx) ((pdx << pfn_pdx_hole_shift) & pfn_top_mask); } -#define mfn_to_pdx(mfn) pfn_to_pdx(mfn_x(mfn)) -#define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) - /** * Computes the offset into the direct map of an maddr * -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 26 08:44:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Sep 2023 08:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.608370.946803 (Exim 4.92) (envelope-from ) id 1ql3fm-00053R-Uu; Tue, 26 Sep 2023 08:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 608370.946803; Tue, 26 Sep 2023 08:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3fm-00053J-S2; Tue, 26 Sep 2023 08:44:02 +0000 Received: by outflank-mailman (input) for mailman id 608370; Tue, 26 Sep 2023 08:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3fl-00053A-EA for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3fl-0003KD-DQ for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ql3fl-0000HU-CM for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7cGAck39+6o8weIVDJkTGzc0Qpdj6g4XJdGqfq8eBP8=; b=DthHeFqmn+L8UJT9hY/bEgr1Gb na+J0YFcyXHA0MszrrnNbDzgJynCUM9jhB6HmOIncZO/aEz57Sv2UAwU5F/tt26+y7+LKQBilkMHe yIolwyDxn2JvqVt1AyDjlJY8uf8VLfT6YrqP2Ik9hy4mo1GQ/VRGxvGWjvyop31ki/7A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: Remove myself as RISC-V maintainer Message-Id: Date: Tue, 26 Sep 2023 08:44:01 +0000 commit 64e18eef5ebf50619304ee56332b25874fee2312 Author: Alistair Francis AuthorDate: Mon Sep 25 10:55:31 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 25 10:55:31 2023 +0200 MAINTAINERS: Remove myself as RISC-V maintainer I unfortunately don't have time to be a Xen maintainer, so remove myself as the maintainer. Signed-off-by: Alistair Francis Acked-by: Jan Beulich --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0f227a2f5d..22034bf6e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -500,7 +500,7 @@ F: tools/hotplug/Linux/block-drbd-probe RISCV M: Bob Eshleman -M: Alistair Francis +R: Alistair Francis R: Connor Davis S: Supported F: config/riscv64.mk -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 26 08:44:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Sep 2023 08:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.608371.946807 (Exim 4.92) (envelope-from ) id 1ql3fw-0005Bo-WD; Tue, 26 Sep 2023 08:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 608371.946807; Tue, 26 Sep 2023 08:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3fw-0005Bh-TW; Tue, 26 Sep 2023 08:44:12 +0000 Received: by outflank-mailman (input) for mailman id 608371; Tue, 26 Sep 2023 08:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3fv-0005BV-HL for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3fv-0003KU-GZ for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ql3fv-0000IP-FW for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=etV5w3YgXC+MbZsRGbt6TIPsFtK/WhNj22A+ObrPTz0=; b=OXgog0yinwJPEb2LgfM1nWc7n4 vG1kCvkEU9A99JBusiP5aB8dlOFb5QC0gSYY17CCE9GifSCmBPFTqVr9ox08Z5hDwfd056gBGEYpo sdVXAEAqCuJ1F+XHXMBOXRzGLhxrfn0nUmhATFAPvxKzuZr+NaDlqus8/IiLq41Jx/oI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/hypercalls: address violations of MISRA C:2012 Rule 8.3 Message-Id: Date: Tue, 26 Sep 2023 08:44:11 +0000 commit 32e13804340ae91c7b633994f53b90396d8c88c6 Author: Federico Serafini AuthorDate: Mon Sep 25 10:56:02 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 25 10:56:02 2023 +0200 xen/hypercalls: address violations of MISRA C:2012 Rule 8.3 Make function declarations and definitions consistent. No functional change. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Release-acked-by: Henry Wang --- xen/common/compat/grant_table.c | 22 +++++++++++----------- xen/common/compat/memory.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index f8177c84c0..e00bc24a34 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -57,7 +57,7 @@ CHECK_gnttab_cache_flush; #undef xen_gnttab_cache_flush int compat_grant_table_op( - unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) cmp_uop, unsigned int count) + unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count) { int rc = 0; unsigned int i, cmd_op; @@ -71,7 +71,7 @@ int compat_grant_table_op( { #define CASE(name) \ case GNTTABOP_##name: \ - if ( unlikely(!guest_handle_okay(guest_handle_cast(cmp_uop, \ + if ( unlikely(!guest_handle_okay(guest_handle_cast(uop, \ gnttab_##name##_compat_t), \ count)) ) \ rc = -EFAULT; \ @@ -119,7 +119,7 @@ int compat_grant_table_op( #undef CASE default: - return do_grant_table_op(cmd, cmp_uop, count); + return do_grant_table_op(cmd, uop, count); } if ( (int)count < 0 ) @@ -148,7 +148,7 @@ int compat_grant_table_op( case GNTTABOP_setup_table: if ( unlikely(count > 1) ) rc = -EINVAL; - else if ( unlikely(__copy_from_guest(&cmp.setup, cmp_uop, 1)) ) + else if ( unlikely(__copy_from_guest(&cmp.setup, uop, 1)) ) rc = -EFAULT; else if ( unlikely(!compat_handle_okay(cmp.setup.frame_list, cmp.setup.nr_frames)) ) rc = -EFAULT; @@ -193,7 +193,7 @@ int compat_grant_table_op( } while (0) XLAT_gnttab_setup_table(&cmp.setup, nat.setup); #undef XLAT_gnttab_setup_table_HNDL_frame_list - if ( unlikely(__copy_to_guest(cmp_uop, &cmp.setup, 1)) ) + if ( unlikely(__copy_to_guest(uop, &cmp.setup, 1)) ) rc = -EFAULT; else i = 1; @@ -203,7 +203,7 @@ int compat_grant_table_op( case GNTTABOP_transfer: for ( n = 0; n < COMPAT_ARG_XLAT_SIZE / sizeof(*nat.xfer) && i < count && rc == 0; ++i, ++n ) { - if ( unlikely(__copy_from_guest_offset(&cmp.xfer, cmp_uop, i, 1)) ) + if ( unlikely(__copy_from_guest_offset(&cmp.xfer, uop, i, 1)) ) rc = -EFAULT; else { @@ -222,7 +222,7 @@ int compat_grant_table_op( { XEN_GUEST_HANDLE_PARAM(gnttab_transfer_compat_t) xfer; - xfer = guest_handle_cast(cmp_uop, gnttab_transfer_compat_t); + xfer = guest_handle_cast(uop, gnttab_transfer_compat_t); guest_handle_add_offset(xfer, i); cnt_uop = guest_handle_cast(xfer, void); while ( n-- ) @@ -237,7 +237,7 @@ int compat_grant_table_op( case GNTTABOP_copy: for ( n = 0; n < COMPAT_ARG_XLAT_SIZE / sizeof(*nat.copy) && i < count && rc == 0; ++i, ++n ) { - if ( unlikely(__copy_from_guest_offset(&cmp.copy, cmp_uop, i, 1)) ) + if ( unlikely(__copy_from_guest_offset(&cmp.copy, uop, i, 1)) ) rc = -EFAULT; else { @@ -267,7 +267,7 @@ int compat_grant_table_op( { XEN_GUEST_HANDLE_PARAM(gnttab_copy_compat_t) copy; - copy = guest_handle_cast(cmp_uop, gnttab_copy_compat_t); + copy = guest_handle_cast(uop, gnttab_copy_compat_t); guest_handle_add_offset(copy, i); cnt_uop = guest_handle_cast(copy, void); while ( n-- ) @@ -285,7 +285,7 @@ int compat_grant_table_op( rc = -EINVAL; break; } - if ( unlikely(__copy_from_guest(&cmp.get_status, cmp_uop, 1) || + if ( unlikely(__copy_from_guest(&cmp.get_status, uop, 1) || !compat_handle_okay(cmp.get_status.frame_list, cmp.get_status.nr_frames)) ) { @@ -303,7 +303,7 @@ int compat_grant_table_op( if ( rc >= 0 ) { XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_compat_t) get = - guest_handle_cast(cmp_uop, + guest_handle_cast(uop, gnttab_get_status_frames_compat_t); if ( unlikely(__copy_field_to_guest(get, nat.get_status, diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 8c34f201c2..45e5fb0e5d 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -54,7 +54,7 @@ static int cf_check get_reserved_device_memory( } #endif -int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) +int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { struct vcpu *curr = current; struct domain *currd = curr->domain; @@ -96,7 +96,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) case XENMEM_increase_reservation: case XENMEM_decrease_reservation: case XENMEM_populate_physmap: - if ( copy_from_guest(&cmp.rsrv, compat, 1) ) + if ( copy_from_guest(&cmp.rsrv, arg, 1) ) return start_extent; /* Is size too large for us to encode a continuation? */ @@ -158,7 +158,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) { int order_delta; - if ( copy_from_guest(&cmp.xchg, compat, 1) ) + if ( copy_from_guest(&cmp.xchg, arg, 1) ) return -EFAULT; order_delta = cmp.xchg.out.extent_order - cmp.xchg.in.extent_order; @@ -241,14 +241,14 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) case XENMEM_maximum_reservation: case XENMEM_maximum_gpfn: case XENMEM_maximum_ram_page: - nat.hnd = compat; + nat.hnd = arg; break; case XENMEM_add_to_physmap: BUILD_BUG_ON((typeof(cmp.atp.size))-1 > (UINT_MAX >> MEMOP_EXTENT_SHIFT)); - if ( copy_from_guest(&cmp.atp, compat, 1) ) + if ( copy_from_guest(&cmp.atp, arg, 1) ) return -EFAULT; XLAT_add_to_physmap(nat.atp, &cmp.atp); @@ -271,7 +271,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) enum XLAT_add_to_physmap_batch_u u = XLAT_add_to_physmap_batch_u_res0; - if ( copy_from_guest(&cmp.atpb, compat, 1) ) + if ( copy_from_guest(&cmp.atpb, arg, 1) ) return -EFAULT; size = cmp.atpb.size; if ( !compat_handle_okay(cmp.atpb.idxs, size) || @@ -322,7 +322,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) case XENMEM_remove_from_physmap: { - if ( copy_from_guest(&cmp.xrfp, compat, 1) ) + if ( copy_from_guest(&cmp.xrfp, arg, 1) ) return -EFAULT; XLAT_remove_from_physmap(nat.xrfp, &cmp.xrfp); @@ -331,7 +331,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) } case XENMEM_access_op: - if ( copy_from_guest(&cmp.mao, compat, 1) ) + if ( copy_from_guest(&cmp.mao, arg, 1) ) return -EFAULT; #define XLAT_mem_access_op_HNDL_pfn_list(_d_, _s_) \ @@ -355,7 +355,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) enum XLAT_vnuma_topology_info_vmemrange vmemrange = XLAT_vnuma_topology_info_vmemrange_h; - if ( copy_from_guest(&cmp.vnuma, compat, 1) ) + if ( copy_from_guest(&cmp.vnuma, arg, 1) ) return -EFAULT; #define XLAT_vnuma_topology_info_HNDL_vdistance_h(_d_, _s_) \ @@ -381,7 +381,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( unlikely(start_extent) ) return -EINVAL; - if ( copy_from_guest(&grdm.map, compat, 1) || + if ( copy_from_guest(&grdm.map, arg, 1) || !compat_handle_okay(grdm.map.buffer, grdm.map.nr_entries) ) return -EFAULT; @@ -395,7 +395,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( !rc && grdm.map.nr_entries < grdm.used_entries ) rc = -ENOBUFS; grdm.map.nr_entries = grdm.used_entries; - if ( __copy_to_guest(compat, &grdm.map, 1) ) + if ( __copy_to_guest(arg, &grdm.map, 1) ) rc = -EFAULT; return rc; @@ -406,7 +406,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) { xen_pfn_t *xen_frame_list = NULL; - if ( copy_from_guest(&cmp.mar, compat, 1) ) + if ( copy_from_guest(&cmp.mar, arg, 1) ) return -EFAULT; /* Marshal the frame list in the remainder of the xlat space. */ @@ -470,7 +470,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; } default: - return compat_arch_memory_op(cmd, compat); + return compat_arch_memory_op(cmd, arg); } rc = do_memory_op(cmd, nat.hnd); @@ -481,14 +481,14 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) cmp.vnuma.nr_vnodes = nat.vnuma->nr_vnodes; cmp.vnuma.nr_vcpus = nat.vnuma->nr_vcpus; cmp.vnuma.nr_vmemranges = nat.vnuma->nr_vmemranges; - if ( __copy_to_guest(compat, &cmp.vnuma, 1) ) + if ( __copy_to_guest(arg, &cmp.vnuma, 1) ) rc = -EFAULT; } break; } cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, arg) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); @@ -573,7 +573,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) } cmp.xchg.nr_exchanged = nat.xchg->nr_exchanged; - if ( __copy_field_to_guest(guest_handle_cast(compat, + if ( __copy_field_to_guest(guest_handle_cast(arg, compat_memory_exchange_t), &cmp.xchg, nr_exchanged) ) rc = -EFAULT; @@ -605,7 +605,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) cmp.vnuma.nr_vnodes = nat.vnuma->nr_vnodes; cmp.vnuma.nr_vcpus = nat.vnuma->nr_vcpus; cmp.vnuma.nr_vmemranges = nat.vnuma->nr_vmemranges; - if ( __copy_to_guest(compat, &cmp.vnuma, 1) ) + if ( __copy_to_guest(arg, &cmp.vnuma, 1) ) rc = -EFAULT; break; @@ -618,7 +618,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) { ASSERT(split == 0 && rc == 0); if ( __copy_field_to_guest( - guest_handle_cast(compat, + guest_handle_cast(arg, compat_mem_acquire_resource_t), nat.mar, nr_frames) ) return -EFAULT; @@ -707,7 +707,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( done < nat.mar->nr_frames ) return hypercall_create_continuation( __HYPERVISOR_memory_op, "ih", - op | (start_extent << MEMOP_EXTENT_SHIFT), compat); + op | (start_extent << MEMOP_EXTENT_SHIFT), arg); /* * Well... Somethings gone wrong with the two levels of chunking. @@ -728,7 +728,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) cmd = op | (start_extent << MEMOP_EXTENT_SHIFT); if ( split > 0 && hypercall_preempt_check() ) return hypercall_create_continuation( - __HYPERVISOR_memory_op, "ih", cmd, compat); + __HYPERVISOR_memory_op, "ih", cmd, arg); } while ( split > 0 ); if ( unlikely(rc > INT_MAX) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 26 08:44:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Sep 2023 08:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.608373.946811 (Exim 4.92) (envelope-from ) id 1ql3g7-0005Ib-1p; Tue, 26 Sep 2023 08:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 608373.946811; Tue, 26 Sep 2023 08:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3g6-0005IT-VN; Tue, 26 Sep 2023 08:44:22 +0000 Received: by outflank-mailman (input) for mailman id 608373; Tue, 26 Sep 2023 08:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3g5-0005I8-KK for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3g5-0003Ky-Ja for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ql3g5-0000Ja-IZ for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O+vBF6ppBmdefpwumTbGP0lWybOBf1KeYgUt5QCslmY=; b=MgbO1NRqyVPFQfaijxHZRRk5n8 fNguj/scd4xWPll4mcePvKLXmiax7SWAU0xWcqUPZAma4u4nSmcoCv4CzsSmgIp6tTQRxr9tXw8B9 NnXn5bXR474XWP8zV2CT0hDvbHvKJDM0gGdSmXqYawqk2W6XNUbifTCydV2gercW62vA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/numa: address a violation of MISRA C:2012 Rule 8.3 Message-Id: Date: Tue, 26 Sep 2023 08:44:21 +0000 commit 7e55acb58a0578e8f8c48f1a0ae0b572ad76c903 Author: Federico Serafini AuthorDate: Mon Sep 25 10:56:45 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 25 10:56:45 2023 +0200 xen/numa: address a violation of MISRA C:2012 Rule 8.3 Make object declarations consistent. No functional change. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Release-acked-by: Henry Wang --- xen/include/xen/numa.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/numa.h b/xen/include/xen/numa.h index 29b8c2df89..287e81ff66 100644 --- a/xen/include/xen/numa.h +++ b/xen/include/xen/numa.h @@ -60,7 +60,7 @@ static inline void clear_node_cpumask(unsigned int cpu) /* Simple perfect hash to map pdx to node numbers */ extern unsigned int memnode_shift; extern unsigned long memnodemapsize; -extern uint8_t *memnodemap; +extern nodeid_t *memnodemap; struct node_data { unsigned long node_start_pfn; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Sep 26 08:44:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Sep 2023 08:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.608374.946814 (Exim 4.92) (envelope-from ) id 1ql3gH-0005Mz-3B; Tue, 26 Sep 2023 08:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 608374.946814; Tue, 26 Sep 2023 08:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3gH-0005Ms-0b; Tue, 26 Sep 2023 08:44:33 +0000 Received: by outflank-mailman (input) for mailman id 608374; Tue, 26 Sep 2023 08:44:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3gF-0005Ma-NH for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ql3gF-0003L9-Mc for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ql3gF-0000KS-Lb for xen-changelog@lists.xenproject.org; Tue, 26 Sep 2023 08:44:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QZyNYnpSTO4q3+EOU3wpNdeLSVZ0DbiDs1BMMcneJDE=; b=y+LA2x5tnBM8YVshSwsIVNiwKN JzlIkCBsA/my6NuNIxYYhnQ3iIZd59c3kwrTEpv6ywEOQac/GyF7odP+ew2fQskqRMv5hoqDcmcTT Lua/wFNUU2s6fxbrAKVgJQ8Fb9YxvWHNYDjO3OctlwoBo9j1CRXTnoz3HXrUhNp5nbnY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/emul-i8254: remove forward declarations and re-order functions Message-Id: Date: Tue, 26 Sep 2023 08:44:31 +0000 commit d6351a10c80fcbbf2b5996d351b7181ba17b3b32 Author: Federico Serafini AuthorDate: Mon Sep 25 10:57:21 2023 +0200 Commit: Jan Beulich CommitDate: Mon Sep 25 10:57:21 2023 +0200 xen/emul-i8254: remove forward declarations and re-order functions Remove forward declarations, including one that violates MISRA C Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"), and re-order functions. No functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich Release-acked-by: Henry Wang --- xen/arch/x86/emul-i8254.c | 129 ++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 67 deletions(-) diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 41ec4a1ef1..ea17fb502a 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -48,11 +48,6 @@ #define RW_STATE_WORD0 3 #define RW_STATE_WORD1 4 -static int cf_check handle_pit_io( - int dir, unsigned int port, unsigned int bytes, uint32_t *val); -static int cf_check handle_speaker_io( - int dir, unsigned int port, unsigned int bytes, uint32_t *val); - #define get_guest_time(v) \ (is_hvm_vcpu(v) ? hvm_get_guest_time(v) : (u64)get_s_time()) @@ -466,68 +461,7 @@ static int cf_check pit_load(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, pit_load, 1, HVMSR_PER_DOM); #endif -void pit_reset(struct domain *d) -{ - PITState *pit = domain_vpit(d); - struct hvm_hw_pit_channel *s; - int i; - - if ( !has_vpit(d) ) - return; - - if ( is_hvm_domain(d) ) - { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); - destroy_periodic_time(&pit->pt0); - pit->pt0.source = PTSRC_isa; - } - - spin_lock(&pit->lock); - - for ( i = 0; i < 3; i++ ) - { - s = &pit->hw.channels[i]; - s->mode = 0xff; /* the init mode */ - s->gate = (i != 2); - pit_load_count(pit, i, 0); - } - - spin_unlock(&pit->lock); -} - -void pit_init(struct domain *d) -{ - PITState *pit = domain_vpit(d); - - if ( !has_vpit(d) ) - return; - - spin_lock_init(&pit->lock); - - if ( is_hvm_domain(d) ) - { - register_portio_handler(d, PIT_BASE, 4, handle_pit_io); - register_portio_handler(d, 0x61, 1, handle_speaker_io); - } - - pit_reset(d); -} - -void pit_deinit(struct domain *d) -{ - PITState *pit = domain_vpit(d); - - if ( !has_vpit(d) ) - return; - - if ( is_hvm_domain(d) ) - { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); - destroy_periodic_time(&pit->pt0); - } -} - -/* the intercept action for PIT DM retval:0--not handled; 1--handled */ +/* The intercept action for PIT DM retval: 0--not handled; 1--handled. */ static int cf_check handle_pit_io( int dir, unsigned int port, unsigned int bytes, uint32_t *val) { @@ -620,6 +554,67 @@ int pv_pit_handler(int port, int data, int write) return !write ? ioreq.data : 0; } +void pit_reset(struct domain *d) +{ + PITState *pit = domain_vpit(d); + struct hvm_hw_pit_channel *s; + int i; + + if ( !has_vpit(d) ) + return; + + if ( is_hvm_domain(d) ) + { + TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + destroy_periodic_time(&pit->pt0); + pit->pt0.source = PTSRC_isa; + } + + spin_lock(&pit->lock); + + for ( i = 0; i < 3; i++ ) + { + s = &pit->hw.channels[i]; + s->mode = 0xff; /* the init mode */ + s->gate = (i != 2); + pit_load_count(pit, i, 0); + } + + spin_unlock(&pit->lock); +} + +void pit_init(struct domain *d) +{ + PITState *pit = domain_vpit(d); + + if ( !has_vpit(d) ) + return; + + spin_lock_init(&pit->lock); + + if ( is_hvm_domain(d) ) + { + register_portio_handler(d, PIT_BASE, 4, handle_pit_io); + register_portio_handler(d, 0x61, 1, handle_speaker_io); + } + + pit_reset(d); +} + +void pit_deinit(struct domain *d) +{ + PITState *pit = domain_vpit(d); + + if ( !has_vpit(d) ) + return; + + if ( is_hvm_domain(d) ) + { + TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + destroy_periodic_time(&pit->pt0); + } +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 27 14:33:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Sep 2023 14:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.609056.947911 (Exim 4.92) (envelope-from ) id 1qlVb5-0002Op-Qx; Wed, 27 Sep 2023 14:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 609056.947911; Wed, 27 Sep 2023 14:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlVb5-0002Oh-Mx; Wed, 27 Sep 2023 14:33:03 +0000 Received: by outflank-mailman (input) for mailman id 609056; Wed, 27 Sep 2023 14:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlVb4-0002Ob-5X for xen-changelog@lists.xenproject.org; Wed, 27 Sep 2023 14:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlVb3-0005T9-Ut for xen-changelog@lists.xenproject.org; Wed, 27 Sep 2023 14:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qlVb3-0008V0-TR for xen-changelog@lists.xenproject.org; Wed, 27 Sep 2023 14: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=JMXuuDnGjgfGAUBUUEET4m6nDPY36x/V9u8D4sDlX2Q=; b=QVJAqJd4ok62l6Qa/YO8S+kKKu cmnUgMfda/BTm0IaoyJgYbFerrMfEYLlijdgL0rgbioG6FVWdcPHevzjlMvvFabMIwX69Nb6CCtO1 7U1G3J+QsX4lOJtyvSgs8hm3uncwX8H0oswaBXWSFe+QtXWPMuRaEH1XURpzMPfah7Ko=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/video: make declarations of defined functions available Message-Id: Date: Wed, 27 Sep 2023 14:33:01 +0000 commit e47f8c6c2a27cbdadb75b443af069a77f917067d Author: Nicola Vetrini AuthorDate: Tue Sep 26 10:06:18 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 26 10:06:18 2023 +0200 drivers/video: make declarations of defined functions available The declarations for 'vesa_{init,early_init,endboot}' needed by 'xen/drivers/video/vesa.c' and 'fill_console_start_info' in 'vga.c' are now available by moving the relative code inside 'vga.h'. While moving the code, the alternative definitions are now guarded by CONFIG_VGA. The alternative #define-s for 'vesa_early_init' and 'vesa_endboot' are dropped, since currently they have no callers when CONFIG_VGA is not defined. This also resolves violations of MISRA C:2012 Rule 8.4. Fixes: 6d9199bd0f22 ("x86-64: enable hypervisor output on VESA frame buffer") Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich Release-acked-by: Henry Wang --- xen/arch/x86/include/asm/setup.h | 6 ------ xen/arch/x86/platform_hypercall.c | 2 +- xen/arch/x86/pv/dom0_build.c | 2 +- xen/drivers/video/vga.c | 8 -------- xen/include/xen/console.h | 2 -- xen/include/xen/vga.h | 6 ++++++ 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index b0e6a39e23..dfdd9e5551 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -25,12 +25,6 @@ void subarch_init_memory(void); void init_IRQ(void); -#ifdef CONFIG_VIDEO -void vesa_init(void); -#else -static inline void vesa_init(void) {}; -#endif - int construct_dom0( struct domain *d, const module_t *image, unsigned long image_headroom, diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 9ff2da8fc3..9469de9045 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -24,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 909ee9a899..5bbed3a36a 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -4,7 +4,6 @@ * Copyright (c) 2002-2005, K A Fraser */ -#include #include #include #include @@ -13,6 +12,7 @@ #include #include #include +#include #include #include diff --git a/xen/drivers/video/vga.c b/xen/drivers/video/vga.c index 0a03508bee..18b590cdf0 100644 --- a/xen/drivers/video/vga.c +++ b/xen/drivers/video/vga.c @@ -54,14 +54,6 @@ string_param("vga", opt_vga); static unsigned int columns, lines; #define ATTRIBUTE 7 -#ifdef CONFIG_X86 -void vesa_early_init(void); -void vesa_endboot(bool_t keep); -#else -#define vesa_early_init() ((void)0) -#define vesa_endboot(x) ((void)0) -#endif - void __init video_init(void) { char *p; diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index 53c56191ba..ab5c30c0da 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -20,8 +20,6 @@ void console_init_postirq(void); void console_endboot(void); int console_has(const char *device); -int fill_console_start_info(struct dom0_vga_console_info *); - unsigned long console_lock_recursive_irqsave(void); void console_unlock_recursive_irqrestore(unsigned long flags); void console_force_unlock(void); diff --git a/xen/include/xen/vga.h b/xen/include/xen/vga.h index f72b63d446..ceb8a527ed 100644 --- a/xen/include/xen/vga.h +++ b/xen/include/xen/vga.h @@ -13,6 +13,12 @@ #ifdef CONFIG_VGA extern struct xen_vga_console_info vga_console_info; +int fill_console_start_info(struct dom0_vga_console_info *ci); +void vesa_init(void); +void vesa_early_init(void); +void vesa_endboot(bool keep); +#else +static inline void vesa_init(void) {} #endif #endif /* _XEN_VGA_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 27 14:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Sep 2023 14:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.609057.947913 (Exim 4.92) (envelope-from ) id 1qlVbF-0002SH-RL; Wed, 27 Sep 2023 14:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 609057.947913; Wed, 27 Sep 2023 14:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlVbF-0002S9-Og; Wed, 27 Sep 2023 14:33:13 +0000 Received: by outflank-mailman (input) for mailman id 609057; Wed, 27 Sep 2023 14:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlVbE-0002Rv-2P for xen-changelog@lists.xenproject.org; Wed, 27 Sep 2023 14:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlVbE-0005TH-1Y for xen-changelog@lists.xenproject.org; Wed, 27 Sep 2023 14:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qlVbE-0008Vj-0c for xen-changelog@lists.xenproject.org; Wed, 27 Sep 2023 14:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VfEMD9As7KDFX/3b5pvqhD9BaY5Og7VWpZjiqitbDgA=; b=M4eZRLGoi7bXmhf0MPwNj+0CGr 7D6iidr9JvaNLlTeq0o0y/FHxOZs0hRl/ZZbYkEXsizTy2gj2hQ0vxsHpzON6yNM0u9ruU8VLFiNK ZG17RkJac+nE8AgEZsVOEZQiKed113rP20e7EYneppgEhLe743wq63G3zqC3lkDGUCXs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Drop ppc64le-*randconfig jobs Message-Id: Date: Wed, 27 Sep 2023 14:33:12 +0000 commit cbb71b95dd708b1e26899bbe1e7bf9a85081fd60 Author: Shawn Anastasio AuthorDate: Tue Sep 26 10:08:25 2023 +0200 Commit: Jan Beulich CommitDate: Tue Sep 26 10:08:25 2023 +0200 automation: Drop ppc64le-*randconfig jobs Since ppc64le is still undergoing early bringup, disable the randconfig CI build which was causing spurious CI failures. Reported-by: Jan Beulich Signed-off-by: Shawn Anastasio Acked-by: Stefano Stabellini Release-acked-by: Henry Wang --- automation/gitlab-ci/build.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 1619e9a558..32af30cced 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -563,24 +563,6 @@ debian-bullseye-gcc-ppc64le-debug: KBUILD_DEFCONFIG: ppc64_defconfig HYPERVISOR_ONLY: y -debian-bullseye-gcc-ppc64le-randconfig: - extends: .gcc-ppc64le-cross-build - variables: - CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: ppc64_defconfig - RANDCONFIG: y - EXTRA_FIXED_RANDCONFIG: - CONFIG_COVERAGE=n - -debian-bullseye-gcc-ppc64le-debug-randconfig: - extends: .gcc-ppc64le-cross-build-debug - variables: - CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: ppc64_defconfig - RANDCONFIG: y - EXTRA_FIXED_RANDCONFIG: - CONFIG_COVERAGE=n - # Yocto test jobs yocto-qemuarm64: extends: .yocto-test-arm64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 28 07:00:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Sep 2023 07:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.609283.948269 (Exim 4.92) (envelope-from ) id 1qll0F-0001zG-3j; Thu, 28 Sep 2023 07:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 609283.948269; Thu, 28 Sep 2023 07: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 1qll0F-0001yo-0O; Thu, 28 Sep 2023 07:00:03 +0000 Received: by outflank-mailman (input) for mailman id 609283; Thu, 28 Sep 2023 07:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qll0E-0001jG-0B for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 07:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qll0D-0004kA-H7 for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 07:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qll0D-0005Bb-Fy for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 07: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=uiY8SHm29vrD0Dh9MQP3xinN2wdw1ntkk2/hfPEWrHI=; b=gjig04tdAUorwAC5peAHa2jx9s 0XZ9Dbf/74yp5bulWG7+tNTrUzl4JY8YXlL9M6SFU/9htu+WJV7fhQYJx1ddW/15QVK+RLqvhsw3C 3MDtsVwpUVCeqCg3iPiD7QV3Q6w0Lf+T8YOB7RvuRHxdwuhZdRNRQBODBQdxhKHWoiMw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ARM: GICv3 ITS: flush caches for newly allocated ITT Message-Id: Date: Thu, 28 Sep 2023 07:00:01 +0000 commit a1f8b32af001c15ce3c6be2364826b1ca35b6caa Author: Volodymyr Babchuk AuthorDate: Fri Sep 22 22:27:15 2023 +0000 Commit: Julien Grall CommitDate: Wed Sep 27 11:34:55 2023 +0100 ARM: GICv3 ITS: flush caches for newly allocated ITT ITS manages Device Tables and Interrupt Translation Tables on its own, so generally we are not interested in maintaining any coherence with CPU's view of those memory regions, except one case: ITS requires that Interrupt Translation Tables should be initialized with zeroes. Existing code already does this, but it does not cleans caches afterwards. This means that ITS may see un-initialized ITT and CPU can overwrite portions of ITT later, when it finally decides to flush caches. Visible effect of this issue that there are not interrupts delivered from a device. Fix this by calling clean_and_invalidate_dcache_va_range() for newly allocated ITT. Fixes: 69082e1c210d ("ARM: GICv3 ITS: introduce device mapping") Signed-off-by: Volodymyr Babchuk Tested-by: Stewart Hildebrand Reviewed-by: Julien Grall Release-acked-by: Henry Wang --- xen/arch/arm/gic-v3-its.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c index 3aa4edda10..8afcd9783b 100644 --- a/xen/arch/arm/gic-v3-its.c +++ b/xen/arch/arm/gic-v3-its.c @@ -685,6 +685,9 @@ int gicv3_its_map_guest_device(struct domain *d, if ( !itt_addr ) goto out_unlock; + clean_and_invalidate_dcache_va_range(itt_addr, + nr_events * hw_its->itte_size); + dev = xzalloc(struct its_device); if ( !dev ) goto out_unlock; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 28 23:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Sep 2023 23:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610111.949385 (Exim 4.92) (envelope-from ) id 1qm0VD-0002Jl-OZ; Thu, 28 Sep 2023 23:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610111.949385; Thu, 28 Sep 2023 23:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qm0VD-0002Jc-Ls; Thu, 28 Sep 2023 23:33:03 +0000 Received: by outflank-mailman (input) for mailman id 610111; Thu, 28 Sep 2023 23:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qm0VB-0002JS-Sy for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 23:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qm0VB-0004ZZ-N3 for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 23:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qm0VB-0004zk-LO for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 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=8KpsmpAZ3EUBHMf3W4NuGuhXJZLV8nZs/BAkzDIR5gs=; b=cHCA1tx/ZiB5wh9Qv14kxEPQJg NSNJ4PMmWeRjtbEmkMyN8K8W2CQchxRJPnB2OFq8jFG2yszVxoVp8Pi6nAd5Gfqhc97x+KJtemUhf RmVOVipbwSUlpu+KWqfv1xFQ6QLm8jFqPFq4ZcJwA5cKZ+FPgtVMZLGjq+SZjPR3mFyw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Change build script to use arch defconfig Message-Id: Date: Thu, 28 Sep 2023 23:33:01 +0000 commit 0595f9685466cafd6fb4c91c2319de481e6b7ec0 Author: Shawn Anastasio AuthorDate: Tue Sep 26 17:37:38 2023 -0500 Commit: Stefano Stabellini CommitDate: Wed Sep 27 16:28:55 2023 -0700 automation: Change build script to use arch defconfig Change automation build script to call the make defconfig target before setting CONFIG_DEBUG and extra options. This fixes issues on Power where the build fails without using the ppc64_defconfig. Reported-by: Jan Beulich Signed-off-by: Shawn Anastasio Reviewed-by: Stefano Stabellini Release-acked-by: Henry Wang --- automation/scripts/build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/automation/scripts/build b/automation/scripts/build index b4edcf010e..b3c71fb6fb 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -22,7 +22,10 @@ if [[ "${RANDCONFIG}" == "y" ]]; then # RANDCONFIG implies HYPERVISOR_ONLY HYPERVISOR_ONLY="y" else - echo "CONFIG_DEBUG=${debug}" > xen/.config + # Start off with arch's defconfig + make -C xen defconfig + + echo "CONFIG_DEBUG=${debug}" >> xen/.config if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then echo "${EXTRA_XEN_CONFIG}" >> xen/.config -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 28 23:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Sep 2023 23:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610113.949389 (Exim 4.92) (envelope-from ) id 1qm0VN-0002So-QE; Thu, 28 Sep 2023 23:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610113.949389; Thu, 28 Sep 2023 23:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qm0VN-0002Sg-NJ; Thu, 28 Sep 2023 23:33:13 +0000 Received: by outflank-mailman (input) for mailman id 610113; Thu, 28 Sep 2023 23:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qm0VL-0002SY-T4 for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 23:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qm0VL-0004Zi-SK for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 23:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qm0VL-00050a-P7 for xen-changelog@lists.xenproject.org; Thu, 28 Sep 2023 23:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jTtrQQWzc3i2X6alPTb0G8hgExt8N7b6ifEQ+Hv8+cA=; b=L8PihGY7VBq5c1+wTyx70roCX/ nErF2sbu8AOCYcpPgv5ZsV5CsESe4eBJ1ccHe8wdHWkiJTnZNQfZ3Mtb9/Ubfx+f+UJ4r5WdmPp8E eEiYVmvimwODcEf7Xm0qS3WAyOIZKhi5Z4yp/RFyGeWhxcKPVcd5qqzNUt4inc3dMC2Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: Add NUMA node id bounds check to page_alloc.c/node_to_scrub Message-Id: Date: Thu, 28 Sep 2023 23:33:11 +0000 commit a363089e68ed677fef12c296253535753fe817e3 Author: Shawn Anastasio AuthorDate: Tue Sep 26 17:37:39 2023 -0500 Commit: Stefano Stabellini CommitDate: Wed Sep 27 16:28:55 2023 -0700 xen/common: Add NUMA node id bounds check to page_alloc.c/node_to_scrub When building for Power with CONFIG_DEBUG unset, a compiler error gets raised inside page_alloc.c's node_to_scrub function: common/page_alloc.c: In function 'node_to_scrub.part.0': common/page_alloc.c:1217:29: error: array subscript 1 is above array bounds of 'long unsigned int[1]' [-Werror=array-bounds] 1217 | if ( node_need_scrub[node] ) It appears that this is a false positive, given that in practice cycle_node should never return a node ID >= MAX_NUMNODES as long as the architecture's node_online_map is properly defined and initialized, so this additional bounds check is only to satisfy GCC. Signed-off-by: Shawn Anastasio Reviewed-by: Stefano Stabellini --- xen/common/page_alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 35d9a26fa6..9b5df74fdd 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1211,6 +1211,14 @@ static unsigned int node_to_scrub(bool get_node) } while ( !cpumask_empty(&node_to_cpumask(node)) && (node != local_node) ); + /* + * In practice `node` will always be within MAX_NUMNODES, but GCC can't + * always see that, so an explicit check is necessary to avoid tripping + * its out-of-bounds array access warning (-Warray-bounds). + */ + if ( node >= MAX_NUMNODES ) + break; + if ( node == local_node ) break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 30 06:44:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Sep 2023 06:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610813.950335 (Exim 4.92) (envelope-from ) id 1qmThr-0005hd-Hs; Sat, 30 Sep 2023 06:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610813.950335; Sat, 30 Sep 2023 06: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 1qmThr-0005hV-F8; Sat, 30 Sep 2023 06:44:03 +0000 Received: by outflank-mailman (input) for mailman id 610813; Sat, 30 Sep 2023 06:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmThq-0005hP-BH for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 06:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmThq-0008P9-AO for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 06:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qmThq-00010X-7i for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 06: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=0eAHDlbRv40rmnX15RVmZdGZWNNMcGJfk7xrSvmqEPo=; b=aoZwUXAwH0PFDcRd13GaiYDu7I EkKcZB5dJTJtr3WePkuZk6jr4kJkAoNZUzEjjVlG0chHi+pL778SE2wLFuWOwDtR4fte8erHebcNY cW0ISX/dWPY14DLF92oPa6RurRHH+lKSgnBd2n+vyvLly5z+cG9ByiPOj38nC/3XiEps=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Config.mk pin QEMU_UPSTREAM_REVISION (prep for Xen 4.18 RC1) Message-Id: Date: Sat, 30 Sep 2023 06:44:02 +0000 commit 520d18e0ff7917ef86b6a69c7949f15e6a804f3d Author: Julien Grall AuthorDate: Fri Sep 29 09:07:10 2023 +0100 Commit: Julien Grall CommitDate: Fri Sep 29 09:07:10 2023 +0100 Config.mk pin QEMU_UPSTREAM_REVISION (prep for Xen 4.18 RC1) Signed-off-by: Julien Grall Release-acked-by: Henry Wang --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index 29c29f8d7f..000cf06d41 100644 --- a/Config.mk +++ b/Config.mk @@ -223,7 +223,7 @@ OVMF_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/ovmf.git OVMF_UPSTREAM_REVISION ?= ba91d0292e593df8528b66f99c1b0b14fadc8e16 QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git -QEMU_UPSTREAM_REVISION ?= master +QEMU_UPSTREAM_REVISION ?= 0df9387c8983e1b1e72d8c574356f572342c03e6 MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git MINIOS_UPSTREAM_REVISION ?= 5bcb28aaeba1c2506a82fab0cdad0201cd9b54b3 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 30 06:44:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Sep 2023 06:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610814.950339 (Exim 4.92) (envelope-from ) id 1qmTi1-0005jQ-JL; Sat, 30 Sep 2023 06:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610814.950339; Sat, 30 Sep 2023 06: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 1qmTi1-0005jI-Ge; Sat, 30 Sep 2023 06:44:13 +0000 Received: by outflank-mailman (input) for mailman id 610814; Sat, 30 Sep 2023 06:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmTi0-0005jA-ER for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 06:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmTi0-0008PG-Dg for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 06:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qmTi0-00010y-CX for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 06: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=TVWJjCwcR7AP6+GV/rqRhLo54R7eXVwIsFwMk/tWH2w=; b=vpC8pzL4XeswbC1b1uL3TadJDP ltxHPXb+Wl4gO0+xeRG81XeGXmTLqkupwo74V2UMdsQ7OYSf2nmf9SojwyaL13hbFk+qK6iTNx/kk Mug2U4DVtjwCwK9TDj0DVI6/porF8QRUeJxzCQSjadw8F9VJjcgn5NmQob4CyCmciUtY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Update Xen version to 4.18-rc Message-Id: Date: Sat, 30 Sep 2023 06:44:12 +0000 commit a8ab67cae01eca7bba8627ce13429c59fda056f3 Author: Julien Grall AuthorDate: Fri Sep 29 09:09:29 2023 +0100 Commit: Julien Grall CommitDate: Fri Sep 29 09:09:29 2023 +0100 Update Xen version to 4.18-rc Signed-off-by: Julien Grall Release-acked-by: Henry Wang --- README | 12 ++++++------ SUPPORT.md | 2 +- xen/Makefile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README b/README index a491c8dce5..855db01d36 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ -############################################### +################################################# __ __ _ _ _ ___ -\ \/ /___ _ __ | || | / |( _ ) - \ // _ \ '_ \ | || |_ | |/ _ \ - / \ __/ | | | |__ _|| | (_) | -/_/\_\___|_| |_| |_|(_)_|\___/ +\ \/ /___ _ __ | || | / |( _ ) _ __ ___ + \ // _ \ '_ \ | || |_ | |/ _ \ _____| '__/ __| + / \ __/ | | | |__ _|| | (_) |_____| | | (__ +/_/\_\___|_| |_| |_|(_)_|\___/ |_| \___| -############################################### +################################################# https://www.xen.org/ diff --git a/SUPPORT.md b/SUPPORT.md index 3461f5cf2f..44dbd4f190 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -9,7 +9,7 @@ for the definitions of the support status levels etc. # Release Support - Xen-Version: 4.18-unstable + Xen-Version: 4.18-rc Initial-Release: n/a Supported-Until: TBD Security-Support-Until: Unreleased - not yet security-supported diff --git a/xen/Makefile b/xen/Makefile index 2dc5e3526d..fd0e63d29e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 18 -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 30 22:00:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Sep 2023 22:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610893.950373 (Exim 4.92) (envelope-from ) id 1qmi0I-0007xs-Gx; Sat, 30 Sep 2023 22:00:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610893.950373; Sat, 30 Sep 2023 22:00: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 1qmi0I-0007xW-E3; Sat, 30 Sep 2023 22:00:02 +0000 Received: by outflank-mailman (input) for mailman id 610893; Sat, 30 Sep 2023 22:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0H-0007oI-Nm for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0H-0007Lf-Ht for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qmi0H-0000kq-Gl for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22: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=wI2YRbYwAVeoTQO9RWh5DNysKRhgUUact5FM2wYwdpQ=; b=aYGjSN3kqFlkuAOaEhPwYmeI9s VbcFEMf9IH+MhgqiA/vT35sox5LhySxLPodE3F17rApCseO0gWanc5vJiEfZZbSNyjKibtQuzJdRB 8auIzipdEEWiERQBEsrLM9zKp50jKtvtdtxqOraKankGKm+lfM0g07Bh/vQ81i/JPCHE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: Avoid leaking memory in check_store Message-Id: Date: Sat, 30 Sep 2023 22:00:01 +0000 commit 33cf95008548e2a9eb5a27728f303298823d895d Author: David Kahurani AuthorDate: Fri Sep 29 07:57:24 2023 +0300 Commit: Andrew Cooper CommitDate: Fri Sep 29 10:50:37 2023 +0100 tools/xenstore: Avoid leaking memory in check_store check_store() will leak the memory from reading the "@introduceDomain" and "@releaseDomain" nodes. While this code should not be trigger-able from an unprivileged domain it is called multiple times when the database gets inconsistent. This means that a malicious guest able to corrupt the database will trigger the leaks here. Fix the leaks so that this code can be safely called from anywhere. Fixes: 67617067f0b6 ("tools/xenstore: let check_store() check the accounting data") Signed-off-by: David Kahurani Reviewed-by: Juergen Gross Release-acked-by: Henry Wang --- tools/xenstored/core.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 092de76a2e..edd07711db 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2535,18 +2535,18 @@ static void clean_store(struct check_store_data *data) domain_check_acc(data->domains); } -int check_store_path(const char *name, struct check_store_data *data) +int check_store_path(const void *ctx, const char *name, struct check_store_data *data) { struct node *node; - node = read_node(NULL, NULL, name); + node = read_node(NULL, ctx, name); if (!node) { log("check_store: error %d reading special node '%s'", errno, name); return errno; } - return check_store_step(NULL, NULL, node, data); + return check_store_step(ctx, NULL, node, data); } void check_store(void) @@ -2556,6 +2556,7 @@ void check_store(void) .enoent = check_store_enoent, }; struct check_store_data data; + void *ctx; /* Don't free values (they are all void *1) */ data.reachable = create_hashtable(NULL, "checkstore", hash_from_key_fn, @@ -2571,17 +2572,19 @@ void check_store(void) goto out_hash; } + ctx = talloc_new(NULL); log("Checking store ..."); - if (walk_node_tree(NULL, NULL, "/", &walkfuncs, &data)) { + if (walk_node_tree(ctx, NULL, "/", &walkfuncs, &data)) { if (errno == ENOMEM) log("check_store: ENOMEM"); - } else if (!check_store_path("@introduceDomain", &data) && - !check_store_path("@releaseDomain", &data) && + } else if (!check_store_path(ctx, "@introduceDomain", &data) && + !check_store_path(ctx, "@releaseDomain", &data) && !check_transactions(data.reachable)) clean_store(&data); log("Checking store complete."); hashtable_destroy(data.domains); + talloc_free(ctx); out_hash: hashtable_destroy(data.reachable); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 30 22:00:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Sep 2023 22:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610894.950376 (Exim 4.92) (envelope-from ) id 1qmi0S-0000AM-I4; Sat, 30 Sep 2023 22:00:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610894.950376; Sat, 30 Sep 2023 22:00:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0S-0000AD-FT; Sat, 30 Sep 2023 22:00:12 +0000 Received: by outflank-mailman (input) for mailman id 610894; Sat, 30 Sep 2023 22:00:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0R-00009y-Mf for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0R-0007Lm-Ly for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qmi0R-0000mJ-Ju for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00: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=32+HAeLbIVL7wMy4uAYybXDqEGelrJrA1qIuh5O8f+0=; b=gITwQ7emz/MHm6LuiQ/3mXmTvf jfQvuTdNT1BEWVtd9rn+RptkvRPvtIjo4DhfGPbx3uQpv4heMayDGYSFrSUbRt+dV2Fp/MsH+UI+h 9YxSdD6DZ77xST+EFE1mbqkhdJz2u76dcytKAV6jQHuTr6og5yvCjUqDzpefI3WkigOc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Fix stack initialization in head.S Message-Id: Date: Sat, 30 Sep 2023 22:00:11 +0000 commit 2797a717121cda0da5eeea3a17203d1c155c5e54 Author: Shawn Anastasio AuthorDate: Thu Sep 28 18:19:27 2023 -0500 Commit: Andrew Cooper CommitDate: Fri Sep 29 10:50:37 2023 +0100 xen/ppc: Fix stack initialization in head.S The code to set up the stack in head.S erroneously loads the bottom of the stack (the symbol cpu0_boot_stack) into r1 instead of the top of the stack (cpu0_boot_stack + STACK_SIZE). Fixes: 3a4e6f67bc68 ("xen/ppc: Set up a basic C environment") Signed-off-by: Shawn Anastasio Reviewed-by: Andrew Cooper Release-acked-by: Henry Wang --- xen/arch/ppc/ppc64/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/ppc/ppc64/head.S b/xen/arch/ppc/ppc64/head.S index e600ddb05f..6ce313aff8 100644 --- a/xen/arch/ppc/ppc64/head.S +++ b/xen/arch/ppc/ppc64/head.S @@ -46,7 +46,7 @@ ENTRY(start) .L_correct_address: /* set up the initial stack */ - LOAD_REG_ADDR(%r1, cpu0_boot_stack) + LOAD_REG_ADDR(%r1, cpu0_boot_stack + STACK_SIZE) li %r11, 0 stdu %r11, -STACK_FRAME_OVERHEAD(%r1) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 30 22:00:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Sep 2023 22:00:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610895.950381 (Exim 4.92) (envelope-from ) id 1qmi0c-0000Ch-JY; Sat, 30 Sep 2023 22:00:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610895.950381; Sat, 30 Sep 2023 22:00: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 1qmi0c-0000CY-Gs; Sat, 30 Sep 2023 22:00:22 +0000 Received: by outflank-mailman (input) for mailman id 610895; Sat, 30 Sep 2023 22:00:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0b-0000CO-Q9 for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0b-0007M3-PY for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qmi0b-0000mo-O5 for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00: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=php+5MxDxwzonCRc9UnRDhZWRsrGkglotCUruJzytVA=; b=O/b45+/M7YLhyr+IVVHvMJgWHA YLOiRKIwXd280y5oETSphVhKxeRBzodSnZC6QCv9qf+vxUrCY4o4j5RGarymebfEFZU2+ESvpwg3F MfAsExdTrag0ic3HyMlDSQ1gihnSpfyj3JhL/emOYXP5ukosN2VQCqU8sbw8o+SBZiI4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add 14.3 Message-Id: Date: Sat, 30 Sep 2023 22:00:21 +0000 commit b1c84ab41a80e08512e61f8fce740227aebc3f9e Author: Stefano Stabellini AuthorDate: Fri Sep 8 13:27:23 2023 -0700 Commit: Stefano Stabellini CommitDate: Fri Sep 29 11:00:47 2023 -0700 docs/misra: add 14.3 Add 14.3, with project-wide deviations. Also take the opportunity to clarify that parameters of function pointer types are expected to have names (Rule 8.2). Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Bertrand Marquis Release-acked-by: Henry Wang --- docs/misra/rules.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 8e7d17d242..67c9195ed8 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -234,7 +234,8 @@ maintainers if you want to suggest a change. * - `Rule 8.2 `_ - Required - Function types shall be in prototype form with named parameters - - + - Clarification: both function and function pointers types shall + have named parameters. * - `Rule 8.3 `_ - Required @@ -395,6 +396,18 @@ maintainers if you want to suggest a change. - A loop counter shall not have essentially floating type - + * - `Rule 14.3 `_ + - Required + - Controlling expressions shall not be invariant + - Due to the extensive usage of IS_ENABLED, sizeof compile-time + checks, and other constructs that are detected as errors by MISRA + C scanners, managing the configuration of a MISRA C scanner for + this rule would be unmanageable. Thus, this rule is adopted with + a project-wide deviation on if, ?:, switch(sizeof(...)), and + switch(offsetof(...)) statements. + + while(0) and while(1) and alike are allowed. + * - `Rule 16.7 `_ - Required - A switch-expression shall not have essentially Boolean type -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 30 22:00:32 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Sep 2023 22:00:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610896.950384 (Exim 4.92) (envelope-from ) id 1qmi0m-0000Fx-N3; Sat, 30 Sep 2023 22:00:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610896.950384; Sat, 30 Sep 2023 22:00: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 1qmi0m-0000Fp-Jf; Sat, 30 Sep 2023 22:00:32 +0000 Received: by outflank-mailman (input) for mailman id 610896; Sat, 30 Sep 2023 22:00:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0l-0000FZ-UA for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0l-0007ME-SR for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qmi0l-0000nF-RZ for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00: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=1uemGZomSBLxwLxp6qIwXhwIO2vau91R9LMFoqVEOuw=; b=iepkoc5699rrRY1bWJabLfydeO 5b3k08bJuhm0DsxKv8j8I0rbSQ8360PlOv4wqDAt0nsNX7rsytnVD+rcBkrzeCgL3D4jSkj4P6R76 UmRCdAG2ex0+fBbtMkGiiBOy725mZ211/B7vBrLEwWbgmz2sIJ4qHZOALip19uadOMPQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add rule 11.9 Message-Id: Date: Sat, 30 Sep 2023 22:00:31 +0000 commit 0b5bca91aa490ec6d57045550b3dc1bc22babf6e Author: Stefano Stabellini AuthorDate: Tue Sep 26 18:05:38 2023 -0700 Commit: Stefano Stabellini CommitDate: Fri Sep 29 11:00:47 2023 -0700 docs/misra: add rule 11.9 Following up from the MISRA C group discussion, add Rule 11.9 to docs/misra/rules.rst. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Bertrand Marquis Release-acked-by: Henry Wang --- docs/misra/rules.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 67c9195ed8..661aa95e23 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -374,6 +374,11 @@ maintainers if you want to suggest a change. - A cast shall not remove any const or volatile qualification from the type pointed to by a pointer - + * - `Rule 11.9 `_ + - Required + - The macro NULL shall be the only permitted form of null pointer constant + - + * - `Rule 12.5 `_ - Mandatory - The sizeof operator shall not have an operand which is a function -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 30 22:00:42 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Sep 2023 22:00:42 +0000 Received: from list by lists.xenproject.org with outflank-mailman.610897.950388 (Exim 4.92) (envelope-from ) id 1qmi0w-0000JZ-Ou; Sat, 30 Sep 2023 22:00:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 610897.950388; Sat, 30 Sep 2023 22:00: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 1qmi0w-0000JR-MK; Sat, 30 Sep 2023 22:00:42 +0000 Received: by outflank-mailman (input) for mailman id 610897; Sat, 30 Sep 2023 22:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0w-0000J8-0W for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qmi0v-0007Mg-VM for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qmi0v-0000o3-UV for xen-changelog@lists.xenproject.org; Sat, 30 Sep 2023 22:00:41 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KjNMfB4n8InW+ONQjBvS7aB4AjQIXm6D7HaUm6hzEwQ=; b=6iXiAJ3MORG7MprNTwIRcfF6nR 23Xb0IMFpMQ1ejcX9i7B7dwTlN/rixsjTocpqTaL/NhyjbkSKf16aWOebRvxvHnaF7u4jHbEXNeMF 6dYYu62rwSpDfMYzpEJaZOHQ8CP9OGJYCDnk01NydneQHFYJMmPZsB3co6L4A2nHJQuw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add rule 2.1 exceptions Message-Id: Date: Sat, 30 Sep 2023 22:00:41 +0000 commit 5bdfcf7fe89759321335159c8304833dc32a25cd Author: Stefano Stabellini AuthorDate: Wed Aug 23 15:39:42 2023 -0700 Commit: Stefano Stabellini CommitDate: Fri Sep 29 11:00:47 2023 -0700 docs/misra: add rule 2.1 exceptions During the discussions that led to the acceptance of Rule 2.1, we decided on a few exceptions that were not properly recorded in rules.rst. Add them now. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Bertrand Marquis Release-acked-by: Henry Wang --- docs/misra/rules.rst | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 661aa95e23..a2fe01464e 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -107,7 +107,16 @@ maintainers if you want to suggest a change. * - `Rule 2.1 `_ - Required - A project shall not contain unreachable code - - + - The following are allowed: + - Invariantly constant conditions, e.g. if(IS_ENABLED(CONFIG_HVM)) { S; } + - Switch with a controlling value statically determined not to + match one or more case statements + - Functions that are intended to be referenced only from + assembly code (e.g. 'do_trap_fiq') + - asm-offsets.c, as they are not linked deliberately, because + they are used to generate definitions for asm modules + - Declarations without initializer are safe, as they are not + executed * - `Rule 2.6 `_ - Advisory -- generated by git-patchbot for /home/xen/git/xen.git#master